SPECS: kdeutils.spec - merged KDE 3.5.9 from AC-branch

glen glen at pld-linux.org
Sat Feb 16 01:08:03 CET 2008 

Author: glen                         Date: Sat Feb 16 00:08:03 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged KDE 3.5.9 from AC-branch

---- Files affected:
SPECS:
   kdeutils.spec (1.197 -> 1.198) 

---- Diffs:

================================================================
Index: SPECS/kdeutils.spec
diff -u SPECS/kdeutils.spec:1.197 SPECS/kdeutils.spec:1.198
--- SPECS/kdeutils.spec:1.197	Sat Jan 19 15:44:15 2008
+++ SPECS/kdeutils.spec	Sat Feb 16 01:07:58 2008
@@ -17,14 +17,14 @@
 Summary(uk.UTF-8):	K Desktop Environment - Утиліти
 Summary(zh_CN.UTF-8):	KDE实用工具
 Name:		kdeutils
-Version:	3.5.8
-Release:	3
+Version:	3.5.9
+Release:	2
 Epoch:		9
 License:	GPL
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5:	d1a0fcc83f35428a76cf7523a04ba19c
-Patch100:	%{name}-branch.diff
+# Source0-md5:	dbe5ddff57141f27778601df5571e182
+#Patch100:	%{name}-branch.diff
 Patch0:		kde-common-PLD.patch
 Patch1:		kde-ac260-lt.patch
 URL:		http://www.kde.org/
@@ -45,9 +45,9 @@
 BuildRequires:	python-devel
 BuildRequires:	python-modules
 %{?with_hidden_visibility:BuildRequires:	qt-devel >= 6:3.3.5.051113-1}
+BuildRequires:	rpmbuild(find_lang) >= 1.32
 BuildRequires:	rpmbuild(macros) >= 1.129
 BuildRequires:	sed >= 4.0
-#BuildRequires:	unsermake >= 040511
 %{?with_xmms:BuildRequires:	xmms-devel}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -614,28 +614,38 @@
 %{__make} -C ksim/monitors/i8k
 
 %install
-rm -rf $RPM_BUILD_ROOT
-rm -f *.lang
-
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	kde_htmldir=%{_kdedocdir}
-
-%{__make} -C ksim/monitors/i8k install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	kde_htmldir=%{_kdedocdir}
-
-install -d $RPM_BUILD_ROOT%{_datadir}/themes/superkaramba
-mv $RPM_BUILD_ROOT%{_desktopdir}/kde/kwallet{config,}.desktop
-mv $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/superkaramba.desktop \
-	$RPM_BUILD_ROOT%{_desktopdir}/kde
+if [ ! -f makeinstall.stamp -o ! -d $RPM_BUILD_ROOT ]; then
+	rm -rf makeinstall.stamp installed.stamp $RPM_BUILD_ROOT
+	%{__make} install \
+		DESTDIR=$RPM_BUILD_ROOT \
+		kde_htmldir=%{_kdedocdir}
+
+	%{__make} -C ksim/monitors/i8k install \
+		DESTDIR=$RPM_BUILD_ROOT \
+		kde_htmldir=%{_kdedocdir}
+		touch makeinstall.stamp
+fi
+
+if [ ! -f installed.stamp ]; then
+	install -d $RPM_BUILD_ROOT%{_datadir}/themes/superkaramba
+	mv $RPM_BUILD_ROOT%{_desktopdir}/kde/kwallet{config,}.desktop
+	mv $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/superkaramba.desktop \
+		$RPM_BUILD_ROOT%{_desktopdir}/kde
+
+	# unsupported
+	rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/locolor
+
+	# drop la files
+	rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
+	rm -f $RPM_BUILD_ROOT%{_libdir}/libkdeinit_ark.la
+	rm -f $RPM_BUILD_ROOT%{_libdir}/libkdeinit_irkick.la
+	rm -f $RPM_BUILD_ROOT%{_libdir}/libkdeinit_kcalc.la
+	rm -f $RPM_BUILD_ROOT%{_libdir}/libkdeinit_kedit.la
 
-# unsupported
-rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/locolor
-
-# drop la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
+	touch installed.stamp
+fi
 
