Fixes not working groffer. Related: #468102groff-1_18_1_4-20_fc12

9 files changed, 106 insertions, 162 deletions

diff --git a/groff-1.18.1.1-bigendian.patch b/groff-1.18.1.1-bigendian.patch
deleted file mode 100644
index 1e3998b..0000000
--- a/groff-1.18.1.1-bigendian.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- groff-1.18.1.1/src/libs/libdriver/input.cc.orig	2006-01-10 11:11:36.000000000 +0100
-+++ groff-1.18.1.1/src/libs/libdriver/input.cc	2006-01-10 11:11:52.000000000 +0100
-@@ -1786,7 +1786,7 @@
- 	if (npages <= 0)
- 	  fatal_command(command);
- 	char *str_arg = get_string_arg();
--	size_t i = 0;
-+	int i = 0;
- 	while ((c = str_arg[i++]) != '\0') {
- 	  EnvInt w;
- #ifdef	ENABLE_MULTIBYTE
diff --git a/groff-1.18.1.1-gcc41.patch b/groff-1.18.1.1-gcc41.patch
deleted file mode 100644
index b95e3f1..0000000
--- a/groff-1.18.1.1-gcc41.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- groff-1.18.1.1/src/devices/grohtml/post-html.cc.gcc41	2006-01-05 16:01:16.000000000 +0100
-+++ groff-1.18.1.1/src/devices/grohtml/post-html.cc	2006-01-05 16:02:14.000000000 +0100
-@@ -261,7 +261,7 @@ struct char_block {
-   char_block   *next;
- 
-   char_block();
--  char_block::char_block(int length);
-+  char_block(int length);
- };
- 
- char_block::char_block()
diff --git a/groff-1.18.1.1-grn.patch b/groff-1.18.1.1-grn.patch
deleted file mode 100644
index 45e4b30..0000000
--- a/groff-1.18.1.1-grn.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- groff-1.18.1.1/src/preproc/grn/hdb.cc.grn	2002-10-07 06:42:55.000000000 +0200
-+++ groff-1.18.1.1/src/preproc/grn/hdb.cc	2004-09-16 10:23:42.394486378 +0200
-@@ -115,7 +115,6 @@
-     type = DBGetType(string);	/* interpret element type */
-     if (type < 0) {		/* no more data */
-       done = TRUE;
--      (void) fclose(file);
-     } else {
- #ifdef UW_FASTSCAN
-       (void) xscanf(file, &x, &y);		/* always one point */
diff --git a/groff-1.18.1.1-revision.patch b/groff-1.18.1.1-revision.patch
deleted file mode 100644
index 8e248cd..0000000
--- a/groff-1.18.1.1-revision.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- groff-1.18.1.1/REVISION.revision	2004-06-29 12:59:31.775599717 +0200
-+++ groff-1.18.1.1/REVISION	2004-06-29 12:58:34.646490040 +0200
-@@ -1 +1 @@
--1
-+1.1
diff --git a/groff-1.18.1.1-tempfile.patch b/groff-1.18.1.1-tempfile.patch
deleted file mode 100644
index 0e73606..0000000
--- a/groff-1.18.1.1-tempfile.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- groff-1.18.1.1/contrib/groffer/groffer.sh.tempfile	2004-06-15 03:44:50.000000000 +0200
-+++ groff-1.18.1.1/contrib/groffer/groffer.sh	2004-10-19 13:04:35.704244526 +0200
-@@ -3228,18 +3228,13 @@
-   do
-     if is_not_empty "$d"; then
-       if obj d is_dir && obj d is_writable; then
--        _TMP_DIR="${d}/${_PROGRAM_NAME}${_PROCESS_ID}";
--        if obj _TMP_DIR is_dir; then
--	  rm -f "${_TMP_DIR}"/*;
--          break;
--        else
--          mkdir "${_TMP_DIR}";
--          if obj _TMP_DIR is_not_dir; then
--            _TMP_DIR='';
--	    continue;
--          fi;
--          break;
--  	fi;
-+	  _TMP_DIR="`mktemp -d ${d}/${_PROGRAM_NAME}.XXXXXX`";
-+	  if test $? = 0; then
-+	      break;
-+	  else
-+	      _TMP_DIR='';
-+	      continue;
-+	  fi
-       fi;
-       if obj _TMP_DIR is_not_writable; then
- 	_TMP_DIR='';
diff --git a/groff-1.18.1.4-grofferpath.patch b/groff-1.18.1.4-grofferpath.patch
deleted file mode 100644
index 6f95036..0000000
--- a/groff-1.18.1.4-grofferpath.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up groff-1.18.1.4/contrib/groffer/groffer.sh.old groff-1.18.1.4/contrib/groffer/groffer.sh
---- groff-1.18.1.4/contrib/groffer/groffer.sh.old	2006-10-04 22:35:39.000000000 +0200
-+++ groff-1.18.1.4/contrib/groffer/groffer.sh	2007-10-08 09:01:29.000000000 +0200
-@@ -129,7 +129,7 @@ no)
- esac;
- 
- export _GROFFER2_SH;		# file name of the script that follows up
--_GROFFER2_SH="${_GROFFER_LIBDIR}"'groffer2.sh';
-+_GROFFER2_SH="${_GROFFER_LIBDIR}${_GROFF_VERSION}"'groffer2.sh';
- 
- export _GROFFER_SH;		# file name of this shell script
- case "$0" in
-@@ -331,7 +331,8 @@ fi;
- if test _"${_SHELL}"_ = __
- then
-   # no shell found, so start groffer2.sh normally
--  eval . "'${_GROFFER2_SH}'" '"$@"';
-+  #eval . "'${_GROFFER2_SH}'" '"$@"';
-+  eval . "/usr/share/groff/${_GROFF_VERSION}/groffer/groffer2.sh" '"$@"';
-   exit;
- else
-   # start groffer2.sh with the found $_SHELL
diff --git a/groff-groffer.patch b/groff-groffer.patch
new file mode 100644
index 0000000..7bafb8a
--- /dev/null
+++ b/groff-groffer.patch
@@ -0,0 +1,64 @@
+Author: Jan Vcelak <jvcelak@redhat.com>
+Related: bz#468102
+
+Fixes 'groffer' tool which didn't work at all. Groffer libraries (scripts) are
+in non-default location on Fedora. This patch fixes this issues. Also an
+unwanted variable expansion was present in groffer2.sh.
+
+diff -u -urp groff-1.18.1.4/contrib/groffer/groffer.sh groff-1.18.1.4.fixed/contrib/groffer/groffer.sh
+--- groff-1.18.1.4/contrib/groffer/groffer.sh	2006-10-04 22:35:39.000000000 +0200
++++ groff-1.18.1.4.fixed/contrib/groffer/groffer.sh	2010-04-06 13:05:09.393197112 +0200
+@@ -109,7 +109,7 @@ no)
+   */) :; ;;
+   *) _AT_LIBDIR_AT="${_AT_LIBDIR_AT}/";
+   esac;
+-  _GROFFER_LIBDIR="${_AT_LIBDIR_AT}"'groff/groffer/';
++  _GROFFER_LIBDIR="${_AT_LIBDIR_AT}"'groff/@VERSION@/groffer/';
+   ;;
+ esac;
+ 
+diff -u -urp groff-1.18.1.4/contrib/groffer/groffer2.sh groff-1.18.1.4.fixed/contrib/groffer/groffer2.sh
+--- groff-1.18.1.4/contrib/groffer/groffer2.sh	2006-10-05 20:44:08.000000000 +0200
++++ groff-1.18.1.4.fixed/contrib/groffer/groffer2.sh	2010-04-06 15:45:44.131323506 +0200
+@@ -4616,7 +4616,7 @@ usage()
+   func_check usage = 0 "$@";
+   echo;
+   version;
+-  cat <<EOF
++  cat <<"EOF"
+ 
+ Usage: groffer [option]... [filespec]...
+ 
+diff -u -urp groff-1.18.1.4/contrib/groffer/Makefile.sub groff-1.18.1.4.fixed/contrib/groffer/Makefile.sub
+--- groff-1.18.1.4/contrib/groffer/Makefile.sub	2006-10-14 14:30:46.000000000 +0200
++++ groff-1.18.1.4.fixed/contrib/groffer/Makefile.sub	2010-04-06 13:05:09.393197112 +0200
+@@ -48,20 +48,20 @@ install_data: groffer
+ 	-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	-$(RM) $(DESTDIR)$(bindir)/groffer
+ 	$(INSTALL_SCRIPT) groffer $(DESTDIR)$(bindir)/groffer
+-	-test -d $(DESTDIR)$(libdir)/groff/groffer || \
+-          $(mkinstalldirs) $(DESTDIR)$(libdir)/groff/groffer
+-	-$(RM) $(DESTDIR)$(libdir)/groff/groffer/groffer2.sh
++	-test -d $(DESTDIR)$(libdir)/groff/$(version)$(revision)/groffer || \
++          $(mkinstalldirs) $(DESTDIR)$(libdir)/groff/$(version)$(revision)/groffer
++	-$(RM) $(DESTDIR)$(libdir)/groff/$(version)$(revision)/groffer/groffer2.sh
+ 	$(INSTALL_SCRIPT) $(srcdir)/groffer2.sh \
+-	  $(DESTDIR)$(libdir)/groff/groffer/groffer2.sh
+-	-$(RM) $(DESTDIR)$(libdir)/groff/groffer/version.sh
++	  $(DESTDIR)$(libdir)/groff/$(version)$(revision)/groffer/groffer2.sh
++	-$(RM) $(DESTDIR)$(libdir)/groff/$(version)$(revision)/groffer/version.sh
+ 	$(INSTALL_DATA) $(srcdir)/version.sh \
+-	$(DESTDIR)$(libdir)/groff/groffer/version.sh
++	$(DESTDIR)$(libdir)/groff/$(version)$(revision)/groffer/version.sh
+ 
+ uninstall_sub:
+ 	-$(RM) $(DESTDIR)$(bindir)/groffer
+-	-$(RM) $(DESTDIR)$(libdir)/groff/groffer/groffer2.sh
+-	-$(RM) $(DESTDIR)$(libdir)/groff/groffer/version.sh
+-	-rmdir $(DESTDIR)$(libdir)/groff/groffer
++	-$(RM) $(DESTDIR)$(libdir)/groff/$(version)$(revision)/groffer/groffer2.sh
++	-$(RM) $(DESTDIR)$(libdir)/groff/$(version)$(revision)/groffer/version.sh
++	-rmdir $(DESTDIR)$(libdir)/groff/$(version)$(revision)/groffer
+ 
+ ########################################################################
+ # Emacs settings
diff --git a/groff-xlibs.patch b/groff-xlibs.patch
deleted file mode 100644
index aa72c29..0000000
--- a/groff-xlibs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- groff-1.18.1/Makefile.ccpg.sopwith	Mon Feb 10 08:33:21 2003
-+++ groff-1.18.1/Makefile.ccpg	Mon Feb 10 08:54:00 2003
-@@ -8,7 +8,7 @@
- 
- all: $(PROG) $(MANPAGES)
- 
--$(PROG): $(OBJS) $(XLIBS)
-+$(PROG): $(OBJS)
- 	$(LINK.cc) -o $@ $(OBJS) $(XLIBS) $(LIBS) $(MLIB)
- 
- install_bin: install_prog
-@@ -28,6 +28,6 @@
- 
- pure: $(PROG).pure
- 
--$(PROG).pure: $(OBJS) $(XLIBS)
-+$(PROG).pure: $(OBJS)
- 	$(PURIFY) $(PURIFYCCFLAGS) \
- 	  $(LINK.cc) -o $@ $(OBJS) $(XLIBS) $(LIBS) $(MLIB)
diff --git a/groff.spec b/groff.spec
index 12331b4..6a9245b 100644
--- a/groff.spec
+++ b/groff.spec
@@ -3,7 +3,7 @@
 Summary: A document formatting system
 Name:	groff
 Version: 1.18.1.4
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPLv2 and GFDL
 Group: Applications/Publishing
 URL: http://groff.ffii.org
