packages: kde4-kdeutils/kde4-kdeutils.spec - merged from DEVEL

shadzik shadzik at pld-linux.org
Thu Feb 18 17:04:29 CET 2010


Author: shadzik                      Date: Thu Feb 18 16:04:29 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/kde4-kdeutils:
   kde4-kdeutils.spec (1.43 -> 1.44) 

---- Diffs:

================================================================
Index: packages/kde4-kdeutils/kde4-kdeutils.spec
diff -u packages/kde4-kdeutils/kde4-kdeutils.spec:1.43 packages/kde4-kdeutils/kde4-kdeutils.spec:1.44
--- packages/kde4-kdeutils/kde4-kdeutils.spec:1.43	Fri Jan 29 00:06:31 2010
+++ packages/kde4-kdeutils/kde4-kdeutils.spec	Thu Feb 18 17:04:23 2010
@@ -4,7 +4,7 @@
 #
 %define		_state		stable
 %define		orgname		kdeutils
-%define		qtver		4.5.3
+%define		qtver		4.6.1
 
 Summary:	K Desktop Environment - utilities
 Summary(es.UTF-8):	KDE - Utilitarios
@@ -15,12 +15,12 @@
 Summary(uk.UTF-8):	K Desktop Environment - Утиліти
 Summary(zh_CN.UTF-8):	KDE实用工具
 Name:		kde4-kdeutils
-Version:	4.3.5
+Version:	4.4.0
 Release:	1
 License:	GPL
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	7321bc385bd0666bb32d5ec467a05244
+# Source0-md5:	e744b82eb9edd229dfa5ca478221cd2e
 URL:		http://www.kde.org/
 BuildRequires:	Qt3Support-devel >= %{qtver}
 BuildRequires:	QtAssistant-devel >= %{qtver}
@@ -40,9 +40,9 @@
 BuildRequires:	QtXml-devel >= %{qtver}
 BuildRequires:	QtXmlPatterns-devel >= %{qtver}
 BuildRequires:	automoc4 >= 0.9.88
-BuildRequires:	cmake >= 2.6.3
+BuildRequires:	cmake >= 2.8.0
 BuildRequires:	gmp-devel
-BuildRequires:	kde4-kdelibs-experimental-devel
+BuildRequires:	kde4-kdelibs-devel >= %{version}
 BuildRequires:	kde4-kdepimlibs-devel >= %{version}
 BuildRequires:	libarchive-devel
 BuildRequires:	libtool
@@ -56,8 +56,8 @@
 BuildRequires:	python-modules
 BuildRequires:	qca-devel >= 2.0.0
 BuildRequires:	qimageblitz-devel
-BuildRequires:	qt4-build
-BuildRequires:	qt4-qmake
+BuildRequires:	qt4-build >= %{qtver}
+BuildRequires:	qt4-qmake >= %{qtver}
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.129
 BuildRequires:	system-config-printer
@@ -470,17 +470,17 @@
 # unsupported
 rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/locolor
 
-%find_lang ark			--with-kde
-%find_lang okteta		--with-kde
-%find_lang kcalc		--with-kde
-%find_lang kcharselect		--with-kde
-%find_lang kdf			--with-kde
-%find_lang kfloppy		--with-kde
-%find_lang kgpg			--with-kde
-%find_lang ktimer		--with-kde
-%find_lang kwallet		--with-kde
-%find_lang superkaramba		--with-kde
-%find_lang ktimer		--with-kde
+#%find_lang ark			--with-kde
+#%find_lang okteta		--with-kde
+#%find_lang kcalc		--with-kde
+#%find_lang kcharselect		--with-kde
+#%find_lang kdf			--with-kde
+#%find_lang kfloppy		--with-kde
+#%find_lang kgpg			--with-kde
+#%find_lang ktimer		--with-kde
+#%find_lang kwallet		--with-kde
+#%find_lang superkaramba		--with-kde
+#%find_lang ktimer		--with-kde
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -504,6 +504,17 @@
 %attr(755,root,root) %{_libdir}/liboktetagui.so
 %attr(755,root,root) %{_libdir}/liboktetacore.so
 %attr(755,root,root) %{_libdir}/libkdelirc_shared.so