+rm -f *.lang
 %find_lang ark			--with-kde
 %find_lang irkick		--with-kde
 %find_lang KRegExpEditor	--with-kde
@@ -643,10 +653,8 @@
 %find_lang kcharselect		--with-kde
 %find_lang kcontrol		--with-kde
 %find_lang kdf			--with-kde
-%find_lang blockdevices		--with-kde
-cat blockdevices.lang >> kdf.lang
-%find_lang kcmlirc		--with-kde
-cat kcmlirc.lang >> irkick.lang
+%find_lang kinfocenter/blockdevices --with-kde -a kdf.lang
+%find_lang kcmlirc		--with-kde -a irkick.lang
 %find_lang kedit		--with-kde
 %find_lang kfloppy		--with-kde
 %find_lang kgpg			--with-kde
@@ -658,8 +666,8 @@
 %find_lang superkaramba		--with-kde
 
 # Omit bogus apidocs entries.
-# Otherwise 'kdeutils-apidocs` owner is needed
-sed -i 's/.*apidocs.*//' *.lang
+# Otherwise 'kdeutils-apidocs' owner is needed
+%{__sed} -i -e '/apidocs/d' *.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -799,6 +807,7 @@
 %attr(755,root,root) %{_libdir}/kde3/libkbyteseditwidget.so
 %attr(755,root,root) %{_libdir}/kde3/libkhexedit2part.so
 %attr(755,root,root) %{_libdir}/libkhexeditcommon.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkhexeditcommon.so.0
 %{_datadir}/apps/khexedit
 %{_datadir}/apps/khexedit2part
 %{_datadir}/services/khexedit2part.desktop
@@ -817,6 +826,7 @@
 %files kmilo
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libkmilo.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkmilo.so.1
 %attr(755,root,root) %{_libdir}/kde3/kded_kmilod.so
 %attr(755,root,root) %{_libdir}/kde3/kmilo_generic.so
 %{_datadir}/services/kded/kmilod.desktop
@@ -847,6 +857,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/klaptop*
 %attr(755,root,root) %{_libdir}/libkcmlaptop.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkcmlaptop.so.0
 %attr(755,root,root) %{_libdir}/kde3/kded_klaptopdaemon.so
 %attr(755,root,root) %{_libdir}/kde3/kcm_laptop.so
 %{_datadir}/apps/klaptopdaemon
@@ -859,6 +870,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kregexpeditor
 %attr(755,root,root) %{_libdir}/libkregexpeditorcommon.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkregexpeditorcommon.so.1
 %attr(755,root,root) %{_libdir}/kde3/libkregexpeditorgui.so
 %{_datadir}/apps/kregexpeditor
 %{_datadir}/services/kregexpeditorgui.desktop
@@ -868,6 +880,7 @@
 %files ksim -f ksim.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libksimcore.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libksimcore.so.1
 %attr(755,root,root) %{_libdir}/kde3/ksim*.so
 %{_datadir}/apps/kicker/extensions/ksim.desktop
 %{_datadir}/apps/ksim
@@ -892,7 +905,7 @@
 %{_desktopdir}/kde/kwallet.desktop
 %{_desktopdir}/kde/kwalletmanager.desktop
 %{_desktopdir}/kde/kwalletmanager-kwalletd.desktop
-%{_iconsdir}/[!l]*/*/*/kwalletmanager.*
+%{_iconsdir}/hicolor/*/*/kwalletmanager.*
 
 %files superkaramba -f superkaramba.lang
 %defattr(644,root,root,755)
@@ -901,7 +914,7 @@
 %{_datadir}/mimelnk/application/x-superkaramba.desktop
 %dir %{_datadir}/themes/superkaramba
 %{_desktopdir}/kde/superkaramba.desktop
-%{_iconsdir}/[!l]*/*/*/superkaramba*.*
+%{_iconsdir}/crystalsvg/*/*/superkaramba*.*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -909,6 +922,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.198  2008-02-16 00:07:58  glen
+- merged KDE 3.5.9 from AC-branch
+
 Revision 1.197  2008-01-19 14:44:15  qboosh
 - URL, bcond descs cleanup
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdeutils.spec?r1=1.197&r2=1.198&f=u

More information about the pld-cvs-commit mailing list