rpms/pm-utils/devel pm-utils.spec,1.121,1.122

[Till Maas]

Author: till

Update of /cvs/pkgs/rpms/pm-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12652

Modified Files:
	pm-utils.spec 
Log Message:
* Wed Aug 05 2009 Till Maas <opensource at till.name> - 1.2.5-6
- filesystem subpackage contents are now provided by filesystem (Red Hat
  Bugzilla 515362) filesystem-2.4.28-1.fc12



Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- pm-utils.spec	26 Jul 2009 18:59:02 -0000	1.121
+++ pm-utils.spec	5 Aug 2009 10:44:06 -0000	1.122
@@ -2,7 +2,7 @@ Name: pm-utils
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
 Version: 1.2.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
 # for chvt
@@ -17,7 +17,6 @@ Requires: hal
 %ifarch %{ix86} x86_64
 Requires: vbetool
 %endif
-Requires: %{name}-filesystem = %{version}-%{release}
 BuildRequires: xmlto
 
 Source0: http://pm-utils.freedesktop.org/releases/pm-utils-%{version}.tar.gz
@@ -44,13 +43,6 @@ Requires:       pkgconfig
 This package contains the pkg-config files for development
 when building programs that use %{name}.
 
-%package filesystem
-Group: System Environment/Base
-Summary: Directories for hooks
-
-%description filesystem
-This package contains the necessary directories for hooks to put their files
-in.
 
 %prep
 %setup -q 
@@ -82,6 +74,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc README COPYING AUTHORS ChangeLog
 %config(noreplace) %{_sysconfdir}/pm-utils-hd-apm-restore.conf
+# The following dirs are owned by filesystem-2.4.28-1.fc12 and newer
+#%dir %{_sysconfdir}/pm/
+#%dir %{_sysconfdir}/pm/config.d
+#%dir %{_sysconfdir}/pm/power.d
+#%dir %{_sysconfdir}/pm/sleep.d
+#%dir %{_libdir}/pm-utils/
+#%dir %{_libdir}/pm-utils/module.d
+#%dir %{_libdir}/pm-utils/power.d
+#%dir %{_libdir}/pm-utils/sleep.d
 %{_libdir}/pm-utils/bin/
 %{_libdir}/pm-utils/defaults
 %{_libdir}/pm-utils/functions
@@ -107,24 +108,16 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %verify(not md5 size mtime) %{_localstatedir}/log/pm-suspend.log
 
 
-%files filesystem
-%defattr(-,root,root,-)
-%dir %{_sysconfdir}/pm/
-%dir %{_sysconfdir}/pm/config.d
-%dir %{_sysconfdir}/pm/power.d
-%dir %{_sysconfdir}/pm/sleep.d
-%dir %{_libdir}/pm-utils/
-%dir %{_libdir}/pm-utils/module.d
-%dir %{_libdir}/pm-utils/power.d
-%dir %{_libdir}/pm-utils/sleep.d
-
-
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/pm-utils.pc
 
 
 %changelog
+* Wed Aug 05 2009 Till Maas <opensource at till.name> - 1.2.5-6
+- filesystem subpackage contents are now provided by filesystem (Red Hat
+  Bugzilla 515362) filesystem-2.4.28-1.fc12
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.5-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild