rpms/kde-filesystem/devel kde-filesystem.spec,1.4,1.4.2.1

[Than Ngo (than)]

Author: than

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

Modified Files:
      Tag: kde-filesystem-kde4-branch
	kde-filesystem.spec 
Log Message:
- kde4 filesystem
- add KDE4 macros




Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-filesystem/devel/kde-filesystem.spec,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- kde-filesystem.spec	21 Jul 2007 04:06:30 -0000	1.4
+++ kde-filesystem.spec	6 Aug 2007 16:16:54 -0000	1.4.2.1
@@ -1,15 +1,15 @@
-
 Summary: KDE filesystem layout
-Name:	 kde-filesystem
-Version: 3.5 
-Release: 9 
+Name: kde-filesystem
+Version: 3.92
+Release: 1
 
-Group:   System Environment/Base
+Group: System Environment/Base
 License: Public Domain
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
 # teamnames (locales) borrowed from kde-i18n packaging
+Source: macros.kde4
 Source1: teamnames
 
 Requires:  filesystem
@@ -25,52 +25,80 @@
 
 
 %install
-rm -f $RPM_BUILD_DIR/%{name}.list
 rm -rf $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/{env,shutdown}
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/{env,shutdown,kdm,xdg/menus}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/{applications/kde,applnk,apps,autostart,config,config.kcfg,desktop-directories,emoticons,mimelnk,services,servicetypes,sounds,templates/.source,wallpapers}
-# 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}
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/HTML/en
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm \
+      -p $RPM_BUILD_ROOT%{_prefix}/env \
+      -p $RPM_BUILD_ROOT%{_prefix}/shutdown \
+      -p $RPM_BUILD_ROOT%{_sysconfdir}/kde4/env \
+      -p $RPM_BUILD_ROOT%{_sysconfdir}/kde4/shutdown \
+      -p $RPM_BUILD_ROOT%{_sysconfdir}/kde4/kdm \
+      -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus \
+      -p $RPM_BUILD_ROOT%{_datadir}/applications/kde4 \
+      -p $RPM_BUILD_ROOT%{_datadir}/kde4/apps \
+      -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/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}/icons/locolor/16x16/actions \
+      -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/16x16/apps \
+      -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/16x16/mimetypes \
+      -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/22x22/actions \
+      -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/22x22/apps \
+      -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/22x22/mimetypes \
+      -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/32x32/actions \
+      -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/32x32/apps \
+      -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/32x32/mimetypes \
+      -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/48x48/actions \
+      -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/48x48/apps \
+      -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/48x48/mimetypes \
+      -p $RPM_BUILD_ROOT%{_docdir}/HTML/en
 
 for locale in $(grep '=' %{SOURCE1} | awk -F= '{print $1}') ; do
- mkdir -p $RPM_BUILD_ROOT%{_docdir}/HTML/${locale}/
+  mkdir -p $RPM_BUILD_ROOT%{_docdir}/HTML/${locale}/
   echo "%lang($locale) %{_docdir}/HTML/$locale/" >> %{name}.list
 done
 
+install %{SOURCE0} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
+
 %clean
 rm -rf $RPM_BUILD_ROOT
-rm -f  $RPM_BUILD_DIR/%{name}.list
 
 
 %files -f %{name}.list
 %defattr(-,root,root,-)
+%config /etc/rpm/macros.kde4
 %{_prefix}/env/
 %{_prefix}/shutdown/
 %{_sysconfdir}/kde/
-%{_datadir}/applications/kde/
-%{_datadir}/applnk/
-%{_datadir}/apps/
-%{_datadir}/config/
-%{_datadir}/config.kcfg/
-%{_datadir}/desktop-directories/
-%{_datadir}/emoticons/
+%{_datadir}/applications/kde4/
+%{_datadir}/kde4/apps/
+%{_datadir}/kde4/config/
+%{_datadir}/kde4/config.kcfg/
+%{_datadir}/kde4/desktop-directories/
+%{_datadir}/kde4/emoticons/
 %{_datadir}/icons/locolor
-%{_datadir}/mimelnk/
-%{_datadir}/services/
-%{_datadir}/servicetypes/
-%{_datadir}/sounds/
-%{_datadir}/templates/
+%{_datadir}/kde4/services/
+%{_datadir}/kde4/servicetypes/
+%{_datadir}/kde4/templates/
 %{_datadir}/wallpapers/
+%{_datadir}/sounds/
+
 %dir %{_docdir}/HTML/
 %lang(en) %{_docdir}/HTML/en/
 
 
 %changelog
+* Mon Aug 06 2007 Than Ngo <than at redhat.com> - 3.92-1
+- kde4 filesystem
+- add KDE4 macros
+
 * Thu Jul 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-9
 - +%%_datadir/{sounds,templates/.source,wallpapers}