public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/inn] epel10.3: rename Fedora-specific patch
@ 2026-08-26 8:55 Dominik 'Rathann' Mierzejewski
0 siblings, 0 replies; only message in thread
From: Dominik 'Rathann' Mierzejewski @ 2026-08-26 8:55 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/inn
Branch : epel10.3
Commit : 247eb03f9513653cf36b1079fe03512ccba0d473
Author : Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date : 2024-10-13T17:42:52+02:00
Stats : +107/-107 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/inn/c/247eb03f9513653cf36b1079fe03512ccba0d473?branch=epel10.3
Log:
rename Fedora-specific patch
use modern autosetup and make_install macros
---
diff --git a/inn-2.7.0-fedora.patch b/inn-2.7.0-fedora.patch
deleted file mode 100644
index 5c92e00..0000000
--- a/inn-2.7.0-fedora.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff -up inn-2.7.2/lib/innconf.c.rh inn-2.7.2/lib/innconf.c
---- inn-2.7.2/lib/innconf.c.rh 2024-10-13 17:15:46.538079313 +0200
-+++ inn-2.7.2/lib/innconf.c 2024-10-13 17:16:21.059904326 +0200
-@@ -226,7 +226,7 @@ static const struct config config_table[
- {K(pgpverify), BOOL(false) },
-
- /* The following settings are specific to innwatch. */
-- {K(doinnwatch), BOOL(true) },
-+ {K(doinnwatch), BOOL(false) },
- {K(innwatchbatchspace), UNUMBER(4000) },
- {K(innwatchlibspace), UNUMBER(25000) },
- {K(innwatchloload), UNUMBER(1000) },
-diff -up inn-2.7.2/Makefile.global.in.rh inn-2.7.2/Makefile.global.in
---- inn-2.7.2/Makefile.global.in.rh 2024-06-22 13:22:42.000000000 +0200
-+++ inn-2.7.2/Makefile.global.in 2024-10-13 17:15:46.539079308 +0200
-@@ -279,8 +279,8 @@ INEWSMODE = @INEWSMODE@
- RNEWSMODE = @RNEWSMODE@
- FILEMODE = @FILEMODE@
-
--OWNER = -o $(RUNASUSER) -g $(RUNASGROUP)
--ROWNER = -o $(RUNASUSER) -g $(RNEWSGROUP)
-+OWNER =
-+ROWNER =
-
- INSTALL = $(top)/support/install-sh -p
-
-diff -up inn-2.7.2/perl/INN/Config.pm.in.rh inn-2.7.2/perl/INN/Config.pm.in
---- inn-2.7.2/perl/INN/Config.pm.in.rh 2024-06-22 13:22:42.000000000 +0200
-+++ inn-2.7.2/perl/INN/Config.pm.in 2024-10-13 17:15:46.539079308 +0200
-@@ -15,7 +15,7 @@ our $exec_prefix = "@exec_prefix@";
-
- ## Then, process the variables provided by innconfval.
- my @INNCONFVAR = ();
--my @values = `${exec_prefix}/bin/innconfval -p`;
-+my @values = `${exec_prefix}/innconfval -p`;
- foreach my $line (@values) {
- eval 'our ' . $line;
- if ($line =~ /^(.*?) = /m) {
-diff -up inn-2.7.2/samples/inn.conf.in.rh inn-2.7.2/samples/inn.conf.in
---- inn-2.7.2/samples/inn.conf.in.rh 2024-06-22 13:22:42.000000000 +0200
-+++ inn-2.7.2/samples/inn.conf.in 2024-10-13 17:15:46.539079308 +0200
-@@ -21,7 +21,7 @@ mta: "@SENDMAIL@
- organization: "A poorly-installed InterNetNews site"
- ovmethod: tradindexed
- hismethod: hisv6
--pathhost: @HOSTNAME@
-+#pathhost: localhost
- pathnews: @prefix@
-
- #runasuser:
-@@ -149,7 +149,7 @@ backofftrigger: 10000
-
- # Monitoring
-
--doinnwatch: true
-+doinnwatch: false
- innwatchbatchspace: 4000
- innwatchlibspace: 25000
- innwatchloload: 1000
-diff -up inn-2.7.2/scripts/Makefile.rh inn-2.7.2/scripts/Makefile
---- inn-2.7.2/scripts/Makefile.rh 2024-06-22 13:22:42.000000000 +0200
-+++ inn-2.7.2/scripts/Makefile 2024-10-13 17:15:46.540079303 +0200
-@@ -25,7 +25,7 @@ install: all
- done
- for F in innreport-display.conf innreport_inn.pm \
- innshellvars innshellvars.pl innshellvars.tcl ; do \
-- $(CP_RPUB) $$F $D$(PATHLIB)/$$F ; \
-+ $(CP_RPUB) $$F $D$(PATHBIN)/$$F ; \
- done
-
- bootstrap:
-diff -up inn-2.7.2/support/fixscript.in.rh inn-2.7.2/support/fixscript.in
---- inn-2.7.2/support/fixscript.in.rh 2024-06-22 13:22:42.000000000 +0200
-+++ inn-2.7.2/support/fixscript.in 2024-10-13 17:15:46.540079303 +0200
-@@ -24,6 +24,7 @@ prefix="@prefix@"
- exec_prefix="@exec_prefix@"
- libdir="@libdir@"
- libperldir="@LIBPERLDIR@"
-+libexecdir="@libexecdir@"
-
- # We can probably just assume sed is on the path, but since we have it, we may
- # as well use it.
-@@ -58,7 +59,7 @@ interpreter=$(head -n 1 "$input")
- case "$interpreter" in
- */sh | *SH*)
- path="@SHELL@"
-- lib=". $libdir/innshellvars"
-+ lib=". $libexecdir/news/innshellvars"
- ;;
- */perl* | *PERL*)
- path=$(echo "$interpreter" | sed 's%^#! *[^ ][^ ]*%'"$PERLPATH%")
-diff -up inn-2.7.2/tests/lib/innconf-t.c.rh inn-2.7.2/tests/lib/innconf-t.c
---- inn-2.7.2/tests/lib/innconf-t.c.rh 2024-06-22 13:22:42.000000000 +0200
-+++ inn-2.7.2/tests/lib/innconf-t.c 2024-10-13 17:15:46.540079303 +0200
-@@ -72,7 +72,7 @@ main(void)
- fclose(config);
- ok(7, !innconf_check("config/tmp"));
- unlink("config/tmp");
-- ok_string(8, "config/tmp:29: unknown parameter foo\n", errors);
-+ ok_string(8, "config/tmp:28: unknown parameter foo\n", errors);
- errors_uncapture();
- free(errors);
- errors = NULL;
diff --git a/inn-fedora.patch b/inn-fedora.patch
new file mode 100644
index 0000000..5c92e00
--- /dev/null
+++ b/inn-fedora.patch
@@ -0,0 +1,103 @@
+diff -up inn-2.7.2/lib/innconf.c.rh inn-2.7.2/lib/innconf.c
+--- inn-2.7.2/lib/innconf.c.rh 2024-10-13 17:15:46.538079313 +0200
++++ inn-2.7.2/lib/innconf.c 2024-10-13 17:16:21.059904326 +0200
+@@ -226,7 +226,7 @@ static const struct config config_table[
+ {K(pgpverify), BOOL(false) },
+
+ /* The following settings are specific to innwatch. */
+- {K(doinnwatch), BOOL(true) },
++ {K(doinnwatch), BOOL(false) },
+ {K(innwatchbatchspace), UNUMBER(4000) },
+ {K(innwatchlibspace), UNUMBER(25000) },
+ {K(innwatchloload), UNUMBER(1000) },
+diff -up inn-2.7.2/Makefile.global.in.rh inn-2.7.2/Makefile.global.in
+--- inn-2.7.2/Makefile.global.in.rh 2024-06-22 13:22:42.000000000 +0200
++++ inn-2.7.2/Makefile.global.in 2024-10-13 17:15:46.539079308 +0200
+@@ -279,8 +279,8 @@ INEWSMODE = @INEWSMODE@
+ RNEWSMODE = @RNEWSMODE@
+ FILEMODE = @FILEMODE@
+
+-OWNER = -o $(RUNASUSER) -g $(RUNASGROUP)
+-ROWNER = -o $(RUNASUSER) -g $(RNEWSGROUP)
++OWNER =
++ROWNER =
+
+ INSTALL = $(top)/support/install-sh -p
+
+diff -up inn-2.7.2/perl/INN/Config.pm.in.rh inn-2.7.2/perl/INN/Config.pm.in
+--- inn-2.7.2/perl/INN/Config.pm.in.rh 2024-06-22 13:22:42.000000000 +0200
++++ inn-2.7.2/perl/INN/Config.pm.in 2024-10-13 17:15:46.539079308 +0200
+@@ -15,7 +15,7 @@ our $exec_prefix = "@exec_prefix@";
+
+ ## Then, process the variables provided by innconfval.
+ my @INNCONFVAR = ();
+-my @values = `${exec_prefix}/bin/innconfval -p`;
++my @values = `${exec_prefix}/innconfval -p`;
+ foreach my $line (@values) {
+ eval 'our ' . $line;
+ if ($line =~ /^(.*?) = /m) {
+diff -up inn-2.7.2/samples/inn.conf.in.rh inn-2.7.2/samples/inn.conf.in
+--- inn-2.7.2/samples/inn.conf.in.rh 2024-06-22 13:22:42.000000000 +0200
++++ inn-2.7.2/samples/inn.conf.in 2024-10-13 17:15:46.539079308 +0200
+@@ -21,7 +21,7 @@ mta: "@SENDMAIL@
+ organization: "A poorly-installed InterNetNews site"
+ ovmethod: tradindexed
+ hismethod: hisv6
+-pathhost: @HOSTNAME@
++#pathhost: localhost
+ pathnews: @prefix@
+
+ #runasuser:
+@@ -149,7 +149,7 @@ backofftrigger: 10000
+
+ # Monitoring
+
+-doinnwatch: true
++doinnwatch: false
+ innwatchbatchspace: 4000
+ innwatchlibspace: 25000
+ innwatchloload: 1000
+diff -up inn-2.7.2/scripts/Makefile.rh inn-2.7.2/scripts/Makefile
+--- inn-2.7.2/scripts/Makefile.rh 2024-06-22 13:22:42.000000000 +0200
++++ inn-2.7.2/scripts/Makefile 2024-10-13 17:15:46.540079303 +0200
+@@ -25,7 +25,7 @@ install: all
+ done
+ for F in innreport-display.conf innreport_inn.pm \
+ innshellvars innshellvars.pl innshellvars.tcl ; do \
+- $(CP_RPUB) $$F $D$(PATHLIB)/$$F ; \
++ $(CP_RPUB) $$F $D$(PATHBIN)/$$F ; \
+ done
+
+ bootstrap:
+diff -up inn-2.7.2/support/fixscript.in.rh inn-2.7.2/support/fixscript.in
+--- inn-2.7.2/support/fixscript.in.rh 2024-06-22 13:22:42.000000000 +0200
++++ inn-2.7.2/support/fixscript.in 2024-10-13 17:15:46.540079303 +0200
+@@ -24,6 +24,7 @@ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ libdir="@libdir@"
+ libperldir="@LIBPERLDIR@"
++libexecdir="@libexecdir@"
+
+ # We can probably just assume sed is on the path, but since we have it, we may
+ # as well use it.
+@@ -58,7 +59,7 @@ interpreter=$(head -n 1 "$input")
+ case "$interpreter" in
+ */sh | *SH*)
+ path="@SHELL@"
+- lib=". $libdir/innshellvars"
++ lib=". $libexecdir/news/innshellvars"
+ ;;
+ */perl* | *PERL*)
+ path=$(echo "$interpreter" | sed 's%^#! *[^ ][^ ]*%'"$PERLPATH%")
+diff -up inn-2.7.2/tests/lib/innconf-t.c.rh inn-2.7.2/tests/lib/innconf-t.c
+--- inn-2.7.2/tests/lib/innconf-t.c.rh 2024-06-22 13:22:42.000000000 +0200
++++ inn-2.7.2/tests/lib/innconf-t.c 2024-10-13 17:15:46.540079303 +0200
+@@ -72,7 +72,7 @@ main(void)
+ fclose(config);
+ ok(7, !innconf_check("config/tmp"));
+ unlink("config/tmp");
+- ok_string(8, "config/tmp:29: unknown parameter foo\n", errors);
++ ok_string(8, "config/tmp:28: unknown parameter foo\n", errors);
+ errors_uncapture();
+ free(errors);
+ errors = NULL;
diff --git a/inn.spec b/inn.spec
index f853be4..90f1116 100644
--- a/inn.spec
+++ b/inn.spec
@@ -23,7 +23,8 @@ Source24: innd-nntpsend.timer
Source25: innd-rnews.service
Source26: innd-rnews.timer
Source30: inn.rsyslog
-Patch1: inn-2.7.0-fedora.patch
+# Fedora-specific paths and configuration settings
+Patch0: inn-fedora.patch
BuildRequires: autoconf
BuildRequires: byacc
BuildRequires: cyrus-sasl-devel
@@ -114,8 +115,7 @@ This package contains dynamic libraries provided by INN project
%prep
gpgv2 --keyring %{S:3} %{S:1} %{S:0}
-%setup -q -n inn-%{version}
-%patch -P1 -p1 -b .rh
+%autosetup -p1
%build
%configure \
@@ -153,7 +153,7 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%install
mkdir -p $RPM_BUILD_ROOT%{_libdir}
mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/news/http
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
# -- Install man pages needed by suck et al.
mkdir -p $RPM_BUILD_ROOT%{_includedir}/inn
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-26 8:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-26 8:55 [rpms/inn] epel10.3: rename Fedora-specific patch Dominik 'Rathann' Mierzejewski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox