[rpms/inn] epel10.3: - update to 2.4.2 & fix #51607 (file conflict)

[rpms/inn] epel10.3: - update to 2.4.2 & fix #51607 (file conflict)

[Martin Stransky]

A new commit has been pushed.

Repo   : rpms/inn
Branch : epel10.3
Commit : 6d6c68dd049178e8d51f4b0d0455c8e30d7bf575
Author : Martin Stransky <stransky@fedoraproject.org>
Date   : 2005-01-11T12:58:31+00:00
Stats  : +32/-3 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/inn/c/6d6c68dd049178e8d51f4b0d0455c8e30d7bf575?branch=epel10.3

Log:
- update to 2.4.2 & fix #51607 (file conflict)

---
diff --git a/.cvsignore b/.cvsignore
index 025569b..508ef3e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
 inn-2.3.5.tar.gz
 inn-faq.tar.gz
 inn-2.4.1.tar.gz
+inn-2.4.2.tar.gz

diff --git a/inn-2.4.2-makedbz.patch b/inn-2.4.2-makedbz.patch
new file mode 100644
index 0000000..bd87587
--- /dev/null
+++ b/inn-2.4.2-makedbz.patch
@@ -0,0 +1,11 @@
+--- inn-2.4.2/site/Makefile.old	2005-01-11 12:47:54.000000000 +0100
++++ inn-2.4.2/site/Makefile	2005-01-11 13:04:57.141172048 +0100
+@@ -135,7 +135,7 @@
+ 	chmod $(FILEMODE) $@
+ $D$(PATH_HISTORY):
+ 	touch $@
+-	$(PATHBIN)/makedbz -i -o
++#	$(PATHBIN)/makedbz -i -o
+ 
+ ##  Remove files that are unchanged from the release version.
+ clean:

diff --git a/inn.spec b/inn.spec
index 043b4d3..e590085 100644
--- a/inn.spec
+++ b/inn.spec
@@ -1,7 +1,7 @@
 Summary: The InterNetNews (INN) system, an Usenet news server.
 Name: inn
-Version: 2.4.1
-Release: 2
+Version: 2.4.2
+Release: 1
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.isc.org/isc/inn/inn-%{version}.tar.gz
@@ -18,6 +18,7 @@ Patch4: inn-2.4.1.pie.patch
 Patch5: inn-2.4.1.diff.patch
 Patch6: inn-2.4.1.posix.patch
 Patch7: inn-2.4.1-warn.patch
+Patch8: inn-2.4.2-makedbz.patch
 BuildRequires: db4-devel
 Prereq: /sbin/chkconfig, grep, coreutils, sed
 Requires: bash >= 2.0, inews
@@ -75,6 +76,7 @@ local news servers.
 %patch5 -p1 -b .diff
 %patch6 -p1 -b .posix
 %patch7 -p1 -b .warn
+%patch8 -p1 -b .makedbz
 
 perl -pi -e 's/LOCK_READ/LLOCK_READ/' `find . -type f`
 perl -pi -e 's/LOCK_WRITE/LLOCK_WRITE/' `find . -type f`
@@ -186,6 +188,7 @@ rm -f files.list files.main files.devel files.inews
 
 %post
 /sbin/chkconfig --add innd
+/usr/lib/news/bin/makedbz -i -o
 
 umask 002
 touch /var/log/news/news.notice
@@ -256,7 +259,15 @@ exit 0
 %dir /var/lib/news/tmp
 %dir /var/run/news
 %defattr(-,root,root)
-%{_mandir}/man[158]/*
+%{_mandir}/man1/c*.1.gz
+%{_mandir}/man1/f*.1.gz
+%{_mandir}/man1/g*.1.gz
+%{_mandir}/man1/inn*.1.gz
+%{_mandir}/man1/n*.1.gz
+%{_mandir}/man1/p*.1.gz
+%{_mandir}/man1/r*.1.gz
+%{_mandir}/man1/s*.1.gz
+%{_mandir}/man[58]/*
 %doc NEWS README* ChangeLog CONTRIBUTORS LICENSE INSTALL
 %doc %dir samples
 
@@ -272,6 +283,11 @@ exit 0
 %{_mandir}/man1/inews*
 
 %changelog
+* Tue Jan 11 2005 Martin Stransky <stransky@redhat.com> 2.4.2-1
+- fix file conflict between inews and inn packages (#51607)
+- update to 2.4.2
+- thanks to Jochen Schmitt <Jochen@herr-schmitt.de>
+
 * Thu Dec 23 2004 Martin Stransky <stransky@redhat.com> 2.4.1-2
 - fix array overflow / uninitialized pointer (#143592)
 

diff --git a/sources b/sources
index c594dc3..245eac8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 b5e6321446594749eea087c6710eefa5  inn-faq.tar.gz
 bec635b6e70188071fdb539cd374f2ba  inn-2.4.1.tar.gz
+4942a275c70e0256dad6f1857be6d62e  inn-2.4.2.tar.gz