diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 92e1334..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: aiksaurus -# $Id$ -NAME := aiksaurus -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/aiksaurus-1.2.1-gcc43.patch b/aiksaurus-1.2.1-gcc43.patch new file mode 100644 index 0000000..906efc0 --- /dev/null +++ b/aiksaurus-1.2.1-gcc43.patch @@ -0,0 +1,33 @@ +diff -urNp --exclude-from=/home/mdomsch/excludes --minimal aiksaurus-1.2.1.orig/base/aiksaurus.t.cpp aiksaurus-1.2.1/base/aiksaurus.t.cpp +--- aiksaurus-1.2.1.orig/base/aiksaurus.t.cpp 2008-09-10 13:40:45.000000000 -0500 ++++ aiksaurus-1.2.1/base/aiksaurus.t.cpp 2008-09-10 13:40:54.000000000 -0500 +@@ -24,6 +24,7 @@ + #include "config.h" + #include + #include ++#include + using namespace std; + using AiksaurusImpl::AsciiCompare; + +diff -urNp --exclude-from=/home/mdomsch/excludes --minimal aiksaurus-1.2.1.orig/gtk/src/Display.cpp aiksaurus-1.2.1/gtk/src/Display.cpp +--- aiksaurus-1.2.1.orig/gtk/src/Display.cpp 2003-05-27 18:56:54.000000000 -0500 ++++ aiksaurus-1.2.1/gtk/src/Display.cpp 2008-09-10 14:01:56.000000000 -0500 +@@ -18,6 +18,7 @@ + * 02111-1307, USA. + */ + ++#include + #include "Display.h" + #include "Meaning.h" + #include "DialogMediator.h" +diff -urNp --exclude-from=/home/mdomsch/excludes --minimal aiksaurus-1.2.1.orig/gtk/src/gtkAiksaur.t.cpp aiksaurus-1.2.1/gtk/src/gtkAiksaur.t.cpp +--- aiksaurus-1.2.1.orig/gtk/src/gtkAiksaur.t.cpp 2002-01-11 20:02:12.000000000 -0600 ++++ aiksaurus-1.2.1/gtk/src/gtkAiksaur.t.cpp 2008-09-10 13:51:47.000000000 -0500 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + using namespace std; + + int main(int argc, char** argv) 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 4536a4a..b83a8b5 100644 --- a/aiksaurus.spec +++ b/aiksaurus.spec @@ -1,24 +1,24 @@ -Name: aiksaurus -Version: 1.2.1 -Release: 16%{?dist} -Summary: An English-language thesaurus library -Vendor: Red Hat, Inc. +Name: aiksaurus +Version: 1.2.1 +Release: 59%{?dist} +Summary: An English-language thesaurus library -Epoch: 1 -Group: System Environment/Libraries -License: GPL -URL: http://aiksaurus.sourceforge.net/ -Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source1: %{name}.png -Source2: %{name}.desktop -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: gtk2-devel -BuildRequires: desktop-file-utils - -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils +Epoch: 1 +# 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 +BuildRequires: make %description Aiksaurus is an English-language thesaurus library that can be @@ -26,119 +26,227 @@ embedded in word processors, email composers, and other authoring software to provide thesaurus capabilities. A basic command line thesaurus program is also included. - %package devel -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Summary: Files for developing with aiksaurus -Group: Development/Libraries - +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Summary: Files for developing with aiksaurus %description devel Includes and definitions for developing with aiksaurus. - %package gtk -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Summary: A GTK+ frontend to aiksaurus -Group: System Environment/Libraries - +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Summary: A GTK+ interface for aiksaurus %description gtk -AiksaurusGTK is a GTK+ interface to the Aiksaurus library. +AiksaurusGTK is a GTK+ interface to the Aiksaurus library. It provides an attractive thesaurus interface, and can be embedded -in GTK+ projects, notably AbiWord. A standalone thesaurus program -is also provided. - +in GTK+ projects, notably AbiWord. %package gtk-devel -Requires: %{name}-gtk = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: gtk2-devel -Summary: Files for developing with aiksaurus-gtk -Group: Development/Libraries - +Requires: %{name}-gtk = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: gtk2-devel +Summary: Files for developing with aiksaurus-gtk %description gtk-devel gtk includes and definitions for developing with aiksaurus. +%package thesaurus +Requires: %{name}-gtk = %{?epoch:%{epoch}:}%{version}-%{release} +Summary: A GTK+ frontend to aiksaurus + +%description thesaurus +A standalone thesaurus program base on aiksaurus-gtk. %prep %setup -q - +%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 make %{?_smp_mflags} - %install -rm -rf $RPM_BUILD_ROOT -%makeinstall +%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 --vendor fedora \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora \ - %{SOURCE2} - -%clean -rm -rf $RPM_BUILD_ROOT - - -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig - - -%post gtk -/sbin/ldconfig -update-desktop-database &> /dev/null ||: - - -%postun gtk -/sbin/ldconfig -update-desktop-database &> /dev/null ||: +desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2} +%ldconfig_scriptlets +%ldconfig_scriptlets gtk %files -%defattr(-, root, root) %doc ChangeLog README COPYING AUTHORS %{_bindir}/%{name} %{_bindir}/caiksaurus %{_libdir}/*Aiksaurus-*.so.* %{_datadir}/%{name}/ - %files devel -%defattr(-, root, root) %dir %{_includedir}/Aiksaurus %{_includedir}/Aiksaurus/Aiksaurus.h %{_includedir}/Aiksaurus/AiksaurusC.h %{_libdir}/*Aiksaurus.so %{_libdir}/pkgconfig/%{name}-1.0.pc - %files gtk -%defattr(-, root, root) -%{_bindir}/gaiksaurus %{_libdir}/*GTK*.so.* -%{_datadir}/applications/fedora-%{name}.desktop -%{_datadir}/pixmaps/%{name}.png - %files gtk-devel -%defattr(-, root, root) %{_includedir}/Aiksaurus/AiksaurusGTK*.h %{_libdir}/*GTK*.so %{_libdir}/pkgconfig/gaiksaurus-1.0.pc +%files thesaurus +%{_bindir}/gaiksaurus +%{_datadir}/applications/%{name}.desktop +%{_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 + +* Sat Feb 09 2013 Rahul Sundaram - 1:1.2.1-27 +- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247 +- clean up spec to follow current guidelines +- disable rpath + +* Wed Jul 18 2012 Fedora Release Engineering - 1:1.2.1-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Feb 28 2012 Fedora Release Engineering - 1:1.2.1-25 +- Rebuilt for c++ ABI breakage + +* Thu Jan 12 2012 Fedora Release Engineering - 1:1.2.1-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Dec 06 2011 Adam Jackson - 1:1.2.1-23 +- Rebuild for new libpng + +* Mon Feb 07 2011 Fedora Release Engineering - 1:1.2.1-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Jul 30 2009 Matthias Clasen - 1:1.2.1-21 +- Split off a thesaurus subpackage + +* Fri Jul 24 2009 Fedora Release Engineering - 1:1.2.1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Feb 23 2009 Fedora Release Engineering - 1:1.2.1-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Sep 10 2008 Matt Domsch - 1:1.2.1-18 +- fix FTBFS #434484 + +* Fri Jun 13 2008 Jon Stanley - 1:1.2.1-17 +- Remove vendor tag, correct license, rebuild + * Wed Feb 20 2008 Fedora Release Engineering - 1:1.2.1-16 - Autorebuild for GCC 4.3