diff --git a/aiksaurus-configure.c99.patch b/aiksaurus-configure.c99.patch new file mode 100644 index 0000000..a55e84a --- /dev/null +++ b/aiksaurus-configure.c99.patch @@ -0,0 +1,15 @@ +diff --git a/configure b/configure +index e397ec9..abb6d27 100755 +--- a/configure ++++ b/configure +@@ -5067,8 +5067,8 @@ main () + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) +- exit(2); +- exit (0); ++ return 2; ++ return 0; + } + _ACEOF + rm -f conftest$ac_exeext diff --git a/aiksaurus-security.patch b/aiksaurus-security.patch new file mode 100644 index 0000000..ba90a45 --- /dev/null +++ b/aiksaurus-security.patch @@ -0,0 +1,29 @@ +--- aiksaurus-1.2.1/base/caiksaurus.cpp.orig 2014-06-07 21:14:03.869649696 +0100 ++++ aiksaurus-1.2.1/base/caiksaurus.cpp 2014-06-07 21:33:06.241471066 +0100 +@@ -254,7 +254,7 @@ + /* see if we got --version. */ + if ( !strcmp(arg, "--version") || !strcmp(arg, "-v") ) + { +- printf(version); ++ printf("%s", version); + exit(0); + } + +@@ -262,7 +262,7 @@ + else if ( !strcmp(arg, "--help") || !strcmp(arg, "-h") ) + { + printf("Usage: %s [word]\n\n", argv[0]); +- printf(help); ++ printf("%s", help); + exit(0); + } + } +@@ -271,7 +271,7 @@ + if (argc != 2) + { + printf("Usage: %s [word]\n", argv[0]); +- printf(help); ++ printf("%s", help); + exit(1); + } + } diff --git a/aiksaurus.spec b/aiksaurus.spec index ffea0ff..b83a8b5 100644 --- a/aiksaurus.spec +++ b/aiksaurus.spec @@ -1,22 +1,24 @@ Name: aiksaurus Version: 1.2.1 -Release: 28%{?dist} +Release: 59%{?dist} Summary: An English-language thesaurus library Epoch: 1 -Group: System Environment/Libraries -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://aiksaurus.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.png Source2: %{name}.desktop Patch0: %{name}-1.2.1-gcc43.patch +Patch1: %{name}-security.patch +Patch2: %{name}-configure.c99.patch +BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: gtk2-devel BuildRequires: desktop-file-utils - -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils +BuildRequires: make %description Aiksaurus is an English-language thesaurus library that can be @@ -27,7 +29,6 @@ thesaurus program is also included. %package devel Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Summary: Files for developing with aiksaurus -Group: Development/Libraries %description devel Includes and definitions for developing with aiksaurus. @@ -35,7 +36,6 @@ Includes and definitions for developing with aiksaurus. %package gtk Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Summary: A GTK+ interface for aiksaurus -Group: System Environment/Libraries %description gtk AiksaurusGTK is a GTK+ interface to the Aiksaurus library. @@ -47,7 +47,6 @@ Requires: %{name}-gtk = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} Requires: gtk2-devel Summary: Files for developing with aiksaurus-gtk -Group: Development/Libraries %description gtk-devel gtk includes and definitions for developing with aiksaurus. @@ -55,16 +54,18 @@ gtk includes and definitions for developing with aiksaurus. %package thesaurus Requires: %{name}-gtk = %{?epoch:%{epoch}:}%{version}-%{release} Summary: A GTK+ frontend to aiksaurus -Group: Applications/Productivity %description thesaurus A standalone thesaurus program base on aiksaurus-gtk. %prep %setup -q -%patch0 -p1 +%patch -P0 -p1 +%patch -P1 -p1 +%patch -P2 -p1 %build +export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS" %configure sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -73,24 +74,17 @@ make %{?_smp_mflags} %install %make_install -rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la +# Remove libtool archives and static libs +find %{buildroot} -type f -name "*.la" -delete # Add the desktop icon. -%{__install} -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png +install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png # Add desktop file. desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2} -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig -%post gtk -p /sbin/ldconfig -%postun gtk -p /sbin/ldconfig - -%post thesaurus -update-desktop-database &> /dev/null ||: - -%postun thesaurus -update-desktop-database &> /dev/null ||: +%ldconfig_scriptlets +%ldconfig_scriptlets gtk %files %doc ChangeLog README COPYING AUTHORS @@ -120,6 +114,101 @@ update-desktop-database &> /dev/null ||: %{_datadir}/pixmaps/%{name}.png %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 1:1.2.1-59 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Wed Jul 23 2025 Fedora Release Engineering - 1:1.2.1-58 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Thu Jan 16 2025 Fedora Release Engineering - 1:1.2.1-57 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jul 25 2024 Miroslav Suchý - 1:1.2.1-56 +- convert license to SPDX + +* Wed Jul 17 2024 Fedora Release Engineering - 1:1.2.1-55 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 1:1.2.1-54 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1:1.2.1-53 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 1:1.2.1-52 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 1:1.2.1-51 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Dec 06 2022 Peter Fordham - 1:1.2.1-50 +- Port configure script to C99. + +* Wed Jul 20 2022 Fedora Release Engineering - 1:1.2.1-49 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jan 19 2022 Fedora Release Engineering - 1:1.2.1-48 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 1:1.2.1-47 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jan 25 2021 Fedora Release Engineering - 1:1.2.1-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Jul 31 2020 Fedora Release Engineering - 1:1.2.1-45 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Jeff Law - 1:1.2.1-44 +- Force C++14 as the code is not ready for C++17 + +* Mon Jul 27 2020 Fedora Release Engineering - 1:1.2.1-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering - 1:1.2.1-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jul 24 2019 Fedora Release Engineering - 1:1.2.1-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 1:1.2.1-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 1:1.2.1-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 1:1.2.1-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Aug 02 2017 Fedora Release Engineering - 1:1.2.1-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1:1.2.1-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1:1.2.1-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 03 2016 Fedora Release Engineering - 1:1.2.1-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Jun 16 2015 Fedora Release Engineering - 1:1.2.1-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 1:1.2.1-32 +- Rebuilt for GCC 5 C++11 ABI change + +* Sat Feb 21 2015 Till Maas - 1:1.2.1-31 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code + +* Fri Aug 15 2014 Fedora Release Engineering - 1:1.2.1-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1:1.2.1-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Aug 03 2013 Fedora Release Engineering - 1:1.2.1-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild