rpms/readahead/devel readahead.spec,1.39,1.40

[Karel Zak (kzak)]

Author: kzak

Update of /cvs/pkgs/rpms/readahead/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14468

Modified Files:
	readahead.spec 
Log Message:
* Wed Oct  3 2007 Karel Zak <kzak at redhat.com> 1:1.4.2-2
- cleanup specfile (based on fedora merge review - #226360)



Index: readahead.spec
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/devel/readahead.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- readahead.spec	1 Oct 2007 23:09:21 -0000	1.39
+++ readahead.spec	3 Oct 2007 09:28:30 -0000	1.40
@@ -1,7 +1,7 @@
 Summary:        Read a preset list of files into memory
 Name:           readahead
 Version:        1.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
@@ -12,8 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): /sbin/chkconfig, /sbin/service
-Requires(pre):  /sbin/chkconfig, /sbin/service
-Requires(triggerpostun): /sbin/chkconfig, /sbin/service
+Requires(preun):  /sbin/chkconfig, /sbin/service
 Requires:       procps /bin/gawk
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  audit-libs-devel
@@ -41,23 +40,11 @@
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-%files -f %{name}.lang
-%defattr(-,root,root)
-%doc COPYING README lists/README.lists
-%attr(0755, root, root)                    %{_sysconfdir}/cron.daily/readahead.cron
-%attr(0755, root, root)                    %{_sysconfdir}/rc.d/init.d/readahead_later
-%attr(0755, root, root)                    %{_sysconfdir}/rc.d/init.d/readahead_early
-%attr(0644, root, root) %config(noreplace) %{_sysconfdir}/readahead.conf
-%dir                                       %{_sysconfdir}/readahead.d
-%attr(0644, root, root)                    %{_sysconfdir}/readahead.d/default.early
-%attr(0644, root, root)                    %{_sysconfdir}/readahead.d/default.later
-%{_sbindir}/readahead
-/sbin/readahead-collector
-
-
 %preun
 if [ "$1" = "0" ] ; then
+ /sbin/service readahead_later stop >/dev/null 2>&1
  /sbin/chkconfig --del readahead_later
+ /sbin/service readahead_early stop >/dev/null 2>&1
  /sbin/chkconfig --del readahead_early
 fi
 
@@ -65,12 +52,23 @@
 /sbin/chkconfig --add readahead_later
 /sbin/chkconfig --add readahead_early
 
-%triggerpostun -- kernel-utils
-/sbin/chkconfig --add readahead_later
-/sbin/chkconfig --add readahead_early
-exit 0
+%files -f %{name}.lang
+%defattr(-,root,root,- )
+%doc COPYING README lists/README.lists
+%{_sysconfdir}/cron.daily/readahead.cron
+%{_sysconfdir}/rc.d/init.d/readahead_later
+%{_sysconfdir}/rc.d/init.d/readahead_early
+%config(noreplace) %{_sysconfdir}/readahead.conf
+%dir %{_sysconfdir}/readahead.d
+%{_sysconfdir}/readahead.d/default.early
+%{_sysconfdir}/readahead.d/default.later
+%{_sbindir}/readahead
+/sbin/readahead-collector
 
 %changelog
+* Wed Oct  3 2007 Karel Zak <kzak at redhat.com> 1:1.4.2-2
+- cleanup specfile (based on fedora merge review - #226360)
+
 * Mon Oct  1 2007 Karel Zak <kzak at redhat.com> 1:1.4.2-1
 - upgrade to 1.4.2 (includes bug fixes only)
    - auparse requires as a record separator (#253226)