diff --git a/.rpmlint b/.rpmlint new file mode 100644 index 0000000..8c685d4 --- /dev/null +++ b/.rpmlint @@ -0,0 +1,2 @@ +from Config import * +addFilter("spelling-error .* customizable"); diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index f126b62..0000000 --- a/gating.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- !Policy -product_versions: - - fedora-rawhide -decision_context: bodhi_update_push_stable -subject_type: koji_build -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} ---- !Policy -product_versions: - - fedora-* -decision_context: bodhi_update_push_stable -subject_type: koji_build -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} diff --git a/slrn-configure-c99.patch b/slrn-configure-c99.patch deleted file mode 100644 index 1244eb0..0000000 --- a/slrn-configure-c99.patch +++ /dev/null @@ -1,63 +0,0 @@ -The exit function is called without including , resulting in -an implicit function declarations. Future compilers will not support -implicit function declarations by default. This will lead to build -failures. - -Submitted upstream: - -diff --git a/autoconf/configure.ac b/autoconf/configure.ac -index cb4f0fc8646c8f8b..0cf57b7d4df35f3d 100644 ---- a/autoconf/configure.ac -+++ b/autoconf/configure.ac -@@ -399,6 +399,7 @@ AC_MSG_CHECKING(for an implementation of va_copy()) - AC_CACHE_VAL(slrn_cv_va_copy,[ - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include -+ #include - void f (int i, ...) { - va_list args1, args2; - va_start (args1, i); -@@ -419,6 +420,7 @@ AC_MSG_CHECKING(for an implementation of __va_copy()) - AC_CACHE_VAL(slrn_cv___va_copy,[ - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include -+ #include - void f (int i, ...) { - va_list args1, args2; - va_start (args1, i); -@@ -439,6 +441,7 @@ AC_MSG_CHECKING(whether va_lists can be copied by value) - AC_CACHE_VAL(slrn_cv_va_val_copy,[ - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include -+ #include - void f (int i, ...) { - va_list args1, args2; - va_start (args1, i); -diff --git a/configure b/configure -index 1dabb5d67e468261..07fe10653d3544bd 100755 ---- a/configure -+++ b/configure -@@ -8307,6 +8307,7 @@ else - /* end confdefs.h. */ - - #include -+ #include - void f (int i, ...) { - va_list args1, args2; - va_start (args1, i); -@@ -8352,6 +8353,7 @@ else - /* end confdefs.h. */ - - #include -+ #include - void f (int i, ...) { - va_list args1, args2; - va_start (args1, i); -@@ -8397,6 +8399,7 @@ else - /* end confdefs.h. */ - - #include -+ #include - void f (int i, ...) { - va_list args1, args2; - va_start (args1, i); diff --git a/slrn.spec b/slrn.spec index 5b39a25..af9a40d 100644 --- a/slrn.spec +++ b/slrn.spec @@ -1,36 +1,14 @@ Summary: A threaded Internet news reader Name: slrn Version: 1.0.3a -Release: 20%{?dist} -# COPYRIGHT: GPL-2.0-or-later -# src: GPL-2.0-or-later -# src/vms.c: "donated for use in slrn by Andrew Greer" -## Not in any binary package -# autoconf/config.guess: GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 -# autoconf/config.rpath: FSFULLR -# autoconf/config.sub: GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 -# autoconf/include/ax_lib_socket_nsl.m4: FSFAP -# autoconf/include/gettext.m4: GPL-1.0-or-later -# autoconf/include/iconv.m4: FSFULLR -# autoconf/include/lib-ld.m4: FSFULLR -# autoconf/include/lib-link.m4: FSFULLR -# autoconf/include/lib-prefix.m4: FSFULLR -# autoconf/include/mkdirp.m4: FSFULLR -# autoconf/include/nls.m4: FSFULLR -# autoconf/include/po.m4: FSFULLR -# autoconf/include/progtest.m4: FSFULLR -# autoconf/install.sh: HPND-sell-variant -# configure: FSFUL AND FSFAP AND FSFULLR -# contrib/cleanscore: GPL-2.0-or-later -# po/Makefile.in.in: "copied and used freely without restrictions" -License: GPL-2.0-or-later -SourceLicense: %{license} AND GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 AND GPL-1.0-or-later AND HPND-sell-variant AND FSFULLR AND FSFUL AND FSFAP -URL: https://slrn.sourceforge.net/ -Source0: https://jedsoft.org/releases/%{name}/%{name}-%{version}.tar.bz2 +Release: 5%{?dist} +License: GPLv2+ +URL: http://slrn.sourceforge.net/ +Source0: http://jedsoft.org/releases/%{name}/%{name}-%{version}.tar.bz2 Source1: slrn-pull-expire Source2: slrnpull.log Source4: README.rpm-slrnpull -Source5: https://jedsoft.org/releases/%{name}/%{name}-%{version}.tar.bz2.asc +Source5: http://jedsoft.org/releases/%{name}/%{name}-%{version}.tar.bz2.asc # 2016-06-09: # Merged GPG keys from https://rg3.github.io/youtube-dl/download.html in one file # gpg --export --export-options export-minimal "428D F5D6 3EF0 7494 BB45 5AC0 EBF0 1804 BCF0 5F6B" \ @@ -41,18 +19,13 @@ Source6: %{name}-gpgkeys.gpg Patch1: slrn-1.0.2-Do-not-strip-binaries.patch Patch2: slrn-0.9.9pre108-sendmail.patch Patch3: fix-FSF-address.patch -Patch4: slrn-configure-c99.patch # Patch4: slrn-dont-limit-signatures.patch -BuildRequires: make BuildRequires: inews BuildRequires: openssl-devel, gcc BuildRequires: slang-devel >= 2.2.3 -BuildRequires: systemd-rpm-macros # Some s-lang scripts (smime.sl) use slsh interpreter Requires: slang-slsh -%if (0%{?fedora} && 0%{?fedora} < 42) || (0%{?rhel} && 0%{?rhel} < 11) Requires(pre): shadow-utils -%endif # For source verification with gpgv BuildRequires: gnupg2 @@ -77,10 +50,9 @@ the slrnpull utility. %define shortver %(echo %{version}|tr -d 'a') gpgv2 --quiet --keyring %{SOURCE6} %{SOURCE5} %{SOURCE0} %setup -q -n %{name}-%{shortver} -%patch -P1 -p1 -b .nostrip -%patch -P2 -p1 -b .sendmail -%patch -P3 -p1 -b .FSFaddress -%patch -P4 -p1 +%patch1 -p1 -b .nostrip +%patch2 -p1 -b .sendmail +%patch3 -p1 -b .FSFaddress #%#patch4 -p1 -b .longsignatures for i in changes.txt; do @@ -89,13 +61,6 @@ done chmod 644 doc/slrnpull/* contrib/* -# Create a sysusers.d config file -# Static UID and GID defined by /usr/share/doc/setup-*/uidgid -cat >slrn.sysusers.conf </dev/null || groupadd -r -g 13 news getent passwd news >/dev/null || \ useradd -r -u 9 -g news -d / -s /sbin/nologin -c "news user" news exit 0 -%endif %files -f %{name}.lang %license COPYING COPYRIGHT @@ -151,7 +112,6 @@ exit 0 %{_bindir}/slrn %{_datadir}/slrn %{_mandir}/man1/slrn.1* -%{_sysusersdir}/slrn.conf %files pull %doc doc/slrnpull/* @@ -164,51 +124,6 @@ exit 0 %{_mandir}/man1/slrnpull.1* %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 1.0.3a-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1.0.3a-19 -- Add sysusers.d config file to allow rpm to create users/groups automatically - -* Sun Jan 19 2025 Fedora Release Engineering - 1.0.3a-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 26 2024 Miroslav Suchý - 1.0.3a-17 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 1.0.3a-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 1.0.3a-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.0.3a-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Feb 04 2023 Florian Weimer - 1.0.3a-13 -- Port configure script to C99 - -* Sat Jan 21 2023 Fedora Release Engineering - 1.0.3a-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.0.3a-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1.0.3a-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Sep 14 2021 Sahana Prasad - 1.0.3a-9 -- Rebuilt with OpenSSL 3.0.0 - -* Fri Jul 23 2021 Fedora Release Engineering - 1.0.3a-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 1.0.3a-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.0.3a-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - * Thu Jan 30 2020 Fedora Release Engineering - 1.0.3a-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild