[kde-filesystem] - own /usr/lib*/kde3, /usr/lib*/kde4 (#644571) - simply stuff, remove crud

[Rex Dieter]

commit 38058d600e6dcea077938598bf5a211d3282d9b4
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Oct 19 19:33:47 2010 -0500

    - own /usr/lib*/kde3,/usr/lib*/kde4 (#644571)
    - simply stuff, remove crud

 kde-filesystem.spec |   77 +++++++++++++++++++++++---------------------------
 1 files changed, 35 insertions(+), 42 deletions(-)
---
diff --git a/kde-filesystem.spec b/kde-filesystem.spec
index a4eff20..17c4eda 100644
--- a/kde-filesystem.spec
+++ b/kde-filesystem.spec
@@ -14,20 +14,17 @@
 %define _kde4_buildtype release
 %define _kde4_macros_api 2
 
-%if 0%{?fedora} > 11
-# moved to filesystem, see http://bugzilla.redhat.com/515745
-%define exclude_sounds 1
-%endif
-
 Summary: KDE filesystem layout
 Name: kde-filesystem
 Version: 4
-Release: 35%{?dist}
+Release: 36%{?dist}
 
 Group: System Environment/Base
 License: Public Domain
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
+
+# noarch->arch transition
+Obsoletes: kde-filesystem < 4-36
 
 # teamnames (locales) borrowed from kde-i18n packaging
 Source1: teamnames
@@ -61,12 +58,15 @@ rm -rf $RPM_BUILD_ROOT
 
 ## KDE3 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/{env,shutdown,kdm}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/{applications/kde,applnk,apps,autostart,config,config.kcfg,emoticons,mimelnk,services,servicetypes,sounds,templates,source}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/{applications/kde,applnk,apps,autostart,config,config.kcfg,emoticons,mimelnk,services,servicetypes,templates,source}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus
 # not sure who best should own locolor, so we'll included it here, for now. -- Rex
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/{16x16,22x22,32x32,48x48}/{actions,apps,mimetypes}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applnk/{.hidden,Applications,Edutainment,Graphics,Internet,Settings,System,Toys,Utilities}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/mimelnk/{all,application,audio,fonts,image,inode,interface,media,message,model,multipart,print,text,uri,video}
+# do qt3 too?
+# mkdir -p $RPM_BUILD_ROOT%{_prefix}/{lib,%{_lib}}/qt-3.3/plugins
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/{lib,%{_lib}}/kde3/plugins
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/HTML/en
 
 for locale in $(grep '=' %{SOURCE1} | awk -F= '{print $1}') ; do
@@ -83,36 +83,23 @@ install -p -m644 -D %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/applnk/.hidden/.direct
 
 ## KDE4
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm \
-      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde/env \
-      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde/shutdown \
-      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde/kdm \
-      -p $RPM_BUILD_ROOT%{_kde4_includedir} \
-      -p $RPM_BUILD_ROOT%{_kde4_libexecdir} \
-      -p $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4 \
-      -p $RPM_BUILD_ROOT%{_kde4_appsdir} \
-      -p $RPM_BUILD_ROOT%{_kde4_appsdir}/color-schemes \
-      -p $RPM_BUILD_ROOT%{_kde4_datadir}/autostart \
-      -p $RPM_BUILD_ROOT%{_kde4_configdir} \
-      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/config.kcfg \
-      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/emoticons \
-      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/kde4/services/ServiceMenus \
-      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/kde4/servicetypes \
-      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/templates/.source \
-      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/16x16/actions \
-      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/16x16/apps \
-      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/16x16/mimetypes \
-      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/22x22/actions \
-      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/22x22/apps \
-      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/22x22/mimetypes \
-      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/32x32/actions \
-      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/32x32/apps \
-      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/32x32/mimetypes \
-      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/48x48/actions \
-      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/48x48/apps \
-      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/48x48/mimetypes \
-      -p $RPM_BUILD_ROOT%{_kde4_datadir}/sounds \
-      -p $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers \
-      -p $RPM_BUILD_ROOT%{_kde4_docdir}/HTML/en/common
+         $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde/{env,shutdown,kdm} \
+         $RPM_BUILD_ROOT%{_kde4_includedir} \
+         $RPM_BUILD_ROOT%{_kde4_libexecdir} \
+         $RPM_BUILD_ROOT%{_kde4_appsdir}/color-schemes \
+         $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4 \
+         $RPM_BUILD_ROOT%{_kde4_datadir}/{autostart,wallpapers} \
+         $RPM_BUILD_ROOT%{_kde4_configdir} \
+         $RPM_BUILD_ROOT%{_kde4_sharedir}/config.kcfg \
+         $RPM_BUILD_ROOT%{_kde4_sharedir}/emoticons \
+         $RPM_BUILD_ROOT%{_kde4_sharedir}/kde4/services/ServiceMenus \
+         $RPM_BUILD_ROOT%{_kde4_sharedir}/kde4/servicetypes \
+         $RPM_BUILD_ROOT%{_kde4_sharedir}/templates/.source \
+         $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/{16x16,22x22,32x32,48x48}/{actions,apps,mimetypes} \
+         $RPM_BUILD_ROOT%{_kde4_docdir}/HTML/en/common
+# do qt4 too?
+# mkdir -p $RPM_BUILD_ROOT%{_prefix}/{lib,%{_lib}}/qt4/plugins
+mkdir -p $RPM_BUILD_ROOT%{_kde4_prefix}/{lib,%{_lib}}/kde4/plugins
 
 for locale in $(grep '=' %{SOURCE1} | awk -F= '{print $1}') ; do
   mkdir -p $RPM_BUILD_ROOT%{_kde4_docdir}/HTML/${locale}/common
@@ -160,8 +147,9 @@ rm -rf $RPM_BUILD_ROOT %{name}.list
 %{_datadir}/mimelnk/
 %{_datadir}/services/
 %{_datadir}/servicetypes/
-%{?exclude_sounds:%exclude }%{_datadir}/sounds/
 %{_datadir}/templates/
+%{_prefix}/lib/kde3/
+%{_prefix}/%{_lib}/kde3/
 %dir %{_docdir}/HTML/
 %lang(en) %{_docdir}/HTML/en/
 
@@ -170,22 +158,27 @@ rm -rf $RPM_BUILD_ROOT %{name}.list
 %{_kde4_sysconfdir}/kde/
 %{_kde4_libexecdir}/
 %{_kde4_includedir}/
-%{_kde4_datadir}/applications/kde4/
 %{_kde4_appsdir}/
 %{_kde4_configdir}/
 %{_kde4_sharedir}/config.kcfg/
 %{_kde4_sharedir}/emoticons/
 %{_kde4_sharedir}/kde4/
 %{_kde4_sharedir}/templates/
+%{_kde4_datadir}/applications/kde4/
 %{_kde4_datadir}/autostart/
-%{_kde4_datadir}/icons/locolor
-%{?exclude_sounds:%exclude }%{_kde4_datadir}/sounds/
+%{_kde4_datadir}/icons/locolor/
 %{_kde4_datadir}/wallpapers/
+%{_kde4_prefix}/lib/kde4/
+%{_kde4_prefix}/%{_lib}/kde4/
 %dir %{_kde4_docdir}/HTML/
 %lang(en) %{_kde4_docdir}/HTML/en/
 
 
 %changelog
+* Tue Oct 19 2010 Rex Dieter <rdieter at fedoraproject.org> - 4-36
+- own /usr/lib*/kde3,/usr/lib*/kde4 (#644571)
+- simply stuff, remove crud
+
 * Sat Feb 13 2010 Rex Dieter <rdieter at fedoraproject.org> - 4-35
 - macros.kde4: restore %%cmake_lib_suffix64