[txt2man/el5/master] Updated to latest upstream with modified patch for consistency
Adam Miller
maxamillion at fedoraproject.org
Tue May 10 13:42:58 UTC 2011
commit 495224cc2bff32e95a0dd70b2c13d1d22d6c07f6
Author: Adam Miller <maxamillion at fedoraproject.org>
Date: Tue May 10 08:42:36 2011 -0500
Updated to latest upstream with modified patch for consistency
.gitignore | 1 +
sources | 2 +-
txt2man-1.5.5-fixbashisms.patch | 23 -----------------------
txt2man-1.5.6-fixbashisms.patch | 14 ++++++++++++++
txt2man.spec | 23 ++++++++++++++++++++---
5 files changed, 36 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..b9631da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/txt2man-1.5.6.tar.gz
diff --git a/sources b/sources
index a14704e..6b106df 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d10fe6e9876a2969201ea4d75ac9ea48 txt2man-1.5.5.tar.gz
+f301b3dc1872fab1b7740f9f69ff281b txt2man-1.5.6.tar.gz
diff --git a/txt2man-1.5.6-fixbashisms.patch b/txt2man-1.5.6-fixbashisms.patch
new file mode 100644
index 0000000..ec0a504
--- /dev/null
+++ b/txt2man-1.5.6-fixbashisms.patch
@@ -0,0 +1,14 @@
+--- bookman.orig 2011-05-09 08:53:22.000000000 -0500
++++ bookman 2011-05-09 08:54:02.000000000 -0500
+@@ -83,9 +83,9 @@
+ shift $(($OPTIND - 1))
+ date=${date:-$(date +'%d %B %Y')}
+
+-[[ $1 ]] || set -- $(while read; do echo $REPLY; done)
++[ $1 ] || set -- $(while read; do echo $REPLY; done)
+
+-[[ $outfile ]] && post="$post >$outfile"
++[ $outfile ] && post="$post >$outfile"
+
+ {
+ # Compute table of content from postscript output.
diff --git a/txt2man.spec b/txt2man.spec
index 2c5b4ca..93754af 100644
--- a/txt2man.spec
+++ b/txt2man.spec
@@ -1,5 +1,5 @@
Name: txt2man
-Version: 1.5.5
+Version: 1.5.6
Release: 1%{?dist}
Summary: Convert flat ASCII text to man page format
@@ -8,7 +8,12 @@ License: GPLv2+
URL: http://mvertes.free.fr/txt2man/
Source0: http://mvertes.free.fr/download/%{name}-%{version}.tar.gz
#Fixes bug with bashisms in /bin/sh script, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473696
-Patch0: txt2man-1.5.5-fixbashisms.patch
+#Patch0: txt2man-1.5.5-fixbashisms.patch
+
+# Fixes same bug as above, but code was changed in new release so old patch
+# no longer worked.
+Patch1: txt2man-1.5.6-fixbashisms.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -21,7 +26,8 @@ and looks very much like the output of the man(1) program.
%prep
%setup -q
-%patch0 -p1
+#%patch0 -p1
+%patch1
%build
#no build needed
@@ -50,6 +56,17 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon May 09 2011 Adam Miller <maxamillion at fedoraproject.org> - 1.5.6-1
+- New upstream release, fixes old bugs.
+- Upstream release notes claim POSIX shell code, but bookman still relies on
+ bash styled syntax so we continue to patch it out.
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Tue Mar 04 2009 Sindre Pedersen Bjordal <sindrepb at fedoraproject.org> - 1.5.5-1
- Initial build
- Include debian patch to fix bashisms
More information about the scm-commits
mailing list