rpms/kde-filesystem/devel kde-filesystem.spec,1.4.2.12,1.4.2.13

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
      Tag: kde-filesystem-kde4-branch
	kde-filesystem.spec 
Log Message:
* Mon Aug 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-9
- BR: gawk
- - %_prefix/{env,shutdown} (non-FHS)



Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/devel/kde-filesystem.spec,v
retrieving revision 1.4.2.12
retrieving revision 1.4.2.13
diff -u -r1.4.2.12 -r1.4.2.13
--- kde-filesystem.spec	16 Aug 2007 16:03:30 -0000	1.4.2.12
+++ kde-filesystem.spec	27 Aug 2007 20:22:02 -0000	1.4.2.13
@@ -16,7 +16,7 @@
 Summary: KDE filesystem layout
 Name: kde-filesystem
 Version: 3.92
-Release: 8
+Release: 9%{?dist}
 
 Group: System Environment/Base
 License: Public Domain
@@ -32,6 +32,8 @@
 # Requires: kde4-macros(api) = %{_kde4_macros_api}
 Provides: kde4-macros(api) = %{_kde4_macros_api} 
 
+BuildRequires: gawk
+
 Requires:  filesystem
 Requires:  rpm
 
@@ -50,7 +52,6 @@
 rm -rf $RPM_BUILD_ROOT
 
 ## KDE3 
-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
@@ -66,8 +67,6 @@
 
 ## KDE4
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm \
-      -p $RPM_BUILD_ROOT%{_kde4_prefix}/env \
-      -p $RPM_BUILD_ROOT%{_kde4_prefix}/shutdown \
       -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/env \
       -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/shutdown \
       -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/kdm \
@@ -132,8 +131,6 @@
 %defattr(-,root,root,-)
 
 # KDE3
-%{_prefix}/env/
-%{_prefix}/shutdown/
 %{_sysconfdir}/kde/
 %{_datadir}/applications/kde/
 %{_datadir}/applnk/
@@ -154,8 +151,6 @@
 
 # KDE4
 %config /etc/rpm/macros.kde4
-%{_kde4_prefix}/env/
-%{_kde4_prefix}/shutdown/
 %{_kde4_sysconfdir}/kde4/
 %{_kde4_libdir}
 %{_kde4_datadir}/applications/kde4/
@@ -175,6 +170,10 @@
 
 
 %changelog
+* Mon Aug 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-9
+- BR: gawk
+- - %%_prefix/{env,shutdown} (non-FHS)
+
 * Wed Aug 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-8
 - simplify macros a bit