SPECS: kdelibs.spec - keep kconf_update scripts and .upd files in ...

glen glen at pld-linux.org
Mon Feb 18 12:35:03 CET 2008 

Author: glen                         Date: Mon Feb 18 11:35:03 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- keep kconf_update scripts and .upd files in same package
- %dir %{_datadir}/apps/kconf_update in kde-common-dirs
- ghost soname symlinks

---- Files affected:
SPECS:
   kdelibs.spec (1.549 -> 1.550) 

---- Diffs:

================================================================
Index: SPECS/kdelibs.spec
diff -u SPECS/kdelibs.spec:1.549 SPECS/kdelibs.spec:1.550
--- SPECS/kdelibs.spec:1.549	Sun Feb 17 14:16:52 2008
+++ SPECS/kdelibs.spec	Mon Feb 18 12:34:58 2008
@@ -364,10 +364,10 @@
 %patch10 -p1
 %patch11 -p1
 
-rm -f configure
-cp /usr/share/automake/config.sub admin
+mv -f configure{,.dist}
 
 %build
+cp /usr/share/automake/config.sub admin
 export kde_htmldir=%{_kdedocdir}
 export kde_libs_htmldir=%{_kdedocdir}
 if [ ! -f configure ]; then
@@ -395,13 +395,17 @@
 %{?with_apidocs:%{__make} apidox}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+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}
 	kde_libs_htmldir=%{_kdedocdir}
+	touch makeinstall.stamp
+fi
 
+if [ ! -f installed.stamp ]; then
 install %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/services
 install %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-icq.desktop
 install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/mimelnk/application
