[packages/kdebase/dev-trinity] cleanups
glen
glen at pld-linux.org
Sat Jun 7 20:14:11 CEST 2014
commit 547eac720ebc2c618df108f14209bf57d9992c10
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Jun 7 21:14:07 2014 +0300
cleanups
kdebase.spec | 23 +++++++----------------
1 file changed, 7 insertions(+), 16 deletions(-)
---
diff --git a/kdebase.spec b/kdebase.spec
index 1b8da6e..d3831eb 100644
--- a/kdebase.spec
+++ b/kdebase.spec
@@ -1174,15 +1174,13 @@ if [ ! -f installed.stamp ]; then
cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/apps/kdm/pics/pldlogo.png
cp -p %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/wallpapers/kdm_pld.png
- %{__tar} xfj %{SOURCE8} -C $RPM_BUILD_ROOT%{_datadir}/services/searchproviders/
- %{__tar} xfj %{SOURCE10} -C $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/
+ %{__tar} xfj %{SOURCE8} -C $RPM_BUILD_ROOT%{_datadir}/services/searchproviders
+ %{__tar} xfj %{SOURCE10} -C $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus
mv $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/scripts/* $RPM_BUILD_ROOT%{_bindir}
- rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/scripts
- %{__tar} xfj %{SOURCE13} -C $RPM_BUILD_ROOT%{_datadir}/apps/konqsidebartng/virtual_folders/
+ rmdir $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/scripts
+ %{__tar} xfj %{SOURCE13} -C $RPM_BUILD_ROOT%{_datadir}/apps/konqsidebartng/virtual_folders
%if %{with kdm}
- # Drop generated Xsession file (we have own one)
-# %{__rm} $RPM_BUILD_ROOT/etc/X11/kdm/Xsession
install -p %{SOURCE5} $RPM_BUILD_ROOT/etc/X11/kdm/Xsession
cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/kdm
cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/kdm-np
@@ -1196,6 +1194,8 @@ if [ ! -f installed.stamp ]; then
$RPM_BUILD_ROOT/etc/X11/kdm/faces/.default.face.icon
cp -p $RPM_BUILD_ROOT%{_datadir}/apps/kdm/pics/users/root1.png \
$RPM_BUILD_ROOT/etc/X11/kdm/faces/root.face.icon
+
+ %{__rm} $RPM_BUILD_ROOT/etc/X11/kdm/README
%endif
# konqueror/dirtree no longer supported
@@ -1213,7 +1213,6 @@ if [ ! -f installed.stamp ]; then
fi
%{__rm} $RPM_BUILD_ROOT%{_desktopdir}/kde/kcmkicker.desktop # see r1.328
-# %{__rm} $RPM_BUILD_ROOT%{_applnkdir}/Internet/keditbookmarks.desktop
%{__rm} $RPM_BUILD_ROOT%{_applnkdir}/Settings/LookNFeel/Themes/iconthemes.desktop
%{__rm} $RPM_BUILD_ROOT%{_applnkdir}/Settings/LookNFeel/kcmtaskbar.desktop
%{__rm} $RPM_BUILD_ROOT%{_applnkdir}/Settings/LookNFeel/panel.desktop
@@ -1326,9 +1325,6 @@ rm -f *.lang
%find_lang kcontrol/smb --with-kde -a konqueror.lang
%find_lang kcontrol/useragent --with-kde -a konqueror.lang
-#%find_lang kappfinder --with-kde
-touch kappfinder.lang
-
%find_lang kate --with-kde
%find_lang kdm --with-kde
@@ -1350,10 +1346,6 @@ touch kappfinder.lang
# Omit apidocs entries
%{__sed} -i -e '/apidocs/d' *.lang
-%if %{with kdm}
-%{__rm} $RPM_BUILD_ROOT/etc/X11/kdm/README
-%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -2236,7 +2228,7 @@ fi
# !!!
%{_iconsdir}/*/*/apps/kthememgr.png
-%files kappfinder -f kappfinder.lang
+%files kappfinder
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kappfinder
%{_datadir}/apps/kappfinder
@@ -2393,7 +2385,6 @@ fi
%{_datadir}/apps/kscreensaver/KBlankscreen.desktop
%{_datadir}/apps/kscreensaver/KRandom.desktop
%{_desktopdir}/kde/screensaver.desktop
-#%{_iconsdir}/*/*/apps/kscreensaver.png
%files useraccount
%defattr(644,root,root,755)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kdebase.git/commitdiff/547eac720ebc2c618df108f14209bf57d9992c10
More information about the pld-cvs-commit
mailing list