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 1/5] - 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 2/5] 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 3/5] 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 b3a51b391920937d81e92bc7e3d9063b0234ea6b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:33:22 +0000 Subject: [PATCH 4/5] 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 5/5] 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