packages: mrtg/mrtg.spec - strict internal deps, cosmetics

Sun Dec 12 17:57:47 CET 2010

Author: glen                         Date: Sun Dec 12 16:57:47 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- strict internal deps, cosmetics

---- Files affected:
packages/mrtg:
   mrtg.spec (1.154 -> 1.155) 

---- Diffs:

================================================================
Index: packages/mrtg/mrtg.spec
diff -u packages/mrtg/mrtg.spec:1.154 packages/mrtg/mrtg.spec:1.155

--- packages/mrtg/mrtg.spec:1.154	Mon Aug 30 08:57:56 2010
+++ packages/mrtg/mrtg.spec	Sun Dec 12 17:57:42 2010
@@ -66,8 +66,8 @@
 Summary:	Files that allow running mrtg via crond
 Summary(pl.UTF-8):	Pliki pozwalające uruchamiać mrtg z crona
 Group:		Applications/Networking
+Requires:	%{name} = %{version}-%{release}
 Requires:	crondaemon
-Requires:	mrtg
 Provides:	mrtg-start
 Obsoletes:	mrtg-init
 Obsoletes:	mrtg-start
@@ -83,8 +83,8 @@
 Summary(pl.UTF-8):	Pliki pozwalające uruchamiać mrtg z poziomu rc-scripts
 Group:		Daemons
 Requires(post,preun):	/sbin/chkconfig
+Requires:	%{name} = %{version}-%{release}
 Requires:	crondaemon
-Requires:	mrtg
 Provides:	mrtg-start
 Obsoletes:	mrtg-cron
 Obsoletes:	mrtg-start
@@ -114,20 +114,20 @@
 	$RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name},%{perl_vendorlib},%{_mandir}/man1} \
 	$RPM_BUILD_ROOT{/var/log/{mrtg,archive/mrtg},/var/{lib,run}/mrtg}
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/mrtg
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/mrtg
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/mrtg
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/mrtg
-install %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/mrtg-cronjob
-install %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/indexmaker-cronjob
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/mrtg
+install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/mrtg
+cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/mrtg
+cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/mrtg
+install -p %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/mrtg-cronjob
+install -p %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/indexmaker-cronjob
 ln -sf %{_sysconfdir}/mrtg/mrtg.cfg $RPM_BUILD_ROOT%{_htmldir}/mrtg.cfg
-install images/* $RPM_BUILD_ROOT%{_htmldir}
+cp -a images/* $RPM_BUILD_ROOT%{_htmldir}
 
-install bin/{cfgmaker,indexmaker} $RPM_BUILD_ROOT%{_libdir}/mrtg
-install bin/{rateup,mrtg} $RPM_BUILD_ROOT%{_bindir}
-install lib/mrtg2/locales_mrtg.pm $RPM_BUILD_ROOT%{perl_vendorlib}
-install lib/mrtg2/MRTG_lib.pm $RPM_BUILD_ROOT%{perl_vendorlib}
-install doc/*.1	$RPM_BUILD_ROOT%{_mandir}/man1
+install -p bin/{cfgmaker,indexmaker} $RPM_BUILD_ROOT%{_libdir}/mrtg
+install -p bin/{rateup,mrtg} $RPM_BUILD_ROOT%{_bindir}
+cp -a lib/mrtg2/locales_mrtg.pm $RPM_BUILD_ROOT%{perl_vendorlib}
+cp -a lib/mrtg2/MRTG_lib.pm $RPM_BUILD_ROOT%{perl_vendorlib}
+cp -a doc/*.1	$RPM_BUILD_ROOT%{_mandir}/man1
 
 ln -sf ../mrtg.cfg $RPM_BUILD_ROOT%{_sysconfdir}/mrtg/conf.d
 
@@ -138,7 +138,7 @@
 */5 * * * * stats umask 022; /bin/nice -n 19 %{_bindir}/indexmaker-cronjob 2> /dev/null
 EOF
 
-sed -i 's#/usr/lib#%{_libdir}#' $RPM_BUILD_ROOT%{_bindir}/indexmaker-cronjob
+sed -i 's#/''usr/lib#%{_libdir}#' $RPM_BUILD_ROOT%{_bindir}/indexmaker-cronjob
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -188,6 +188,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.155  2010/12/12 16:57:42  glen
+- strict internal deps, cosmetics
+
 Revision 1.154  2010/08/30 06:57:56  grzegorz
 - added "env LANG=C" to mrtg.cron, rel 3.:
 
@@ -448,7 +451,7 @@
 - changed nice priority to 19 from 20 (-20 highest priority, 19 lowest) in cron job
 
 Revision 1.70  2002/06/07 10:29:33  lukasz
--fixed /etc/cron.d/mrtg
+- fixed /etc/cron.d/mrtg
 
 Revision 1.69  2002/06/02 19:38:10  lukasz
 - added manuals
@@ -457,9 +460,9 @@
 - 2.9.18
 
 Revision 1.67  2002/05/21 23:14:12  kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
              s/^automake -a -c -f/\%\{__automake\}/; \
-	     s/^autoconf/\%\{__autoconf\}/"
+     s/^autoconf/\%\{__autoconf\}/"
 
 Revision 1.66  2002/05/06 21:05:41  kloczek
 - release 5: merge translations from KSI and Conectiva.
