rpms/koffice/devel koffice.spec, 1.40, 1.41 koffice-admin-gcc4isok.patch, 1.1, NONE needs.rebuild, 1.1, NONE

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Wed Sep 20 19:34:48 UTC 2006 

Author: rdieter

Update of /cvs/extras/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21982

Modified Files:
	koffice.spec 
Removed Files:
	koffice-admin-gcc4isok.patch needs.rebuild 
Log Message:
* Wed Sep 20 2006 Rex Dieter <rexdieter[AT]users.sf.net>
- 1.5.2-2
- drop deprecated patches
- drop extraneous BR's
- optimize %configure
- use icon/mime bits from ScriptletSnippets
- simplify desktop-file-install usage



Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- koffice.spec	3 Aug 2006 09:15:26 -0000	1.40
+++ koffice.spec	20 Sep 2006 19:34:48 -0000	1.41
@@ -1,6 +1,6 @@
 Name:           koffice
 Version:        1.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
@@ -10,54 +10,43 @@
 Source100:      koshell.png
 
 # stuff for the build configuration
-Patch0:         koffice-admin-gcc4isok.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
-BuildRequires:  automake
-BuildRequires:  autoconf >= 2.53
 BuildRequires:  kdebase-devel
 BuildRequires:  kdelibs-devel
 BuildRequires:  freetype-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  libart_lgpl-devel
-BuildRequires:  libidn-devel
-BuildRequires:  gamin-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  ImageMagick-devel
 BuildRequires:  bzip2-devel
 BuildRequires:  zlib-devel
-BuildRequires:  libstdc++-devel
-BuildRequires:  alsa-lib-devel
-BuildRequires:  libvorbis-devel
-BuildRequires:  libogg-devel
 BuildRequires:  openssl-devel
-BuildRequires:  esound-devel
-BuildRequires:  python-devel
+BuildRequires:  python-devel python
 BuildRequires:  pcre-devel
 BuildRequires:  libwpd-devel
 BuildRequires:  lcms-devel
 BuildRequires:  gettext-devel
 BuildRequires:  mysql-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  postgresql-devel
 BuildRequires:  perl
-BuildRequires:  python2-devel
 BuildRequires:  wv2-devel
 BuildRequires:  libpqxx-devel
 BuildRequires:  doxygen
 BuildRequires:  graphviz-devel
 BuildRequires:  aspell-devel
-BuildRequires:  libacl-devel
 BuildRequires:  libxslt-devel
 BuildRequires:  OpenEXR-devel
 BuildRequires:  libexif-devel
 BuildRequires:  libGL-devel libGLU-devel
-BuildRequires:  libXi-devel
 BuildRequires:  readline-devel
-BuildRequires:  ruby ruby-devel
+BuildRequires:  ruby ruby-devel >= 1.8.2 
+%if "%{?fedora}" > "4"
+BuildRequires:  libXi-devel
+%endif
 
 %description
 KOffice - Integrated Office Suite
@@ -95,6 +84,8 @@
 Requires:       perl
 Conflicts:      koffice <= 4:%{version}-%{release}
 Conflicts:      koffice-i18n < 4:%{version}
+# Consider, for ownership of %{_datadir}/templates -- Rex
+#Requires:	kdebase
 
 %description core
 core libraries and support files for koffice
@@ -225,22 +216,22 @@
 
 %prep
 %setup -q
-%patch0 -p1
-
-# this will make sure that patch0 is considered
-make -f admin/Makefile.common
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-%configure --disable-rpath --disable-dependency-tracking --enable-shared \
---enable-fast-install --with-pic --disable-static \
---with-qt-libraries=$QTDIR/lib --with-extra-libs=%{_libdir} \
---with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \
---with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \
---enable-final
+%configure \
+  --disable-rpath --disable-dependency-tracking \
+  --disable-gcc-hidden-visibility \
+  --enable-new-ldflags \
+  --disable-debug --disable-warnings \
+  --with-pic --enable-shared --disable-static \
+  --with-extra-libs=%{_libdir} \
+  --with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \
+  --with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \
+  --enable-final
 
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -263,158 +254,43 @@
 popd
 
 #now take care of all the desktop files with desktop-file-utils
