rpms/logrotate/F-12 logrotate-3.7.8-man5.patch, NONE, 1.1 logrotate.spec, 1.81, 1.82

[Daniel Novotny]

Author: dnovotny

Update of /cvs/extras/rpms/logrotate/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30978

Modified Files:
	logrotate.spec 
Added Files:
	logrotate-3.7.8-man5.patch 
Log Message:
fix #525659 (man page for logrotate.conf)


logrotate-3.7.8-man5.patch:
 Makefile         |    5 ++++-
 logrotate.conf.5 |    1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE logrotate-3.7.8-man5.patch ---
diff -up /dev/null logrotate-3.7.8/logrotate.conf.5
--- /dev/null	2009-09-29 13:43:00.063127317 +0200
+++ logrotate-3.7.8/logrotate.conf.5	2009-09-29 14:46:24.000000000 +0200
@@ -0,0 +1 @@
+.so man8/logrotate.8
diff -up logrotate-3.7.8/Makefile.man5 logrotate-3.7.8/Makefile
--- logrotate-3.7.8/Makefile.man5	2008-05-19 12:25:54.000000000 +0200
+++ logrotate-3.7.8/Makefile	2009-09-29 14:47:01.000000000 +0200
@@ -3,7 +3,8 @@ OS_NAME = $(shell uname -s)
 LFS = $(shell echo `getconf LFS_CFLAGS 2>/dev/null`)
 CFLAGS = -Wall -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" $(RPM_OPT_FLAGS) $(LFS)
 PROG = logrotate
-MAN = logrotate.8
+MAN = logrotate.8 
+MAN5 = logrotate.conf.5
 LOADLIBES = -lpopt
 SVNURL= svn+ssh://svn.fedorahosted.org/svn/logrotate
 SVNPUBURL = http://svn.fedorahosted.org/svn/logrotate
@@ -99,6 +100,7 @@ install:
 	[ -d $(PREFIX)/$(BINDIR) ] || mkdir -p $(PREFIX)/$(BINDIR)
 	[ -d $(PREFIX)/$(MANDIR) ] || mkdir -p $(PREFIX)/$(MANDIR)
 	[ -d $(PREFIX)/$(MANDIR)/man8 ] || mkdir -p $(PREFIX)/$(MANDIR)/man8
+	[ -d $(PREFIX)/$(MANDIR)/man5 ] || mkdir -p $(PREFIX)/$(MANDIR)/man5
 
 	if [ "$(OS_NAME)" = HP-UX ]; then \
 	$(INSTALL) $(PROG) $(PREFIX)/$(BINDIR) 0755 bin bin; \
@@ -106,6 +108,7 @@ install:
 	else \
 	$(INSTALL) -m 755 $(PROG) $(PREFIX)/$(BINDIR); \
 	$(INSTALL) -m 644 $(MAN) $(PREFIX)/$(MANDIR)/man`echo $(MAN) | sed "s/.*\.//"`/$(MAN); \
+	$(INSTALL) -m 644 $(MAN5) $(PREFIX)/$(MANDIR)/man`echo $(MAN5) | sed "s/.*\.//"`/$(MAN5); \
 	fi
 
 co:


Index: logrotate.spec
===================================================================
RCS file: /cvs/extras/rpms/logrotate/F-12/logrotate.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- logrotate.spec	17 Sep 2009 09:37:46 -0000	1.81
+++ logrotate.spec	12 Nov 2009 16:46:26 -0000	1.82
@@ -1,13 +1,14 @@
 Summary: Rotates, compresses, removes and mails system log files
 Name: logrotate
 Version: 3.7.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL+
 Group: System Environment/Base
 Source: https://fedorahosted.org/releases/l/o/logrotate/logrotate-%{version}.tar.gz
 Patch1: logrotate-3.7.7-curdir2.patch
 Patch2: logrotate-3.7.7-toolarge.patch
 Patch3: logrotate-3.7.8-devnull.patch
+Patch4: logrotate-3.7.8-man5.patch
 
 Requires: coreutils >= 5.92 libsepol libselinux popt
 BuildRequires: libselinux-devel popt-devel
@@ -29,6 +30,7 @@ log files on your system.
 %patch1 -p1 -b .curdir
 %patch2 -p1 -b .toolarge
 %patch3 -p1 -b .devnull
+%patch4 -p1 -b .man5
 
 %build
 make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" WITH_SELINUX=yes
@@ -52,12 +54,16 @@ rm -rf $RPM_BUILD_ROOT
 %doc CHANGES COPYING
 %attr(0755, root, root) %{_sbindir}/logrotate
 %attr(0644, root, root) %{_mandir}/man8/logrotate.8*
+%attr(0644, root, root) %{_mandir}/man5/logrotate.conf.5*
 %attr(0755, root, root) %{_sysconfdir}/cron.daily/logrotate
 %attr(0644, root, root) %config(noreplace) %{_sysconfdir}/logrotate.conf
 %attr(0755, root, root) %dir %{_sysconfdir}/logrotate.d
 %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/logrotate.status
 
 %changelog
+* Thu Nov 12 2009 Daniel Novotny <dnovotny at redhat.com> 3.7.8-5
+- fix #525659 (man page for logrotate.conf)
+
 * Thu Sep 17 2009 Daniel Novotny <dnovotny at redhat.com> 3.7.8-4
 - fix #517321 (logrotate blocking anacron)