@@ -472,19 +475,19 @@
   Group field using gettext).
 
 Revision 1.63  2002/01/18 02:13:58  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.62  2001/10/27 20:09:26  kloczek
 - release 4.
 
 Revision 1.61  2001/10/27 09:51:52  grzegorz
-- added %%verify(not size mtime md5) to %%{_sysconfdir}/mrtg/mrtg.cfg
+- added %verify(not size mtime md5) to %{_sysconfdir}/mrtg/mrtg.cfg
 
 Revision 1.60  2001/10/11 08:42:04  qboosh
 - BuildRequires: autoconf, automake
 
 Revision 1.59  2001/07/13 16:36:54  wiget
-release 3; gd2/ac 2.50 ready
+- release 3; gd2/ac 2.50 ready
 
 Revision 1.58  2001/06/22 20:22:42  zagrodzki
 - use separate SNMP_Session
@@ -523,10 +526,10 @@
 - release 2
 - install perl stuff in perl_sitelib
 - use /etc/mrtg in cron job
-- fixed %%doc
+- fixed %doc
 
 Revision 1.47  2001/04/14 18:00:04  baggins
-- removed explicit requirements for perl = %%{version} and %%{perl_sitearch}
+- removed explicit requirements for perl = %{version} and %{perl_sitearch}
   they will be added by rpm if needed
 
 Revision 1.46  2001/04/13 21:57:59  baggins
@@ -545,7 +548,7 @@
   perl(RRDs) perl module on building package.
 
 Revision 1.42  2001/02/21 18:55:50  wiget
-fix requires
+- fix requires
 
 Revision 1.41  2001/02/21 17:54:18  areq
 - 2.9.10
@@ -563,28 +566,28 @@
 - updated to 2.9.4.
 
 Revision 1.36  2000/10/30 21:42:28  misiek
-run cron jobs with nice 20
+- run cron jobs with nice 20
 
 Revision 1.35  2000/10/24 23:31:01  kloczek
 - cosmetics.
 
 Revision 1.34  2000/10/24 23:18:28  misiek
-redirect output from indexmaker to /dev/null; avoid mails from crond
+- redirect output from indexmaker to /dev/null; avoid mails from crond
 
 Revision 1.33  2000/10/24 23:01:20  misiek
-fixed buildrequires
+- fixed buildrequires
 
 Revision 1.32  2000/10/24 22:06:52  misiek
-updated to 2.9.2
+- updated to 2.9.2
 
 Revision 1.31  2000/10/06 14:32:32  wiget
-2.9.1
+- 2.9.1
 
 Revision 1.30  2000/10/06 13:51:47  kloczek
 - adaptezrized.
 
 Revision 1.29  2000/10/06 13:38:50  wiget
-use relative links
+- use relative links
 
 Revision 1.28  2000/10/06 09:55:52  yaro
 - update to 2.9.0
@@ -593,7 +596,7 @@
 - release 2, built against libpng >= 1.0.8
 
 Revision 1.26  2000/06/09 07:54:44  kloczek
-- more %%{__make} macros.
+- more %{__make} macros.
 
 Revision 1.25  2000/04/01 11:14:54  zagrodzki
 - changed all BuildRoot definitons
@@ -630,16 +633,16 @@
 - simplification in %install.
 
 Revision 1.16  1999/07/31 14:06:16  misiek
-it's GPL now
+- it's GPL now
 
 Revision 1.15  1999/07/29 15:24:54  misiek
-typo
+- typo
 
 Revision 1.14  1999/07/29 12:49:11  misiek
-GIF->PNG
+- GIF->PNG
 
 Revision 1.13  1999/07/27 15:47:03  misiek
-update to 2.8.6
+- update to 2.8.6
 
 Revision 1.12  1999/07/20 11:04:34  baggins
 - fixed usage of macros
@@ -652,32 +655,3 @@
 
 Revision 1.10  1999/07/12 23:06:10  kloczek
 - added using CVS keywords in %changelog (for automating them).
-
-* Sat Feb 27 1999 Arkadiusz Miśkiewicz <misiek at misiek.eu.org>
-- upgreaded to 2.6.6
-
-* Sun Feb 21 1999 Arkadiusz Miśkiewicz <misiek at misiek.eu.org>
-- PLDized
-
-* Fri Oct 08 1998 Michael Maher <mike at redhat.com>
-- built package for 5.2 powertools.
-
-* Fri Jun 02 1998 Michael Maher <mike at redhat.com>
-- fixed bugs found in package.
-
-* Fri May 22 1998 Michael Maher <mike at redhat.com>
-- updated package
-- checked package looks ok
-
-* Sun Dec  7 1997 Otto Hammersmith <otto at redhat.com>
-- added WorkDir to mrtg.cfg
-
-* Tue Nov 25 1997 Otto Hammersmith <otto at redhat.com>
-- addeed patch to clean up paths to perl in the contrib directory.  ugh
-
-* Mon Nov 17 1997 Otto Hammersmith <otto at redhat.com>
-- updated version to 2.5.1
-- change buildroot to /var/tmp from /tmp
-
-* Mon Apr 28 1997 Michael Fulbright <msf at redhat.com>
-- Updated to 2.2 and changed to build with a Buildroot.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mrtg/mrtg.spec?r1=1.154&r2=1.155&f=u

