diff --git a/ochusha.spec b/ochusha.spec index 558948b..deb1d4f 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,19 +25,19 @@ %define strtag cvs%{codate}T%{cotime_JST} %define repoid 36733 -%define vendor_rel 14 +%define baserelease 21 %define pre_release 1 %if %{pre_release} -%define rel 0.%{vendor_rel}.%{strtag}%{?dist}.1 +%define rel 0.%{baserelease}.%{strtag}%{?dist} %else -%define rel %{vendor_rel}%{?dist} +%define rel %{baserelease}%{?dist} %endif Summary: A GTK+ 2ch.net BBS Browser Name: ochusha Version: %{main_ver} -Release: %{rel}.15 +Release: %{rel} URL: http://ochusha.sourceforge.jp/ %if %{pre_release} Source: %{name}-%{main_ver}-%{strtag}.tar.bz2 @@ -44,12 +48,21 @@ Source10: ochusha-prefs-gtkrc Source11: ochusha.sh Patch0: ochusha-D20100214-gtk-deprecated.patch Patch1: ochusha-D20100817-format-string.patch -License: BSD +# 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 + +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD Requires: mona-fonts-VLGothic +%if 0%{?fedora} < 41 Requires: %{system_ca_cert_file} +%endif Requires: xdg-utils +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: desktop-file-utils @@ -76,7 +89,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 @@ -90,6 +103,13 @@ images that helps users to interact with BBSs. -e 's|-D[^ ][^ ]*DEPRECATED||g' \ libochushagtk_lgpl/Makefile.am +# Support autoconf 2.7x +%if %{pre_release} +%{__sed} -i.autoconf \ + -e 's@2.6\[0-9\]@2.[67][0-9]@' \ + autogen.sh +%endif + %if %{pre_release} sh autogen.sh %endif @@ -215,6 +235,58 @@ 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* Thu Jan 19 2023 Fedora Release Engineering - 0.6.0.1-0.15.cvs20100817T0000.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 0.6.0.1-0.15.cvs20100817T0000.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 0.6.0.1-0.15.cvs20100817T0000.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 0.6.0.1-0.15.cvs20100817T0000.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Mar 25 2021 Mamoru TASAKA - 0.6.0.1-0.15.cvs20100817T0000 +- Support autoconf 2.7x + +* Tue Jan 26 2021 Fedora Release Engineering - 0.6.0.1-0.14.cvs20100817T0000.1.18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.6.0.1-0.14.cvs20100817T0000.1.17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 0.6.0.1-0.14.cvs20100817T0000.1.16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 0.6.0.1-0.14.cvs20100817T0000.1.15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild