From 96c7fdda0f85e667f23cc18d17d4e5f77fbe9159 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 17 Sep 2007 11:39:43 +0000 Subject: [PATCH 01/80] Bugzilla Bug 293061: Cowsay doesn't let Getopt::Std support --help correctly. --- cowsay-3.03-help.patch | 11 +++++++++++ cowsay.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 cowsay-3.03-help.patch diff --git a/cowsay-3.03-help.patch b/cowsay-3.03-help.patch new file mode 100644 index 0000000..1fc4b4a --- /dev/null +++ b/cowsay-3.03-help.patch @@ -0,0 +1,11 @@ +diff -rup cowsay-3.03.orig/cowsay cowsay-3.03/cowsay +--- cowsay-3.03.orig/cowsay 2007-09-17 13:27:32.000000000 +0200 ++++ cowsay-3.03/cowsay 2007-09-17 13:28:04.000000000 +0200 +@@ -185,3 +185,7 @@ Usage: $progname [-bdgpstwy] [-h] [-e ey + [-l] [-n] [-T tongue] [-W wrapcolumn] [message] + EOF + } ++ ++sub main::HELP_MESSAGE { ++ display_usage; ++} diff --git a/cowsay.spec b/cowsay.spec index 1b04b67..cbcc7a2 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -1,6 +1,6 @@ Name: cowsay Version: 3.03 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games License: Artistic or GPL @@ -8,6 +8,7 @@ URL: http://www.nog.net/~tony/warez/cowsay.shtml Source0: http://www.nog.net/~tony/warez/%{name}-%{version}.tar.gz Source1: cowsay.bashcomp Source2: animalsay +Patch0: cowsay-3.03-help.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -21,6 +22,7 @@ pictures of other animals. %prep %setup -q +%patch0 -p1 -b .help %{__sed} -e 's#%PREFIX%/share/cows#%{_datadir}/%{name}#' \ -e 's#%BANGPERL%#!%{__perl}#' -i %{name} %{__sed} -e 's#%PREFIX%/share/cows#%{_datadir}/%{name}#' \ @@ -57,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/bash_completion.d %changelog +* Mon Sep 17 2007 Lubomir Kundrak - 3.03-3 +- Make --help be a bit more sane (#293061) + * Tue Jan 02 2007 Michał Bentkowski - 3.03-2 - Use cp -p to keep timestamps - Fix paths in manpage From fae3b1e167fb8b1aae5934b2b8d4f43af3347f07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Bentkowski?= Date: Tue, 9 Oct 2007 19:45:20 +0000 Subject: [PATCH 02/80] - Fix mech-and-cow file (#250844) --- cowsay.spec | 9 ++++++++- mech-and-cow.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 mech-and-cow.patch diff --git a/cowsay.spec b/cowsay.spec index cbcc7a2..3956811 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -1,6 +1,6 @@ Name: cowsay Version: 3.03 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games License: Artistic or GPL @@ -9,6 +9,7 @@ Source0: http://www.nog.net/~tony/warez/%{name}-%{version}.tar.gz Source1: cowsay.bashcomp Source2: animalsay Patch0: cowsay-3.03-help.patch +Patch1: mech-and-cow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -28,6 +29,9 @@ pictures of other animals. %{__sed} -e 's#%PREFIX%/share/cows#%{_datadir}/%{name}#' \ -e 's#/usr/local/share/cows#%{_datadir}/%{name}#' -i %{name}.1 +mv cows/mech-and-cow cows/mech-and-cow.cow +%patch1 -p1 + %build echo No need to build anything @@ -59,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/bash_completion.d %changelog +* Tue Oct 09 2007 Michał Bentkowski - 3.03-4 +- Fix mech-and-cow file (#250844) + * Mon Sep 17 2007 Lubomir Kundrak - 3.03-3 - Make --help be a bit more sane (#293061) diff --git a/mech-and-cow.patch b/mech-and-cow.patch new file mode 100644 index 0000000..c8e97b2 --- /dev/null +++ b/mech-and-cow.patch @@ -0,0 +1,45 @@ +--- cowsay/cows/mech-and-cow.cow 2007-10-07 12:17:44.000000000 +0200 ++++ cowsay/cows/mech-and-cow.cow.new 2007-10-07 12:17:54.000000000 +0200 +@@ -1,21 +1,22 @@ +- ,-----. +- | | +- ,--| |-. +- __,----| | | | +- ,;:: | `_____' | +- `._______| i^i | +- `----| |---'| . +- ,-------._| |== ||// +- | |_|P`. /'/ +- `-------' 'Y Y/'/' +- .==\ /_\ ++$sthguoht = $thoughts; ++if ( $thoughts eq "\\" ) { ++ $sthguoht = "/"; ++} ++$the_cow = <<"EOC"; ++ $thoughts ,-----. ++ $sthguoht | | ++ $thoughts ,--| |-. ++ $sthguoht __,----| | | | ++ $thoughts ,;:: | `_____' | ++ $sthguoht `._______| i^i | ++ $thoughts `----| |---'| . ++ $sthguoht ,-------._| |== ||// ++ $thoughts | |_|P`. /'/ ++ $sthguoht `-------' 'Y Y/'/' ++ $thoughts .==\ /_\ + ^__^ / /'| `i +- (oo)\_______ /' / | | +- (__)\ )\/\ /' / | `i +- ||----w | ___,;`----'.___L_,-'`\__ +- || || i_____;----\.____i""\____\ +- +- +- +- +- ++ ($eyes)\_______ /' / | | ++ (__)\ )\\/\\ /' / | `i ++ $tongue||----w|| ___,;`----'.___L_,-'`\__ ++ || || i_____;----\.____i""\____\ ++EOC From d4027794ab672ab625b5f262f9d7de0319a245ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Bentkowski?= Date: Tue, 9 Oct 2007 19:54:17 +0000 Subject: [PATCH 03/80] - Fix mech-and-cow file (#250844) --- cowsay-3.03-help.patch | 11 +++++++++++ cowsay.spec | 14 ++++++++++++- mech-and-cow.patch | 45 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 cowsay-3.03-help.patch create mode 100644 mech-and-cow.patch diff --git a/cowsay-3.03-help.patch b/cowsay-3.03-help.patch new file mode 100644 index 0000000..1fc4b4a --- /dev/null +++ b/cowsay-3.03-help.patch @@ -0,0 +1,11 @@ +diff -rup cowsay-3.03.orig/cowsay cowsay-3.03/cowsay +--- cowsay-3.03.orig/cowsay 2007-09-17 13:27:32.000000000 +0200 ++++ cowsay-3.03/cowsay 2007-09-17 13:28:04.000000000 +0200 +@@ -185,3 +185,7 @@ Usage: $progname [-bdgpstwy] [-h] [-e ey + [-l] [-n] [-T tongue] [-W wrapcolumn] [message] + EOF + } ++ ++sub main::HELP_MESSAGE { ++ display_usage; ++} diff --git a/cowsay.spec b/cowsay.spec index 1b04b67..3956811 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -1,6 +1,6 @@ Name: cowsay Version: 3.03 -Release: 2%{?dist} +Release: 4%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games License: Artistic or GPL @@ -8,6 +8,8 @@ URL: http://www.nog.net/~tony/warez/cowsay.shtml Source0: http://www.nog.net/~tony/warez/%{name}-%{version}.tar.gz Source1: cowsay.bashcomp Source2: animalsay +Patch0: cowsay-3.03-help.patch +Patch1: mech-and-cow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -21,11 +23,15 @@ pictures of other animals. %prep %setup -q +%patch0 -p1 -b .help %{__sed} -e 's#%PREFIX%/share/cows#%{_datadir}/%{name}#' \ -e 's#%BANGPERL%#!%{__perl}#' -i %{name} %{__sed} -e 's#%PREFIX%/share/cows#%{_datadir}/%{name}#' \ -e 's#/usr/local/share/cows#%{_datadir}/%{name}#' -i %{name}.1 +mv cows/mech-and-cow cows/mech-and-cow.cow +%patch1 -p1 + %build echo No need to build anything @@ -57,6 +63,12 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/bash_completion.d %changelog +* Tue Oct 09 2007 Michał Bentkowski - 3.03-4 +- Fix mech-and-cow file (#250844) + +* Mon Sep 17 2007 Lubomir Kundrak - 3.03-3 +- Make --help be a bit more sane (#293061) + * Tue Jan 02 2007 Michał Bentkowski - 3.03-2 - Use cp -p to keep timestamps - Fix paths in manpage diff --git a/mech-and-cow.patch b/mech-and-cow.patch new file mode 100644 index 0000000..c8e97b2 --- /dev/null +++ b/mech-and-cow.patch @@ -0,0 +1,45 @@ +--- cowsay/cows/mech-and-cow.cow 2007-10-07 12:17:44.000000000 +0200 ++++ cowsay/cows/mech-and-cow.cow.new 2007-10-07 12:17:54.000000000 +0200 +@@ -1,21 +1,22 @@ +- ,-----. +- | | +- ,--| |-. +- __,----| | | | +- ,;:: | `_____' | +- `._______| i^i | +- `----| |---'| . +- ,-------._| |== ||// +- | |_|P`. /'/ +- `-------' 'Y Y/'/' +- .==\ /_\ ++$sthguoht = $thoughts; ++if ( $thoughts eq "\\" ) { ++ $sthguoht = "/"; ++} ++$the_cow = <<"EOC"; ++ $thoughts ,-----. ++ $sthguoht | | ++ $thoughts ,--| |-. ++ $sthguoht __,----| | | | ++ $thoughts ,;:: | `_____' | ++ $sthguoht `._______| i^i | ++ $thoughts `----| |---'| . ++ $sthguoht ,-------._| |== ||// ++ $thoughts | |_|P`. /'/ ++ $sthguoht `-------' 'Y Y/'/' ++ $thoughts .==\ /_\ + ^__^ / /'| `i +- (oo)\_______ /' / | | +- (__)\ )\/\ /' / | `i +- ||----w | ___,;`----'.___L_,-'`\__ +- || || i_____;----\.____i""\____\ +- +- +- +- +- ++ ($eyes)\_______ /' / | | ++ (__)\ )\\/\\ /' / | `i ++ $tongue||----w|| ___,;`----'.___L_,-'`\__ ++ || || i_____;----\.____i""\____\ ++EOC From 40eb715d07874830a3a484f436bb79d4ff84d186 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 5 May 2008 21:56:37 +0000 Subject: [PATCH 04/80] Initialize branch EL-5 for cowsay --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 From 3cdaf515c23a96c73e68f77c46106b1a0683766e Mon Sep 17 00:00:00 2001 From: Jon Stanley Date: Fri, 23 May 2008 14:04:49 +0000 Subject: [PATCH 05/80] fixed license tag --- cowsay.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cowsay.spec b/cowsay.spec index 3956811..b1452a2 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -1,9 +1,9 @@ Name: cowsay Version: 3.03 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games -License: Artistic or GPL +License: Artistic or GPLv2+ URL: http://www.nog.net/~tony/warez/cowsay.shtml Source0: http://www.nog.net/~tony/warez/%{name}-%{version}.tar.gz Source1: cowsay.bashcomp @@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/bash_completion.d %changelog +* Fri May 23 2008 Jon Stanley - 3.03-5 +- Fix license tag + * Tue Oct 09 2007 Michał Bentkowski - 3.03-4 - Fix mech-and-cow file (#250844) From b2f0522d426986f7f9a8361ceb78944f003287db Mon Sep 17 00:00:00 2001 From: Jon Stanley Date: Fri, 23 May 2008 14:05:08 +0000 Subject: [PATCH 06/80] fixed license tag --- cowsay.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cowsay.spec b/cowsay.spec index 3956811..b1452a2 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -1,9 +1,9 @@ Name: cowsay Version: 3.03 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games -License: Artistic or GPL +License: Artistic or GPLv2+ URL: http://www.nog.net/~tony/warez/cowsay.shtml Source0: http://www.nog.net/~tony/warez/%{name}-%{version}.tar.gz Source1: cowsay.bashcomp @@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/bash_completion.d %changelog +* Fri May 23 2008 Jon Stanley - 3.03-5 +- Fix license tag + * Tue Oct 09 2007 Michał Bentkowski - 3.03-4 - Fix mech-and-cow file (#250844) From 0f3a6456cf695b8c44c9d8932175e2b2bb54e623 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 15 Jul 2008 17:54:19 +0000 Subject: [PATCH 07/80] fix license tag --- cowsay.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cowsay.spec b/cowsay.spec index b1452a2..8cf31b7 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -1,9 +1,9 @@ Name: cowsay Version: 3.03 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games -License: Artistic or GPLv2+ +License: GPLv2+ or Artistic URL: http://www.nog.net/~tony/warez/cowsay.shtml Source0: http://www.nog.net/~tony/warez/%{name}-%{version}.tar.gz Source1: cowsay.bashcomp @@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/bash_completion.d %changelog +* Tue Jul 15 2008 Tom "spot" Callaway - 3.03-6 +- fix license tag to prevent false positive + * Fri May 23 2008 Jon Stanley - 3.03-5 - Fix license tag From 33db5e04ee089d20c163508fc59419d0cf7f9f88 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 24 Feb 2009 09:18:05 +0000 Subject: [PATCH 08/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index 8cf31b7..c37c9a6 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -1,6 +1,6 @@ Name: cowsay Version: 3.03 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games License: GPLv2+ or Artistic @@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/bash_completion.d %changelog +* Tue Feb 24 2009 Fedora Release Engineering - 3.03-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Jul 15 2008 Tom "spot" Callaway - 3.03-6 - fix license tag to prevent false positive From 8475eb342996de4dcfc8770ee9a68c40d0b7567b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 19:31:41 +0000 Subject: [PATCH 09/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index c37c9a6..45f0087 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -1,6 +1,6 @@ Name: cowsay Version: 3.03 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games License: GPLv2+ or Artistic @@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/bash_completion.d %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 3.03-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Tue Feb 24 2009 Fedora Release Engineering - 3.03-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 49eed6f33e8793adada79bef0d30d603508de339 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:47:37 +0000 Subject: [PATCH 10/80] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e6cf47f..99ecd5e 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: cowsay -# $Id$ +# $Id: Makefile,v 1.1 2007/01/02 19:04:42 ecik Exp $ NAME := cowsay 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From b3a51b391920937d81e92bc7e3d9063b0234ea6b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:33:22 +0000 Subject: [PATCH 11/80] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e6cf47f..99ecd5e 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: cowsay -# $Id$ +# $Id: Makefile,v 1.1 2007/01/02 19:04:42 ecik Exp $ NAME := cowsay 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 6e50fb4a2a4a50d98550559165fa4524f4a9baee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 12:12:57 +0000 Subject: [PATCH 12/80] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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 99ecd5e..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: cowsay -# $Id: Makefile,v 1.1 2007/01/02 19:04:42 ecik Exp $ -NAME := cowsay -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 $$d/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/branch b/branch deleted file mode 100644 index 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5 From 00ae34fec855d27eae5dcbecc3ffe55a528bb7b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 12:12:58 +0000 Subject: [PATCH 13/80] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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 99ecd5e..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: cowsay -# $Id: Makefile,v 1.1 2007/01/02 19:04:42 ecik Exp $ -NAME := cowsay -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 $$d/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) From c51435e83f1e2a2e25d427cfacf5ddce88ef60a2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 05:34:13 -0600 Subject: [PATCH 14/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index 45f0087..d2f0f77 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -1,6 +1,6 @@ Name: cowsay Version: 3.03 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games License: GPLv2+ or Artistic @@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/bash_completion.d %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 3.03-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Jul 24 2009 Fedora Release Engineering - 3.03-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From c43d4d2a0e226dc4f64d6d66c12b6d55fa5d8bcb Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 17:54:51 -0600 Subject: [PATCH 15/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index d2f0f77..f8acb55 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -1,6 +1,6 @@ Name: cowsay Version: 3.03 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games License: GPLv2+ or Artistic @@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/bash_completion.d %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 3.03-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Feb 08 2011 Fedora Release Engineering - 3.03-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 200ec5af36c2ca51f1335ec9b59b07cb4b3da397 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 14:43:54 -0500 Subject: [PATCH 16/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index f8acb55..f575233 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -1,6 +1,6 @@ Name: cowsay Version: 3.03 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games License: GPLv2+ or Artistic @@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/bash_completion.d %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 3.03-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Thu Jan 12 2012 Fedora Release Engineering - 3.03-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 1edf3a2d5d4bf3ab5310b2d8accba157b24acb46 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 13:00:49 -0600 Subject: [PATCH 17/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index f575233..186755d 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -1,6 +1,6 @@ Name: cowsay Version: 3.03 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games License: GPLv2+ or Artistic @@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/bash_completion.d %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 3.03-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Wed Jul 18 2012 Fedora Release Engineering - 3.03-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From fa3680c1ec0f5f9fa6c581fb6ea4a43a14bf093a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 18 Jul 2013 00:11:27 +0200 Subject: [PATCH 18/80] Perl 5.18 rebuild --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index 186755d..4305036 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -1,6 +1,6 @@ Name: cowsay Version: 3.03 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games License: GPLv2+ or Artistic @@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/bash_completion.d %changelog +* Wed Jul 17 2013 Petr Pisar - 3.03-13 +- Perl 5.18 rebuild + * Wed Feb 13 2013 Fedora Release Engineering - 3.03-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From cad1d7d8aa245bb7c1577958fd865dd0f7af4b37 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 00:55:50 -0500 Subject: [PATCH 19/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index 4305036..aca3d21 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -1,6 +1,6 @@ Name: cowsay Version: 3.03 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games License: GPLv2+ or Artistic @@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/bash_completion.d %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 3.03-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Jul 17 2013 Petr Pisar - 3.03-13 - Perl 5.18 rebuild From dcaab9024d47f34635e099160d5d6d33a4e99773 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 00:59:08 -0500 Subject: [PATCH 20/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index aca3d21..3499d45 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -1,6 +1,6 @@ Name: cowsay Version: 3.03 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games License: GPLv2+ or Artistic @@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/bash_completion.d %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 3.03-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Aug 03 2013 Fedora Release Engineering - 3.03-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From ce11af716f30333776f7bbca684d25d69f3e8da3 Mon Sep 17 00:00:00 2001 From: Rahul Sundaram Date: Fri, 26 Sep 2014 19:17:22 -0400 Subject: [PATCH 21/80] fix location of bash completion script - don't own /etc/bash_completion.d/ - drop redundant buildroot, defattr and clean --- cowsay.spec | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/cowsay.spec b/cowsay.spec index 3499d45..c9b9148 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -1,6 +1,7 @@ +%define compdir %(pkg-config --variable=completionsdir bash-completion) Name: cowsay Version: 3.03 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games License: GPLv2+ or Artistic @@ -10,8 +11,9 @@ Source1: cowsay.bashcomp Source2: animalsay Patch0: cowsay-3.03-help.patch Patch1: mech-and-cow.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +BuildRequires: bash-completion + %description cowsay is a configurable talking cow, written in Perl. It operates @@ -47,22 +49,23 @@ cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir} chmod +x $RPM_BUILD_ROOT%{_bindir}/animalsay ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/cowthink ln -s %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/cowthink.1 - -cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d - -%clean -rm -rf $RPM_BUILD_ROOT - +mkdir -p $RPM_BUILD_ROOT%{compdir}/ +cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %files -%defattr(-,root,root,-) %doc ChangeLog LICENSE README %{_bindir}/* %{_mandir}/man1/cow* %{_datadir}/%{name} -%{_sysconfdir}/bash_completion.d +%(dirname %{compdir}) + %changelog +* Fri Sep 26 2014 Rahul Sundaram - 3.03-16 +- fix location of bash completion script +- don't own /etc/bash_completion.d/ +- drop redundant buildroot, defattr and clean + * Sat Jun 07 2014 Fedora Release Engineering - 3.03-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From f7d2db43dee2bc04e0ea769235bbd6cae774cd51 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Fri, 20 Feb 2015 14:26:41 -0800 Subject: [PATCH 22/80] include unicode and formatting fixes from Debian --- ...ay-3.03-debian-01-empty_messages_fix.patch | 19 +++++++++++++ ....03-debian-02-remove_trailing_spaces.patch | 28 +++++++++++++++++++ cowsay-3.03-debian-utf8_width.patch | 24 ++++++++++++++++ cowsay.spec | 14 +++++++++- 4 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 cowsay-3.03-debian-01-empty_messages_fix.patch create mode 100644 cowsay-3.03-debian-02-remove_trailing_spaces.patch create mode 100644 cowsay-3.03-debian-utf8_width.patch diff --git a/cowsay-3.03-debian-01-empty_messages_fix.patch b/cowsay-3.03-debian-01-empty_messages_fix.patch new file mode 100644 index 0000000..bb2ea7a --- /dev/null +++ b/cowsay-3.03-debian-01-empty_messages_fix.patch @@ -0,0 +1,19 @@ +Description: Work-around for broken baloons with empty messages +Forwarded: no +Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=165218#5 +Bug-Debian: http://bugs.debian.org/165218 +Author: Jeronimo Pellegrini + +--- cowsay-3.03.orig/cowsay ++++ cowsay-3.03/cowsay +@@ -106,6 +106,10 @@ sub maxlength { + $l = length $i; + $m = $l if ($l > $m); + } ++## maxlength patch from Jeronimo Pellegrini (Closes: #165218) ++ if ($m == -1) { ++ $m = 0; ++ } + return $m; + } + diff --git a/cowsay-3.03-debian-02-remove_trailing_spaces.patch b/cowsay-3.03-debian-02-remove_trailing_spaces.patch new file mode 100644 index 0000000..496439b --- /dev/null +++ b/cowsay-3.03-debian-02-remove_trailing_spaces.patch @@ -0,0 +1,28 @@ +Description: Removing trailing spaces + This is mainly to work-around broken word-wrapping by mail clients. +Forwarded: no +Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=276144#42 +Bug-Debian: http://bugs.debian.org/276144 +Author: Florian Ernst + +--- cowsay-3.03.orig/cowsay ++++ cowsay-3.03/cowsay +@@ -128,15 +132,16 @@ sub construct_balloon { + @border = qw[ / \ \ / | | ]; + } + } ++## no trailing spaces (#276144) + push(@balloon_lines, +- " " . ("_" x $max2) . " \n" , ++ " " . ("_" x $max2) . "\n" , + sprintf($format, $border[0], $message[0], $border[1]), + (@message < 2 ? "" : + map { sprintf($format, $border[4], $_, $border[5]) } + @message[1 .. $#message - 1]), + (@message < 2 ? "" : + sprintf($format, $border[2], $message[$#message], $border[3])), +- " " . ("-" x $max2) . " \n" ++ " " . ("-" x $max2) . "\n" + ); + } + diff --git a/cowsay-3.03-debian-utf8_width.patch b/cowsay-3.03-debian-utf8_width.patch new file mode 100644 index 0000000..0c3f86e --- /dev/null +++ b/cowsay-3.03-debian-utf8_width.patch @@ -0,0 +1,24 @@ +Description: utf8 support in input, output and arguments on utf8-enabled locales + Note that this is not a complete solution (doesn't support Chinese/Japanese + characters for example) but it's better than what we had. +Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=254557#27 +Bug-Debian: http://bugs.debian.org/254557 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/cowsay/+bug/393212 +Author: Damyan Ivanov + +--- a/cowsay ++++ b/cowsay +@@ -12,6 +12,13 @@ use File::Basename; + use Getopt::Std; + use Cwd; + ++if (${^UTF8LOCALE}) { ++ binmode STDIN, ':utf8'; ++ binmode STDOUT, ':utf8'; ++ require Encode; ++ eval { $_ = Encode::decode_utf8($_,1) } for @ARGV; ++} ++ + $version = "3.03"; + $progname = basename($0); + $eyes = "oo"; diff --git a/cowsay.spec b/cowsay.spec index c9b9148..bca9bdd 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -1,7 +1,7 @@ %define compdir %(pkg-config --variable=completionsdir bash-completion) Name: cowsay Version: 3.03 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games License: GPLv2+ or Artistic @@ -11,6 +11,11 @@ Source1: cowsay.bashcomp Source2: animalsay Patch0: cowsay-3.03-help.patch Patch1: mech-and-cow.patch +# these are from https://packages.debian.org/sid/cowsay +Patch2: cowsay-3.03-debian-01-empty_messages_fix.patch +Patch3: cowsay-3.03-debian-02-remove_trailing_spaces.patch +Patch4: cowsay-3.03-debian-utf8_width.patch + BuildArch: noarch BuildRequires: bash-completion @@ -34,6 +39,10 @@ pictures of other animals. mv cows/mech-and-cow cows/mech-and-cow.cow %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 + %build echo No need to build anything @@ -61,6 +70,9 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %changelog +* Fri Feb 20 2015 Matthew Miller - 3.03-17 +- include unicode and formatting fixes from Debian + * Fri Sep 26 2014 Rahul Sundaram - 3.03-16 - fix location of bash completion script - don't own /etc/bash_completion.d/ From 71d587c48e5bc34842866d4443894b1f315914c0 Mon Sep 17 00:00:00 2001 From: Rahul Sundaram Date: Fri, 26 Sep 2014 19:17:22 -0400 Subject: [PATCH 23/80] fix location of bash completion script - don't own /etc/bash_completion.d/ - drop redundant buildroot, defattr and clean --- cowsay.spec | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/cowsay.spec b/cowsay.spec index 3499d45..c9b9148 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -1,6 +1,7 @@ +%define compdir %(pkg-config --variable=completionsdir bash-completion) Name: cowsay Version: 3.03 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games License: GPLv2+ or Artistic @@ -10,8 +11,9 @@ Source1: cowsay.bashcomp Source2: animalsay Patch0: cowsay-3.03-help.patch Patch1: mech-and-cow.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +BuildRequires: bash-completion + %description cowsay is a configurable talking cow, written in Perl. It operates @@ -47,22 +49,23 @@ cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir} chmod +x $RPM_BUILD_ROOT%{_bindir}/animalsay ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/cowthink ln -s %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/cowthink.1 - -cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d - -%clean -rm -rf $RPM_BUILD_ROOT - +mkdir -p $RPM_BUILD_ROOT%{compdir}/ +cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %files -%defattr(-,root,root,-) %doc ChangeLog LICENSE README %{_bindir}/* %{_mandir}/man1/cow* %{_datadir}/%{name} -%{_sysconfdir}/bash_completion.d +%(dirname %{compdir}) + %changelog +* Fri Sep 26 2014 Rahul Sundaram - 3.03-16 +- fix location of bash completion script +- don't own /etc/bash_completion.d/ +- drop redundant buildroot, defattr and clean + * Sat Jun 07 2014 Fedora Release Engineering - 3.03-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 81aabda6adb8c01fbb849880714489f94c38ce83 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Fri, 20 Feb 2015 14:26:41 -0800 Subject: [PATCH 24/80] include unicode and formatting fixes from Debian --- ...ay-3.03-debian-01-empty_messages_fix.patch | 19 +++++++++++++ ....03-debian-02-remove_trailing_spaces.patch | 28 +++++++++++++++++++ cowsay-3.03-debian-utf8_width.patch | 24 ++++++++++++++++ cowsay.spec | 14 +++++++++- 4 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 cowsay-3.03-debian-01-empty_messages_fix.patch create mode 100644 cowsay-3.03-debian-02-remove_trailing_spaces.patch create mode 100644 cowsay-3.03-debian-utf8_width.patch diff --git a/cowsay-3.03-debian-01-empty_messages_fix.patch b/cowsay-3.03-debian-01-empty_messages_fix.patch new file mode 100644 index 0000000..bb2ea7a --- /dev/null +++ b/cowsay-3.03-debian-01-empty_messages_fix.patch @@ -0,0 +1,19 @@ +Description: Work-around for broken baloons with empty messages +Forwarded: no +Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=165218#5 +Bug-Debian: http://bugs.debian.org/165218 +Author: Jeronimo Pellegrini + +--- cowsay-3.03.orig/cowsay ++++ cowsay-3.03/cowsay +@@ -106,6 +106,10 @@ sub maxlength { + $l = length $i; + $m = $l if ($l > $m); + } ++## maxlength patch from Jeronimo Pellegrini (Closes: #165218) ++ if ($m == -1) { ++ $m = 0; ++ } + return $m; + } + diff --git a/cowsay-3.03-debian-02-remove_trailing_spaces.patch b/cowsay-3.03-debian-02-remove_trailing_spaces.patch new file mode 100644 index 0000000..496439b --- /dev/null +++ b/cowsay-3.03-debian-02-remove_trailing_spaces.patch @@ -0,0 +1,28 @@ +Description: Removing trailing spaces + This is mainly to work-around broken word-wrapping by mail clients. +Forwarded: no +Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=276144#42 +Bug-Debian: http://bugs.debian.org/276144 +Author: Florian Ernst + +--- cowsay-3.03.orig/cowsay ++++ cowsay-3.03/cowsay +@@ -128,15 +132,16 @@ sub construct_balloon { + @border = qw[ / \ \ / | | ]; + } + } ++## no trailing spaces (#276144) + push(@balloon_lines, +- " " . ("_" x $max2) . " \n" , ++ " " . ("_" x $max2) . "\n" , + sprintf($format, $border[0], $message[0], $border[1]), + (@message < 2 ? "" : + map { sprintf($format, $border[4], $_, $border[5]) } + @message[1 .. $#message - 1]), + (@message < 2 ? "" : + sprintf($format, $border[2], $message[$#message], $border[3])), +- " " . ("-" x $max2) . " \n" ++ " " . ("-" x $max2) . "\n" + ); + } + diff --git a/cowsay-3.03-debian-utf8_width.patch b/cowsay-3.03-debian-utf8_width.patch new file mode 100644 index 0000000..0c3f86e --- /dev/null +++ b/cowsay-3.03-debian-utf8_width.patch @@ -0,0 +1,24 @@ +Description: utf8 support in input, output and arguments on utf8-enabled locales + Note that this is not a complete solution (doesn't support Chinese/Japanese + characters for example) but it's better than what we had. +Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=254557#27 +Bug-Debian: http://bugs.debian.org/254557 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/cowsay/+bug/393212 +Author: Damyan Ivanov + +--- a/cowsay ++++ b/cowsay +@@ -12,6 +12,13 @@ use File::Basename; + use Getopt::Std; + use Cwd; + ++if (${^UTF8LOCALE}) { ++ binmode STDIN, ':utf8'; ++ binmode STDOUT, ':utf8'; ++ require Encode; ++ eval { $_ = Encode::decode_utf8($_,1) } for @ARGV; ++} ++ + $version = "3.03"; + $progname = basename($0); + $eyes = "oo"; diff --git a/cowsay.spec b/cowsay.spec index c9b9148..bca9bdd 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -1,7 +1,7 @@ %define compdir %(pkg-config --variable=completionsdir bash-completion) Name: cowsay Version: 3.03 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games License: GPLv2+ or Artistic @@ -11,6 +11,11 @@ Source1: cowsay.bashcomp Source2: animalsay Patch0: cowsay-3.03-help.patch Patch1: mech-and-cow.patch +# these are from https://packages.debian.org/sid/cowsay +Patch2: cowsay-3.03-debian-01-empty_messages_fix.patch +Patch3: cowsay-3.03-debian-02-remove_trailing_spaces.patch +Patch4: cowsay-3.03-debian-utf8_width.patch + BuildArch: noarch BuildRequires: bash-completion @@ -34,6 +39,10 @@ pictures of other animals. mv cows/mech-and-cow cows/mech-and-cow.cow %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 + %build echo No need to build anything @@ -61,6 +70,9 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %changelog +* Fri Feb 20 2015 Matthew Miller - 3.03-17 +- include unicode and formatting fixes from Debian + * Fri Sep 26 2014 Rahul Sundaram - 3.03-16 - fix location of bash completion script - don't own /etc/bash_completion.d/ From 7cefef37932cc65aaf5c408c543391edbf45af16 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Fri, 20 Feb 2015 14:26:41 -0800 Subject: [PATCH 25/80] include unicode and formatting fixes from Debian --- ...ay-3.03-debian-01-empty_messages_fix.patch | 19 +++++++++++++ ....03-debian-02-remove_trailing_spaces.patch | 28 +++++++++++++++++++ cowsay-3.03-debian-utf8_width.patch | 24 ++++++++++++++++ cowsay.spec | 14 +++++++++- 4 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 cowsay-3.03-debian-01-empty_messages_fix.patch create mode 100644 cowsay-3.03-debian-02-remove_trailing_spaces.patch create mode 100644 cowsay-3.03-debian-utf8_width.patch diff --git a/cowsay-3.03-debian-01-empty_messages_fix.patch b/cowsay-3.03-debian-01-empty_messages_fix.patch new file mode 100644 index 0000000..bb2ea7a --- /dev/null +++ b/cowsay-3.03-debian-01-empty_messages_fix.patch @@ -0,0 +1,19 @@ +Description: Work-around for broken baloons with empty messages +Forwarded: no +Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=165218#5 +Bug-Debian: http://bugs.debian.org/165218 +Author: Jeronimo Pellegrini + +--- cowsay-3.03.orig/cowsay ++++ cowsay-3.03/cowsay +@@ -106,6 +106,10 @@ sub maxlength { + $l = length $i; + $m = $l if ($l > $m); + } ++## maxlength patch from Jeronimo Pellegrini (Closes: #165218) ++ if ($m == -1) { ++ $m = 0; ++ } + return $m; + } + diff --git a/cowsay-3.03-debian-02-remove_trailing_spaces.patch b/cowsay-3.03-debian-02-remove_trailing_spaces.patch new file mode 100644 index 0000000..496439b --- /dev/null +++ b/cowsay-3.03-debian-02-remove_trailing_spaces.patch @@ -0,0 +1,28 @@ +Description: Removing trailing spaces + This is mainly to work-around broken word-wrapping by mail clients. +Forwarded: no +Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=276144#42 +Bug-Debian: http://bugs.debian.org/276144 +Author: Florian Ernst + +--- cowsay-3.03.orig/cowsay ++++ cowsay-3.03/cowsay +@@ -128,15 +132,16 @@ sub construct_balloon { + @border = qw[ / \ \ / | | ]; + } + } ++## no trailing spaces (#276144) + push(@balloon_lines, +- " " . ("_" x $max2) . " \n" , ++ " " . ("_" x $max2) . "\n" , + sprintf($format, $border[0], $message[0], $border[1]), + (@message < 2 ? "" : + map { sprintf($format, $border[4], $_, $border[5]) } + @message[1 .. $#message - 1]), + (@message < 2 ? "" : + sprintf($format, $border[2], $message[$#message], $border[3])), +- " " . ("-" x $max2) . " \n" ++ " " . ("-" x $max2) . "\n" + ); + } + diff --git a/cowsay-3.03-debian-utf8_width.patch b/cowsay-3.03-debian-utf8_width.patch new file mode 100644 index 0000000..0c3f86e --- /dev/null +++ b/cowsay-3.03-debian-utf8_width.patch @@ -0,0 +1,24 @@ +Description: utf8 support in input, output and arguments on utf8-enabled locales + Note that this is not a complete solution (doesn't support Chinese/Japanese + characters for example) but it's better than what we had. +Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=254557#27 +Bug-Debian: http://bugs.debian.org/254557 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/cowsay/+bug/393212 +Author: Damyan Ivanov + +--- a/cowsay ++++ b/cowsay +@@ -12,6 +12,13 @@ use File::Basename; + use Getopt::Std; + use Cwd; + ++if (${^UTF8LOCALE}) { ++ binmode STDIN, ':utf8'; ++ binmode STDOUT, ':utf8'; ++ require Encode; ++ eval { $_ = Encode::decode_utf8($_,1) } for @ARGV; ++} ++ + $version = "3.03"; + $progname = basename($0); + $eyes = "oo"; diff --git a/cowsay.spec b/cowsay.spec index c9b9148..bca9bdd 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -1,7 +1,7 @@ %define compdir %(pkg-config --variable=completionsdir bash-completion) Name: cowsay Version: 3.03 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games License: GPLv2+ or Artistic @@ -11,6 +11,11 @@ Source1: cowsay.bashcomp Source2: animalsay Patch0: cowsay-3.03-help.patch Patch1: mech-and-cow.patch +# these are from https://packages.debian.org/sid/cowsay +Patch2: cowsay-3.03-debian-01-empty_messages_fix.patch +Patch3: cowsay-3.03-debian-02-remove_trailing_spaces.patch +Patch4: cowsay-3.03-debian-utf8_width.patch + BuildArch: noarch BuildRequires: bash-completion @@ -34,6 +39,10 @@ pictures of other animals. mv cows/mech-and-cow cows/mech-and-cow.cow %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 + %build echo No need to build anything @@ -61,6 +70,9 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %changelog +* Fri Feb 20 2015 Matthew Miller - 3.03-17 +- include unicode and formatting fixes from Debian + * Fri Sep 26 2014 Rahul Sundaram - 3.03-16 - fix location of bash completion script - don't own /etc/bash_completion.d/ From a4c674fcffcf49471f303e4e06b08b8dc88f245f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 03:17:44 +0000 Subject: [PATCH 26/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index bca9bdd..7759def 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -1,7 +1,7 @@ %define compdir %(pkg-config --variable=completionsdir bash-completion) Name: cowsay Version: 3.03 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games License: GPLv2+ or Artistic @@ -70,6 +70,9 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 3.03-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri Feb 20 2015 Matthew Miller - 3.03-17 - include unicode and formatting fixes from Debian From b868d82aab16389179e53c5213350843ae8e037a Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Sun, 17 Jan 2016 23:37:08 +0100 Subject: [PATCH 27/80] Replace %define by %global --- cowsay.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index 7759def..d89e235 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -1,4 +1,5 @@ -%define compdir %(pkg-config --variable=completionsdir bash-completion) +%global compdir %(pkg-config --variable=completionsdir bash-completion) + Name: cowsay Version: 3.03 Release: 18%{?dist} From 94a4aa863f5c3e45c8cae19be36694b392d08fe7 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Sun, 17 Jan 2016 23:19:44 +0100 Subject: [PATCH 28/80] Avoid licensing issue with ASCII art BSD daemon We remove the daemon.cow from the binary RPM. --- cowsay.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cowsay.spec b/cowsay.spec index 7759def..09c2684 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -55,6 +55,9 @@ cp -p cows/* $RPM_BUILD_ROOT%{_datadir}/%{name} cp -p %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir} +# License issue +rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/daemon.cow + chmod +x $RPM_BUILD_ROOT%{_bindir}/animalsay ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/cowthink ln -s %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/cowthink.1 From 9aa588f33e19e9d91905cf4f58132d4f989e2afa Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 18:09:05 +0000 Subject: [PATCH 29/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index 4d52eb1..95ecb46 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -2,7 +2,7 @@ Name: cowsay Version: 3.03 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games License: GPLv2+ or Artistic @@ -74,6 +74,9 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 3.03-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sun Jan 17 2016 Hans Ulrich Niedermann - 3.03-19 - replace %%define by %%global - avoid license issue with daemon.cow by not shipping it in RPM From 2014c73485490cdc7072a129551cef8ca7493053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 24 Jun 2016 09:44:08 +0200 Subject: [PATCH 30/80] Mandatory Perl build-requires added --- cowsay.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/cowsay.spec b/cowsay.spec index 95ecb46..e49e813 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -19,6 +19,7 @@ Patch4: cowsay-3.03-debian-utf8_width.patch BuildArch: noarch BuildRequires: bash-completion +BuildRequires: perl-generators %description From 736a3c6facd002a7b312fa53ec882bbea36c71bf Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 12 Dec 2016 08:48:41 -0600 Subject: [PATCH 31/80] 3.04 --- .gitignore | 1 + cowsay.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 53e94e0..5016d90 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ cowsay-3.03.tar.gz +/cowsay-3.04.tar.gz diff --git a/cowsay.spec b/cowsay.spec index e49e813..653b313 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -1,13 +1,13 @@ %global compdir %(pkg-config --variable=completionsdir bash-completion) Name: cowsay -Version: 3.03 -Release: 20%{?dist} +Version: 3.04 +Release: 1%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games License: GPLv2+ or Artistic -URL: http://www.nog.net/~tony/warez/cowsay.shtml -Source0: http://www.nog.net/~tony/warez/%{name}-%{version}.tar.gz +URL: https://github.com/tnalpgge/rank-amateur-cowsay +Source0: %{url}/archive/%{name}-%{version}.tar.gz Source1: cowsay.bashcomp Source2: animalsay Patch0: cowsay-3.03-help.patch @@ -31,7 +31,7 @@ pictures of other animals. %prep -%setup -q +%setup -qn rank-amateur-cowsay-cowsay-%{version} %patch0 -p1 -b .help %{__sed} -e 's#%PREFIX%/share/cows#%{_datadir}/%{name}#' \ -e 's#%BANGPERL%#!%{__perl}#' -i %{name} @@ -75,6 +75,9 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %changelog +* Mon Dec 12 2016 Jon Ciesla - 3.04-1 +- 3.04, new upstream location, BZ 1403460. + * Wed Feb 03 2016 Fedora Release Engineering - 3.03-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 085bb53..2aec0b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b29169797359420dadb998079021a494 cowsay-3.03.tar.gz +SHA512 (cowsay-3.04.tar.gz) = 99d21ef9a7c7c76056cb7acb2c771fbdabfedde4f6edb5d3035337c59f9e88944690d1b43282c32827ad79339199716366c8be73b0dea09063ec2d52220c1b51 From b9183950d5991ca74c477c831c361fc688f6d678 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Wed, 14 Dec 2016 11:09:00 -0600 Subject: [PATCH 32/80] Drop perl-Acme-Cow requires. --- cowsay.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index 653b313..cfe49da 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -1,8 +1,9 @@ %global compdir %(pkg-config --variable=completionsdir bash-completion) +%global __requires_exclude .*Acme::Cow.* Name: cowsay Version: 3.04 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games License: GPLv2+ or Artistic @@ -75,6 +76,9 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %changelog +* Wed Dec 14 2016 Jon Ciesla - 3.04-2 +- Drop bogus Acme::Cow requirement, BZ 1404804. + * Mon Dec 12 2016 Jon Ciesla - 3.04-1 - 3.04, new upstream location, BZ 1403460. From 3c419da48199a40179c264210f217252f6934394 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 19 Dec 2016 09:48:47 -0600 Subject: [PATCH 33/80] License tag fix. --- cowsay.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cowsay.spec b/cowsay.spec index cfe49da..b978c8f 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -3,10 +3,10 @@ Name: cowsay Version: 3.04 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games -License: GPLv2+ or Artistic +License: GPLv3+ URL: https://github.com/tnalpgge/rank-amateur-cowsay Source0: %{url}/archive/%{name}-%{version}.tar.gz Source1: cowsay.bashcomp @@ -76,6 +76,9 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %changelog +* Mon Dec 19 2016 Jon Ciesla - 3.04-3 +- Fix license tag, BZ 1350114. + * Wed Dec 14 2016 Jon Ciesla - 3.04-2 - Drop bogus Acme::Cow requirement, BZ 1404804. From f25da9c90ee81b7fd4f9260063f744b900cbc159 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 9 Jan 2017 12:38:46 -0600 Subject: [PATCH 34/80] Require perl-Encode --- cowsay.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cowsay.spec b/cowsay.spec index b978c8f..2bf7b5e 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -3,7 +3,7 @@ Name: cowsay Version: 3.04 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games License: GPLv3+ @@ -21,7 +21,7 @@ Patch4: cowsay-3.03-debian-utf8_width.patch BuildArch: noarch BuildRequires: bash-completion BuildRequires: perl-generators - +Requires: perl-Encode %description cowsay is a configurable talking cow, written in Perl. It operates @@ -76,6 +76,9 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %changelog +* Mon Jan 09 2017 Jon Ciesla - 3.04-4 +- Require perl-Encode, BZ 1411168. + * Mon Dec 19 2016 Jon Ciesla - 3.04-3 - Fix license tag, BZ 1350114. From 4b499903d49f5882e2c14e4b3c11ff978aa261af Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 07:55:28 +0000 Subject: [PATCH 35/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index 2bf7b5e..01d086b 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -3,7 +3,7 @@ Name: cowsay Version: 3.04 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games License: GPLv3+ @@ -76,6 +76,9 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 3.04-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Jan 09 2017 Jon Ciesla - 3.04-4 - Require perl-Encode, BZ 1411168. From 370dc9c3d7de5b73bff1ec81be1fc7c38837aad2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 05:32:52 +0000 Subject: [PATCH 36/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index 01d086b..1bfec7c 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -3,7 +3,7 @@ Name: cowsay Version: 3.04 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games License: GPLv3+ @@ -76,6 +76,9 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 3.04-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 3.04-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 2f7c5e9129401c77c4b98759be232d35121df6fc Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Thu, 24 Aug 2017 15:08:34 -0400 Subject: [PATCH 37/80] add a simple readme file to the repo --- README | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 README diff --git a/README b/README new file mode 100644 index 0000000..35e2f72 --- /dev/null +++ b/README @@ -0,0 +1,9 @@ + ________________________________ +< Freedom Friends Features First > + -------------------------------- + \ ^__^ + \ (oo)\_______ + (__)\ )\/\ + ||----w | + || || + From 90d42c0271a18ffb48ddd0c81b378575dea1e550 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 20 Nov 2017 09:16:00 -0600 Subject: [PATCH 38/80] Split out -tasteless. --- cowsay.spec | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index 1bfec7c..ae45682 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -3,7 +3,7 @@ Name: cowsay Version: 3.04 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games License: GPLv3+ @@ -30,6 +30,13 @@ of silliness. It generates ASCII pictures of a cow with a message. It can also generate pictures of other animals. +%package tasteless +Summary: Tasteless .cow files +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +BuildArch: noarch + +%description tasteless +This package contains tasteless .cow files. %prep %setup -qn rank-amateur-cowsay-cowsay-%{version} @@ -72,10 +79,21 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %{_bindir}/* %{_mandir}/man1/cow* %{_datadir}/%{name} +%exclude %{_datadir}/cowsay/bong.cow +%exclude %{_datadir}/cowsay/sodomized.cow +%exclude %{_datadir}/cowsay/satanic.cow %(dirname %{compdir}) +%files tasteless +%{_datadir}/cowsay/bong.cow +%{_datadir}/cowsay/sodomized.cow +%{_datadir}/cowsay/satanic.cow + %changelog +* Mon Nov 20 2017 Gwyn Ciesla - 3.04-7 +- Split out -tasteless, 1515182. + * Wed Jul 26 2017 Fedora Release Engineering - 3.04-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 4d3ba6760b856b60d0b6eec23c0719b38c7cac53 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 20 Nov 2017 10:17:01 -0600 Subject: [PATCH 39/80] Drop tasteless. --- cowsay.spec | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/cowsay.spec b/cowsay.spec index ae45682..6a2a937 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -3,7 +3,7 @@ Name: cowsay Version: 3.04 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games License: GPLv3+ @@ -30,14 +30,6 @@ of silliness. It generates ASCII pictures of a cow with a message. It can also generate pictures of other animals. -%package tasteless -Summary: Tasteless .cow files -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -BuildArch: noarch - -%description tasteless -This package contains tasteless .cow files. - %prep %setup -qn rank-amateur-cowsay-cowsay-%{version} %patch0 -p1 -b .help @@ -84,13 +76,10 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %exclude %{_datadir}/cowsay/satanic.cow %(dirname %{compdir}) -%files tasteless -%{_datadir}/cowsay/bong.cow -%{_datadir}/cowsay/sodomized.cow -%{_datadir}/cowsay/satanic.cow - - %changelog +* Mon Nov 20 2017 Gwyn Ciesla - 3.04-8 +- Drop tastless content entirely. + * Mon Nov 20 2017 Gwyn Ciesla - 3.04-7 - Split out -tasteless, 1515182. From bbc7f8f360e33cd7d1c0bc07cfb1f9a4f829d824 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 05:48:06 +0000 Subject: [PATCH 40/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index 6a2a937..b639ac2 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -3,7 +3,7 @@ Name: cowsay Version: 3.04 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Configurable speaking/thinking cow Group: Amusements/Games License: GPLv3+ @@ -77,6 +77,9 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %(dirname %{compdir}) %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 3.04-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Mon Nov 20 2017 Gwyn Ciesla - 3.04-8 - Drop tastless content entirely. From a8c9bef9508b556e9a40fa43aec7ebac141f0a62 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Thu, 8 Feb 2018 09:44:15 -0500 Subject: [PATCH 41/80] spec file modernization (no group, no rm -rf) --- cowsay.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cowsay.spec b/cowsay.spec index b639ac2..3e9e86d 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -3,9 +3,8 @@ Name: cowsay Version: 3.04 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Configurable speaking/thinking cow -Group: Amusements/Games License: GPLv3+ URL: https://github.com/tnalpgge/rank-amateur-cowsay Source0: %{url}/archive/%{name}-%{version}.tar.gz @@ -49,7 +48,6 @@ mv cows/mech-and-cow cows/mech-and-cow.cow echo No need to build anything %install -rm -rf $RPM_BUILD_ROOT # using install.sh is not a good idea so let's make the install manually mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_datadir}/%{name},%{_sysconfdir}/bash_completion.d} cp -p %{name} $RPM_BUILD_ROOT%{_bindir} @@ -77,6 +75,9 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %(dirname %{compdir}) %changelog +* Thu Feb 08 2018 Matthew Miller - 3.04-10 +- spec file modernization (no group, no rm -rf) + * Wed Feb 07 2018 Fedora Release Engineering - 3.04-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 8be681dfeab29a44aa1f1f05687f31b1d672e72b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 22:16:45 +0000 Subject: [PATCH 42/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index 3e9e86d..e3dedfb 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -3,7 +3,7 @@ Name: cowsay Version: 3.04 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Configurable speaking/thinking cow License: GPLv3+ URL: https://github.com/tnalpgge/rank-amateur-cowsay @@ -75,6 +75,9 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %(dirname %{compdir}) %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 3.04-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Feb 08 2018 Matthew Miller - 3.04-10 - spec file modernization (no group, no rm -rf) From d43aec5f5de2826a8d96000f9949ddaaef3b4a9f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 16:19:33 +0000 Subject: [PATCH 43/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index e3dedfb..ba94da5 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -3,7 +3,7 @@ Name: cowsay Version: 3.04 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Configurable speaking/thinking cow License: GPLv3+ URL: https://github.com/tnalpgge/rank-amateur-cowsay @@ -75,6 +75,9 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %(dirname %{compdir}) %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 3.04-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 3.04-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 7bb93506cadbe17e5c6ed5e1bb7c3a1f05fca93a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 21:04:20 +0000 Subject: [PATCH 44/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index ba94da5..8de9c73 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -3,7 +3,7 @@ Name: cowsay Version: 3.04 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Configurable speaking/thinking cow License: GPLv3+ URL: https://github.com/tnalpgge/rank-amateur-cowsay @@ -75,6 +75,9 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %(dirname %{compdir}) %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 3.04-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 3.04-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From f40b6e9792d47ad36690cce2f55e6af3048ac7bb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 14:52:22 +0000 Subject: [PATCH 45/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index 8de9c73..5643ab7 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -3,7 +3,7 @@ Name: cowsay Version: 3.04 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Configurable speaking/thinking cow License: GPLv3+ URL: https://github.com/tnalpgge/rank-amateur-cowsay @@ -75,6 +75,9 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %(dirname %{compdir}) %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 3.04-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 3.04-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 80c2d5566f2ef05298f23308092c807c8d9cbadb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 14:37:17 +0000 Subject: [PATCH 46/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index 5643ab7..eae237c 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -3,7 +3,7 @@ Name: cowsay Version: 3.04 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Configurable speaking/thinking cow License: GPLv3+ URL: https://github.com/tnalpgge/rank-amateur-cowsay @@ -75,6 +75,9 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %(dirname %{compdir}) %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 3.04-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 3.04-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 291b998b6c2a6138180c338785970375ef49e411 Mon Sep 17 00:00:00 2001 From: Filipe Brandenburger Date: Thu, 19 Nov 2020 13:27:47 -0800 Subject: [PATCH 47/80] Add fox cow to cowsay The fox cow is included in the Debian/Ubuntu package of cowsay. Author has released it under the same license as cowsay itself: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=888229 Tested: ``` $ cowsay -f fox 'Crazy like a fox!' ___________________ < Crazy like a fox! > ------------------- \ ,-. .-, \ |-.\ __ /.-| \ \ ` ` / /_ _ \ < _`q p _ > <.._=/ \=_. > {`\()/`}`\ { } \ |{ } \ \ '--' .- \ |- / \ | | | | | ; | | |.;.,..__ | .-"";` `| / | / `-../____,..---'` ``` --- cowsay.spec | 9 ++++++++- fox-cow.patch | 24 ++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 fox-cow.patch diff --git a/cowsay.spec b/cowsay.spec index eae237c..b21a5bf 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -3,7 +3,7 @@ Name: cowsay Version: 3.04 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Configurable speaking/thinking cow License: GPLv3+ URL: https://github.com/tnalpgge/rank-amateur-cowsay @@ -16,6 +16,8 @@ Patch1: mech-and-cow.patch Patch2: cowsay-3.03-debian-01-empty_messages_fix.patch Patch3: cowsay-3.03-debian-02-remove_trailing_spaces.patch Patch4: cowsay-3.03-debian-utf8_width.patch +# More cows: +Patch5: fox-cow.patch BuildArch: noarch BuildRequires: bash-completion @@ -44,6 +46,8 @@ mv cows/mech-and-cow cows/mech-and-cow.cow %patch3 -p1 %patch4 -p1 +%patch5 -p1 + %build echo No need to build anything @@ -75,6 +79,9 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %(dirname %{compdir}) %changelog +* Thu Nov 19 2020 Filipe Brandenburger - 3.04-16 +- Add fox cow. + * Mon Jul 27 2020 Fedora Release Engineering - 3.04-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/fox-cow.patch b/fox-cow.patch new file mode 100644 index 0000000..5303eda --- /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/cows/fox.cow +@@ -0,0 +1,18 @@ ++$the_cow = < ++ <.._=/ \\=_. > ++ {`\\()/`}`\\ ++ { } \\ ++ |{ } \\ ++ \\ '--' .- \\ ++ |- / \\ ++ | | | | | ; ++ | | |.;.,..__ | ++ .-"";` `| ++ / | / ++ `-../____,..---'` ++EOC From b72e58356a261fff230dbcd5187d453774968a51 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 02:35:56 +0000 Subject: [PATCH 48/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index b21a5bf..dd3515c 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -3,7 +3,7 @@ Name: cowsay Version: 3.04 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Configurable speaking/thinking cow License: GPLv3+ URL: https://github.com/tnalpgge/rank-amateur-cowsay @@ -79,6 +79,9 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %(dirname %{compdir}) %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 3.04-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Nov 19 2020 Filipe Brandenburger - 3.04-16 - Add fox cow. From 8e1a6621a88347b132f675ffddfc339fab7bc5b9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 15:06:53 +0000 Subject: [PATCH 49/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 26de85af9444fe5330a7d69593720e2226f38172 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 13 Aug 2021 09:29:36 -0500 Subject: [PATCH 50/80] 3.7.0 --- .gitignore | 1 + animalsay | 4 +- ...ay-3.03-debian-01-empty_messages_fix.patch | 19 ------- ....03-debian-02-remove_trailing_spaces.patch | 28 ----------- cowsay-3.03-debian-utf8_width.patch | 24 --------- cowsay-3.03-help.patch | 11 ---- cowsay.spec | 50 +++++++------------ fox-cow.patch | 2 +- mech-and-cow.patch | 45 ----------------- sources | 2 +- 10 files changed, 22 insertions(+), 164 deletions(-) delete mode 100644 cowsay-3.03-debian-01-empty_messages_fix.patch delete mode 100644 cowsay-3.03-debian-02-remove_trailing_spaces.patch delete mode 100644 cowsay-3.03-debian-utf8_width.patch delete mode 100644 cowsay-3.03-help.patch delete mode 100644 mech-and-cow.patch diff --git a/.gitignore b/.gitignore index 5016d90..757bf60 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ cowsay-3.03.tar.gz /cowsay-3.04.tar.gz +/cowsay-3.7.0.tar.gz diff --git a/animalsay b/animalsay index 77c3461..b717763 100644 --- a/animalsay +++ b/animalsay @@ -2,13 +2,13 @@ NUM=0 TOL=0 -for cow in /usr/share/cowsay/*.cow ; do +for cow in /usr/share/cowsay/cows/*.cow ; do TOL=$((TOL+1)) done SELECT=$(((`date +%M | sed -e 's|^0||'`*60+`date +%S | sed -e 's|^0||'`)%(TOL))) -for cow in /usr/share/cowsay/*.cow ; do +for cow in /usr/share/cowsay/cows/*.cow ; do NUM=$((NUM+1)) if [ $NUM = $SELECT ] ; then break ; fi done diff --git a/cowsay-3.03-debian-01-empty_messages_fix.patch b/cowsay-3.03-debian-01-empty_messages_fix.patch deleted file mode 100644 index bb2ea7a..0000000 --- a/cowsay-3.03-debian-01-empty_messages_fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Work-around for broken baloons with empty messages -Forwarded: no -Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=165218#5 -Bug-Debian: http://bugs.debian.org/165218 -Author: Jeronimo Pellegrini - ---- cowsay-3.03.orig/cowsay -+++ cowsay-3.03/cowsay -@@ -106,6 +106,10 @@ sub maxlength { - $l = length $i; - $m = $l if ($l > $m); - } -+## maxlength patch from Jeronimo Pellegrini (Closes: #165218) -+ if ($m == -1) { -+ $m = 0; -+ } - return $m; - } - diff --git a/cowsay-3.03-debian-02-remove_trailing_spaces.patch b/cowsay-3.03-debian-02-remove_trailing_spaces.patch deleted file mode 100644 index 496439b..0000000 --- a/cowsay-3.03-debian-02-remove_trailing_spaces.patch +++ /dev/null @@ -1,28 +0,0 @@ -Description: Removing trailing spaces - This is mainly to work-around broken word-wrapping by mail clients. -Forwarded: no -Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=276144#42 -Bug-Debian: http://bugs.debian.org/276144 -Author: Florian Ernst - ---- cowsay-3.03.orig/cowsay -+++ cowsay-3.03/cowsay -@@ -128,15 +132,16 @@ sub construct_balloon { - @border = qw[ / \ \ / | | ]; - } - } -+## no trailing spaces (#276144) - push(@balloon_lines, -- " " . ("_" x $max2) . " \n" , -+ " " . ("_" x $max2) . "\n" , - sprintf($format, $border[0], $message[0], $border[1]), - (@message < 2 ? "" : - map { sprintf($format, $border[4], $_, $border[5]) } - @message[1 .. $#message - 1]), - (@message < 2 ? "" : - sprintf($format, $border[2], $message[$#message], $border[3])), -- " " . ("-" x $max2) . " \n" -+ " " . ("-" x $max2) . "\n" - ); - } - diff --git a/cowsay-3.03-debian-utf8_width.patch b/cowsay-3.03-debian-utf8_width.patch deleted file mode 100644 index 0c3f86e..0000000 --- a/cowsay-3.03-debian-utf8_width.patch +++ /dev/null @@ -1,24 +0,0 @@ -Description: utf8 support in input, output and arguments on utf8-enabled locales - Note that this is not a complete solution (doesn't support Chinese/Japanese - characters for example) but it's better than what we had. -Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=254557#27 -Bug-Debian: http://bugs.debian.org/254557 -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/cowsay/+bug/393212 -Author: Damyan Ivanov - ---- a/cowsay -+++ b/cowsay -@@ -12,6 +12,13 @@ use File::Basename; - use Getopt::Std; - use Cwd; - -+if (${^UTF8LOCALE}) { -+ binmode STDIN, ':utf8'; -+ binmode STDOUT, ':utf8'; -+ require Encode; -+ eval { $_ = Encode::decode_utf8($_,1) } for @ARGV; -+} -+ - $version = "3.03"; - $progname = basename($0); - $eyes = "oo"; diff --git a/cowsay-3.03-help.patch b/cowsay-3.03-help.patch deleted file mode 100644 index 1fc4b4a..0000000 --- a/cowsay-3.03-help.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -rup cowsay-3.03.orig/cowsay cowsay-3.03/cowsay ---- cowsay-3.03.orig/cowsay 2007-09-17 13:27:32.000000000 +0200 -+++ cowsay-3.03/cowsay 2007-09-17 13:28:04.000000000 +0200 -@@ -185,3 +185,7 @@ Usage: $progname [-bdgpstwy] [-h] [-e ey - [-l] [-n] [-T tongue] [-W wrapcolumn] [message] - EOF - } -+ -+sub main::HELP_MESSAGE { -+ display_usage; -+} diff --git a/cowsay.spec b/cowsay.spec index dd3515c..9ca542b 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -2,22 +2,15 @@ %global __requires_exclude .*Acme::Cow.* Name: cowsay -Version: 3.04 -Release: 17%{?dist} +Version: 3.7.0 +Release: 1%{?dist} Summary: Configurable speaking/thinking cow License: GPLv3+ -URL: https://github.com/tnalpgge/rank-amateur-cowsay -Source0: %{url}/archive/%{name}-%{version}.tar.gz +URL: https://github.com/cowsay-org/cowsay +Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Source1: cowsay.bashcomp Source2: animalsay -Patch0: cowsay-3.03-help.patch -Patch1: mech-and-cow.patch -# these are from https://packages.debian.org/sid/cowsay -Patch2: cowsay-3.03-debian-01-empty_messages_fix.patch -Patch3: cowsay-3.03-debian-02-remove_trailing_spaces.patch -Patch4: cowsay-3.03-debian-utf8_width.patch -# More cows: -Patch5: fox-cow.patch +Patch0: fox-cow.patch BuildArch: noarch BuildRequires: bash-completion @@ -32,35 +25,23 @@ It generates ASCII pictures of a cow with a message. It can also generate pictures of other animals. %prep -%setup -qn rank-amateur-cowsay-cowsay-%{version} -%patch0 -p1 -b .help -%{__sed} -e 's#%PREFIX%/share/cows#%{_datadir}/%{name}#' \ - -e 's#%BANGPERL%#!%{__perl}#' -i %{name} -%{__sed} -e 's#%PREFIX%/share/cows#%{_datadir}/%{name}#' \ - -e 's#/usr/local/share/cows#%{_datadir}/%{name}#' -i %{name}.1 +%setup -q -mv cows/mech-and-cow cows/mech-and-cow.cow -%patch1 -p1 - -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 - -%patch5 -p1 +%patch0 -p1 %build echo No need to build anything %install # using install.sh is not a good idea so let's make the install manually -mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_datadir}/%{name},%{_sysconfdir}/bash_completion.d} +mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_datadir}/%{name}/cows,%{_sysconfdir}/bash_completion.d} cp -p %{name} $RPM_BUILD_ROOT%{_bindir} -cp -p cows/* $RPM_BUILD_ROOT%{_datadir}/%{name} +cp -p share/cows/* $RPM_BUILD_ROOT%{_datadir}/%{name}/cows cp -p %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir} # License issue -rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/daemon.cow +rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/cows/daemon.cow chmod +x $RPM_BUILD_ROOT%{_bindir}/animalsay ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/cowthink @@ -69,16 +50,19 @@ mkdir -p $RPM_BUILD_ROOT%{compdir}/ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %files -%doc ChangeLog LICENSE README +%doc ChangeLog LICENSE.txt README* %{_bindir}/* %{_mandir}/man1/cow* %{_datadir}/%{name} -%exclude %{_datadir}/cowsay/bong.cow -%exclude %{_datadir}/cowsay/sodomized.cow -%exclude %{_datadir}/cowsay/satanic.cow +%exclude %{_datadir}/cowsay/cows/bong.cow +%exclude %{_datadir}/cowsay/cows/sodomized.cow +%exclude %{_datadir}/cowsay/cows/satanic.cow %(dirname %{compdir}) %changelog +* Fri Aug 13 2021 Gwyn Ciesla - 3.7.0-1 +- 3.7.0i, new upstream. + * Tue Jan 26 2021 Fedora Release Engineering - 3.04-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/fox-cow.patch b/fox-cow.patch index 5303eda..5ff22a0 100644 --- a/fox-cow.patch +++ b/fox-cow.patch @@ -2,7 +2,7 @@ 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/cows/fox.cow ++++ b/share/cows/fox.cow @@ -0,0 +1,18 @@ +$the_cow = < Date: Wed, 19 Jan 2022 23:52:46 +0000 Subject: [PATCH 51/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index 9ca542b..ac7119a 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -3,7 +3,7 @@ Name: cowsay Version: 3.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Configurable speaking/thinking cow License: GPLv3+ URL: https://github.com/cowsay-org/cowsay @@ -60,6 +60,9 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %(dirname %{compdir}) %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 3.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Aug 13 2021 Gwyn Ciesla - 3.7.0-1 - 3.7.0i, new upstream. From 5a9b158171e0e99416065256a53383dd1310617e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 23:37:31 +0000 Subject: [PATCH 52/80] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index ac7119a..00666ea 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -3,7 +3,7 @@ Name: cowsay Version: 3.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Configurable speaking/thinking cow License: GPLv3+ URL: https://github.com/cowsay-org/cowsay @@ -60,6 +60,9 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %(dirname %{compdir}) %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 3.7.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 3.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From d9498eb9cd8d10cfeeb2f678d1841c96ab96ee5c Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Wed, 10 Aug 2022 22:50:58 +0200 Subject: [PATCH 53/80] Stop packaging cows in the unsupported *.pm format The cowsay code does not support cows in the *.pm format. As "cowsay -r" occasionally selects one unsupported *.pm format cow purely by chance, "cowsay -r" will produce an error message instead of a cow in these occasions. Not packaging the *.pm cows avoids the issue until upstream either stops considering unsupported cows for random selection or implements support for *.pm format cows. The upstream bug is https://github.com/cowsay-org/cowsay/issues/22 and affects at least cowsay-3.7.0. It is currently marked to be resolved in cowsay-3.8.0 (the random selection part, not the *.pm implementation part). --- cowsay.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index 00666ea..b091ef3 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -3,7 +3,7 @@ Name: cowsay Version: 3.7.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Configurable speaking/thinking cow License: GPLv3+ URL: https://github.com/cowsay-org/cowsay @@ -54,12 +54,16 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %{_bindir}/* %{_mandir}/man1/cow* %{_datadir}/%{name} +%exclude %{_datadir}/cowsay/cows/*.pm %exclude %{_datadir}/cowsay/cows/bong.cow %exclude %{_datadir}/cowsay/cows/sodomized.cow %exclude %{_datadir}/cowsay/cows/satanic.cow %(dirname %{compdir}) %changelog +* Wed Aug 10 2022 Hans Ulrich Niedermann - 3.7.0-4 +- Stop packaging cows in the unsupported *.pm format + * Wed Jul 20 2022 Fedora Release Engineering - 3.7.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 5d3d4b296bb0b65bf6f7ff50b177b734f55974e4 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Wed, 10 Aug 2022 23:37:43 +0200 Subject: [PATCH 54/80] Fix mixed use of spaces and tabs in spec file Fix mixed use of spaces and tabs in spec file. rpmlint complains about it, and adapting that one line to use the same formatting as all other lines do certainly does not hurt. --- cowsay.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index b091ef3..e32e885 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -15,7 +15,7 @@ Patch0: fox-cow.patch BuildArch: noarch BuildRequires: bash-completion BuildRequires: perl-generators -Requires: perl-Encode +Requires: perl-Encode %description cowsay is a configurable talking cow, written in Perl. It operates From ef7782ce32c5b9061f51468809fe56e67b288ebd Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Mon, 15 Aug 2022 10:33:44 +0200 Subject: [PATCH 55/80] Ensure /usr/bin/animalsay mode is 0755 Ensure /usr/bin/animalsay mode is 0755 (not 0775). File mode 0775 has happened at least for my mockbuild environment. To achieve a certain file mode of 0755, we * change the git permissions of animalsay from 0664 to 0644 * use "install" instead of "cp" for installing the file * explicitly tell "install" to install with -m 0755 --- animalsay | 0 cowsay.spec | 8 +++++--- 2 files changed, 5 insertions(+), 3 deletions(-) mode change 100644 => 100755 animalsay diff --git a/animalsay b/animalsay old mode 100644 new mode 100755 diff --git a/cowsay.spec b/cowsay.spec index e32e885..8451fb9 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -3,7 +3,7 @@ Name: cowsay Version: 3.7.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Configurable speaking/thinking cow License: GPLv3+ URL: https://github.com/cowsay-org/cowsay @@ -38,16 +38,15 @@ mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_datadir}/%{name}/cows,%{_ cp -p %{name} $RPM_BUILD_ROOT%{_bindir} cp -p share/cows/* $RPM_BUILD_ROOT%{_datadir}/%{name}/cows cp -p %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1 -cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir} # License issue rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/cows/daemon.cow -chmod +x $RPM_BUILD_ROOT%{_bindir}/animalsay ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/cowthink ln -s %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/cowthink.1 mkdir -p $RPM_BUILD_ROOT%{compdir}/ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ +install -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir} %files %doc ChangeLog LICENSE.txt README* @@ -61,6 +60,9 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ %(dirname %{compdir}) %changelog +* Mon Aug 15 2022 Hans Ulrich Niedermann - 3.7.0-5 +- Ensure /usr/bin/animalsay file mode is 0755 + * Wed Aug 10 2022 Hans Ulrich Niedermann - 3.7.0-4 - Stop packaging cows in the unsupported *.pm format From a3eb4ebf242b49e87218cf0789ac259488828a02 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Mon, 15 Aug 2022 10:34:28 +0200 Subject: [PATCH 56/80] Use "install" command for installing dirs and files Use "install" for installing all dirs and files. As the name suggests, the "install" command is the program for installing files (and directories), as it will e.g. ignore the umask (unlike the "cp" command). --- cowsay.spec | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/cowsay.spec b/cowsay.spec index 8451fb9..adffb61 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -33,20 +33,28 @@ pictures of other animals. echo No need to build anything %install -# using install.sh is not a good idea so let's make the install manually -mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_datadir}/%{name}/cows,%{_sysconfdir}/bash_completion.d} -cp -p %{name} $RPM_BUILD_ROOT%{_bindir} -cp -p share/cows/* $RPM_BUILD_ROOT%{_datadir}/%{name}/cows -cp -p %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1 +# 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 %{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 %{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%{_datadir}/%{name}/cows +install -p -m 0644 share/cows/* $RPM_BUILD_ROOT%{_datadir}/%{name}/cows + +# Install actions specific to the Fedora package # License issue rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/cows/daemon.cow - -ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/cowthink -ln -s %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/cowthink.1 -mkdir -p $RPM_BUILD_ROOT%{compdir}/ -cp %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/ +# animalsay install -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir} +# bash completion file +install -d -m 0755 $RPM_BUILD_ROOT%{compdir} +install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir} %files %doc ChangeLog LICENSE.txt README* @@ -62,6 +70,7 @@ install -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir} %changelog * Mon Aug 15 2022 Hans Ulrich Niedermann - 3.7.0-5 - Ensure /usr/bin/animalsay file mode is 0755 +- Use "install" command for installing dirs and files * Wed Aug 10 2022 Hans Ulrich Niedermann - 3.7.0-4 - Stop packaging cows in the unsupported *.pm format From 5aa4b4f5662046759660a538da862bd5aabced22 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Mon, 15 Aug 2022 10:34:28 +0200 Subject: [PATCH 57/80] Change name of bash completion file to just "cowsay" Change the name of the installed bash completion file from "cowsay.bashcomp" to "cowsay". Of the 1000+ files in /usr/share/bash-completion/completions/ on my system, no other file is called "*.bashcomp". Most are just called the same as their respective command. We also let the filesystem package take care of owning the directory /usr/share/bash-completion/ and its subdirectories. --- cowsay.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cowsay.spec b/cowsay.spec index adffb61..c8eb21a 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -16,6 +16,8 @@ BuildArch: noarch BuildRequires: bash-completion BuildRequires: perl-generators Requires: perl-Encode +# introduced /usr/share/bash-completion/... +Requires: filesystem >= 3.6-1 %description cowsay is a configurable talking cow, written in Perl. It operates @@ -54,7 +56,7 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/cows/daemon.cow install -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir} # bash completion file install -d -m 0755 $RPM_BUILD_ROOT%{compdir} -install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir} +install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/%{name} %files %doc ChangeLog LICENSE.txt README* @@ -65,12 +67,13 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir} %exclude %{_datadir}/cowsay/cows/bong.cow %exclude %{_datadir}/cowsay/cows/sodomized.cow %exclude %{_datadir}/cowsay/cows/satanic.cow -%(dirname %{compdir}) +%{compdir}/%{name} %changelog * Mon Aug 15 2022 Hans Ulrich Niedermann - 3.7.0-5 - Ensure /usr/bin/animalsay file mode is 0755 - Use "install" command for installing dirs and files +- Change name of bash completion file to just "cowsay" * Wed Aug 10 2022 Hans Ulrich Niedermann - 3.7.0-4 - Stop packaging cows in the unsupported *.pm format From d6487aed350be2b0c97cce67a9f099aed2b4180b Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Mon, 15 Aug 2022 10:34:28 +0200 Subject: [PATCH 58/80] Define and use rpm macro for cows directory Define and use rpm macro for cows directory (DRY). --- cowsay.spec | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/cowsay.spec b/cowsay.spec index c8eb21a..19e592c 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -1,6 +1,8 @@ %global compdir %(pkg-config --variable=completionsdir bash-completion) %global __requires_exclude .*Acme::Cow.* +%global cowsdir %{_datadir}/%{name}/cows + Name: cowsay Version: 3.7.0 Release: 5%{?dist} @@ -45,8 +47,8 @@ install -d -m 0755 $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%{_datadir}/%{name}/cows -install -p -m 0644 share/cows/* $RPM_BUILD_ROOT%{_datadir}/%{name}/cows +install -d -m 0755 $RPM_BUILD_ROOT%{cowsdir} +install -p -m 0644 share/cows/* $RPM_BUILD_ROOT%{cowsdir} # Install actions specific to the Fedora package @@ -62,11 +64,12 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/%{name} %doc ChangeLog LICENSE.txt README* %{_bindir}/* %{_mandir}/man1/cow* -%{_datadir}/%{name} -%exclude %{_datadir}/cowsay/cows/*.pm -%exclude %{_datadir}/cowsay/cows/bong.cow -%exclude %{_datadir}/cowsay/cows/sodomized.cow -%exclude %{_datadir}/cowsay/cows/satanic.cow +%dir %{_datadir}/%{name} +%{cowsdir} +%exclude %{cowsdir}/*.pm +%exclude %{cowsdir}/bong.cow +%exclude %{cowsdir}/sodomized.cow +%exclude %{cowsdir}/satanic.cow %{compdir}/%{name} %changelog @@ -74,6 +77,7 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/%{name} - Ensure /usr/bin/animalsay file mode is 0755 - Use "install" command for installing dirs and files - Change name of bash completion file to just "cowsay" +- Define and use macro for cows directory * Wed Aug 10 2022 Hans Ulrich Niedermann - 3.7.0-4 - Stop packaging cows in the unsupported *.pm format From 80eb0c801a389520fe10054e3b53ecd77d57866c Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Mon, 15 Aug 2022 10:34:28 +0200 Subject: [PATCH 59/80] Install empty site-cows directory for site specific cows Upstream's "make install" does install an empty /usr/share/cowsay/site-cows/ directory into which local site specific cows can be placed, so reimplement *and* *package* that. --- cowsay.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cowsay.spec b/cowsay.spec index 19e592c..4e1937e 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -2,6 +2,7 @@ %global __requires_exclude .*Acme::Cow.* %global cowsdir %{_datadir}/%{name}/cows +%global sitecowsdir %{_datadir}/%{name}/site-cows Name: cowsay Version: 3.7.0 @@ -50,6 +51,8 @@ ln -s %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/cowthink.1 install -d -m 0755 $RPM_BUILD_ROOT%{cowsdir} install -p -m 0644 share/cows/* $RPM_BUILD_ROOT%{cowsdir} +install -d -m 0755 $RPM_BUILD_ROOT%{sitecowsdir} + # Install actions specific to the Fedora package # License issue @@ -70,6 +73,7 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/%{name} %exclude %{cowsdir}/bong.cow %exclude %{cowsdir}/sodomized.cow %exclude %{cowsdir}/satanic.cow +%dir %{sitecowsdir} %{compdir}/%{name} %changelog @@ -78,6 +82,7 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/%{name} - Use "install" command for installing dirs and files - Change name of bash completion file to just "cowsay" - Define and use macro for cows directory +- Install empty site-cows directory for site specific cows * Wed Aug 10 2022 Hans Ulrich Niedermann - 3.7.0-4 - Stop packaging cows in the unsupported *.pm format From 5d32962217eadeaba824f843d5355d8c0d318e50 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Mon, 15 Aug 2022 10:34:28 +0200 Subject: [PATCH 60/80] Fix bash completion to look in actual cow directories Fix bash completion to look in the actual cows/ directory. It appears that cowsay used to store its cows in /usr/share/cowsay and that is where the cowsay.bashcomp file also looked. However, cowsay now stores its cows in /usr/share/cowsay/cows, so the bash completion should look there as well. Note that the bash completion should also look into /usr/share/cowsay/site-cows/ and wherever else cowsay looks for cows. --- cowsay.bashcomp | 4 ++-- cowsay.spec | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cowsay.bashcomp b/cowsay.bashcomp index 77d8be9..bc341c8 100644 --- a/cowsay.bashcomp +++ b/cowsay.bashcomp @@ -20,8 +20,8 @@ _cowsay() { case "${prev}" in -f) - COMPREPLY=( $( command ls /usr/share/cowsay| \ - sed -ne 's/^\('$cur'.*\)\.cow$/\1/p') ) + COMPREPLY=( $( command ls /usr/share/cowsay/cows| \ + sed -ne 's|^\('$cur'.*\)\.cow$|\1|p') ) return 0 ;; -[eTW]) diff --git a/cowsay.spec b/cowsay.spec index 4e1937e..9943945 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -83,6 +83,7 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/%{name} - Change name of bash completion file to just "cowsay" - Define and use macro for cows directory - Install empty site-cows directory for site specific cows +- Fix bash completion to look in actual cows/ directory * Wed Aug 10 2022 Hans Ulrich Niedermann - 3.7.0-4 - Stop packaging cows in the unsupported *.pm format From d2cb780a1aa9acf6ce077802d2672b9a3ae2ec51 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Tue, 16 Aug 2022 00:47:01 +0200 Subject: [PATCH 61/80] fix package %description grammatical typo --- cowsay.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index 9943945..e758cd0 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -24,7 +24,7 @@ Requires: filesystem >= 3.6-1 %description cowsay is a configurable talking cow, written in Perl. It operates -much as the figlet program does, and it written in the same spirit +much as the figlet program does, and it is written in the same spirit of silliness. It generates ASCII pictures of a cow with a message. It can also generate pictures of other animals. From 82e420a7145ab0f1d2ccb7045f211a4972f844a5 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Mon, 22 Aug 2022 16:42:51 +0200 Subject: [PATCH 62/80] 3.7.0-6 ship /etc/cowsay/cowpath.d directory --- cowsay.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index e758cd0..1900e0a 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -6,7 +6,7 @@ Name: cowsay Version: 3.7.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Configurable speaking/thinking cow License: GPLv3+ URL: https://github.com/cowsay-org/cowsay @@ -53,6 +53,8 @@ install -p -m 0644 share/cows/* $RPM_BUILD_ROOT%{cowsdir} install -d -m 0755 $RPM_BUILD_ROOT%{sitecowsdir} +install -d -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/cowpath.d + # Install actions specific to the Fedora package # License issue @@ -65,6 +67,8 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/%{name} %files %doc ChangeLog LICENSE.txt README* +%dir %{_sysconfdir}/%{name} +%dir %{_sysconfdir}/%{name}/cowpath.d %{_bindir}/* %{_mandir}/man1/cow* %dir %{_datadir}/%{name} @@ -77,6 +81,9 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/%{name} %{compdir}/%{name} %changelog +* Mon Aug 22 2022 Hans Ulrich Niedermann - 3.7.0-6 +- ship /etc/cowsay/cowpath.d directory + * Mon Aug 15 2022 Hans Ulrich Niedermann - 3.7.0-5 - Ensure /usr/bin/animalsay file mode is 0755 - Use "install" command for installing dirs and files From 2c11944a72e4d745ecaa5477df592eea830633be Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 00:32:52 +0000 Subject: [PATCH 63/80] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index 1900e0a..f204421 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -6,7 +6,7 @@ Name: cowsay Version: 3.7.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Configurable speaking/thinking cow License: GPLv3+ URL: https://github.com/cowsay-org/cowsay @@ -81,6 +81,9 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/%{name} %{compdir}/%{name} %changelog +* 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 From 063b199fc40d2ba110839396cc6a0ee24c3134b6 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 28 Feb 2023 10:45:28 -0600 Subject: [PATCH 64/80] migrated to SPDX license --- cowsay.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cowsay.spec b/cowsay.spec index f204421..77c4c26 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -6,9 +6,9 @@ Name: cowsay Version: 3.7.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Configurable speaking/thinking cow -License: GPLv3+ +License: GPL-2.0-or-later URL: https://github.com/cowsay-org/cowsay Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Source1: cowsay.bashcomp @@ -81,6 +81,9 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/%{name} %{compdir}/%{name} %changelog +* 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 From e4760c6bc8374ae2d77ba7aadeafe83fdf3cf62b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 16:26:20 +0000 Subject: [PATCH 65/80] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index 77c4c26..2664e70 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -6,7 +6,7 @@ Name: cowsay Version: 3.7.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Configurable speaking/thinking cow License: GPL-2.0-or-later URL: https://github.com/cowsay-org/cowsay @@ -81,6 +81,9 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/%{name} %{compdir}/%{name} %changelog +* 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 From 244ad5ef41648c6d799c63efa2fa1c614c385675 Mon Sep 17 00:00:00 2001 From: Perry Myers Date: Thu, 18 Jan 2024 14:11:00 -0500 Subject: [PATCH 66/80] Remove some additional tasteless content missed before --- cowsay.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index 2664e70..b71501b 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -6,7 +6,7 @@ Name: cowsay Version: 3.7.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Configurable speaking/thinking cow License: GPL-2.0-or-later URL: https://github.com/cowsay-org/cowsay @@ -77,10 +77,16 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/%{name} %exclude %{cowsdir}/bong.cow %exclude %{cowsdir}/sodomized.cow %exclude %{cowsdir}/satanic.cow +%exclude %{cowsdir}/telebears.cow +%exclude %{cowsdir}/head-in.cow +%exclude %{cowsdir}/mutilated.cow %dir %{sitecowsdir} %{compdir}/%{name} %changelog +* 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 From f6a199834213277d61750f3f6471df1d539f0b88 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 18 Jan 2024 13:18:24 -0600 Subject: [PATCH 67/80] Convert patch macro --- cowsay.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index b71501b..d626005 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -32,7 +32,7 @@ pictures of other animals. %prep %setup -q -%patch0 -p1 +%patch -P 0 -p1 %build echo No need to build anything From 4747f16bd95a5dcfc76568491d95f0627be89394 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 16:13:53 +0000 Subject: [PATCH 68/80] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index d626005..af710fc 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -6,7 +6,7 @@ Name: cowsay Version: 3.7.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Configurable speaking/thinking cow License: GPL-2.0-or-later URL: https://github.com/cowsay-org/cowsay @@ -84,6 +84,9 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/%{name} %{compdir}/%{name} %changelog +* 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 From e8ee4d2ac94678bf60d066ab4ccd538196247d83 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 08:10:46 +0000 Subject: [PATCH 69/80] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index af710fc..14f5f27 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -6,7 +6,7 @@ Name: cowsay Version: 3.7.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Configurable speaking/thinking cow License: GPL-2.0-or-later URL: https://github.com/cowsay-org/cowsay @@ -84,6 +84,9 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/%{name} %{compdir}/%{name} %changelog +* 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 From de7395bcf10c384075c8682bd5e781e5aa33d5fc Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 18 Mar 2024 10:49:59 -0500 Subject: [PATCH 70/80] Fix bash-completion BR --- cowsay.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cowsay.spec b/cowsay.spec index 14f5f27..db7dfce 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -6,7 +6,7 @@ Name: cowsay Version: 3.7.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Configurable speaking/thinking cow License: GPL-2.0-or-later URL: https://github.com/cowsay-org/cowsay @@ -16,7 +16,7 @@ Source2: animalsay Patch0: fox-cow.patch BuildArch: noarch -BuildRequires: bash-completion +BuildRequires: pkgconfig(bash-completion) BuildRequires: perl-generators Requires: perl-Encode # introduced /usr/share/bash-completion/... @@ -84,6 +84,9 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/%{name} %{compdir}/%{name} %changelog +* 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 From fda7e5c0c9c2c66cfc52c9ec2e7e0e2a0f0baad0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 20:03:00 +0000 Subject: [PATCH 71/80] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index db7dfce..2af8093 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -6,7 +6,7 @@ Name: cowsay Version: 3.7.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Configurable speaking/thinking cow License: GPL-2.0-or-later URL: https://github.com/cowsay-org/cowsay @@ -84,6 +84,9 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/%{name} %{compdir}/%{name} %changelog +* 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 From e8ab827979e56818f856d8b19322eac5384555b9 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 8 Aug 2024 10:09:09 -0500 Subject: [PATCH 72/80] 3.8.1 --- .gitignore | 1 + cowsay.spec | 12 ++++++------ fox-cow.patch | 24 ------------------------ sources | 2 +- 4 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 fox-cow.patch diff --git a/.gitignore b/.gitignore index 757bf60..4fd1acd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ cowsay-3.03.tar.gz /cowsay-3.04.tar.gz /cowsay-3.7.0.tar.gz +/cowsay-3.8.1.tar.gz diff --git a/cowsay.spec b/cowsay.spec index 2af8093..036702e 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -5,15 +5,14 @@ %global sitecowsdir %{_datadir}/%{name}/site-cows Name: cowsay -Version: 3.7.0 -Release: 14%{?dist} +Version: 3.8.1 +Release: 1%{?dist} Summary: Configurable speaking/thinking cow License: GPL-2.0-or-later 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) @@ -32,8 +31,6 @@ pictures of other animals. %prep %setup -q -%patch -P 0 -p1 - %build echo No need to build anything @@ -66,7 +63,7 @@ install -d -m 0755 $RPM_BUILD_ROOT%{compdir} install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/%{name} %files -%doc ChangeLog LICENSE.txt README* +%doc LICENSE.txt README* %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/cowpath.d %{_bindir}/* @@ -84,6 +81,9 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/%{name} %{compdir}/%{name} %changelog +* 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 diff --git a/fox-cow.patch b/fox-cow.patch deleted file mode 100644 index 5ff22a0..0000000 --- a/fox-cow.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 c051d7d..6511900 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cowsay-3.7.0.tar.gz) = 92c169350049d894c36ec753f0b7eb9250da7839d9f1eedcad1ff5d9f2cff188bd1509dabd3b4dd562bdd0e660e80e6a437c7f260ce5b2376b7ef624f0ee673b +SHA512 (cowsay-3.8.1.tar.gz) = dc08f9643b3731fe6e0d99e7ab97e5e13542159a916311b0054a7fb7fc701b3881c48409839a552bc7447e3c6741262ea7ce83bf2e7ed12a964ca050d3e6f82a From 5fd3de1dc10b855376a903f2d406c40e2523c19f Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Thu, 8 Aug 2024 16:45:36 +0200 Subject: [PATCH 73/80] spec file: consistent header indentation --- cowsay.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cowsay.spec b/cowsay.spec index 036702e..abcaff6 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -8,7 +8,7 @@ Name: cowsay Version: 3.8.1 Release: 1%{?dist} Summary: Configurable speaking/thinking cow -License: GPL-2.0-or-later +License: GPL-2.0-or-later URL: https://github.com/cowsay-org/cowsay Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Source1: cowsay.bashcomp @@ -19,7 +19,7 @@ BuildRequires: pkgconfig(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 From 4a86ef51a8f5a6c10f53e1e4ded3b343ddf13ca1 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Thu, 8 Aug 2024 17:16:12 +0200 Subject: [PATCH 74/80] make %files list more explicit (fewer wildcards) --- cowsay.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cowsay.spec b/cowsay.spec index abcaff6..c5f54ce 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -63,11 +63,14 @@ install -d -m 0755 $RPM_BUILD_ROOT%{compdir} install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/%{name} %files -%doc LICENSE.txt README* +%doc LICENSE.txt README README.md %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/cowpath.d -%{_bindir}/* -%{_mandir}/man1/cow* +%{_bindir}/animalsay +%{_bindir}/cowsay +%{_bindir}/cowthink +%{_mandir}/man1/cowsay.1* +%{_mandir}/man1/cowthink.1* %dir %{_datadir}/%{name} %{cowsdir} %exclude %{cowsdir}/*.pm From 1ca832c699ef2697f862fc7f72aae77aa88aca80 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Thu, 8 Aug 2024 17:18:45 +0200 Subject: [PATCH 75/80] Install CHANGELOG.md doc file --- cowsay.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cowsay.spec b/cowsay.spec index c5f54ce..4e6d580 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -6,7 +6,7 @@ Name: cowsay Version: 3.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Configurable speaking/thinking cow License: GPL-2.0-or-later URL: https://github.com/cowsay-org/cowsay @@ -63,7 +63,7 @@ install -d -m 0755 $RPM_BUILD_ROOT%{compdir} install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/%{name} %files -%doc LICENSE.txt README README.md +%doc CHANGELOG.md LICENSE.txt README README.md %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/cowpath.d %{_bindir}/animalsay @@ -84,6 +84,9 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/%{name} %{compdir}/%{name} %changelog +* 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 From 8fafe2d336fa838c57678514e35893b774d63438 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 20 Aug 2024 09:06:50 -0500 Subject: [PATCH 76/80] 3.8.2 --- .gitignore | 1 + cowsay.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4fd1acd..3ba9da6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ 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 diff --git a/cowsay.spec b/cowsay.spec index 4e6d580..1297b2e 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -5,8 +5,8 @@ %global sitecowsdir %{_datadir}/%{name}/site-cows Name: cowsay -Version: 3.8.1 -Release: 2%{?dist} +Version: 3.8.2 +Release: 1%{?dist} Summary: Configurable speaking/thinking cow License: GPL-2.0-or-later URL: https://github.com/cowsay-org/cowsay @@ -84,6 +84,9 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/%{name} %{compdir}/%{name} %changelog +* 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 diff --git a/sources b/sources index 6511900..484d3e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cowsay-3.8.1.tar.gz) = dc08f9643b3731fe6e0d99e7ab97e5e13542159a916311b0054a7fb7fc701b3881c48409839a552bc7447e3c6741262ea7ce83bf2e7ed12a964ca050d3e6f82a +SHA512 (cowsay-3.8.2.tar.gz) = defe9ce38ce89c0034b09d7fe6471111b955f1779fcecbd79a1887388b499ca2da7126c648cf6c04a836fc923f2c72a8081ede3bbd543b930d4ad8311df23b41 From 8c6c18cfdb8622b0efb425f967ae2b1ef10aed78 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 22 Aug 2024 09:30:16 -0500 Subject: [PATCH 77/80] 3.8.3 --- .gitignore | 1 + cowsay.spec | 15 +++++++-------- sources | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 3ba9da6..4a46f46 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ cowsay-3.03.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 diff --git a/cowsay.spec b/cowsay.spec index 1297b2e..e769bde 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -5,7 +5,7 @@ %global sitecowsdir %{_datadir}/%{name}/site-cows Name: cowsay -Version: 3.8.2 +Version: 3.8.3 Release: 1%{?dist} Summary: Configurable speaking/thinking cow License: GPL-2.0-or-later @@ -38,15 +38,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 %{name} $RPM_BUILD_ROOT%{_bindir} +install -p -m 0755 bin/%{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 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1 +install -p -m 0644 man/man1/%{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/cows/* $RPM_BUILD_ROOT%{cowsdir} +install -p -m 0644 share/cowsay/cows/* $RPM_BUILD_ROOT%{cowsdir} install -d -m 0755 $RPM_BUILD_ROOT%{sitecowsdir} @@ -73,17 +73,16 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/%{name} %{_mandir}/man1/cowthink.1* %dir %{_datadir}/%{name} %{cowsdir} -%exclude %{cowsdir}/*.pm %exclude %{cowsdir}/bong.cow -%exclude %{cowsdir}/sodomized.cow -%exclude %{cowsdir}/satanic.cow -%exclude %{cowsdir}/telebears.cow %exclude %{cowsdir}/head-in.cow %exclude %{cowsdir}/mutilated.cow %dir %{sitecowsdir} %{compdir}/%{name} %changelog +* 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 diff --git a/sources b/sources index 484d3e4..8878dac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cowsay-3.8.2.tar.gz) = defe9ce38ce89c0034b09d7fe6471111b955f1779fcecbd79a1887388b499ca2da7126c648cf6c04a836fc923f2c72a8081ede3bbd543b930d4ad8311df23b41 +SHA512 (cowsay-3.8.3.tar.gz) = 4015df099a93487cef26eba65d1e40e6d68c3c4deb6b3674235e8575f5a0a6a41ff4250d2b908a1d8261cc1940ff7f6a44f027fcf37a907fe25e9846e35ff2bb From 1752bd2731347f177e01420a7cd86f18ed3cc42e Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 2 Dec 2024 13:27:50 -0600 Subject: [PATCH 78/80] 3.8.4 --- .gitignore | 1 + cowsay.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4a46f46..6f3c533 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ cowsay-3.03.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 e769bde..2b9d757 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -5,7 +5,7 @@ %global sitecowsdir %{_datadir}/%{name}/site-cows Name: cowsay -Version: 3.8.3 +Version: 3.8.4 Release: 1%{?dist} Summary: Configurable speaking/thinking cow License: GPL-2.0-or-later @@ -80,6 +80,9 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/%{name} %{compdir}/%{name} %changelog +* 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 diff --git a/sources b/sources index 8878dac..aa7d49c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cowsay-3.8.3.tar.gz) = 4015df099a93487cef26eba65d1e40e6d68c3c4deb6b3674235e8575f5a0a6a41ff4250d2b908a1d8261cc1940ff7f6a44f027fcf37a907fe25e9846e35ff2bb +SHA512 (cowsay-3.8.4.tar.gz) = 58e6a28e3205a3dd50c899c207b58592c43f8485dc44d3dc8de41bc480ec6d7e5a14e74769c8bb983d401004dce99f040c7a095839056861b7aa6aae71e08bb7 From 790dad452d88d1556d9de85daa19970c5e6c3fba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 14:39:47 +0000 Subject: [PATCH 79/80] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index 2b9d757..e86a387 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -6,7 +6,7 @@ Name: cowsay Version: 3.8.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Configurable speaking/thinking cow License: GPL-2.0-or-later URL: https://github.com/cowsay-org/cowsay @@ -80,6 +80,9 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/%{name} %{compdir}/%{name} %changelog +* 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 From 3ed7976227ed9b7eccfb5025116a64a379efc4a6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:43:57 +0000 Subject: [PATCH 80/80] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- cowsay.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cowsay.spec b/cowsay.spec index e86a387..53c8eb6 100644 --- a/cowsay.spec +++ b/cowsay.spec @@ -6,7 +6,7 @@ Name: cowsay Version: 3.8.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Configurable speaking/thinking cow License: GPL-2.0-or-later URL: https://github.com/cowsay-org/cowsay @@ -80,6 +80,9 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{compdir}/%{name} %{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