rpms/pm-utils/devel pm-utils.spec,1.107,1.108

[Till Maas (till)]

Author: till

Update of /cvs/pkgs/rpms/pm-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10500

Modified Files:
	pm-utils.spec 
Log Message:
* Fri Jun 20 2008 Till Maas <opensource at till.name> - 1.1.2.2-2
- %pre and %post scriptlets should not be needed anymore, old
  config files should be already moved in every supported release
  and the selinux context for the logfile should be restored by
  rpm
- remove pcitulils BR, it was needed for vbetool, which is in a
  separate package now
- substitute %{__rm} macros for uniform macro usage



Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- pm-utils.spec	29 May 2008 08:02:05 -0000	1.107
+++ pm-utils.spec	20 Jun 2008 17:32:04 -0000	1.108
@@ -2,10 +2,11 @@
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
 Version: 1.1.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
-Requires: kbd pciutils >= 2.2.1
+# for chvt
+Requires: kbd
 Requires: radeontool
 # for hd apm settings
 Requires: hdparm
@@ -50,8 +51,9 @@
 %configure
 make
 
+
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
@@ -63,26 +65,9 @@
 
 install -D -m 0755 %{SOURCE23} $RPM_BUILD_ROOT%{_bindir}/pm-utils-bugreport-info.sh
 
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
-
 
-%pre
-if [ -f %{_sysconfdir}/sysconfig/pm ]; then
-	mkdir -p %{_sysconfdir}/pm/config.d
-	mv %{_sysconfdir}/sysconfig/pm %{_sysconfdir}/pm/config.d/01oldconfig.conf
-fi
-
-
-%post
-if [ -f %{_sysconfdir}/pm/config.rpmsave ]; then
-	mv %{_sysconfdir}/pm/config.rpmsave %{_sysconfdir}/pm/config.d/02oldconfig.conf
-fi
-touch -a %{_localstatedir}/log/pm-suspend.log
-if [ -f %{_localstatedir}/log/pm-suspend.log ] ; then
-	chmod 0600 %{_localstatedir}/log/pm-suspend.log
-	[ -x /sbin/restorecon ] && restorecon  %{_localstatedir}/log/pm-suspend.log > /dev/null 2>&1 ||:
-fi
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 
 %files
@@ -111,13 +96,26 @@
 %dir %{_datadir}/doc/pm-utils
 %doc %{_datadir}/doc/pm-utils/*
 
+# no logrotate needed, because only one run of pm-utils is stored
+# in the logfile
 %ghost %verify(not md5 size mtime) %{_localstatedir}/log/pm-suspend.log
 
+
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/pm-utils.pc
 
+
 %changelog
+* Fri Jun 20 2008 Till Maas <opensource at till.name> - 1.1.2.2-2
+- %%pre and %%post scriptlets should not be needed anymore, old
+  config files should be already moved in every supported release
+  and the selinux context for the logfile should be restored by
+  rpm
+- remove pcitulils BR, it was needed for vbetool, which is in a
+  separate package now
+- substitute %%{__rm} macros for uniform macro usage
+
 * Mon May 29 2008 Richard Hughes <rhughes at redhat.com> - 1.1.2.2-1
 - Update to 1.1.2.2