rpms/ez-ipupdate/devel .cvsignore, 1.2, 1.3 ez-ipupdate.spec, 1.4, 1.5 sources, 1.2, 1.3

[Ville Skytta (scop)]

Changeset from: scop

Update of /cvs/extras/rpms/ez-ipupdate/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv20664

Modified Files:
	.cvsignore ez-ipupdate.spec sources 
Log Message:
Sync with fedora.us 3.0.11-0.fdr.0.6.b8.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ez-ipupdate/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:15:56 -0000	1.2
+++ .cvsignore	27 Nov 2004 11:21:02 -0000	1.3
@@ -1,2 +1,3 @@
 ez-ipupdate-3.0.11b8.tar.gz
 ez-ipupdate_3.0.11b8-6.diff.gz
+ez-ipupdate_3.0.11b8-8.diff.gz


Index: ez-ipupdate.spec
===================================================================
RCS file: /cvs/extras/rpms/ez-ipupdate/devel/ez-ipupdate.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ez-ipupdate.spec	10 Nov 2004 02:02:41 -0000	1.4
+++ ez-ipupdate.spec	27 Nov 2004 11:21:02 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           ez-ipupdate
 Version:        3.0.11
-Release:        0.6.b8
+Release:        0.7.b8
 Epoch:          0
 Summary:        Client for Dynamic DNS Services
 
@@ -9,14 +9,14 @@
 URL:            http://www.gusnet.cx/proj/ez-ipupdate/
 Source0:        http://www.gusnet.cx/proj/ez-ipupdate/dist/ez-ipupdate-3.0.11b8.tar.gz
 Source1:        %{name}.init
-Patch0:         http://ftp.debian.org/debian/pool/main/e/ez-ipupdate/ez-ipupdate_3.0.11b8-6.diff.gz
+Patch0:         http://ftp.debian.org/debian/pool/main/e/ez-ipupdate/ez-ipupdate_3.0.11b8-8.diff.gz
 Patch1:         %{name}-pidfile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires(post):       /sbin/chkconfig
-Requires(preun):      /sbin/chkconfig
-Requires(pre):        /usr/sbin/useradd, /usr/sbin/groupadd
-Requires(postun):     /usr/sbin/userdel, /usr/sbin/groupdel
+Requires(post):   /sbin/chkconfig
+Requires(preun):  /sbin/chkconfig
+Requires(pre):    /usr/sbin/useradd /usr/sbin/groupadd
+Requires(postun): /usr/sbin/userdel /usr/sbin/groupdel
 
 %description
 ez-ipupdate is a small utility for updating your host name for any of the
@@ -35,35 +35,32 @@
   * http://www.zoneedit.com
 It is pure C and works on Linux, *BSD and Solaris.
 Don't forget to create your own config file to %{_sysconfdir}/ez-ipupdate.conf.
-You can find some example in %{_docdir}/%{name}-%{version}.
+You can find some examples in %{_docdir}/%{name}-%{version}.
 
-# -----------------------------------------------------------------------------
 
 %prep
 %setup -q -n %{name}-%{version}b8
 %patch0 -p1
 %patch1 -p0
-touch stamp-h.in
+touch *.in aclocal.m4 configure
 chmod +x missing
 
-# -----------------------------------------------------------------------------
 
 %build
 %configure
 make %{?_smp_mflags}
 
-# -----------------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall bindir=$RPM_BUILD_ROOT%{_sbindir}
+make install DESTDIR=$RPM_BUILD_ROOT bindir=%{_sbindir}
 
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
 cp -p ez-ipupdate.8 $RPM_BUILD_ROOT%{_mandir}/man8
 
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-perl -pe \
+%{__perl} -pe \
   's|/var/|%{_localstatedir}/|g ;
    s|/usr/sbin/|%{_sbindir}/|g ;
    s|/etc/([^ir])|%{_sysconfdir}/$1|g ;
@@ -79,12 +76,10 @@
 # Create a dedicated dir for the pid file so we can run as non-root.
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/ez-ipupdate
 
-# -----------------------------------------------------------------------------
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %pre
 /usr/sbin/groupadd -r ez-ipupd >/dev/null 2>&1 || :
@@ -95,37 +90,40 @@
 /sbin/chkconfig --add ez-ipupdate
 
 %preun
-if [ "$1" = "0" ]; then
+if [ $1 -eq 0 ] ; then
   %{_initrddir}/ez-ipupdate stop >/dev/null 2>&1 || :
   /sbin/chkconfig --del ez-ipupdate
 fi
 
 %postun
-if [ "$1" = "0" ]; then
+if [ $1 -eq 0 ] ; then
   /usr/sbin/userdel ez-ipupd >/dev/null 2>&1 || :
   /usr/sbin/groupdel ez-ipupd >/dev/null 2>&1 || :
-elif [ "$1" -ge 1 ]; then
+elif [ $1 -ge 1 ] ; then
   %{_initrddir}/ez-ipupdate condrestart >/dev/null
 fi
 
-# -----------------------------------------------------------------------------
 
 %files
 %defattr(0644,root,root,0755)
 %doc CHANGELOG COPYING README example-*.conf
-%{_mandir}/*/*
+%{_mandir}/man8/ez-ipupdate.8*
 %defattr(0755,root,root,0755)
-%attr(0755,root,root) %{_sbindir}/*
-%attr(0755,root,root) %{_initrddir}/*
+%attr(0755,root,root) %{_sbindir}/ez-ipupdate
+%attr(0755,root,root) %{_initrddir}/ez-ipupdate
 %defattr(0644,ez-ipupd,ez-ipupd,0755)
 %dir %{_localstatedir}/cache/ez-ipupdate
 %ghost %{_localstatedir}/cache/ez-ipupdate/default-cache
 %dir %{_localstatedir}/run/ez-ipupdate
 %ghost %attr(0640,root,ez-ipupd) %config(noreplace,missingok) %{_sysconfdir}/ez-ipupdate.conf
 
-# -----------------------------------------------------------------------------
 
 %changelog
+* Sun Nov 14 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:3.0.11-0.7.b8
+- Update patch from Debian to 3.0.11b8-8, fixes CAN-2004-0980.
+- Try harder to avoid (re-)running aclocal and friends during build.
+- Cosmetic specfile improvements.
+
 * Wed Nov 10 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:3.0.11-0.6.b8
 - Fix build on FC3 (add "chmod +x missing" in %%prep).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ez-ipupdate/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:15:56 -0000	1.2
+++ sources	27 Nov 2004 11:21:02 -0000	1.3
@@ -1,2 +1,2 @@
 000211add4c4845ffa4211841bff4fb0  ez-ipupdate-3.0.11b8.tar.gz
-a76900721e323732ee3d7b038744b21c  ez-ipupdate_3.0.11b8-6.diff.gz
+2d3fd3d0599667244931444c69394c51  ez-ipupdate_3.0.11b8-8.diff.gz