diff --git a/.gitignore b/.gitignore index ddabda0..1542a95 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ WordNet-3.0.tar.bz2 -/wn3.1.dict.tar.gz diff --git a/wordnet.rpmlintrc b/.rpmlint similarity index 100% rename from wordnet.rpmlintrc rename to .rpmlint diff --git a/rpminspect.yaml b/rpminspect.yaml deleted file mode 100644 index 3cc93e9..0000000 --- a/rpminspect.yaml +++ /dev/null @@ -1,3 +0,0 @@ -shellsyntax: - ignore: - - /usr/bin/wnb diff --git a/sources b/sources index 908cb7d..fc97b5b 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (WordNet-3.0.tar.bz2) = 2d0f94114da276a40c954d52b234355e64e9422d6431580558d4c7f1c574902aa7d31660a157aca0ca1954aabad3779de610c9c49f9511d419136d4c13b3e7f0 -SHA512 (wn3.1.dict.tar.gz) = 16dca17a87026d8a0b7b4758219cd21a869c3ef3da23ce7875924546f2eacac4c2f376cb271b798b2c458fe8c078fb43d681356e3d9beef40f4bd88d3579394f +89b4db7c6840ce69a8e315a3f83d996b WordNet-3.0.tar.bz2 diff --git a/wordnet.spec b/wordnet.spec index ae8940c..73b6246 100644 --- a/wordnet.spec +++ b/wordnet.spec @@ -1,19 +1,18 @@ Name: wordnet Version: 3.0 -Release: 52%{?dist} +Release: 30%{?dist} Summary: A lexical database for the English language -License: MIT and GPL-2.0-or-later +Group: Applications/Text +License: MIT and GPLv2+ URL: http://wordnet.princeton.edu/ Source0: http://wordnetcode.princeton.edu/%{version}/WordNet-%{version}.tar.bz2 -# Updated database -Source1: http://wordnetcode.princeton.edu/wn3.1.dict.tar.gz Patch0: wordnet-3.0-CVE-2008-2149.patch Patch1: wordnet-3.0-CVE-2008-3908.patch Patch2: wordnet-3.0-fix_man.patch Patch3: wordnet-3.0-fix_resourcedir_path.patch Patch4: wordnet-3.0-src_stubs_c.patch -# wordnet-3.0-wishwn_manpage.patch is GPL-2.0-or-later +# wordnet-3.0-wishwn_manpage.patch is GPLv2+ Patch5: wordnet-3.0-wishwn_manpage.patch Patch6: wordnet-3.0-use_system_tk_headers.patch Patch7: wordnet-3.0-libtool.patch @@ -22,14 +21,9 @@ Patch8: wordnet-3.0-error_message.patch # Bug #1037386 Patch9: wordnet-3.0-Pass-compilation-with-Werror-format-security.patch BuildRequires: automake >= 1.8 -BuildRequires: coreutils -BuildRequires: gcc -BuildRequires: gzip BuildRequires: libtool -BuildRequires: make -BuildRequires: tar -BuildRequires: tcl-devel < 1:9 -BuildRequires: tk-devel < 1:9 +BuildRequires: tcl-devel +BuildRequires: tk-devel %description WordNet is a large lexical database of English, developed under the direction @@ -44,6 +38,7 @@ natural language processing. %package browser Summary: Tk browser for WordNet +Group: Applications/Text Requires: %{name}%{?_isa} = %{version}-%{release} Requires: font(:lang=en) @@ -53,6 +48,7 @@ This package contains graphical browser for WordNet database. %package devel Summary: The development libraries and header files for WordNet +Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel @@ -62,6 +58,7 @@ applications based on WordNet. %package doc Summary: Manual pages for WordNet in alternative formats +Group: Documentation BuildArch: noarch %description doc @@ -70,34 +67,30 @@ and PostScript format. %prep -%setup -q -n WordNet-%{version} -%patch -P 0 -p1 -b .cve-2008-2149 -%patch -P 1 -p1 -b .cve-2008-3908 -%patch -P 2 -p1 -b .fix_man -%patch -P 3 -p1 -b .fix_resourcedir_path -%patch -P 4 -p1 -b .src_stubs_c -%patch -P 5 -p1 -b .wishwn_manpage +%setup -q -n WordNet-3.0 +%patch0 -p1 -b .cve-2008-2149 +%patch1 -p1 -b .cve-2008-3908 +%patch2 -p1 -b .fix_man +%patch3 -p1 -b .fix_resourcedir_path +%patch4 -p1 -b .src_stubs_c +%patch5 -p1 -b .wishwn_manpage sed -e '/man_MANS/ s/$/ wishwn.1/' -i doc/man/Makefile.am -%patch -P 6 -p1 -b .use_system_tk_headers -%patch -P 7 -p1 -b .libtool -%patch -P 8 -p1 -b .error_message -%patch -P 9 -p1 -b .format +%patch6 -p1 -b .use_system_tk_headers +%patch7 -p1 -b .libtool +%patch8 -p1 -b .error_message +%patch9 -p1 -b .format # delete the include/tk dir, since we do not use the included tk headers rm -rf include/tk -# Update a database -tar -xozf %{SOURCE1} -# Remove database byproducts brought by the database update -rm -rf dict/dbfiles %build libtoolize && aclocal autoupdate autoreconf -i -%if 0%{?fedora} >= 21 || 0%{?rhel} > 7 +%if 0%{?fedora} >= 21 export CFLAGS="%{?optflags} -DUSE_INTERP_RESULT" export CXXFLAGS="%{?optflags} -DUSE_INTERP_RESULT" -%endif +%endif #0%{?fedora} >= 21 %configure --enable-static=no --prefix=%{_datadir}/wordnet-%{version}/ make %{?_smp_mflags} @@ -112,7 +105,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/doc rm -rf doc/{html,ps,pdf}/Makefile* -%ldconfig_scriptlets +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig %files %doc AUTHORS COPYING ChangeLog README @@ -143,73 +138,6 @@ rm -rf doc/{html,ps,pdf}/Makefile* %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 3.0-52 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Tue Jun 30 2026 Yaakov Selkowitz - 3.0-51 -- Build with Tcl 8 - -* Sat Jan 17 2026 Fedora Release Engineering - 3.0-50 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 3.0-49 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 3.0-48 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 3.0-47 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 3.0-46 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 3.0-45 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jul 07 2023 Parag Nemade - 3.0-44 -- Migrate to SPDX license expression - -* Sat Jan 21 2023 Fedora Release Engineering - 3.0-43 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 3.0-42 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 3.0-41 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 3.0-40 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 3.0-39 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 3.0-38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 3.0-37 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 3.0-36 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 3.0-35 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 3.0-34 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Mar 23 2018 Petr Pisar - 3.0-33 -- Modernize spec file -- Update database to version 3.1 - -* Fri Feb 09 2018 Fedora Release Engineering - 3.0-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jan 24 2018 Merlin Mathesius - 3.0-31 -- Cleanup spec file conditionals - * Thu Aug 03 2017 Fedora Release Engineering - 3.0-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild @@ -316,3 +244,4 @@ rm -rf doc/{html,ps,pdf}/Makefile* * Sat Nov 29 2008 Steven Fernandez - 3.0-1 - First build for Fedora 10 +