-#core
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/KThesaurus.desktop
-
+# set --vendor="" to avoid any future probs like bug #173086 -- Rex
 desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --add-category=X-Fedora --vendor="" \
   --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/koshell.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/*.desktop
 
-#kword
 desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kword.desktop
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --add-category=X-Fedora --vendor="" \
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
 
-#kspread
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kspread.desktop
-
-#kpresenter
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kpresenter.desktop
-
-#karbon
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/karbon.desktop
-
-#krita
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_magick.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_jpeg.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_openexr.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_png.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_raw.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_tiff.desktop
-
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/krita.desktop
-
-#kugar
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kugar.desktop
-
-#kchart
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kchart.desktop
-
-#kformula
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kformula.desktop
-
-#kivio
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/kivio.desktop
-
-#kexi
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kexi.desktop
-
-#kplato
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kplato.desktop
-
-rm $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post core -p /sbin/ldconfig
-%postun core -p /sbin/ldconfig
+%post core
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/crystalsvg ||:
+touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/locolor || :
+gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
+
+%postun core
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/crystalsvg ||:
+touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/locolor || :
+gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
+
 
 %post kword -p /sbin/ldconfig
 %postun kword -p /sbin/ldconfig
@@ -496,15 +372,17 @@
 %{_libdir}/kde3/libkprkword.*
 %{_libdir}/kde3/libthesaurustool.*
 %{_libdir}/kde3/clipartthumbnail.*
-%{_datadir}/apps/koffice
+%{_datadir}/apps/koffice/
 %{_datadir}/apps/konqueror/servicemenus/*
-%{_datadir}/apps/koshell
-%{_datadir}/apps/thesaurus
+%{_datadir}/apps/koshell/
+%{_datadir}/apps/thesaurus/
 %{_datadir}/config.kcfg/koshell.kcfg
-%{_datadir}/doc/HTML/en/koffice
-%{_datadir}/doc/HTML/en/koshell
-%{_datadir}/doc/HTML/en/thesaurus
-%{_datadir}/icons/*
+%{_datadir}/doc/HTML/en/koffice/
+%{_datadir}/doc/HTML/en/koshell/
+%{_datadir}/doc/HTML/en/thesaurus/
+%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
 %{_datadir}/services/clipartthumbnail.desktop
 %{_datadir}/services/kfile*.desktop
 %{_datadir}/services/kwmailmerge*.desktop
@@ -518,20 +396,20 @@
 %{_datadir}/servicetypes/koplugin.desktop
 %{_datadir}/servicetypes/kwmailmerge.desktop
 %{_datadir}/servicetypes/widgetfactory.desktop
-%{_datadir}/applications/fedora-KThesaurus.desktop
-%{_datadir}/applications/fedora-koshell.desktop
+%{_datadir}/applications/kde/*KThesaurus.desktop
+%{_datadir}/applications/kde/*koshell.desktop
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublecombobox.png
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublelineedit.png
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublespinbox2.png
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublespincombobox.png
-%{_datadir}/apps/kross
+%{_datadir}/apps/kross/
 %{_libdir}/kde3/krosspython.*
 %{_libdir}/kde3/krossruby.*
 
 %files devel
 %{_includedir}/*
-%{_datadir}/doc/HTML/en/koffice-apidocs
-%{_libdir}/*.so
+%{_datadir}/doc/HTML/en/koffice-apidocs/
+%{_libdir}/lib*.so
 
 %files kword
 %defattr(-,root,root,-)
@@ -540,13 +418,13 @@
 %{_libdir}/libkwordprivate.so.*
 %{_libdir}/kde3/libkwordpart.*
 %{_libdir}/kde3/kword.*
-%{_datadir}/apps/kword
+%{_datadir}/apps/kword/
 %{_datadir}/doc/HTML/en/kword
 %{_datadir}/services/kword*.desktop
 %{_datadir}/services/kwserial*.desktop
 %{_datadir}/templates/TextDocument.desktop
 %{_datadir}/templates/.source/TextDocument.kwt
-%{_datadir}/applications/fedora-kword.desktop
+%{_datadir}/applications/kde/*kword.desktop
 
 %files kspread
 %defattr(-,root,root,-)
@@ -565,12 +443,12 @@
 %{_libdir}/kde3/libopencalcexport.*
 %{_libdir}/kde3/libopencalcimport.*
 %{_libdir}/kde3/libqproimport.*
-%{_datadir}/apps/kspread
-%{_datadir}/doc/HTML/en/kspread
+%{_datadir}/apps/kspread/
+%{_datadir}/doc/HTML/en/kspread/
 %{_datadir}/services/kspread*.desktop
 %{_datadir}/templates/SpreadSheet.desktop
 %{_datadir}/templates/.source/SpreadSheet.kst
-%{_datadir}/applications/fedora-kspread.desktop
+%{_datadir}/applications/kde/*kspread.desktop
 
 %files kpresenter
 %defattr(-,root,root,-)
@@ -589,12 +467,12 @@
 %{_libdir}/kde3/libkpresentersvgexport.*
 %{_libdir}/kde3/libkpresenterxbmexport.*
 %{_libdir}/kde3/libkpresenterxpmexport.*
-%{_datadir}/apps/kpresenter
-%{_datadir}/doc/HTML/en/kpresenter
+%{_datadir}/apps/kpresenter/
+%{_datadir}/doc/HTML/en/kpresenter/
 %{_datadir}/services/kpresenter*.desktop
 %{_datadir}/templates/Presentation.desktop
 %{_datadir}/templates/.source/Presentation.kpt
-%{_datadir}/applications/fedora-kpresenter.desktop
+%{_datadir}/applications/kde/*kpresenter.desktop
 
 %files karbon
 %defattr(-,root,root,-)
@@ -621,11 +499,11 @@
 %{_libdir}/kde3/libkarbonxcfexport.*
 %{_libdir}/kde3/libwmfexport.*
 %{_libdir}/kde3/libwmfimport.*
-%{_datadir}/apps/karbon
+%{_datadir}/apps/karbon/
 %{_datadir}/services/karbon*
 %{_datadir}/templates/Illustration.desktop
 %{_datadir}/templates/.source/Illustration.karbon
-%{_datadir}/applications/fedora-karbon.desktop
+%{_datadir}/applications/kde/*karbon.desktop
 %{_datadir}/doc/HTML/en/karbon/
 
 %files krita
@@ -705,12 +583,12 @@
 %{_libdir}/kde3/libkritatiffexport.*
 %{_libdir}/kde3/libkritatiffimport.*
 %{_libdir}/kde3/krosskritacore.*
-%{_datadir}/apps/krita
+%{_datadir}/apps/krita/
 %{_datadir}/services/krita*.desktop
 %{_datadir}/servicetypes/krita*.desktop
-%{_datadir}/applications/fedora-krita*.desktop
-%{_datadir}/apps/kritaplugins
-%{_datadir}/doc/HTML/en/krita
+%{_datadir}/applications/kde/*krita*.desktop
+%{_datadir}/apps/kritaplugins/
+%{_datadir}/doc/HTML/en/krita/
 %{_datadir}/servicetypes/karbon_module.desktop
 
 %files kugar
@@ -725,13 +603,13 @@
 %{_libdir}/kde3/kugar.*
 %{_libdir}/kde3/libkudesignerpart.*
 %{_libdir}/kde3/libkugarpart.*
-%{_datadir}/apps/kudesigner
-%{_datadir}/apps/kugar
-%{_datadir}/doc/HTML/en/kugar
+%{_datadir}/apps/kudesigner/
+%{_datadir}/apps/kugar/
+%{_datadir}/doc/HTML/en/kugar/
 %{_datadir}/services/kugar*.desktop
-%{_datadir}/applications/fedora-kugar.desktop
-# this not being fedorarized fixes #173086
-%{_datadir}/applnk/Office/kudesigner.desktop
+%{_datadir}/applications/kde/*kugar.desktop
+# this not being fedorarized fixes #173086/
+%{_datadir}/applications/kde/*kudesigner.desktop
 
 %files kexi
 %defattr(-,root,root,-)
@@ -773,10 +651,10 @@
 %{_datadir}/mimelnk/application/*
 %{_datadir}/servicetypes/kexi*.desktop
 %{_datadir}/services/kexi
-%{_datadir}/apps/kexi
+%{_datadir}/apps/kexi/
 %{_datadir}/services/kformdesigner/*
-%{_datadir}/doc/HTML/en/kexi
-%{_datadir}/applications/fedora-kexi.desktop
+%{_datadir}/doc/HTML/en/kexi/
+%{_datadir}/applications/kde/*kexi.desktop
 %{_datadir}/services/kexidb_sqlite*driver.desktop
 
 %files kexi-driver-mysql
@@ -808,20 +686,20 @@
 %{_libdir}/kde3/libkchartmngexport.*
 %{_libdir}/kde3/libkchartxbmexport.*
 %{_libdir}/kde3/libkchartxpmexport.*
-%{_datadir}/apps/kchart
+%{_datadir}/apps/kchart/
 %{_datadir}/services/kchart*.desktop
-%{_datadir}/doc/HTML/en/kchart
-%{_datadir}/applications/fedora-kchart.desktop
+%{_datadir}/doc/HTML/en/kchart/
+%{_datadir}/applications/kde/*kchart.desktop
 
 %files kformula
 %defattr(-,root,root,-)
 %{_bindir}/kformula
 %{_libdir}/kde3/libkformulapart.*
 %{_libdir}/kde3/kformula.*
-%{_datadir}/apps/kformula
-%{_datadir}/doc/HTML/en/kformula
+%{_datadir}/apps/kformula/
+%{_datadir}/doc/HTML/en/kformula/
 %{_datadir}/services/kformula*.desktop
-%{_datadir}/applications/fedora-kformula.desktop
+%{_datadir}/applications/kde/*kformula.desktop
 
 %files kivio
 %defattr(-,root,root,-)
@@ -837,11 +715,11 @@
 %{_libdir}/kde3/libkiviotargettool.*
 %{_libdir}/kde3/libkiviotexttool.*
 %{_libdir}/kde3/libkiviozoomtool.*
-%{_datadir}/apps/kivio
+%{_datadir}/apps/kivio/
 %{_datadir}/config.kcfg/kivio.kcfg
 %{_datadir}/doc/HTML/en/kivio
 %{_datadir}/services/kivio*.desktop
-%{_datadir}/applications/fedora-kivio.desktop
+%{_datadir}/applications/kde/*kivio.desktop
 
 %files filters
 %defattr(-,root,root,-)
@@ -891,7 +769,7 @@
 %{_libdir}/kde3/libkfosvgexport.*
 %{_libdir}/kde3/liboodrawimport.*
 %{_libdir}/kde3/libpowerpointimport.*
-%{_datadir}/apps/xsltfilter
+%{_datadir}/apps/xsltfilter/
 %{_datadir}/services/generic_filter.desktop
 %{_datadir}/services/xslt*.desktop
 %{_datadir}/servicetypes/kofilter*.desktop
@@ -902,12 +780,20 @@
 %{_libdir}/libkdeinit_kplato.so
 %{_libdir}/kde3/kplato.*
 %{_libdir}/kde3/libkplatopart.*
-%{_datadir}/apps/kplato
-%{_datadir}/doc/HTML/en/kplato
+%{_datadir}/apps/kplato/
+%{_datadir}/doc/HTML/en/kplato/
 %{_datadir}/services/kplatopart.desktop
-%{_datadir}/applications/fedora-kplato.desktop
+%{_datadir}/applications/kde/*kplato.desktop
 
 %changelog
+* Wed Sep 20 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- 1.5.2-2
+- drop deprecated patches
+- drop extraneous BR's
+- optimize %%configure
+- use icon/mime bits from ScriptletSnippets
+- simplify desktop-file-install usage
+
 * Thu Aug 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.5.2-1
 - version upgrade (#200935)


--- koffice-admin-gcc4isok.patch DELETED ---


--- needs.rebuild DELETED ---

More information about the scm-commits mailing list