1.3.33-1

.cvsignore

@@ -1 +1 @@
-chkconfig-1.3.32.tar.gz
+chkconfig-1.3.33.tar.gz

chkconfig.spec

@@ -1,12 +1,12 @@
 Summary: A system tool for maintaining the /etc/rc*.d hierarchy
 Name: chkconfig
-Version: 1.3.32
+Version: 1.3.33
 Release: 1
 License: GPL
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildPrereq: newt newt-devel gettext
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: newt-devel gettext
 Conflicts: initscripts <= 5.30-1
 
 %description
@@ -18,7 +18,7 @@ of the drudgery of manually editing the symbolic links.
 %package -n ntsysv
 Summary: A tool to set the stop/start of system services in a runlevel
 Group: System Environment/Base
-Requires: chkconfig = %{version}
+Requires: chkconfig = %{version}-%{release}
 
 %description -n ntsysv
 Ntsysv provides a simple interface for setting which system services
@@ -32,15 +32,11 @@ page), ntsysv configures the current runlevel (5 if you're using X).
 
 %build
 
-%ifarch sparc
-LIBMHACK=-lm
-%endif
-
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LIBMHACK=$LIBMHACK
+make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make instroot=$RPM_BUILD_ROOT MANDIR=%{_mandir} install
+make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} SBINDIR=%{_sbindir} install
 
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 ln -s rc.d/init.d $RPM_BUILD_ROOT/etc/init.d
@@ -59,8 +55,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING
 %dir /etc/alternatives
 /sbin/chkconfig
-/usr/sbin/update-alternatives
-/usr/sbin/alternatives
+%{_sbindir}/update-alternatives
+%{_sbindir}/alternatives
 /etc/init.d
 /etc/rc.d/init.d
 /etc/rc[0-6].d
@@ -72,10 +68,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ntsysv
 %defattr(-,root,root)
-/usr/sbin/ntsysv
+%{_sbindir}/ntsysv
 %{_mandir}/*/ntsysv.8*
 
 %changelog
+* Tue Feb  6 2007 Bill Nottingham <notting@redhat.com> 1.3.33-1
+- various changes from review - support alternate %%{_sbindir}, fix
+  summaries, add version to requires, assorted other bits
+
 * Fri Feb  2 2007 Bill Nottingham <notting@redhat.com> 1.3.32-1
 - support overriding various defaults via /etc/chkconfig.d (<johnsonm@rpath.com>)
 
@@ -313,10 +313,10 @@ rm -rf $RPM_BUILD_ROOT
 - bump copyright date
 
 * Tue Jul 11 2000 Bill Nottingham <notting@redhat.com>
-- no %pre today. Maybe tomorrow.
+- no %%pre today. Maybe tomorrow.
 
 * Thu Jul  6 2000 Bill Nottingham <notting@redhat.com>
-- put initscripts %pre here too
+- put initscripts %%pre here too
 
 * Mon Jul  3 2000 Bill Nottingham <notting@redhat.com>
 - oops, if we don't prereq initscripts, we *need* to own /etc/rc[0-6].d

sources

@@ -1 +1 @@
-0c4fe70326998d03f08e9d67059d3816  chkconfig-1.3.32.tar.gz
+4cf0b1ec8facfabb543290d32ebb6bb5  chkconfig-1.3.33.tar.gz