@@ -13,27 +13,21 @@ Source4: man-pages-ja-GNU_groff-20000115.tar.gz
 Source6: hyphen.cs
 Source7: nroff
 Patch1: groff-1.16-safer.patch
-Patch3: groff_1.18.1-15.diff
-Patch4: groff-1.18-info.patch
-Patch6: groff-1.18-pfbtops_cpp.patch
-Patch7: groff-1.18-gzip.patch
-Patch9: groff-1.18.1-fixminus.patch
-Patch11: groff-1.18.1-8bit.patch
-Patch12: groff-1.18.1-korean.patch
-Patch13: groff-1.18.1-gzext.patch
-#Patch14: groff-xlibs.patch
-Patch15: groff-1.18.1-fix15.patch
-Patch16: groff-1.18.1-devutf8.patch
-#Patch17: groff-1.18.1.3-revision.patch
-Patch18: groff-1.18.1.1-do_char.patch
-#Patch19: groff-1.18.1.1-grn.patch
-#Patch20: groff-1.18.1.1-tempfile.patch
-#Patch21: groff-1.18.1.1-gcc41.patch
-#Patch22: groff-1.18.1.1-bigendian.patch
-Patch23: groff-1.18.1.1-spacefix.patch
-Patch24: groff-1.18.1.4-sectmp.patch
-Patch25: groff-1.18.1.4-grofferpath.patch
-Patch26: groff-1.18.1.4-gcc4.3.0.patch
+Patch2: groff_1.18.1-15.diff
+Patch3: groff-1.18-info.patch
+Patch4: groff-1.18-pfbtops_cpp.patch
+Patch5: groff-1.18-gzip.patch
+Patch6: groff-1.18.1-fixminus.patch
+Patch7: groff-1.18.1-8bit.patch
+Patch8: groff-1.18.1-korean.patch
+Patch9: groff-1.18.1-gzext.patch
+Patch10: groff-1.18.1-fix15.patch
+Patch11: groff-1.18.1-devutf8.patch
+Patch12: groff-1.18.1.1-do_char.patch
+Patch13: groff-1.18.1.1-spacefix.patch
+Patch14: groff-1.18.1.4-sectmp.patch
+Patch15: groff-1.18.1.4-gcc4.3.0.patch
+Patch16: groff-groffer.patch
  
 Requires: mktemp
 Requires: /sbin/install-info