@@ -440,6 +444,9 @@
 sed -i 's:-lboost_filesystem -lboost_regex::' $RPM_BUILD_ROOT%{_libdir}/kde3/plugins/designer/kdewidgets.la
 sed -i 's:-lboost_filesystem -lboost_regex::' $RPM_BUILD_ROOT%{_libdir}/*.la
 
+	touch installed.stamp
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -513,8 +520,9 @@
 %attr(755,root,root) %{_datadir}/apps/dcopidlng/kalyptus
 %{_datadir}/apps/dcopidlng/*.pm
 %{_datadir}/apps/kcertpart
-%attr(755,root,root) %{_datadir}/apps/kconf_update/*.pl
 %{_datadir}/apps/kconf_update/*.upd
+%attr(755,root,root) %{_datadir}/apps/kconf_update/*.pl
+%attr(755,root,root) %{_datadir}/apps/kconf_update/*.sh
 %{_datadir}/apps/kdeprint
 # also contains 3rdparty kpartplugins dir
 %{_datadir}/apps/khtml/domain_info
@@ -768,15 +776,25 @@
 %attr(755,root,root) %{_libdir}/kde3/libshellscript.so
 %attr(755,root,root) %{_libdir}/kde3/wmfthumbnail.so
 %attr(755,root,root) %{_libdir}/libDCOP.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libDCOP.so.4
 %attr(755,root,root) %{_libdir}/libartskde.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libartskde.so.1
 %attr(755,root,root) %{_libdir}/libkabc.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkabc.so.1
 %attr(755,root,root) %{_libdir}/libkabc_dir.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkabc_dir.so.1
 %attr(755,root,root) %{_libdir}/libkabc_file.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkabc_file.so.1
 %attr(755,root,root) %{_libdir}/libkabc_ldapkio.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkabc_ldapkio.so.1
 %attr(755,root,root) %{_libdir}/libkatepartinterfaces.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkatepartinterfaces.so.0
 %attr(755,root,root) %{_libdir}/libkdecore.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdecore.so.4
 %attr(755,root,root) %{_libdir}/libkdefakes.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdefakes.so.4
 %attr(755,root,root) %{_libdir}/libkdefx.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdefx.so.4
 %attr(755,root,root) %{_libdir}/libkdeinit_cupsdconf.so
 %attr(755,root,root) %{_libdir}/libkdeinit_dcopserver.so
 %attr(755,root,root) %{_libdir}/libkdeinit_kaddprinterwizard.so
@@ -789,34 +807,63 @@
 %attr(755,root,root) %{_libdir}/libkdeinit_kio_uiserver.so
 %attr(755,root,root) %{_libdir}/libkdeinit_klauncher.so
 %attr(755,root,root) %{_libdir}/libkdeprint.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdeprint.so.4
 %attr(755,root,root) %{_libdir}/libkdeprint_management.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdeprint_management.so.4
 %attr(755,root,root) %{_libdir}/libkdesasl.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdesasl.so.1
 %attr(755,root,root) %{_libdir}/libkdesu.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdesu.so.4
 %attr(755,root,root) %{_libdir}/libkdeui.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdeui.so.4
 %attr(755,root,root) %{_libdir}/libkdnssd.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdnssd.so.1
 %attr(755,root,root) %{_libdir}/libkhtml.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkhtml.so.4
 %attr(755,root,root) %{_libdir}/libkimproxy.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkimproxy.so.0
 %attr(755,root,root) %{_libdir}/libkio.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkio.so.4
 %attr(755,root,root) %{_libdir}/libkjava.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkjava.so.1
 %attr(755,root,root) %{_libdir}/libkjs.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkjs.so.1
 %attr(755,root,root) %{_libdir}/libkmdi.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkmdi.so.1
 %attr(755,root,root) %{_libdir}/libkmdi2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkmdi2.so.1
 %attr(755,root,root) %{_libdir}/libkmediaplayer.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkmediaplayer.so.0
 %attr(755,root,root) %{_libdir}/libkmid.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkmid.so.0
 %attr(755,root,root) %{_libdir}/libknewstuff.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libknewstuff.so.1
 %attr(755,root,root) %{_libdir}/libkntlm.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkntlm.so.0
 %attr(755,root,root) %{_libdir}/libkparts.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkparts.so.2
 %attr(755,root,root) %{_libdir}/libkresources.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkresources.so.1
 %attr(755,root,root) %{_libdir}/libkscreensaver.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkscreensaver.so.4
 %attr(755,root,root) %{_libdir}/libkscript.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkscript.so.0
 %attr(755,root,root) %{_libdir}/libkspell.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkspell.so.4
 %attr(755,root,root) %{_libdir}/libkspell2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkspell2.so.1
 %attr(755,root,root) %{_libdir}/libktexteditor.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libktexteditor.so.0
 %attr(755,root,root) %{_libdir}/libkunittest.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkunittest.so.1
 %attr(755,root,root) %{_libdir}/libkutils.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkutils.so.1
 %attr(755,root,root) %{_libdir}/libkwalletbackend.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkwalletbackend.so.1
 %attr(755,root,root) %{_libdir}/libkwalletclient.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkwalletclient.so.1
 %attr(755,root,root) %{_libdir}/libvcard.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libvcard.so.0
 
 # 3rdparty directories
 %dir %{_libdir}/kconf_update_bin
@@ -937,7 +984,6 @@
 %attr(755,root,root) %{_bindir}/makekdewidgets
 %{_datadir}/apps/katepart
 %{_datadir}/apps/kcm_componentchooser
-%attr(755,root,root) %{_datadir}/apps/kconf_update/*.sh
 %{_datadir}/apps/kdeui
 %{_datadir}/apps/kdewidgets
 %{_datadir}/apps/khtml/css/html4.css
@@ -956,7 +1002,6 @@
 %dir %{_datadir}/apps/kjava
 %dir %{_datadir}/config
 %dir %{_datadir}/config/ui
-%dir %{_datadir}/apps/kconf_update
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -964,6 +1009,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.550  2008-02-18 11:34:58  glen
+- keep kconf_update scripts and .upd files in same package
+- %dir %{_datadir}/apps/kconf_update in kde-common-dirs
+- ghost soname symlinks
+
 Revision 1.549  2008-02-17 13:16:52  glen
 - revert R: sperl (find some less intrusive method); rel 3
 
@@ -1580,4 +1630,3 @@
 
 Revision 1.380  2005/01/04 21:54:45  havner
 - security pointed by Michal Kochanowicz
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdelibs.spec?r1=1.549&r2=1.550&f=u

More information about the pld-cvs-commit mailing list