+%attr(755,root,root) %{_libdir}/libkastencontrollers.so
+%attr(755,root,root) %{_libdir}/libkastencore.so
+%attr(755,root,root) %{_libdir}/libkastengui.so
+%attr(755,root,root) %{_libdir}/liboktetakastencontrollers.so
+%attr(755,root,root) %{_libdir}/liboktetakastencore.so
+%attr(755,root,root) %{_libdir}/liboktetakastengui.so
+
+#%{_includedir}/KDE/Kasten
+#%{_includedir}/KDE/Okteta
+#%{_includedir}/kasten
+#%{_includedir}/okteta
 
 %files profiles
 %defattr(644,root,root,755)
@@ -519,15 +530,15 @@
 %{_datadir}/apps/profiles/suspend.profile.xml
 %{_datadir}/apps/profiles/vlc.profile.xml
 
-%files ark -f ark.lang
+%files ark
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/ark
-%attr(755,root,root) %{_libdir}/kde4/libarkpart.so
+%attr(755,root,root) %{_libdir}/kde4/arkpart.so
 %attr(755,root,root) %{_libdir}/kde4/kerfuffle_libarchive.so
 %attr(755,root,root) %{_libdir}/kde4/kerfuffle_libgz.so
 %attr(755,root,root) %ghost %{_libdir}/libkerfuffle.so.?
 %attr(755,root,root) %{_libdir}/libkerfuffle.so.*.*.*
-%attr(755,root,root) %{_libdir}/kde4/kerfuffle_7z.so
+%attr(755,root,root) %{_libdir}/kde4/kerfuffle_cli7z.so
 %attr(755,root,root) %{_libdir}/kde4/kerfuffle_clirar.so
 %attr(755,root,root) %{_libdir}/kde4/kerfuffle_clizip.so
 %attr(755,root,root) %{_libdir}/kde4/kerfuffle_libbz2.so
@@ -540,7 +551,7 @@
 %{_datadir}/kde4/services/kerfuffle_libgz.desktop
 #%{_datadir}/kde4/services/ark_dndextract.desktop
 %{_datadir}/kde4/services/kcm_lirc.desktop
-%{_datadir}/kde4/services/kerfuffle_7z.desktop
+%{_datadir}/kde4/services/kerfuffle_cli7z.desktop
 %{_datadir}/kde4/services/kerfuffle_clirar.desktop
 %{_datadir}/kde4/services/kerfuffle_clizip.desktop
 %{_datadir}/kde4/services/kerfuffle_libbz2.desktop
@@ -549,6 +560,7 @@
 %{_datadir}/kde4/services/ServiceMenus/ark_servicemenu.desktop
 %{_datadir}/config.kcfg/ark.kcfg
 %{_desktopdir}/kde4/ark.desktop
+%{_kdedocdir}/en/ark
 %{_mandir}/man1/ark.1.*
 ## ?
 %attr(755,root,root) %{_bindir}/sweeper
@@ -557,26 +569,41 @@
 %{_datadir}/apps/sweeper/sweeperui.rc
 %{_datadir}/dbus-1/interfaces/org.kde.sweeper.xml
 
-%files okteta -f okteta.lang
+%files okteta
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/okteta
-%attr(755,root,root) %{_libdir}/kde4/libarkpart.so
 %attr(755,root,root) %{_libdir}/kde4/libkbytearrayedit.so
 %attr(755,root,root) %{_libdir}/kde4/oktetapart.so
 %attr(755,root,root) %ghost %{_libdir}/liboktetacore.so.?
 %attr(755,root,root) %{_libdir}/liboktetacore.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/liboktetagui.so.?
 %attr(755,root,root) %{_libdir}/liboktetagui.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liboktetakastencore.so.?
+%attr(755,root,root) %{_libdir}/liboktetakastencore.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liboktetakastencontrollers.so.?
+%attr(755,root,root) %{_libdir}/liboktetakastencontrollers.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liboktetakastengui.so.?
+%attr(755,root,root) %{_libdir}/liboktetakastengui.so.*.*.*
 %{_desktopdir}/kde4/okteta.desktop
 %dir %{_datadir}/apps/okteta
 %{_datadir}/apps/okteta/oktetaui.rc
 %dir %{_datadir}/apps/oktetapart
-%{_datadir}/apps/oktetapart/oktetapartui.rc
+%{_datadir}/apps/oktetapart/oktetapartbrowserui.rc
+%{_datadir}/apps/oktetapart/oktetapartreadonlyui.rc
+%{_datadir}/apps/oktetapart/oktetapartreadwriteui.rc
 %{_iconsdir}/hicolor/*x*/apps/okteta.png
 %{_datadir}/kde4/services/kbytearrayedit.desktop
 %{_datadir}/kde4/services/oktetapart.desktop
+%{_kdedocdir}/en/okteta
+#kasten
+%attr(755,root,root) %ghost %{_libdir}/libkastencore.so.?
+%attr(755,root,root) %{_libdir}/libkastencore.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkastencontrollers.so.?
+%attr(755,root,root) %{_libdir}/libkastencontrollers.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkastengui.so.?
+%attr(755,root,root) %{_libdir}/libkastengui.so.*.*.*
 
-%files kcalc -f kcalc.lang
+%files kcalc
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kcalc
 %attr(755,root,root) %{_libdir}/libkdeinit4_kcalc.so
@@ -584,20 +611,22 @@
 %{_datadir}/apps/kconf_update/kcalcrc.upd
 %{_datadir}/config.kcfg/kcalc.kcfg
 %{_desktopdir}/kde4/kcalc.desktop
+%{_kdedocdir}/en/kcalc
 #%{_iconsdir}/*/*/apps/kcalc.*
 
-%files kcharselect -f kcharselect.lang
+%files kcharselect
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kcharselect
 %{_datadir}/apps/kcharselect
 %{_datadir}/apps/kconf_update/kcharselect.upd
 %{_desktopdir}/kde4/KCharSelect.desktop
+%{_kdedocdir}/en/kcharselect
 
-%files kdessh
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/kdessh
+#%files kdessh
+#%defattr(644,root,root,755)
+#%attr(755,root,root) %{_bindir}/kdessh
 
-%files kdf -f kdf.lang
+%files kdf
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kdf
 %attr(755,root,root) %{_bindir}/kwikdisk
@@ -609,15 +638,17 @@
 %{_iconsdir}/*/*/apps/kcmdf.*
 %{_iconsdir}/*/*/apps/kdf.*
 %{_iconsdir}/*/*/apps/kwikdisk.*
+%{_kdedocdir}/en/kdf
 
-%files kfloppy -f kfloppy.lang
+%files kfloppy
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kfloppy
-%{_datadir}/kde4/services/ServiceMenus/floppy_format.desktop
+#%{_datadir}/kde4/services/ServiceMenus/floppy_format.desktop
 %{_desktopdir}/kde4/KFloppy.desktop
 %{_iconsdir}/*/*/apps/kfloppy.*
+%{_kdedocdir}/en/kfloppy
 
-%files kgpg -f kgpg.lang
+%files kgpg
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kgpg
 %{_datadir}/apps/kgpg
@@ -629,14 +660,16 @@
 %{_desktopdir}/kde4/kgpg.desktop
 %{_iconsdir}/*/*/apps/kgpg.*
 %{_datadir}/dbus-1/interfaces/org.kde.kgpg.Key.xml
+%{_kdedocdir}/en/kgpg
 
-%files ktimer -f ktimer.lang
+%files ktimer
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/ktimer
 %{_desktopdir}/kde4/ktimer.desktop
 %{_iconsdir}/*/*/*/ktimer.png
+%{_kdedocdir}/en/ktimer
 
-%files kwalletmanager -f kwallet.lang
+%files kwalletmanager
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kwalletmanager
 %attr(755,root,root) %{_libdir}/kde4/kcm_kwallet.so
@@ -646,8 +679,9 @@
 %{_desktopdir}/kde4/kwalletmanager.desktop
 %{_desktopdir}/kde4/kwalletmanager-kwalletd.desktop
 %{_iconsdir}/hicolor/*/apps/kwalletmanager*.png
+%{_kdedocdir}/en/kwallet
 
-%files superkaramba -f superkaramba.lang
+%files superkaramba
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/superkaramba
 %attr(755,root,root) %{_libdir}/libsuperkaramba.so.*.*.*
@@ -661,6 +695,7 @@
 %{_datadir}/kde4/services/plasma-scriptengine-superkaramba.desktop
 %{_desktopdir}/kde4/superkaramba.desktop
 %{_iconsdir}/[!l]*/*/*/superkaramba*.*
+%{_kdedocdir}/en/superkaramba
 
 %files printer-applet
 %defattr(644,root,root,755)
@@ -687,15 +722,15 @@
 %{_desktopdir}/kde4/irkick.desktop
 %dir %{_datadir}/apps/irkick
 %{_datadir}/apps/irkick/irkick.notifyrc
-%{_datadir}/apps/remotes/AppleRemote.remote.xml
-%{_datadir}/apps/remotes/AsusDH.remote.xml
-%{_datadir}/apps/remotes/RM-0010.remote.xml
-%{_datadir}/apps/remotes/cimr100.remote.xml
-%{_datadir}/apps/remotes/hauppauge.remote.xml
-%{_datadir}/apps/remotes/packbell.remote.xml
-%{_datadir}/apps/remotes/remote.dtd
-%{_datadir}/apps/remotes/sherwood.remote.xml
-%{_datadir}/apps/remotes/sonytv.remote.xml
+#%{_datadir}/apps/remotes/AppleRemote.remote.xml
+#%{_datadir}/apps/remotes/AsusDH.remote.xml
+#%{_datadir}/apps/remotes/RM-0010.remote.xml
+#%{_datadir}/apps/remotes/cimr100.remote.xml
+#%{_datadir}/apps/remotes/hauppauge.remote.xml
+#%{_datadir}/apps/remotes/packbell.remote.xml
+#%{_datadir}/apps/remotes/remote.dtd
+#%{_datadir}/apps/remotes/sherwood.remote.xml
+#%{_datadir}/apps/remotes/sonytv.remote.xml
 %{_datadir}/autostart/irkick.desktop
 %{_iconsdir}/hicolor/22x22/apps/irkick.png
 %{_iconsdir}/oxygen/*x*/devices/infrared-remote.png
@@ -710,19 +745,45 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.43  2010/01/28 23:06:31  shadzik
-- 4.3.5
+Revision 1.44  2010/02/18 16:04:23  shadzik
+- merged from DEVEL
+
+Revision 1.39.2.12  2010/02/04 22:12:49  arekm
+- up to 4.4.0
+
+Revision 1.39.2.11  2010/02/02 20:56:35  shadzik
+- bump up qtver; it's not necessary but we make sure we link with the latest qtver
+
+Revision 1.39.2.10  2010/02/02 16:01:49  shadzik
+- minor clean up (removing old svn snap stuff)
+
+Revision 1.39.2.9  2010/02/02 13:12:57  shadzik
+- force cmake 2.8.0 BR
+
+Revision 1.39.2.8  2010/02/01 07:01:27  shadzik
+- 4.4 RC3
+
+Revision 1.39.2.7  2010/01/28 23:09:23  shadzik
 - kill useless kde4-kdebase-devel BR
 
-Revision 1.42  2009/12/03 23:10:23  sparky
-- BR: kde4-kdelibs-experimental-devel, python-PyKDE4, qca-devel,
-  qimageblitz-devel, qt4-build, qt4-qmake, rpm-pythonprov, xz-devel
+Revision 1.39.2.6  2010/01/08 11:53:27  arekm
+- up to 4.3.90
+
+Revision 1.39.2.5  2009/12/24 02:06:38  shadzik
+- 4.4 Beta2
+
+Revision 1.39.2.4  2009/12/05 02:32:03  shadzik
+- 4.4 beta1
+
+Revision 1.39.2.3  2009/12/03 23:12:15  sparky
+- BR: kde4-kdelibs-devel, python-PyKDE4, qca-devel, qimageblitz-devel,
+  qt4-build, qt4-qmake, rpm-pythonprov, xz-devel
 
-Revision 1.41  2009/11/28 20:59:16  shadzik
-- 4.3.4
+Revision 1.39.2.2  2009/10/19 08:13:48  paszczus
+- updated to 4.3.72
 
-Revision 1.40  2009/10/31 14:41:05  shadzik
-- 4.3.3
+Revision 1.39.2.1  2009/10/08 00:20:49  cactus
+- up to 4.3.69
 
 Revision 1.39  2009/10/03 12:00:05  shadzik
 - updated qt BR
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdeutils/kde4-kdeutils.spec?r1=1.43&r2=1.44&f=u



More information about the pld-cvs-commit mailing list