@@ -81,29 +75,22 @@ System display.
 
 %prep
 %setup -q -a 4
-%patch1 -p1
-%patch3 -p1
-%patch4 -p1
-#%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch9 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1 -b .gzext
-#%patch14 -p1
-%patch15 -p1 -b .fix9
-%patch16 -p1 -b .devutf8
-#%patch17 -p1 -b .revision
-%patch18 -p1 -b .do_char
-#%patch19 -p1 -b .grn
-#%patch20 -p1 -b .tempfile
-#%patch21 -p1 -b .gcc41
-#%patch22 -p1 -b .bigendian
-%patch23 -p1 -b .spacefix
-%patch24 -p1 -b .sectmp
-%patch25 -p1 -b .grofferpath
-%patch26 -p1 -b .gcc43
+%patch1 -p1 -b .safer
+%patch2 -p1 -b .v15
+%patch3 -p1 -b .info
+%patch4 -p1 -b .pfbtops_cpp
+%patch5 -p1 -b .gzip
+%patch6 -p1 -b .fixminus
+%patch7 -p1 -b .8bit
+%patch8 -p1 -b .korean
+%patch9 -p1 -b .gzext
+%patch10 -p1 -b .fix15
+%patch11 -p1 -b .devutf8
+%patch12 -p1 -b .do_char
+%patch13 -p1 -b .spacefix
+%patch14 -p1 -b .sectmp
+%patch15 -p1 -b .gcc43
+%patch16 -p1 -b .groffer
 
 for i in contrib/mm/{groff_mm,groff_mmse,mmroff}.man \
 		src/devices/grolbp/grolbp.man; do
