From d3312cd4135ead6e91b7a7007f865094b7e8be29 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 10:36:31 +0000 Subject: [PATCH 01/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ochusha.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ochusha.spec b/ochusha.spec index 91b22fd..b16f81d 100644 --- a/ochusha.spec +++ b/ochusha.spec @@ -33,7 +33,7 @@ Summary: A GTK+ 2ch.net BBS Browser Name: ochusha Version: %{main_ver} -Release: %{rel}.5 +Release: %{rel}.6 URL: http://ochusha.sourceforge.jp/ %if %{pre_release} Source: %{name}-%{main_ver}-%{strtag}.tar.bz2 @@ -223,6 +223,9 @@ change_encoding \ %{_datadir}/icons/hicolor/48x48/apps/*.png %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 0.6.0.1-0.15.cvs20100817T0000.6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 0.6.0.1-0.15.cvs20100817T0000.5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 8eb25ab81c7585936b1a50513b976c70f170f2d7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 10:38:30 +0000 Subject: [PATCH 02/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ochusha.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ochusha.spec b/ochusha.spec index b16f81d..603e087 100644 --- a/ochusha.spec +++ b/ochusha.spec @@ -33,7 +33,7 @@ Summary: A GTK+ 2ch.net BBS Browser Name: ochusha Version: %{main_ver} -Release: %{rel}.6 +Release: %{rel}.7 URL: http://ochusha.sourceforge.jp/ %if %{pre_release} Source: %{name}-%{main_ver}-%{strtag}.tar.bz2 @@ -223,6 +223,9 @@ change_encoding \ %{_datadir}/icons/hicolor/48x48/apps/*.png %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 0.6.0.1-0.15.cvs20100817T0000.7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 0.6.0.1-0.15.cvs20100817T0000.6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 811f6a59e8faca43f00e56793ec3db99529dd440 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 21 Mar 2024 21:26:17 +0900 Subject: [PATCH 03/10] once save the analysis --- ochusha.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ochusha.spec b/ochusha.spec index 603e087..7d4d847 100644 --- a/ochusha.spec +++ b/ochusha.spec @@ -21,13 +21,13 @@ %define strtag cvs%{codate}T%{cotime_JST} %define repoid 36733 -%define vendor_rel 15 +%define baserelease 15 %define pre_release 1 %if %{pre_release} -%define rel 0.%{vendor_rel}.%{strtag}%{?dist} +%define rel 0.%{baserelease}.%{strtag}%{?dist} %else -%define rel %{vendor_rel}%{?dist} +%define rel %{baserelease}%{?dist} %endif Summary: A GTK+ 2ch.net BBS Browser @@ -44,6 +44,11 @@ Source10: ochusha-prefs-gtkrc Source11: ochusha.sh Patch0: ochusha-D20100214-gtk-deprecated.patch Patch1: ochusha-D20100817-format-string.patch +# COPYING BSD-2-Clause +# intl/ LGPL-2.1-or-later (unused) +# libochusha/sigslot.h public domain (need review) +# libochushagtk_lgpl/ LGPL-2.1-or-later + License: BSD Requires: mona-fonts-VLGothic From 8fc2c90e99fef98237e6aa30eaa9a8a616a7fadb Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:48 +0200 Subject: [PATCH 04/10] Eliminate use of obsolete %patchN syntax (#2283636) --- ochusha.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ochusha.spec b/ochusha.spec index 7d4d847..3b87d28 100644 --- a/ochusha.spec +++ b/ochusha.spec @@ -82,7 +82,7 @@ images that helps users to interact with BBSs. %setup -q %endif #%%patch0 -p0 -b .gtk -%patch1 -p1 -b .format +%patch -P1 -p1 -b .format # Icon path fix %{__sed} -i -e 's|Icon.*$|Icon=ochusha48|' ochusha/ochusha.desktop.in From ab2fc55ebec2647c2490a54588b5140cbf681a07 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 31 May 2024 14:44:29 +0900 Subject: [PATCH 05/10] Rebuild for %patch macro usage update --- ochusha.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ochusha.spec b/ochusha.spec index 3b87d28..6f0282e 100644 --- a/ochusha.spec +++ b/ochusha.spec @@ -21,7 +21,7 @@ %define strtag cvs%{codate}T%{cotime_JST} %define repoid 36733 -%define baserelease 15 +%define baserelease 16 %define pre_release 1 %if %{pre_release} @@ -33,7 +33,7 @@ Summary: A GTK+ 2ch.net BBS Browser Name: ochusha Version: %{main_ver} -Release: %{rel}.7 +Release: %{rel} URL: http://ochusha.sourceforge.jp/ %if %{pre_release} Source: %{name}-%{main_ver}-%{strtag}.tar.bz2 @@ -228,6 +228,9 @@ change_encoding \ %{_datadir}/icons/hicolor/48x48/apps/*.png %changelog +* Fri May 31 2024 Mamoru TASAKA - 0.6.0.1-0.16.cvs20100817T0000 +- Rebuild for %%patch macro usage update + * Thu Jan 25 2024 Fedora Release Engineering - 0.6.0.1-0.15.cvs20100817T0000.7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 848279fd8207d9bfd86ca943bde756ac616c55e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 20:27:33 +0000 Subject: [PATCH 06/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- ochusha.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ochusha.spec b/ochusha.spec index 6f0282e..e7f38ce 100644 --- a/ochusha.spec +++ b/ochusha.spec @@ -21,7 +21,7 @@ %define strtag cvs%{codate}T%{cotime_JST} %define repoid 36733 -%define baserelease 16 +%define baserelease 17 %define pre_release 1 %if %{pre_release} @@ -228,6 +228,9 @@ change_encoding \ %{_datadir}/icons/hicolor/48x48/apps/*.png %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 0.6.0.1-0.17.cvs20100817T0000 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri May 31 2024 Mamoru TASAKA - 0.6.0.1-0.16.cvs20100817T0000 - Rebuild for %%patch macro usage update From dad0aa7a1a10484c73ad65a10c08474792a2f0dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 2 Sep 2024 12:18:34 +0200 Subject: [PATCH 07/10] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- ochusha.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ochusha.spec b/ochusha.spec index e7f38ce..3b38de6 100644 --- a/ochusha.spec +++ b/ochusha.spec @@ -21,7 +21,7 @@ %define strtag cvs%{codate}T%{cotime_JST} %define repoid 36733 -%define baserelease 17 +%define baserelease 18 %define pre_release 1 %if %{pre_release} @@ -49,7 +49,8 @@ Patch1: ochusha-D20100817-format-string.patch # libochusha/sigslot.h public domain (need review) # libochushagtk_lgpl/ LGPL-2.1-or-later -License: BSD +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD Requires: mona-fonts-VLGothic Requires: %{system_ca_cert_file} @@ -228,6 +229,9 @@ change_encoding \ %{_datadir}/icons/hicolor/48x48/apps/*.png %changelog +* Mon Sep 02 2024 Miroslav Suchý - 0.6.0.1-0.18.cvs20100817T0000 +- convert license to SPDX + * Thu Jul 18 2024 Fedora Release Engineering - 0.6.0.1-0.17.cvs20100817T0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 5e99305a16e193e1e815b540a58e68afa9e7ef98 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 24 Sep 2024 19:13:55 +0900 Subject: [PATCH 08/10] Update system ca cert file for F42 Remove explicit file Requires per new package guidelines --- ochusha.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ochusha.spec b/ochusha.spec index 3b38de6..8a09ff4 100644 --- a/ochusha.spec +++ b/ochusha.spec @@ -12,7 +12,11 @@ %define with_system_ca_cert_file 1 %define with_external_onig 1 +%if 0%{?fedora} >= 42 +%define system_ca_cert_file %{_sysconfdir}/pki/ca-trust/extracted/pem/tls-ca-bundle.pem +%else %define system_ca_cert_file %{_sysconfdir}/pki/tls/cert.pem +%endif %define help_url file://%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/doc/index.html %define main_ver 0.6.0.1 @@ -21,7 +25,7 @@ %define strtag cvs%{codate}T%{cotime_JST} %define repoid 36733 -%define baserelease 18 +%define baserelease 19 %define pre_release 1 %if %{pre_release} @@ -53,7 +57,9 @@ Patch1: ochusha-D20100817-format-string.patch License: LicenseRef-Callaway-BSD Requires: mona-fonts-VLGothic +%if 0%{?fedora} < 41 Requires: %{system_ca_cert_file} +%endif Requires: xdg-utils BuildRequires: make @@ -229,6 +235,10 @@ change_encoding \ %{_datadir}/icons/hicolor/48x48/apps/*.png %changelog +* Tue Sep 24 2024 Mamoru TASAKA - 0.6.0.1-0.19.cvs20100817T0000 +- Update system ca cert file for F42 +- Remove explicit file Requires per new package guidelines + * Mon Sep 02 2024 Miroslav Suchý - 0.6.0.1-0.18.cvs20100817T0000 - convert license to SPDX From 9afab6848eb386dd499781d80067813a1c25422f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 21:14:09 +0000 Subject: [PATCH 09/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ochusha.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ochusha.spec b/ochusha.spec index 8a09ff4..eeb6a2e 100644 --- a/ochusha.spec +++ b/ochusha.spec @@ -25,7 +25,7 @@ %define strtag cvs%{codate}T%{cotime_JST} %define repoid 36733 -%define baserelease 19 +%define baserelease 20 %define pre_release 1 %if %{pre_release} @@ -235,6 +235,9 @@ change_encoding \ %{_datadir}/icons/hicolor/48x48/apps/*.png %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 0.6.0.1-0.20.cvs20100817T0000 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Sep 24 2024 Mamoru TASAKA - 0.6.0.1-0.19.cvs20100817T0000 - Update system ca cert file for F42 - Remove explicit file Requires per new package guidelines From f2ed1fc914236dd3e3a620958b7d48531f1b1cd2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 23:22:40 +0000 Subject: [PATCH 10/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ochusha.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ochusha.spec b/ochusha.spec index eeb6a2e..deb1d4f 100644 --- a/ochusha.spec +++ b/ochusha.spec @@ -25,7 +25,7 @@ %define strtag cvs%{codate}T%{cotime_JST} %define repoid 36733 -%define baserelease 20 +%define baserelease 21 %define pre_release 1 %if %{pre_release} @@ -235,6 +235,9 @@ change_encoding \ %{_datadir}/icons/hicolor/48x48/apps/*.png %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0.6.0.1-0.21.cvs20100817T0000 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 0.6.0.1-0.20.cvs20100817T0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild