rpms/kde-filesystem/devel kde-filesystem.spec,1.4.2.3,1.4.2.4

Than Ngo (than) fedora-extras-commits at redhat.com
Thu Aug 9 11:19:30 UTC 2007


Author: than

Update of /cvs/extras/rpms/kde-filesystem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30642

Modified Files:
      Tag: kde-filesystem-kde4-branch
	kde-filesystem.spec 
Log Message:
fix macro



Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-filesystem/devel/kde-filesystem.spec,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -r1.4.2.3 -r1.4.2.4
--- kde-filesystem.spec	9 Aug 2007 10:21:24 -0000	1.4.2.3
+++ kde-filesystem.spec	9 Aug 2007 11:18:58 -0000	1.4.2.4
@@ -40,13 +40,13 @@
       -p $RPM_BUILD_ROOT%{_datadir}/autostart \
       -p $RPM_BUILD_ROOT%{_datadir}/kde4/config \
       -p $RPM_BUILD_ROOT%{_datadir}/kde4/config.kcfg \
-      -p $RPM_BUILD_ROOT%{_datadir}/desktop-directories \
-      -p $RPM_BUILD_ROOT%{_datadir}/emoticons \
+      -p $RPM_BUILD_ROOT%{_datadir}/kde4/desktop-directories \
+      -p $RPM_BUILD_ROOT%{_datadir}/kde4/emoticons \
       -p $RPM_BUILD_ROOT%{_datadir}/kde4/services \
       -p $RPM_BUILD_ROOT%{_datadir}/kde4/servicetypes \
       -p $RPM_BUILD_ROOT%{_datadir}/sounds \
       -p $RPM_BUILD_ROOT%{_datadir}/kde4/templates/.source \
-      -p $RPM_BUILD_ROOT%{_datadir}/wallpapers
+      -p $RPM_BUILD_ROOT%{_datadir}/wallpapers \
       -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/16x16/actions \
       -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/16x16/apps \
       -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/16x16/mimetypes \
@@ -61,6 +61,7 @@
       -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/48x48/mimetypes \
       -p $RPM_BUILD_ROOT%{_docdir}/HTML/en
 
+rm -f %{name}.list
 for locale in $(grep '=' %{SOURCE1} | awk -F= '{print $1}') ; do
   mkdir -p $RPM_BUILD_ROOT%{_docdir}/HTML/${locale}/
   echo "%lang($locale) %{_docdir}/HTML/$locale/" >> %{name}.list
@@ -69,7 +70,7 @@
 install %{SOURCE0} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT %{name}.list
 
 
 %files -f %{name}.list
@@ -77,7 +78,7 @@
 %config /etc/rpm/macros.kde4
 %{_prefix}/env/
 %{_prefix}/shutdown/
-%{_sysconfdir}/kde/
+%{_sysconfdir}/kde4/
 %{_libdir}/kde4
 %{_datadir}/applications/kde4/
 %{_datadir}/kde4/apps/




More information about the fedora-extras-commits mailing list