summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--sources2
-rw-r--r--txt2man-1.5.5-fixbashisms.patch23
-rw-r--r--txt2man-1.5.6-fixbashisms.patch14
-rw-r--r--txt2man.spec19
5 files changed, 26 insertions, 33 deletions
diff --git a/.gitignore b/.gitignore
index 167f71f..3312619 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
txt2man-1.5.5.tar.gz
+/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.5-fixbashisms.patch b/txt2man-1.5.5-fixbashisms.patch
deleted file mode 100644
index ff30a97..0000000
--- a/txt2man-1.5.5-fixbashisms.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Nru txt2man-1.5.5/bookman txt2man-1.5.5/bookman
---- txt2man-1.5.5/bookman 2007-03-21 11:07:24.000000000 +0000
-+++ txt2man-1.5.5/bookman 2008-04-12 03:29:07.000000000 +0100
-@@ -83,16 +83,16 @@
- shift $(($OPTIND - 1))
- date=${date:-$(date +'%d %B %Y')}
-
--[[ $1 ]] || set -- $(while read; do echo $REPLY; done)
-+[ $1 ] || set -- $(while read REPLY; do echo $REPLY; done)
-
--[[ $outfile ]] && post="$post >$outfile"
-+[ $outfile ] && post="$post >$outfile"
-
- {
- # Compute table of content from postscript output.
- # Generate output in gtroff intermediate format, so
- # it can be merged with content.
- {
-- [[ -f $cover ]] && cat $cover || {
-+ [ -f $cover ] && cat $cover || {
- printf ".af %% i\n.P1\n"
- printf ".OH ||%s||\n" "$volume"
- printf ".EH ||%s||\n" "$volume"
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 fa1f9f7..93754af 100644
--- a/txt2man.spec
+++ b/txt2man.spec
@@ -1,6 +1,6 @@
Name: txt2man
Version: 1.5.6
-Release: 3%{?dist}
+Release: 1%{?dist}
Summary: Convert flat ASCII text to man page format
Group: Applications/Text
@@ -8,7 +8,11 @@ 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 # Fixed in upstream 1.5.6
+#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
@@ -23,6 +27,7 @@ and looks very much like the output of the man(1) program.
%prep
%setup -q
#%patch0 -p1
+%patch1
%build
#no build needed
@@ -51,14 +56,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.6-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
* Mon May 09 2011 Adam Miller <maxamillion@fedoraproject.org> - 1.5.6-1
-- New upstream release, fixes old bug converting bash script to POSIX shell code
+- 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@lists.fedoraproject.org> - 1.5.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild