[kde-workspace] update %files, cleanup
Rex Dieter
rdieter at fedoraproject.org
Thu Dec 20 02:54:03 UTC 2012
commit 206a4ba94ccac186253bdca4cc4b6c2d64b5d50f
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Wed Dec 19 20:54:10 2012 -0600
update %files, cleanup
kde-workspace.spec | 26 ++------------------------
1 files changed, 2 insertions(+), 24 deletions(-)
---
diff --git a/kde-workspace.spec b/kde-workspace.spec
index 651dafc..4f9274f 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -440,7 +440,6 @@ Requires: akonadi
%build
-
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} \
@@ -455,8 +454,6 @@ make %{?_smp_mflags} -C %{_target_platform}
%install
-rm -rf %{buildroot}
-
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
# xsession support
@@ -466,10 +463,10 @@ mv %{buildroot}%{_kde4_appsdir}/kdm/sessions/kde-plasma.desktop \
%{buildroot}%{_datadir}/xsessions/
# remove extraneous xsession files
-rm -rf %{buildroot}%{_kde4_appsdir}/kdm/sessions
+rm -rfv %{buildroot}%{_kde4_appsdir}/kdm/sessions
# nuke, use external kde-settings-kdm
-rm -rf %{buildroot}%{_kde4_configdir}/kdm
+rm -rfv %{buildroot}%{_kde4_configdir}/kdm
# own %{_kde4_appsdir}/kdm/faces and set default user image
mkdir -p %{buildroot}%{_kde4_appsdir}/kdm/faces
@@ -477,8 +474,6 @@ pushd %{buildroot}%{_kde4_appsdir}/kdm/faces
ln -sf ../pics/users/%{default_face_icon} .default.face.icon
popd
-## unpackaged files
-
%check
for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
@@ -486,10 +481,6 @@ for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
done
-%clean
-rm -rf %{buildroot}
-
-
%post
touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
@@ -509,7 +500,6 @@ update-desktop-database -q &> /dev/null || :
fi
%files
-%defattr(-,root,root,-)
%doc COPYING README
%{_kde4_bindir}/kaccess
%{_kde4_bindir}/kapplymousetheme
@@ -751,7 +741,6 @@ fi
%postun libs -p /sbin/ldconfig
%files libs
-%defattr(-,root,root,-)
%{_kde4_libdir}/libkdecorations.so.4*
%{_kde4_libdir}/libkephal.so.4*
%{_kde4_libdir}/libkfontinst.so.4*
@@ -779,7 +768,6 @@ fi
%{_kde4_libdir}/kde4/plugins/styles/oxygen.so
%files devel
-%defattr(-,root,root,-)
%{_kde4_includedir}/*
%{_kde4_appsdir}/cmake/modules/*.cmake
%{_kde4_libdir}/cmake/KDE4Workspace/
@@ -810,8 +798,6 @@ fi
%{_kde4_libdir}/libkwinglesutils.so
%files ksplash-themes
-%defattr(-,root,root,-)
-%{_kde4_appsdir}/ksplash/Themes/Horos/
%{_kde4_appsdir}/ksplash/Themes/Minimalistic/
%files -n kcm_colors
@@ -830,7 +816,6 @@ fi
%{_kde4_appsdir}/color-schemes/ZionReversed.colors
%files -n kdm
-%defattr(-,root,root,-)
%{_kde4_bindir}/genkdmconf
%{_kde4_bindir}/kdm
%{_kde4_bindir}/kdmctl
@@ -850,7 +835,6 @@ fi
%{_kde4_datadir}/kde4/services/kdm.desktop
%files -n kdm-themes
-%defattr(-,root,root,-)
%{_kde4_appsdir}/kdm/themes/circles/
%{_kde4_appsdir}/kdm/themes/horos/
%{_kde4_appsdir}/kdm/themes/oxygen/
@@ -912,7 +896,6 @@ fi
%{_kde4_libdir}/libprocessui.so.4*
%files -n ksysguardd
-%defattr(-,root,root,-)
%config(noreplace) %{_kde4_sysconfdir}/ksysguarddrc
%{_kde4_bindir}/ksysguardd
@@ -934,7 +917,6 @@ fi
%{_kde4_libdir}/libkworkspace.so.4*
%files -n oxygen-cursor-themes
-%defattr(-,root,root,-)
%{_kde4_iconsdir}/Oxygen_Black/
%{_kde4_iconsdir}/Oxygen_Blue/
%{_kde4_iconsdir}/Oxygen_White/
@@ -943,26 +925,22 @@ fi
%if 0%{?googlegadgets}
%files -n plasma-scriptengine-googlegadgets
-%defattr(-,root,root,-)
%{_kde4_libdir}/kde4/plasma_package_ggl.so
%{_kde4_libdir}/kde4/plasma_scriptengine_ggl.so
%{_kde4_datadir}/kde4/services/*googlegadgets.desktop
%endif
%files -n plasma-scriptengine-python
-%defattr(-,root,root,-)
%{python_sitearch}/PyKDE4/plasmascript.py*
%{_kde4_appsdir}/plasma_scriptengine_python
%{_kde4_datadir}/kde4/services/plasma-scriptengine*python.desktop
%files -n plasma-scriptengine-ruby
-%defattr(-,root,root,-)
%{_kde4_appsdir}/plasma_scriptengine_ruby/
%{_kde4_datadir}/kde4/services/plasma-scriptengine-*ruby*.desktop
%if 0%{?akonadi_subpkg}
%files akonadi
-%defattr(-,root,root,-)
%{_kde4_libdir}/kde4/plasma_engine_akonadi.so
%{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
%endif
More information about the scm-commits
mailing list