rpms/koffice/FC-6 .cvsignore, 1.13, 1.14 koffice.spec, 1.44, 1.45 sources, 1.13, 1.14 koffice-1.6.0.patch, 1.1, NONE koshell.png, 1.1, NONE

[Rex Dieter (rdieter) <fedora-extras-commits redhat com>]

Author: rdieter

Update of /cvs/extras/rpms/koffice/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12628

Modified Files:
	.cvsignore koffice.spec sources 
Removed Files:
	koffice-1.6.0.patch koshell.png 
Log Message:
* Fri Dec 01 2006 Rex Dieter <rexdieter[AT]users.sf.net>
1.6.1-1
- koffice-1.6.1 (#218030)
- BR: GraphicsMagick-devel
- simplify %files (prudent globbing)
- fix unowned dirs (#212174)
- make buildable on/for EL-4 too



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-6/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	20 Oct 2006 13:43:42 -0000	1.13
+++ .cvsignore	1 Dec 2006 22:07:48 -0000	1.14
@@ -1 +1,3 @@
 koffice-1.6.0.tar.bz2
+koffice-1.6.1.tar.bz2
+koshell.png


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-6/koffice.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- koffice.spec	25 Oct 2006 11:19:19 -0000	1.44
+++ koffice.spec	1 Dec 2006 22:07:48 -0000	1.45
@@ -1,17 +1,17 @@
+
 Name:           koffice
-Version:        1.6.0
-Release:        2%{?dist}
+Version:        1.6.1
+Release:        1%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
 License:        GPL/LGPL
 URL:            http://www.koffice.org/
-Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-1.6.0.tar.bz2
-Source100:      koshell.png
-Patch0:         koffice-1.6.0.patch
-# stuff for the build configuration
+Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source100:      koshell.png
+
 # BuildRequires: world-devel ;)
 BuildRequires:  kdebase-devel
 BuildRequires:  kdelibs-devel
@@ -21,11 +21,14 @@
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libjpeg-devel
+BuildRequires:  GraphicsMagick-devel
+# ImageMagick usage is deprecated (in favor of GraphicsMagick), 
+# and can likely go way, but let's keep it around, for now.  -- Rex
 BuildRequires:  ImageMagick-devel
 BuildRequires:  bzip2-devel
 BuildRequires:  zlib-devel
 BuildRequires:  openssl-devel
-BuildRequires:  python-devel python
+BuildRequires:  python-devel
 BuildRequires:  pcre-devel
 BuildRequires:  libwpd-devel
 BuildRequires:  lcms-devel
@@ -43,9 +46,14 @@
 BuildRequires:  libexif-devel
 BuildRequires:  libGL-devel libGLU-devel
 BuildRequires:  readline-devel
-BuildRequires:  ruby ruby-devel >= 1.8.2 
+%if 0%{?fedora} > 2  || 0%{?rhel} > 4
+%define ruby 1
+BuildRequires:  ruby ruby-devel >= 1.8.2
+%endif
+%if 0%{?fedora} > 3 || 0%{?rhel} > 4
 BuildRequires:  poppler-devel
-%if "%{?fedora}" > "4"
+%endif
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
 BuildRequires:  libXi-devel
 %endif
 
@@ -85,8 +93,6 @@
 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
@@ -215,9 +221,10 @@
 %description kplato
 %{summary}
 
+
 %prep
 %setup -q
-%patch0
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -235,6 +242,7 @@
 
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -255,24 +263,19 @@
 done
 popd
 
-#now take care of all the desktop files with desktop-file-utils
-# set --vendor="" to avoid any future probs like bug #173086 -- Rex
 desktop-file-install \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
-  --add-category=X-Fedora --vendor="" \
+  --vendor="" \
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applnk/Office/*.desktop
 
-desktop-file-install \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
-  --add-category=X-Fedora --vendor="" \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
-
 rm $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post core
 /sbin/ldconfig
 touch --no-create %{_datadir}/icons/crystalsvg ||:
@@ -351,7 +354,6 @@
 %{_libdir}/libkstore.so.*
 %{_libdir}/libkwmailmerge_interface.so.*
 %{_libdir}/libkwmf.so.*
-%{_libdir}/libkdeinit_kformula.so
 %{_libdir}/libkformulalib.so.*
 %{_libdir}/libkopalette.so.*
 %{_libdir}/libkoproperty.so.*
@@ -400,13 +402,10 @@
 %{_datadir}/servicetypes/widgetfactory.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/kofficewidgets/
 %{_datadir}/apps/kross/
 %{_libdir}/kde3/krosspython.*
-%{_libdir}/kde3/krossruby.*
+%{?ruby:%{_libdir}/kde3/krossruby.*}
 
 %files devel
 %{_includedir}/*
@@ -421,7 +420,7 @@
 %{_libdir}/kde3/libkwordpart.*
 %{_libdir}/kde3/kword.*
 %{_datadir}/apps/kword/
-%{_datadir}/doc/HTML/en/kword
+%{_datadir}/doc/HTML/en/kword/
 %{_datadir}/services/kword*.desktop
 %{_datadir}/services/kwserial*.desktop
 %{_datadir}/templates/TextDocument.desktop
@@ -461,16 +460,7 @@
 %{_libdir}/libkdeinit_kpresenter.so
 %{_libdir}/libkpresenterimageexport.so.*
 %{_libdir}/libkpresenterprivate.so.*
-%{_libdir}/kde3/libkpresenterpart.*
-%{_libdir}/kde3/kformula.*
-%{_libdir}/kde3/kpresenter.*
-%{_libdir}/kde3/libkpresenterbmpexport.*
-%{_libdir}/kde3/libkpresenterjpegexport.*
-%{_libdir}/kde3/libkpresentermngexport.*
-%{_libdir}/kde3/libkpresenterpngexport.*
-%{_libdir}/kde3/libkpresentersvgexport.*
-%{_libdir}/kde3/libkpresenterxbmexport.*
-%{_libdir}/kde3/libkpresenterxpmexport.*
+%{_libdir}/kde3/*kpresenter*.*
 %{_datadir}/apps/kpresenter/
 %{_datadir}/doc/HTML/en/kpresenter/
 %{_datadir}/services/kpresenter*.desktop
@@ -483,28 +473,12 @@
 %{_bindir}/karbon
 %{_libdir}/libkdeinit_karbon.so
 %{_libdir}/libkarboncommon.so.*
-%{_libdir}/kde3/karbon_defaulttools.*
-%{_libdir}/kde3/karbon_flattenpathplugin.*
-%{_libdir}/kde3/karbon_imagetoolplugin.*
-%{_libdir}/kde3/karbon_insertknotsplugin.*
-%{_libdir}/kde3/karbon_roundcornersplugin.*
-%{_libdir}/kde3/karbon_shadoweffectplugin.*
-%{_libdir}/kde3/karbon.*
-%{_libdir}/kde3/karbon_whirlpinchplugin.*
-%{_libdir}/kde3/karbon_zoomtoolplugin.*
-%{_libdir}/kde3/libkarbonpart.*
-%{_libdir}/kde3/libkarbonaiimport.*
-%{_libdir}/kde3/libkarbonepsexport.*
-%{_libdir}/kde3/libkarbonkontourimport.*
-%{_libdir}/kde3/libkarbonmsodimport.*
-%{_libdir}/kde3/libkarbonpngexport.*
-%{_libdir}/kde3/libkarbonsvgexport.*
-%{_libdir}/kde3/libkarbonsvgimport.*
-%{_libdir}/kde3/libkarbonxcfexport.*
+%{_libdir}/kde3/*karbon*.*
 %{_libdir}/kde3/libwmfexport.*
 %{_libdir}/kde3/libwmfimport.*
 %{_datadir}/apps/karbon/
 %{_datadir}/services/karbon*
+%{_datadir}/servicetypes/karbon_module.desktop
 %{_datadir}/templates/Illustration.desktop
 %{_datadir}/templates/.source/Illustration.karbon
 %{_datadir}/applications/kde/*karbon.desktop
@@ -514,101 +488,15 @@
 %defattr(-,root,root,-)
 %{_bindir}/krita
 %{_libdir}/libkdeinit_krita.so
-%{_libdir}/libkrita_cmyk_u16.so.*
-%{_libdir}/libkrita_gray_u16.so.*
-%{_libdir}/libkrita_lms_f32.so.*
-%{_libdir}/libkrita_rgb_f16half.so.*
-%{_libdir}/libkrita_rgb_f32.so.*
-%{_libdir}/libkrita_rgb_u16.so.*
-%{_libdir}/libkrita_ycbcr_u16.so*
-%{_libdir}/libkrita_ycbcr_u8.so*
-%{_libdir}/libkritacolor.so.*
-%{_libdir}/libkritagrayscale.so.*
-%{_libdir}/libkritaimage.so.*
-%{_libdir}/libkritargb.so.*
-%{_libdir}/libkritascripting.so.*
-%{_libdir}/libkritaui.so.*
-%{_libdir}/libkritacommon.so.*
-%{_libdir}/kde3/kritacimg.*
-%{_libdir}/kde3/kritacolorrange.*
-%{_libdir}/kde3/kritacolorsfilters.*
-%{_libdir}/kde3/kritacolorspaceconversion.*
-%{_libdir}/kde3/kritaconvolutionfilters.*
-%{_libdir}/kde3/kritadefaultpaintops.*
-%{_libdir}/kde3/kritadefaulttools.*
-%{_libdir}/kde3/kritaembossfilter.*
-%{_libdir}/kde3/kritaexample.*
-%{_libdir}/kde3/kritagrayplugin.*
-%{_libdir}/kde3/kritahistogram.*
-%{_libdir}/kde3/kritaimagesize.*
-%{_libdir}/kde3/kritaoilpaintfilter.*
-%{_libdir}/kde3/kritaraindropsfilter.*
-%{_libdir}/kde3/kritargbplugin.*
-%{_libdir}/kde3/kritarotateimage.*
-%{_libdir}/kde3/kritascreenshot.*
-%{_libdir}/kde3/kritaselectiontools.*
-%{_libdir}/kde3/kritashearimage.*
-%{_libdir}/kde3/krita.*
-%{_libdir}/kde3/kritatoolcrop.*
-%{_libdir}/kde3/kritatoolfilter.*
-%{_libdir}/kde3/kritatoolpolygon.*
-%{_libdir}/kde3/kritatoolpolyline.*
-%{_libdir}/kde3/kritatoolstar.*
-%{_libdir}/kde3/kritatooltransform.*
-%{_libdir}/kde3/libkritapart.*
-%{_libdir}/kde3/krita_cmyk_u16_plugin.*
-%{_libdir}/kde3/krita_gray_u16_plugin.*
-%{_libdir}/kde3/krita_lms_f32_plugin.*
-%{_libdir}/kde3/krita_rgb_f16half_plugin.*
-%{_libdir}/kde3/krita_rgb_f32_plugin.*
-%{_libdir}/kde3/krita_rgb_u16_plugin.*
-%{_libdir}/kde3/kritabumpmap.*
-%{_libdir}/kde3/kritacmykplugin.*
-%{_libdir}/kde3/kritadropshadow.*
-%{_libdir}/kde3/kritafiltersgallery.*
-%{_libdir}/kde3/kritahistogramdocker.*
-%{_libdir}/kde3/kritaimageenhancement.*
-%{_libdir}/kde3/kritapixelizefilter.*
-%{_libdir}/kde3/kritaroundcornersfilter.*
-%{_libdir}/kde3/kritascripting.*
-%{_libdir}/kde3/kritaseparatechannels.*
-%{_libdir}/kde3/kritasmalltilesfilter.*
-%{_libdir}/kde3/kritasobelfilter.*
-%{_libdir}/kde3/kritatoolselectsimilar.*
-%{_libdir}/kde3/kritawetplugin.*
-%{_libdir}/kde3/libkrita_openexr_export.*
-%{_libdir}/kde3/libkrita_openexr_import.*
-%{_libdir}/kde3/libkrita_raw_import.*
-%{_libdir}/kde3/libkritajpegexport.*
-%{_libdir}/kde3/libkritajpegimport.*
-%{_libdir}/kde3/libkritapngexport.*
-%{_libdir}/kde3/libkritapngimport.*
-%{_libdir}/kde3/libkritatiffexport.*
-%{_libdir}/kde3/libkritatiffimport.*
-%{_libdir}/kde3/libkritapdfimport.*
-%{_libdir}/kde3/krosskritacore.*
-%{_libdir}/kde3/krita_ycbcr_u16_plugin.*
-%{_libdir}/kde3/krita_ycbcr_u8_plugin.*
-%{_libdir}/kde3/kritablurfilter.*
-%{_libdir}/kde3/kritaextensioncolorsfilters.*
-%{_libdir}/kde3/kritafastcolortransfer.*
-%{_libdir}/kde3/kritalenscorrectionfilter.*
-%{_libdir}/kde3/kritamodifyselection.*
-%{_libdir}/kde3/kritanoisefilter.*
-%{_libdir}/kde3/kritarandompickfilter.*
-%{_libdir}/kde3/kritasubstrate.*
-%{_libdir}/kde3/kritatoolcurves.*
-%{_libdir}/kde3/kritatoolperspectivegrid.*
-%{_libdir}/kde3/kritatoolperspectivetransform.*
-%{_libdir}/kde3/kritaunsharpfilter.*
-%{_libdir}/kde3/kritawavefilter.*
+%{_libdir}/libkrita*.so.*
+%{_libdir}/kde3/*krita*.*
 %{_datadir}/apps/krita/
 %{_datadir}/services/krita*.desktop
 %{_datadir}/servicetypes/krita*.desktop
 %{_datadir}/applications/kde/*krita*.desktop
+%{_datadir}/applnk/.hidden/*krita*.desktop
 %{_datadir}/apps/kritaplugins/
 %{_datadir}/doc/HTML/en/krita/
-%{_datadir}/servicetypes/karbon_module.desktop
 
 %files kugar
 %defattr(-,root,root,-)
@@ -627,7 +515,6 @@
 %{_datadir}/doc/HTML/en/kugar/
 %{_datadir}/services/kugar*.desktop
 %{_datadir}/applications/kde/*kugar.desktop
-# this not being fedorarized fixes #173086/
 %{_datadir}/applications/kde/*kudesigner.desktop
 
 %files kexi
@@ -636,33 +523,13 @@
 %{_bindir}/ksqlite*
 %{_bindir}/krossrunner
 %{_libdir}/libkdeinit_kexi.so
-%{_libdir}/libkexicore.so.*
-%{_libdir}/libkexidatatable.so.*
-%{_libdir}/libkexidbparser.so.*
-%{_libdir}/libkexidb.so.*
-%{_libdir}/libkexiextendedwidgets.so.*
-%{_libdir}/libkexiformutils.so.*
-%{_libdir}/libkexiguiutils.so.*
-%{_libdir}/libkeximain.so.*
-%{_libdir}/libkeximigrate.so.*
-%{_libdir}/libkexirelationsview.so.*
-%{_libdir}/libkexisql2.so.*
-%{_libdir}/libkexisql3.so.*
+%{_libdir}/libkexi*.so.*
 %{_libdir}/libkformdesigner.so.*
-%{_libdir}/libkexiutils.so.*
-%{_libdir}/kde3/kformdesigner_containers.*
-%{_libdir}/kde3/kformdesigner_kexidbwidgets.*
-%{_libdir}/kde3/kformdesigner_stdwidgets.*
+%{_libdir}/kde3/kformdesigner_*.*
 %{_libdir}/kde3/kexidb_sqlite2driver.*
 %{_libdir}/kde3/kexidb_sqlite3driver.*
-%{_libdir}/kde3/kexihandler_form.*
-%{_libdir}/kde3/kexihandler_migration.*
-%{_libdir}/kde3/kexihandler_query.*
-%{_libdir}/kde3/kexihandler_relation.*
-%{_libdir}/kde3/kexihandler_script.*
-%{_libdir}/kde3/kexihandler_table.*
+%{_libdir}/kde3/kexihandler_*.*
 %{_libdir}/kde3/kexi.*
-%{_libdir}/kde3/kexihandler_csv_importexport.*
 %{_libdir}/kde3/krosskexiapp.*
 %{_libdir}/kde3/krosskexidb.*
 %{_datadir}/config/kexirc
@@ -693,18 +560,9 @@
 %files kchart
 %defattr(-,root,root,-)
 %{_bindir}/kchart
-%{_libdir}/libkchartcommon.so.*
+%{_libdir}/libkchart*.so.*
 %{_libdir}/libkdeinit_kchart.so
-%{_libdir}/libkchartimageexport.so.*
-%{_libdir}/kde3/kchart.*
-%{_libdir}/kde3/libkchartpart.*
-%{_libdir}/kde3/libkchartpngexport.*
-%{_libdir}/kde3/libkchartsvgexport.*
-%{_libdir}/kde3/libkchartbmpexport.*
-%{_libdir}/kde3/libkchartjpegexport.*
-%{_libdir}/kde3/libkchartmngexport.*
-%{_libdir}/kde3/libkchartxbmexport.*
-%{_libdir}/kde3/libkchartxpmexport.*
+%{_libdir}/kde3/*kchart*.*
 %{_datadir}/apps/kchart/
 %{_datadir}/services/kchart*.desktop
 %{_datadir}/doc/HTML/en/kchart/
@@ -713,8 +571,8 @@
 %files kformula
 %defattr(-,root,root,-)
 %{_bindir}/kformula
-%{_libdir}/kde3/libkformulapart.*
-%{_libdir}/kde3/kformula.*
+%{_libdir}/libkdeinit_kformula.so
+%{_libdir}/kde3/*kformula*.*
 %{_datadir}/apps/kformula/
 %{_datadir}/doc/HTML/en/kformula/
 %{_datadir}/services/kformula*.desktop
@@ -725,18 +583,11 @@
 %{_bindir}/kivio
 %{_libdir}/libkdeinit_kivio.so
 %{_libdir}/libkiviocommon.so.*
-%{_libdir}/kde3/kivio.*
-%{_libdir}/kde3/libkiviopart.*
+%{_libdir}/kde3/*kivio*.*
 %{_libdir}/kde3/straight_connector.*
-%{_libdir}/kde3/libkivioconnectortool.*
-%{_libdir}/kde3/libkivioimageexport.*
-%{_libdir}/kde3/libkivioselecttool.*
-%{_libdir}/kde3/libkiviotargettool.*
-%{_libdir}/kde3/libkiviotexttool.*
-%{_libdir}/kde3/libkiviozoomtool.*
 %{_datadir}/apps/kivio/
 %{_datadir}/config.kcfg/kivio.kcfg
-%{_datadir}/doc/HTML/en/kivio
+%{_datadir}/doc/HTML/en/kivio/
 %{_datadir}/services/kivio*.desktop
 %{_datadir}/applications/kde/*kivio.desktop
 
@@ -806,11 +657,24 @@
 %{_datadir}/services/kplatopart.desktop
 %{_datadir}/applications/kde/*kplato.desktop
 
+
 %changelog
+* Fri Dec 01 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+1.6.1-1
+- koffice-1.6.1 (#218030)
+- BR: GraphicsMagick-devel
+- simplify %%files (prudent globbing)
+- fix unowned dirs (#212174)
+- make buildable on/for EL-4 too
+
 * Wed Oct 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-1.6.0-2
+1.6.0-3
 - fix #212145: add missing BR for krita pdf support
 
+* Wed Oct 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.6.0-2
+- bump
+
 * Wed Oct 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.6.0-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-6/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	20 Oct 2006 13:43:42 -0000	1.13
+++ sources	1 Dec 2006 22:07:48 -0000	1.14
@@ -1 +1,2 @@
-e669cf19b2e1c7db7029c0772c527c0d  koffice-1.6.0.tar.bz2
+03382edf62db9913b57ad8760c7d5f52  koshell.png
+f7b90b46b79019edc60761a6bff2d387  koffice-1.6.1.tar.bz2


--- koffice-1.6.0.patch DELETED ---