[rpms/inn] epel10: fix build

[rpms/inn] epel10: fix build

[Dominik 'Rathann' Mierzejewski]

            A new commit has been pushed.

            Repo   : rpms/inn
            Branch : epel10
            Commit : 1aa7b6dedacb7880237dae9d35e8887901867ad9
            Author : Dominik 'Rathann' Mierzejewski <rpm@greysector.net>
            Date   : 2016-01-21T18:04:46+01:00
            Stats  : +9/-61 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/inn/c/1aa7b6dedacb7880237dae9d35e8887901867ad9?branch=epel10

            Log:
            fix build

- drop obsolete patches

---
diff --git a/inn-2.4.2-makedbz.patch b/inn-2.4.2-makedbz.patch
deleted file mode 100644
index 3808012..0000000
--- a/inn-2.4.2-makedbz.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -urNp inn-2.4.4-orig/site/Makefile inn-2.4.4/site/Makefile
---- inn-2.4.4-orig/site/Makefile	2008-05-15 10:59:16.000000000 +0200
-+++ inn-2.4.4/site/Makefile	2008-05-15 11:06:54.000000000 +0200
-@@ -135,10 +135,10 @@ $D$(PATH_ACTIVE_TIMES):
- 	chmod $(FILEMODE) $@
- $D$(PATH_HISTORY):
- 	touch $@
--	chown $(RUNASUSER) $@
--	chgrp $(RUNASGROUP) $@
--	chmod $(FILEMODE) $@
--	test -z "$D" && $(PATHBIN)/makedbz -i -o
-+#	chown $(RUNASUSER) $@
-+#	chgrp $(RUNASGROUP) $@
-+#	chmod $(FILEMODE) $@
-+#  test -z "$D" && $(PATHBIN)/makedbz -i -o
- 
- bootstrap:
- 

diff --git a/inn-2.5.0-chown.patch b/inn-2.5.0-chown.patch
deleted file mode 100644
index 9a10799..0000000
--- a/inn-2.5.0-chown.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -urNp inn-2.5.0-orig/site/Makefile inn-2.5.0/site/Makefile
---- inn-2.5.0-orig/site/Makefile	2009-06-10 15:45:58.000000000 +0200
-+++ inn-2.5.0/site/Makefile	2009-06-10 15:46:29.000000000 +0200
-@@ -140,9 +140,9 @@ $D$(PATH_ACTIVE): 	; $(CP_DATA) active.m
- $D$(PATH_NEWSGROUPS):	; $(CP_DATA) newsgroups.minimal $@
- $D$(PATH_ACTIVE_TIMES):
- 	touch $@
--	chown $(RUNASUSER) $@
--	chgrp $(RUNASGROUP) $@
--	chmod $(FILEMODE) $@
-+#	chown $(RUNASUSER) $@
-+#	chgrp $(RUNASGROUP) $@
-+#	chmod $(FILEMODE) $@
- $D$(PATH_HISTORY):
- 	touch $@
- #	chown $(RUNASUSER) $@

diff --git a/inn-2.6.0-rh.patch b/inn-2.6.0-rh.patch
index 10b87d1..7fd287a 100644
--- a/inn-2.6.0-rh.patch
+++ b/inn-2.6.0-rh.patch
@@ -1,7 +1,7 @@
-diff -up inn-2.6.0rc1/Makefile.global.in.rh inn-2.6.0rc1/Makefile.global.in
---- inn-2.6.0rc1/Makefile.global.in.rh	2015-03-25 21:36:36.000000000 +0100
-+++ inn-2.6.0rc1/Makefile.global.in	2015-04-21 16:36:11.228008292 +0200
-@@ -305,8 +305,8 @@ INEWSMODE	= @INEWSMODE@
+diff -up inn-2.6.0/Makefile.global.in.rh inn-2.6.0/Makefile.global.in
+--- inn-2.6.0/Makefile.global.in.rh	2015-09-12 15:25:22.000000000 +0200
++++ inn-2.6.0/Makefile.global.in	2016-01-21 15:45:09.587661504 +0100
+@@ -299,8 +299,8 @@ INEWSMODE	= @INEWSMODE@
  RNEWSMODE	= @RNEWSMODE@
  FILEMODE	= @FILEMODE@
  
