SPECS (DEVEL): koffice.spec - up to 1.4.1 - work but needs cleanups

zawadaa zawadaa at pld-linux.org
Wed Jul 27 00:56:21 CEST 2005


Author: zawadaa                      Date: Tue Jul 26 22:56:21 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- up to 1.4.1
- work but needs cleanups

---- Files affected:
SPECS:
   koffice.spec (1.97.2.17 -> 1.97.2.18) 

---- Diffs:

================================================================
Index: SPECS/koffice.spec
diff -u SPECS/koffice.spec:1.97.2.17 SPECS/koffice.spec:1.97.2.18
--- SPECS/koffice.spec:1.97.2.17	Mon Jul  4 03:42:58 2005
+++ SPECS/koffice.spec	Wed Jul 27 00:56:15 2005
@@ -3,10 +3,10 @@
 # Conditional build:
 %bcond_without  apidocs # do not prepare API documentation
 
-%define		_state		unstable
-%define		_ver		1.4.88
-%define		_snap		050702
-%define		artsver		13:1.4.89
+%define		_state		stable
+%define		_ver		1.4.1
+%define		_snap		%{nil}
+%define		artsver		13:1.4.1
 
 Summary:	KOffice - powerful office suite for KDE
 Summary(pl):	KOffice - potężny pakiet biurowy dla KDE
@@ -15,12 +15,13 @@
 Summary(uk):	îÁÂŚŇ ĎĆŚÓÎÉČ ĐŇĎÇŇÁÍ ÄĚŃ KDE
 Summary(zh_CN):	KDE ľÄ°ěšŤÓŚÓĂČíźţźŻĄŁ
 Name:		koffice
-Version:	%{_ver}.%{_snap}
-Release:	1
+Version:	%{_ver}
+Release:	0.1
 Epoch:		6
 License:	GPL/LGPL
 Group:		X11/Applications
-Source0:	ftp://ftp.pld-linux.org/software/kde/%{name}-%{_snap}.tar.bz2
+Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{name}-%{version}/src/%{name}-%{version}.tar.bz2
+# Source0-md5:	91a7b68757addc5934c5a8209a4926d5
 Patch0:		kde-common-PLD.patch
 URL:		http://www.koffice.org/
 BuildRequires:	ImageMagick-c++-devel
@@ -34,6 +35,7 @@
 BuildRequires:	libpqxx-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtiff-devel
+BuildRequires:	libwpd-devel
 BuildRequires:	mysql-devel
 BuildRequires:	perl-base
 BuildRequires:	python-devel >= 2.2
@@ -195,6 +197,7 @@
 Summary(pl):	KOffice - Kexi
 Group:		X11/Applications
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	libpqxx
 Requires:	mysql-libs
 
 %description kexi
@@ -247,17 +250,17 @@
 %description kivio -l pt_BR
 Editor de fluxogramas do KOffice.
 
-%package kplato
-Summary:	KOffice - kplato
-Summary(pl):	KOffice - kplato
-Group:		X11/Applications
-Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+#%package kplato
+#Summary:	KOffice - kplato
+#Summary(pl):	KOffice - kplato
+#Group:		X11/Applications
+#Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 
-%description kplato
-TODO.
+#%description kplato
+#TODO.
 
-%description kplato -l pl
-TODO.
+#%description kplato -l pl
+#TODO.
 
 %package kpresenter
 Summary:	KOffice - KPresenter
@@ -360,7 +363,7 @@
 Processador de texto do KOffice.
 
 %prep
-%setup -q -n %{name}-%{_snap}
+%setup -q
 %patch0 -p1
 
 for f in `find . -name *.desktop`; do
@@ -393,7 +396,7 @@
 	fi
 done
 
-echo "KDE_OPTIONS = nofinal" >> kplato/Makefile.am
+#echo "KDE_OPTIONS = nofinal" >> kplato/Makefile.am
 
 %build
 cp /usr/share/automake/config.sub admin
@@ -407,6 +410,8 @@
 %configure \
 	--disable-rpath \
 	--enable-final \
+	--with-pgsqllibdir=%{_libdir} \
+	--with-pqxxlibdir=%{_libdir} \
 	--with-qt-libraries=%{_libdir}
 
 #%%{__make} -C kword/mailmerge/sql qtsqlopenwidget.h
@@ -429,14 +434,14 @@
 install debian/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 %find_lang kchart	--with-kde