@@ -114,7 +101,7 @@ done
 %build
 #PATH=$PATH:%{_prefix}/X11R6/bin
 #autoconf
-%configure --enable-multibyte
+%configure --enable-multibyte --libdir=%{_datadir}
 # no html docs
 make make_html=
 (cd doc && makeinfo groff.texinfo)
@@ -142,7 +129,7 @@ make install make_html= make_install_html= \
 			infodir=%{buildroot}/%{_prefix}/info \
 			sysconfdir=%{buildroot}/etc \
 			includedir=%{buildroot}/usr/include \
-			libdir=%{buildroot}/%{_libdir} \
+			libdir=%{buildroot}/%{_datadir} \
 			libexecdir=%{buildroot}/usr/libexec \
 			localstatedir=%{buildroot}/var \
 			sharedstatedir=%{buildroot}/usr/com \
@@ -179,15 +166,11 @@ install -pm 755 %SOURCE7 $RPM_BUILD_ROOT%{_bindir}/nroff
 ln -sf doc.tmac $RPM_BUILD_ROOT%{_datadir}/groff/%version/tmac/docj.tmac
 # installed, but not packaged in rpm
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/groff/%{version}/groffer/
-chmod 755 $RPM_BUILD_ROOT%{_datadir}/groff/1.18.1.4/font/devps/generate/symbol.sed
-chmod 755 $RPM_BUILD_ROOT%{_datadir}/groff/1.18.1.4/font/devdvi/generate/CompileFonts
-chmod 755 $RPM_BUILD_ROOT%{_datadir}/groff/1.18.1.4/font/devps/generate/afmname
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/groff/groffer/version.sh
-mv $RPM_BUILD_ROOT%{_libdir}/groff/groffer/* $RPM_BUILD_ROOT/%{_datadir}/groff/%{version}/groffer/
+chmod 755 $RPM_BUILD_ROOT%{_datadir}/groff/%{version}/font/devps/generate/symbol.sed
+chmod 755 $RPM_BUILD_ROOT%{_datadir}/groff/%{version}/font/devdvi/generate/CompileFonts
+chmod 755 $RPM_BUILD_ROOT%{_datadir}/groff/%{version}/font/devps/generate/afmname
+chmod 755 $RPM_BUILD_ROOT%{_datadir}/groff/%{version}/groffer/version.sh
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/groff $RPM_BUILD_ROOT%{_infodir}/dir $RPM_BUILD_ROOT/%{_prefix}/lib/X11/app-defaults
-rm -rf $RPM_BUILD_ROOT%{_libdir}/groff/groffer
-rm -rf $RPM_BUILD_ROOT%{_libdir}/groff/site-tmac
-rm -rf $RPM_BUILD_ROOT%{_libdir}/groff
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -224,7 +207,10 @@ exit 0
 %endif
 
 %changelog
-* Wed Feb  3 2010 Ville Skyttä <ville.skytta@iki.fi> - 1.18.1.4-19
+* Wed Apr 6 2010 Jan Vcelak	<jvcelak@redhat.com> - 1.18.1.4-20
+- Fixes not working groffer (#468102).
+
+* Wed Feb 3 2010 Ville Skyttä <ville.skytta@iki.fi> - 1.18.1.4-19
 - Move grog to main package, add main package dependency to -perl (#468102).
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.18.1.4-18