diff --git a/.gitignore b/.gitignore index 6f3c533..757bf60 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,3 @@ cowsay-3.03.tar.gz /cowsay-3.04.tar.gz /cowsay-3.7.0.tar.gz -/cowsay-3.8.1.tar.gz -/cowsay-3.8.2.tar.gz -/cowsay-3.8.3.tar.gz -/cowsay-3.8.4.tar.gz diff --git a/cowsay.spec b/cowsay.spec index 53c8eb6..1900e0a 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -5,21 +5,22 @@ %global sitecowsdir %{_datadir}/%{name}/site-cows Name: cowsay -Version: 3.8.4 -Release: 3%{?dist} +Version: 3.7.0 +Release: 6%{?dist} Summary: Configurable speaking/thinking cow -License: GPL-2.0-or-later +License: GPLv3+ URL: https://github.com/cowsay-org/cowsay Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Source1: cowsay.bashcomp Source2: animalsay +Patch0: fox-cow.patch BuildArch: noarch -BuildRequires: pkgconfig(bash-completion) +BuildRequires: bash-completion BuildRequires: perl-generators Requires: perl-Encode # introduced /usr/share/bash-completion/... -Requires: filesystem >= 3.6-1 +Requires: filesystem >= 3.6-1 %description cowsay is a configurable talking cow, written in Perl. It operates @@ -31,6 +32,8 @@ pictures of other animals. %prep %setup -q +%patch0 -p1 + %build echo No need to build anything @@ -38,15 +41,15 @@ echo No need to build anything # At least for cowsay-3.7.0, replace upstream's "make install" by our # own installation code. install -d -m 0755 $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/%{name} $RPM_BUILD_ROOT%{_bindir} +install -p -m 0755 %{name} $RPM_BUILD_ROOT%{_bindir} ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/cowthink install -d -m 0755 $RPM_BUILD_ROOT%{_mandir}/man1 -install -p -m 0644 man/man1/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1 +install -p -m 0644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1 ln -s %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/cowthink.1 install -d -m 0755 $RPM_BUILD_ROOT%{cowsdir} -install -p -m 0644 share/cowsay/cows/* $RPM_BUILD_ROOT%{cowsdir} +install -p -m 0644 share/cows/* $RPM_BUILD_ROOT%{cowsdir} install -d -m 0755 $RPM_BUILD_ROOT%{sitecowsdir} @@ -63,68 +66,21 @@ install -d -m 0755 $RPM_BUILD_ROOT%{compdir} install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/%{name} %files -%doc CHANGELOG.md LICENSE.txt README README.md +%doc ChangeLog LICENSE.txt README* %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/cowpath.d -%{_bindir}/animalsay -%{_bindir}/cowsay -%{_bindir}/cowthink -%{_mandir}/man1/cowsay.1* -%{_mandir}/man1/cowthink.1* +%{_bindir}/* +%{_mandir}/man1/cow* %dir %{_datadir}/%{name} %{cowsdir} +%exclude %{cowsdir}/*.pm %exclude %{cowsdir}/bong.cow -%exclude %{cowsdir}/head-in.cow -%exclude %{cowsdir}/mutilated.cow +%exclude %{cowsdir}/sodomized.cow +%exclude %{cowsdir}/satanic.cow %dir %{sitecowsdir} %{compdir}/%{name} %changelog -* Wed Jul 23 2025 Fedora Release Engineering - 3.8.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 3.8.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Dec 02 2024 Gwyn Ciesla - 3.8.4-1 -- 3.8.4 - -* Thu Aug 22 2024 Gwyn Ciesla - 3.8.3-1 -- 3.8.3 - -* Tue Aug 20 2024 Gwyn Ciesla - 3.8.2-1 -- 3.8.2 - -* Thu Aug 8 2024 Hans Ulrich Niedermann - 3.8.1-2 -- Install CHANGELOG.md doc file - -* Thu Aug 08 2024 Gwyn Ciesla - 3.8.1-1 -- 3.8.1 - -* Wed Jul 17 2024 Fedora Release Engineering - 3.7.0-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Mar 18 2024 Gwyn Ciesla - 3.7.0-13 -- BR fix for bash-completion - -* Wed Jan 24 2024 Fedora Release Engineering - 3.7.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 3.7.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jan 18 2024 Perry Myers - 3.7.0-10 -- Remove some additional tasteless content missed before - -* Wed Jul 19 2023 Fedora Release Engineering - 3.7.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Feb 28 2023 Gwyn Ciesla - 3.7.0-8 -- migrated to SPDX license - -* Thu Jan 19 2023 Fedora Release Engineering - 3.7.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - * Mon Aug 22 2022 Hans Ulrich Niedermann - 3.7.0-6 - ship /etc/cowsay/cowpath.d directory diff --git a/fox-cow.patch b/fox-cow.patch new file mode 100644 index 0000000..5ff22a0 --- /dev/null +++ b/fox-cow.patch @@ -0,0 +1,24 @@ +Description: Add a fox cow +Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=888229#5 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=888229 +--- /dev/null ++++ b/share/cows/fox.cow +@@ -0,0 +1,18 @@ ++$the_cow = < ++ <.._=/ \\=_. > ++ {`\\()/`}`\\ ++ { } \\ ++ |{ } \\ ++ \\ '--' .- \\ ++ |- / \\ ++ | | | | | ; ++ | | |.;.,..__ | ++ .-"";` `| ++ / | / ++ `-../____,..---'` ++EOC diff --git a/sources b/sources index aa7d49c..c051d7d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cowsay-3.8.4.tar.gz) = 58e6a28e3205a3dd50c899c207b58592c43f8485dc44d3dc8de41bc480ec6d7e5a14e74769c8bb983d401004dce99f040c7a095839056861b7aa6aae71e08bb7 +SHA512 (cowsay-3.7.0.tar.gz) = 92c169350049d894c36ec753f0b7eb9250da7839d9f1eedcad1ff5d9f2cff188bd1509dabd3b4dd562bdd0e660e80e6a437c7f260ce5b2376b7ef624f0ee673b