-%find_lang kexi		--with-kde
+#%find_lang kexi		--with-kde
 %find_lang kformula	--with-kde
 %find_lang kivio	--with-kde
 %find_lang koffice	--with-kde
 %find_lang koshell	--with-kde
 cat koshell.lang >> koffice.lang
 %find_lang kpresenter	--with-kde
-%find_lang krita	--with-kde
+#%find_lang krita	--with-kde
 %find_lang kspread	--with-kde
 %find_lang kugar	--with-kde
 %find_lang kword	--with-kde
@@ -471,7 +476,7 @@
 %{_libdir}/libkexirelationsview.so
 %{_libdir}/libkexisql2.so
 %{_libdir}/libkexisql3.so
-%{_libdir}/libkexiutils.so
+#%{_libdir}/libkexiutils.so
 %{_libdir}/libkformdesigner.so
 %{_libdir}/libkformulalib.so
 %{_libdir}/libkiviocommon.so
@@ -479,7 +484,7 @@
 %{_libdir}/libkofficecore.so
 %{_libdir}/libkofficeui.so
 %{_libdir}/libkopainter.so
-%{_libdir}/libkoproperty.so
+#%{_libdir}/libkoproperty.so
 %{_libdir}/libkoscript.so
 %{_libdir}/libkotext.so
 %{_libdir}/libkowmf.so
@@ -492,7 +497,7 @@
 %{_libdir}/libkwordexportfilters.so
 %{_includedir}/*.h
 %{_includedir}/kexidb
-%{_includedir}/kexiutils
+#%{_includedir}/kexiutils
 %{_includedir}/kword
 
 %if %{with apidocs}
@@ -501,7 +506,8 @@
 %{_kdedocdir}/en/%{name}-apidocs
 %endif
 
-%files common -f koffice.lang
+%files common
+# -f koffice.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/koconverter
 %attr(755,root,root) %{_bindir}/koscript
@@ -542,8 +548,8 @@
 %attr(755,root,root) %{_libdir}/libkexisql2.so.*.*.*
 %{_libdir}/libkexisql3.la
 %attr(755,root,root) %{_libdir}/libkexisql3.so.*.*.*
-%{_libdir}/libkexiutils.la
-%attr(755,root,root) %{_libdir}/libkexiutils.so.*.*.*
+#%{_libdir}/libkexiutils.la
+#%attr(755,root,root) %{_libdir}/libkexiutils.so.*.*.*
 %{_libdir}/libkformdesigner.la
 %attr(755,root,root) %{_libdir}/libkformdesigner.so.*.*.*
 %{_libdir}/libkformulalib.la
@@ -558,8 +564,8 @@
 %attr(755,root,root) %{_libdir}/libkofficeui.so.*.*.*
 %{_libdir}/libkopainter.la
 %attr(755,root,root) %{_libdir}/libkopainter.so.*.*.*
-%{_libdir}/libkoproperty.la
-%attr(755,root,root) %{_libdir}/libkoproperty.so.*.*.*
+#%{_libdir}/libkoproperty.la
+#%attr(755,root,root) %{_libdir}/libkoproperty.so.*.*.*
 %{_libdir}/libkoscript.la
 %attr(755,root,root) %{_libdir}/libkoscript.so.*.*.*
 %{_libdir}/libkotext.la
@@ -582,10 +588,10 @@
 %attr(755,root,root) %{_libdir}/libkwordexportfilters.so.*.*.*
 %{_libdir}/kde3/clipartthumbnail.la
 %attr(755,root,root) %{_libdir}/kde3/clipartthumbnail.so
-%{_libdir}/kde3/kfile_abiword.la
-%attr(755,root,root) %{_libdir}/kde3/kfile_abiword.so
-%{_libdir}/kde3/kfile_gnumeric.la
-%attr(755,root,root) %{_libdir}/kde3/kfile_gnumeric.so
+#%{_libdir}/kde3/kfile_abiword.la
+#%attr(755,root,root) %{_libdir}/kde3/kfile_abiword.so
+#%{_libdir}/kde3/kfile_gnumeric.la
+#%attr(755,root,root) %{_libdir}/kde3/kfile_gnumeric.so
 %{_libdir}/kde3/kfile_koffice.la
 %attr(755,root,root) %{_libdir}/kde3/kfile_koffice.so
 %{_libdir}/kde3/kfile_ooo.la
@@ -611,8 +617,8 @@
 %{_datadir}/apps/koshell
 %{_datadir}/config.kcfg/koshell.kcfg
 %{_datadir}/services/clipartthumbnail.desktop
-%{_datadir}/services/kfile_abiword.desktop
-%{_datadir}/services/kfile_gnumeric.desktop
+#%{_datadir}/services/kfile_abiword.desktop
+#%{_datadir}/services/kfile_gnumeric.desktop
 %{_datadir}/services/kfile_koffice.desktop
 %{_datadir}/services/kfile_ooo.desktop
 %{_datadir}/services/kodocinfopropspage.desktop
@@ -658,10 +664,10 @@
 %attr(755,root,root) %{_libdir}/kde3/libkchartpngexport.so
 %{_libdir}/kde3/libkchartsvgexport.la
 %attr(755,root,root) %{_libdir}/kde3/libkchartsvgexport.so
-%{_libdir}/kde3/libkptchart.la
-%attr(755,root,root) %{_libdir}/kde3/libkptchart.so
+#%{_libdir}/kde3/libkptchart.la
+#%attr(755,root,root) %{_libdir}/kde3/libkptchart.so
 %{_datadir}/apps/kchart
-%{_datadir}/apps/konqueror/servicemenus/kchart_konqi.desktop
+#%{_datadir}/apps/konqueror/servicemenus/kchart_konqi.desktop
 %{_datadir}/services/kchartpart.desktop
 %{_datadir}/services/kchart_png_export.desktop
 %{_datadir}/services/kchart_svg_export.desktop
@@ -669,7 +675,8 @@
 %{_iconsdir}/*/*x*/apps/kchart.png
 %{_mandir}/man1/kchart.1*
 
