rpms/pm-utils/devel pm-utils.spec,1.119,1.120

Till Maas till at fedoraproject.org
Sat Jul 18 21:50:01 UTC 2009


Author: till

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

Modified Files:
	pm-utils.spec 
Log Message:
* Sat Jul 18 2009 Till Maas <opensource at till.name> - 1.2.5-4
- Remove atd script
- create filesystem subpackage for hooks



Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- pm-utils.spec	17 Jul 2009 11:44:05 -0000	1.119
+++ pm-utils.spec	18 Jul 2009 21:49:31 -0000	1.120
@@ -2,7 +2,7 @@ Name: pm-utils
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
 Version: 1.2.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
 # for chvt
@@ -17,6 +17,7 @@ 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
@@ -24,7 +25,6 @@ Source0: http://pm-utils.freedesktop.org
 Source21: pm-utils-99hd-apm-restore
 Source22: pm-utils-hd-apm-restore.conf
 Source23: pm-utils-bugreport-info.sh
-Source24: 56atd
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -44,6 +44,14 @@ 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 
 
@@ -65,7 +73,6 @@ install -D -m 0644 %{SOURCE22} $RPM_BUIL
 
 install -D -m 0755 %{SOURCE23} $RPM_BUILD_ROOT%{_bindir}/pm-utils-bugreport-info.sh
 
-install -D -m 0755 %{SOURCE24} $RPM_BUILD_ROOT%{_libdir}/pm-utils/sleep.d/56atd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,15 +82,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc README COPYING AUTHORS ChangeLog
 %config(noreplace) %{_sysconfdir}/pm-utils-hd-apm-restore.conf
-%{_sysconfdir}/pm/
-%dir %{_libdir}/pm-utils/
 %{_libdir}/pm-utils/bin/
 %{_libdir}/pm-utils/defaults
 %{_libdir}/pm-utils/functions
+%{_libdir}/pm-utils/module.d/*
 %{_libdir}/pm-utils/pm-functions
-%{_libdir}/pm-utils/power.d/
-%{_libdir}/pm-utils/sleep.d/
-%{_libdir}/pm-utils/module.d
+%{_libdir}/pm-utils/power.d/*
+%{_libdir}/pm-utils/sleep.d/*
 %{_bindir}/on_ac_power
 %{_bindir}/pm-is-supported
 %{_bindir}/pm-utils-bugreport-info.sh
@@ -102,12 +107,28 @@ 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
+* Sat Jul 18 2009 Till Maas <opensource at till.name> - 1.2.5-4
+- Remove atd script
+- create filesystem subpackage for hooks
+
 * Fri Jul 17 2009 Marcela Mašláňová <mmaslano at redhat.com> - 1.2.5-3
 - move atd script into pm-utils
 




More information about the scm-commits mailing list