From: Elan Ruusamäe <glen@pld-linux.org>
Date: Wed, 11 Oct 2006 20:33:37 +0000 (+0000)
Subject: - AC-branch merge
X-Git-Tag: auto/th/kdelibs-3_5_5-1~2
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=19755ff248de7c455d1b57c3ee898fb6e6410bc8;p=packages%2Fkdelibs.git

- AC-branch merge

Changed files:
    kdelibs.spec -> 1.478
---

diff --git a/kdelibs.spec b/kdelibs.spec
index 39a7d33..38086de 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -348,7 +348,7 @@ strony innych u
 %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}
@@ -398,12 +398,15 @@ install -d \
 
 # 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