-%files kexi -f kexi.lang
+%files kexi
+# -f kexi.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kexi*
 %attr(755,root,root) %{_bindir}/ksqlite
@@ -689,8 +696,8 @@
 %attr(755,root,root) %{_libdir}/kde3/kexidb_sqlite3driver.so
 %{_libdir}/kde3/kexidbwidgets.la
 %attr(755,root,root) %{_libdir}/kde3/kexidbwidgets.so
-%{_libdir}/kde3/kexihandler_csv_import.la
-%attr(755,root,root) %{_libdir}/kde3/kexihandler_csv_import.so
+#%{_libdir}/kde3/kexihandler_csv_import.la
+#%attr(755,root,root) %{_libdir}/kde3/kexihandler_csv_import.so
 %{_libdir}/kde3/kexihandler_form.la
 %attr(755,root,root) %{_libdir}/kde3/kexihandler_form.so
 %{_libdir}/kde3/kexihandler_migration.la
@@ -739,7 +746,8 @@
 %{_iconsdir}/crystalsvg/16x16/mimetypes/kexiproject_sqlite2.png
 %{_iconsdir}/crystalsvg/32x32/mimetypes/kexiproject_sqlite2.png
 
-%files kformula -f kformula.lang
+%files kformula
+# -f kformula.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kformula
 %{_libdir}/libkdeinit_kformula.la
@@ -776,7 +784,8 @@
 %{_iconsdir}/*/*/apps/kformula.png
 %{_mandir}/man1/kformula.1*
 
-%files kivio -f kivio.lang
+%files kivio 
+#-f kivio.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kivio
 %{_libdir}/*kivio*.la
@@ -793,21 +802,22 @@
 %{_iconsdir}/*/*/apps/kivio.png
 %{_mandir}/man1/kivio.1*
 
-%files kplato
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/kplato
-%{_libdir}/libkdeinit_kplato.la
-%attr(755,root,root) %{_libdir}/libkdeinit_kplato.so
-%{_libdir}/kde3/kplato.la
-%attr(755,root,root) %{_libdir}/kde3/kplato.so
-%{_libdir}/kde3/libkplatopart.la
-%attr(755,root,root) %{_libdir}/kde3/libkplatopart.so
-%{_datadir}/apps/kplato
-%{_datadir}/services/kplatopart.desktop
-%{_desktopdir}/kde/kplato.desktop
-%{_iconsdir}/*/*/apps/kplato.*
+#%files kplato
+#%defattr(644,root,root,755)
+#%attr(755,root,root) %{_bindir}/kplato
+#%{_libdir}/libkdeinit_kplato.la
+#%attr(755,root,root) %{_libdir}/libkdeinit_kplato.so
+#%{_libdir}/kde3/kplato.la
+#%attr(755,root,root) %{_libdir}/kde3/kplato.so
+#%{_libdir}/kde3/libkplatopart.la
+#%attr(755,root,root) %{_libdir}/kde3/libkplatopart.so
+#%{_datadir}/apps/kplato
+#%{_datadir}/services/kplatopart.desktop
+#%{_desktopdir}/kde/kplato.desktop
+#%{_iconsdir}/*/*/apps/kplato.*
 
