summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjvcelak <jvcelak@fedoraproject.org>2010-03-19 11:31:50 +0000
committerjvcelak <jvcelak@fedoraproject.org>2010-03-19 11:31:50 +0000
commite3e620a019ddbfbf28cf22dce52d81d8065b9ffd (patch)
treee8d5c3b38277200b48513beec73d085650ace18f
parenta072af177be8cfe6663c060ed441eb0b266cfbc8 (diff)
downloadgroff-e3e620a019ddbfbf28cf22dce52d81d8065b9ffd.tar.gz
groff-e3e620a019ddbfbf28cf22dce52d81d8065b9ffd.tar.xz
groff-e3e620a019ddbfbf28cf22dce52d81d8065b9ffd.zip
Resolves: #530788groff-1_20_1-1_fc14
-rw-r--r--groff-info-missing-x11.patch18
-rw-r--r--groff.spec8
2 files changed, 25 insertions, 1 deletions
diff --git a/groff-info-missing-x11.patch b/groff-info-missing-x11.patch
new file mode 100644
index 0000000..0ae70ce
--- /dev/null
+++ b/groff-info-missing-x11.patch
@@ -0,0 +1,18 @@
+Adds info message that 'groff-x11' package might be missing when executing
+'groff -X' and 'gxditview' is not found.
+
+Author: Jan Vcelak <jvcelak@redhat.com>
+Fixes: #530788 groff and groff-gxditview shouldn't be split
+
+diff -ur groff-1.20.1.orig/src/roff/groff/pipeline.c groff-1.20.1/src/roff/groff/pipeline.c
+--- groff-1.20.1.orig/src/roff/groff/pipeline.c 2010-03-19 11:06:37.437182240 +0100
++++ groff-1.20.1/src/roff/groff/pipeline.c 2010-03-19 11:42:14.820161806 +0100
+@@ -486,6 +486,8 @@
+ execvp(commands[i][0], commands[i]);
+ error("couldn't exec %1: %2",
+ commands[i][0], strerror(errno), (char *)0);
++ if (strcmp(commands[i][0], "gxditview") == 0)
++ fprintf(stderr, "You might be missing 'groff-x11' package.\n");
+ fflush(stderr); /* just in case error() doesn't */
+ _exit(EXEC_FAILED_EXIT_STATUS);
+ }
diff --git a/groff.spec b/groff.spec
index f32e776..d4df230 100644
--- a/groff.spec
+++ b/groff.spec
@@ -3,13 +3,15 @@
Summary: A document formatting system
Name: groff
Version: 1.20.1
-Release: 0%{?dist}
+Release: 1%{?dist}
License: GPLv3+ and GFDL and BSD and MIT
Group: Applications/Publishing
URL: http://groff.ffii.org
Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
+Patch1: groff-info-missing-x11.patch
+
Requires: mktemp
Requires: /sbin/install-info
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -73,6 +75,7 @@ language and documentation for creating PDF files.
%prep
%setup -q
+%patch1 -p1 -b .info-missing-x11
for file in NEWS src/devices/grolbp/grolbp.man doc/{groff.info*,webpage.ms} \
contrib/mm/*.man contrib/mom/examples/{README.txt,*.mom} ; do
@@ -186,6 +189,9 @@ fi
%doc %{_docdir}/%{name}-%{version}/pdf/
%changelog
+* Fri Mar 19 2010 Jan Vcelak <jvcelak@redhat.com> - 1.20.1-1
+- Resolves: #530788
+
* Tue Mar 12 2010 Jan Vcelak <jvcelak@redhat.com> - 1.20.1-0
- Package rebase to upstream 1.20.1