SPECS: kdelibs.spec - AC-branch merge

[glen]

Author: glen                         Date: Wed Oct 11 20:33:43 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- AC-branch merge

---- Files affected:
SPECS:
   kdelibs.spec (1.477 -> 1.478) 

---- Diffs:

================================================================
Index: SPECS/kdelibs.spec
diff -u SPECS/kdelibs.spec:1.477 SPECS/kdelibs.spec:1.478
--- SPECS/kdelibs.spec:1.477	Tue Oct 10 17:15:43 2006
+++ SPECS/kdelibs.spec	Wed Oct 11 22:33:37 2006
@@ -349,7 +349,7 @@
 %patch9 -p1
 
 %build
-cp %{_datadir}/automake/config.sub admin
+cp /usr/share/automake/config.sub admin
 
 export kde_htmldir=%{_kdedocdir}
 export kde_libs_htmldir=%{_kdedocdir}
@@ -399,12 +399,15 @@
 
 # For fileshare
 touch $RPM_BUILD_ROOT/etc/security/fileshare.conf
-%{__sed} -i -e "s|/etc/init.d|/etc/rc.d/init.d|g" $RPM_BUILD_ROOT%{_bindir}/fileshare*
+%{__sed} -i -e 's|/etc/init.d|/etc/rc.d/init.d|g' $RPM_BUILD_ROOT%{_bindir}/fileshare*
 
-if [ -d "$RPM_BUILD_ROOT%{_kdedocdir}/en/%{name}-%{version}-apidocs" ] ; then
+if [ -d $RPM_BUILD_ROOT%{_kdedocdir}/en/%{name}-%{version}-apidocs ] ; then
 	mv -f $RPM_BUILD_ROOT%{_kdedocdir}/en/%{name}-{%{version}-,}apidocs
 fi
 
+# packaged by hicolor-icon-theme
+rm $RPM_BUILD_ROOT%{_iconsdir}/hicolor/index.theme
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -993,6 +996,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.478  2006/10/11 20:33:37  glen
+- AC-branch merge
+
 Revision 1.477  2006/10/10 15:15:43  arekm
 - reenable branch diff (it already contains fixes)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdelibs.spec?r1=1.477&r2=1.478&f=u