-%files kpresenter -f kpresenter.lang
+%files kpresenter
+# -f kpresenter.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kpresenter
 %attr(755,root,root) %{_bindir}/kprconverter.pl
@@ -834,7 +844,8 @@
 %{_mandir}/man1/kpresenter.1*
 %{_mandir}/man1/kprconverter.pl.1*
 
-%files krita -f krita.lang
+%files krita
+# -f krita.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/krita
 %{_libdir}/kde3/*krita*.la
@@ -845,7 +856,7 @@
 %{_datadir}/apps/krita
 %{_datadir}/services/krita_magick_export.desktop
 %{_datadir}/services/krita_magick_import.desktop
-%{_datadir}/services/krita_rgb_u16_plugin.desktop
+#%{_datadir}/services/krita_rgb_u16_plugin.desktop
 #%{_datadir}/services/kritacmykplugin.desktop
 %{_datadir}/services/kritadefaulttools.desktop
 %{_datadir}/services/kritagrayplugin.desktop
@@ -855,7 +866,7 @@
 %{_datadir}/services/kritadefaultpaintops.desktop
 #%{_datadir}/services/kritamagick.desktop
 %{_datadir}/services/kritaselectiontools.desktop
-%{_datadir}/services/kritatestcsplugin.desktop
+#%{_datadir}/services/kritatestcsplugin.desktop
 %{_datadir}/services/kritatoolcrop.desktop
 %{_datadir}/services/kritatoolfilter.desktop
 %{_datadir}/services/kritatoolpolygon.desktop
@@ -863,14 +874,15 @@
 %{_datadir}/services/kritatoolselectpicker.desktop
 %{_datadir}/services/kritatoolstar.desktop
 %{_datadir}/services/kritatooltransform.desktop
-%{_datadir}/services/kritawetplugin.desktop
-%{_datadir}/services/kritawsbrushpaintop.desktop
-%{_datadir}/services/kritawsplugin.desktop
+#%{_datadir}/services/kritawetplugin.desktop
+#%{_datadir}/services/kritawsbrushpaintop.desktop
+#%{_datadir}/services/kritawsplugin.desktop
 %{_datadir}/templates/Illustration.desktop
 %{_desktopdir}/kde/krita.desktop
 %{_iconsdir}/*/*/*/krita.png
 
-%files kspread -f kspread.lang
+%files kspread
+# -f kspread.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kspread
 %{_libdir}/libkdeinit_kspread.la
@@ -902,7 +914,8 @@
 %{_iconsdir}/[!l]*/*/apps/kspread*.png
 %{_mandir}/man1/kspread.1*
 
-%files kugar -f kugar.lang
+%files kugar
+# -f kugar.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kudesigner
 %attr(755,root,root) %{_bindir}/kugar
@@ -921,12 +934,14 @@
 %{_datadir}/apps/kugar
 %{_datadir}/services/kugar_kugar_import.desktop
 %{_datadir}/services/kugarpart.desktop
+%{_iconsdir}/*/*/*/kudesigner.png
 %{_iconsdir}/*/*/*/kugar.png
 %{_iconsdir}/*/*/mimetypes/kugardata.png
 %{_mandir}/man1/kudesigner.1*
 %{_mandir}/man1/kugar.1*
 
-%files kword -f kword.lang
+%files kword
+# -f kword.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kthesaurus
 %attr(755,root,root) %{_bindir}/kword
@@ -998,6 +1013,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.97.2.18  2005/07/26 22:56:15  zawadaa
+- up to 1.4.1
+- work but needs cleanups
+
 Revision 1.97.2.17  2005/07/04 01:42:58  adgor
 - 050702
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/koffice.spec?r1=1.97.2.17&r2=1.97.2.18&f=u




More information about the pld-cvs-commit mailing list