Hello community, here is the log from the commit of package koffice checked in at Sat Jun 3 11:36:51 CEST 2006. -------- --- KDE/koffice/koffice.changes 2006-06-02 11:12:08.000000000 +0200 +++ koffice/koffice.changes 2006-06-02 18:01:39.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 2 16:01:00 CEST 2006 - stbinner@suse.de + +- fix build for < 10.1 and for < 10.0 +- remove 9.2 and supplementary specific stuff + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ koffice.spec ++++++ --- /var/tmp/diff_new_pack.ztCYSp/_old 2006-06-03 11:36:16.000000000 +0200 +++ /var/tmp/diff_new_pack.ztCYSp/_new 2006-06-03 11:36:16.000000000 +0200 @@ -26,7 +26,7 @@ Group: Productivity/Office/Suite Summary: Libraries and Base Files for the KDE Office Suite Version: 1.5.1 -Release: 9 +Release: 10 Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: koffice-%{version}.tar.bz2 @@ -196,7 +196,9 @@ Group: Productivity/Graphics/Vector Editors Obsoletes: kivio Provides: kivio +%if %suse_version > 1000 Recommends: koffice-illustration-plugins +%endif %description illustration This package contains the koffice illustration applications: @@ -261,7 +263,9 @@ %patch10 rm -rf ascend . /etc/opt/kde3/common_options +%if %suse_version > 930 update_admin --no-unsermake +%endif %build . /etc/opt/kde3/common_options @@ -272,6 +276,9 @@ %install . /etc/opt/kde3/common_options make DESTDIR=${RPM_BUILD_ROOT} $INSTALL_TARGET +%if %{?opensuse_bs:1}0 +rm $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/image/x-raw.desktop +%endif mkdir -p $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/truetype-tmp pushd $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/truetype-tmp %if 0 @@ -491,13 +498,6 @@ /opt/kde3/share/icons/*/*x*/*/kformula.png /opt/kde3/share/apps/konqueror/servicemenus/kformula_konqi.desktop /opt/kde3/share/apps/konqueror/servicemenus/kword_konqi.desktop -%if %suse_version == 920 -%if !%is_plus -/opt/kde3/share/mimelnk/application/vnd.oasis.opendocument.text-template.desktop -/opt/kde3/share/mimelnk/application/vnd.oasis.opendocument.text.desktop -/opt/kde3/share/mimelnk/application/vnd.oasis.opendocument.formula.desktop -%endif -%endif /opt/kde3/share/templates/TextDocument.desktop /opt/kde3/share/templates/.source/TextDocument.kwt @@ -534,13 +534,6 @@ /opt/kde3/share/services/kspread* /opt/kde3/share/apps/konqueror/servicemenus/kspread_konqi.desktop /opt/kde3/share/apps/konqueror/servicemenus/kchart_konqi.desktop -%if %suse_version == 920 -%if !%is_plus -/opt/kde3/share/mimelnk/application/vnd.oasis.opendocument.spreadsheet-template.desktop -/opt/kde3/share/mimelnk/application/vnd.oasis.opendocument.spreadsheet.desktop -/opt/kde3/share/mimelnk/application/vnd.oasis.opendocument.chart.desktop -%endif -%endif /opt/kde3/share/templates/SpreadSheet.desktop /opt/kde3/share/templates/.source/SpreadSheet.kst @@ -588,14 +581,12 @@ /opt/kde3/share/servicetypes/kexi*.desktop /opt/kde3/share/services/kformdesigner* %doc %lang(en) /opt/kde3/share/doc/HTML/en/kexi -%if !%is_plus %if %suse_version < 1001 /opt/kde3/share/config/magic/msaccess.magic /opt/kde3/share/config/magic/sqlite.magic /opt/kde3/share/mimelnk/application/x-sqlite2.desktop /opt/kde3/share/mimelnk/application/x-sqlite3.desktop %endif -%endif %files presentation %defattr(-,root,root) @@ -613,12 +604,6 @@ /opt/kde3/share/icons/*/*x*/*/kpresenter.png /opt/kde3/share/services/kpr* /opt/kde3/share/apps/konqueror/servicemenus/kpresenter_konqi.desktop -%if %suse_version == 920 -%if !%is_plus -/opt/kde3/share/mimelnk/application/vnd.oasis.opendocument.presentation-template.desktop -/opt/kde3/share/mimelnk/application/vnd.oasis.opendocument.presentation.desktop -%endif -%endif /opt/kde3/share/templates/Presentation.desktop /opt/kde3/share/templates/.source/Presentation.kpt @@ -672,13 +657,6 @@ %doc %lang(en) /opt/kde3/share/doc/HTML/en/krita /opt/kde3/share/apps/konqueror/servicemenus/kivio_konqi.desktop /opt/kde3/share/apps/konqueror/servicemenus/karbon_konqi.desktop -%if %suse_version == 920 -%if !%is_plus -/opt/kde3/share/mimelnk/application/vnd.oasis.opendocument.graphics-template.desktop -/opt/kde3/share/mimelnk/application/vnd.oasis.opendocument.graphics.desktop -/opt/kde3/share/mimelnk/application/vnd.oasis.opendocument.image.desktop -%endif -%endif /opt/kde3/share/templates/Illustration.desktop /opt/kde3/share/templates/.source/Illustration.karbon @@ -718,6 +696,9 @@ %changelog -n koffice * Fri Jun 02 2006 - stbinner@suse.de +- fix build for < 10.1 and for < 10.0 +- remove 9.2 and supplementary specific stuff +* Fri Jun 02 2006 - stbinner@suse.de - recommend koffice-illustration-plugins for koffice-illustration * Fri May 19 2006 - stbinner@suse.de - Kexi: fix forms plugin not being loaded ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org