From 264f8f79dec36b7280472c9ce9492e5edd9d0af2 Mon Sep 17 00:00:00 2001
From: Daniel Novotny <dnovotny@fedoraproject.org>
Date: Tue, 29 Sep 2009 13:34:11 +0000
Subject: [PATCH] fix #525659

---
 logrotate-3.7.8-man5.patch | 34 ++++++++++++++++++++++++++++++++++
 logrotate.spec             |  8 +++++++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 logrotate-3.7.8-man5.patch

diff --git a/logrotate-3.7.8-man5.patch b/logrotate-3.7.8-man5.patch
new file mode 100644
index 0000000..6f78c58
--- /dev/null
+++ b/logrotate-3.7.8-man5.patch
@@ -0,0 +1,34 @@
+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:
diff --git a/logrotate.spec b/logrotate.spec
index 6c42197..79f9650 100644
--- a/logrotate.spec
+++ b/logrotate.spec
@@ -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
+* Tue Sep 29 2009 Daniel Novotny <dnovotny@redhat.com> 3.7.8-5
+- fix #525659 (man page for logrotate.conf)
+
 * Thu Sep 17 2009 Daniel Novotny <dnovotny@redhat.com> 3.7.8-4
 - fix #517321 (logrotate blocking anacron)