@@ -12,24 +12,9 @@ diff -up inn-2.6.0rc1/Makefile.global.in.rh inn-2.6.0rc1/Makefile.global.in
  
  INSTALL		= $(top)/support/install-sh -c
  
-diff -up inn-2.6.0rc1/Makefile.rh inn-2.6.0rc1/Makefile
---- inn-2.6.0rc1/Makefile.rh	2015-03-25 21:36:36.000000000 +0100
-+++ inn-2.6.0rc1/Makefile	2015-04-21 16:36:11.228008292 +0200
-@@ -102,9 +102,9 @@ install: directories
- directories:
- 	@chmod +x support/install-sh
- 	for D in $(INSTDIRS) ; do \
--	    support/install-sh $(OWNER) -m 0755 -d $(D)$$D ; \
-+	    support/install-sh $(OWNER) -m 0755 -d $(DESTDIR)/$$D ; \
- 	done
--	support/install-sh $(OWNER) -m 0750 -d $(D)$(PATHRUN)
-+	support/install-sh $(OWNER) -m 0750 -d $(DESTDIR)/$(PATHRUN)
- 
- update: 
- 	@chmod +x support/install-sh
-diff -up inn-2.6.0rc1/samples/inn.conf.in.rh inn-2.6.0rc1/samples/inn.conf.in
---- inn-2.6.0rc1/samples/inn.conf.in.rh	2015-03-25 21:36:36.000000000 +0100
-+++ inn-2.6.0rc1/samples/inn.conf.in	2015-04-21 16:36:11.229008292 +0200
+diff -up inn-2.6.0/samples/inn.conf.in.rh inn-2.6.0/samples/inn.conf.in
+--- inn-2.6.0/samples/inn.conf.in.rh	2015-09-12 15:25:22.000000000 +0200
++++ inn-2.6.0/samples/inn.conf.in	2016-01-21 15:45:09.587661504 +0100
 @@ -21,7 +21,7 @@ mta:                         "@SENDMAIL@
  organization:                "A poorly-installed InterNetNews site"
  ovmethod:                    tradindexed

diff --git a/inn.spec b/inn.spec
index b4b3119..1c8094a 100644
--- a/inn.spec
+++ b/inn.spec
@@ -21,9 +21,7 @@ Source26: innd-rnews.timer
 Patch1:  inn-2.6.0-rh.patch
 Patch6: inn-2.5.2.posix.patch
 Patch7: inn-2.4.3.warn.patch
-Patch8: inn-2.4.2-makedbz.patch
 Patch10: inn-2.6.0-doc.patch
-Patch13: inn-2.5.0-chown.patch
 Patch14: inn-redhat_build.patch
 patch17: inn-2.5.2-pconf.patch
 Patch19: inn-2.5.4-docrun.patch
@@ -97,13 +95,11 @@ useradd -r -u 9 -g news -d /etc/news  \
 exit 0
 
 %prep
-%setup -q -n inn-%{version}rc1
+%setup -q -n inn-%{version}
 %patch1 -p1 -b .rh
 %patch6 -p1 -b .posix
 %patch7 -p1 -b .warn
-%patch8 -p1 -b .makedbz
 %patch10 -p1 -b .docx
-%patch13 -p1 -b .chown
 %patch14 -p1 -b .redhat_build
 
 %patch17 -p1 -b .pfix
@@ -549,6 +545,7 @@ fi
 * Thu Jan 21 2016 Dominik Mierzejewski <rpm@greysector.net> - 2.6.0-1
 - update to 2.6.0 release
 - update homepage URL
+- drop obsolete patches
 
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6.0-0.rc1.1.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild