[packages/groff] - updated to 1.22.1 - added info patch (unify direntry) - removed obsolete makefile-typo,grotty-wc-n
qboosh
qboosh at pld-linux.org
Sat Jan 12 19:49:31 CET 2013
commit 7786dd3c554712978b78113c491432b80bc08779
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Jan 12 19:49:47 2013 +0100
- updated to 1.22.1
- added info patch (unify direntry)
- removed obsolete makefile-typo,grotty-wc-no-sgr,grofferdir-auto patches
groff-grofferdir-auto.patch | 149 -------------------------------------------
groff-grotty-wc-no-sgr.patch | 58 -----------------
groff-info.patch | 14 ++++
groff-makefile-typo.patch | 17 -----
groff.spec | 20 +++---
5 files changed, 24 insertions(+), 234 deletions(-)
---
diff --git a/groff.spec b/groff.spec
index 1bcc5fc..000d928 100644
--- a/groff.spec
+++ b/groff.spec
@@ -8,20 +8,18 @@ Summary(ru.UTF-8): GNU groff - пакет для форматирования т
Summary(tr.UTF-8): GNU groff metin biçemleme paketi
Summary(uk.UTF-8): GNU groff - пакет для форматування тексту
Name: groff
-Version: 1.21
-Release: 2
+Version: 1.22.1
+Release: 1
Epoch: 1
License: GPL v3+
Group: Applications/Publishing
Source0: http://ftp.gnu.org/gnu/groff/%{name}-%{version}.tar.gz
-# Source0-md5: 8b8cd29385b97616a0f0d96d0951c5bf
+# Source0-md5: 875c9c628b8b78a0c325000a43ebb964
Source1: %{name}-trofftops.sh
Source2: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source2-md5: 3f8b22cc1eefb53306c8c2acf31aca29
Source3: %{name}-nroff
-Patch0: %{name}-makefile-typo.patch
-Patch1: %{name}-grotty-wc-no-sgr.patch
-Patch2: %{name}-grofferdir-auto.patch
+Patch0: %{name}-info.patch
URL: http://www.gnu.org/software/groff/
BuildRequires: autoconf >= 2.62
BuildRequires: libstdc++-devel
@@ -29,10 +27,10 @@ BuildRequires: netpbm-progs
BuildRequires: perl-base
BuildRequires: sed >= 4.0
BuildRequires: texinfo >= 4.8
-BuildRequires: xorg-cf-files
+BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXaw-devel
BuildRequires: xorg-lib-libXmu-devel
-BuildRequires: xorg-util-imake
+BuildRequires: xorg-lib-libXt-devel
Requires: mktemp
Obsoletes: groff-for-man
Obsoletes: groff-tools
@@ -192,8 +190,6 @@ używany przy drukowaniu).
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%build
%{__autoconf}
@@ -276,6 +272,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/groff
%attr(755,root,root) %{_bindir}/grolbp
%attr(755,root,root) %{_bindir}/grolj4
+%attr(755,root,root) %{_bindir}/gropdf
%attr(755,root,root) %{_bindir}/grops
%attr(755,root,root) %{_bindir}/grotty
%attr(755,root,root) %{_bindir}/gsoelim
@@ -287,6 +284,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/lookbib
%attr(755,root,root) %{_bindir}/neqn
%attr(755,root,root) %{_bindir}/nroff
+%attr(755,root,root) %{_bindir}/pdfmom
%attr(755,root,root) %{_bindir}/pdfroff
%attr(755,root,root) %{_bindir}/pfbtops
%attr(755,root,root) %{_bindir}/pic
@@ -327,6 +325,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/grohtml.1*
%{_mandir}/man1/grolbp.1*
%{_mandir}/man1/grolj4.1*
+%{_mandir}/man1/gropdf.1*
%{_mandir}/man1/grops.1*
%{_mandir}/man1/grotty.1*
%{_mandir}/man1/gsoelim.1*
@@ -338,6 +337,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/lookbib.1*
%{_mandir}/man1/neqn.1*
%{_mandir}/man1/nroff.1*
+%{_mandir}/man1/pdfmom.1*
%{_mandir}/man1/pdfroff.1*
%{_mandir}/man1/pfbtops.1*
%{_mandir}/man1/pic.1*
diff --git a/groff-grofferdir-auto.patch b/groff-grofferdir-auto.patch
deleted file mode 100644
index 1e99b27..0000000
--- a/groff-grofferdir-auto.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-fix: groffer libdir is incorrect
-
-adds --with-grofferdir= configure option
-
-Resolves: #678572
-Author: Jan Vcelak <jvcelak at redhat.com>
-
-diff -uNPrp groff-1.21/configure groff-1.21.fixed/configure
---- groff-1.21/configure 2010-12-31 08:33:20.000000000 +0100
-+++ groff-1.21.fixed/configure 2011-03-21 10:45:25.100074487 +0100
-@@ -648,6 +648,7 @@ PSPRINT
- LPQ
- LP
- LPR
-+groffer_dir
- appresdir
- XLIBDIRS
- XPROGDIRS
-@@ -715,6 +716,7 @@ ac_user_opts='
- enable_option_checking
- with_x
- with_appresdir
-+with_grofferdir
- with_gnu_ld
- enable_rpath
- with_libiconv_prefix
-@@ -1362,6 +1363,7 @@ Optional Packages:
- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-x use the X Window System
- --with-appresdir=DIR X11 application resource files
-+ --with-grofferdir=DIR groffer files location
- --with-gnu-ld assume the C compiler uses GNU ld default=no
- --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
- --without-libiconv-prefix don't search for libiconv in includedir and libdir
-@@ -5446,6 +5448,18 @@ EOF
- fi
- fi
-
-+
-+# Check whether --with-grofferdir was given.
-+if test "${with_grofferdir+set}" = set; then :
-+ withval=$with_grofferdir;
-+fi
-+
-+if test "x$with_grofferdir" = "x"; then
-+ groffer_dir=$libdir/groff/groffer
-+ else
-+ groffer_dir=$with_grofferdir
-+ fi
-+
- if test -z "$PSPRINT"; then
- for ac_prog in lpr
- do
-diff -uNPrp groff-1.21/configure.ac groff-1.21.fixed/configure.ac
---- groff-1.21/configure.ac 2010-12-31 08:33:08.000000000 +0100
-+++ groff-1.21.fixed/configure.ac 2011-03-21 10:43:32.249906873 +0100
-@@ -59,6 +59,8 @@ GROFF_OS390
- GROFF_X11
- GROFF_APPRESDIR_OPTION
- GROFF_APPRESDIR_DEFAULT
-+GROFF_GROFFERDIR_OPTION
-+GROFF_GROFFERDIR_DEFAULT
- GROFF_PRINT
- AC_PROG_EGREP
- AC_PATH_PROG([PERLPATH], [perl], [/usr/bin/perl])
-diff -uNPrp groff-1.21/contrib/groffer/Makefile.sub groff-1.21.fixed/contrib/groffer/Makefile.sub
---- groff-1.21/contrib/groffer/Makefile.sub 2010-12-31 08:33:09.000000000 +0100
-+++ groff-1.21.fixed/contrib/groffer/Makefile.sub 2011-03-21 10:56:57.142842476 +0100
-@@ -63,8 +63,6 @@ GROFFER_REST=$(srcdir)/roff2.man \
- GROFFER_PERL_=`echo $(GROFFER_PERL) | sed 's|$(srcdir)/perl/||g'`
- GROFFER_SHELL_=`echo $(GROFFER_SHELL) | sed 's|$(srcdir)/shell||g'`
-
--groffer_dir=$(libdir)/groff/groffer
--
- # TODO: Add perl check to configure script.
- groffer: $(GROFFER_PERL) $(GROFFER_SHELL) \
- $(GROFFER_REST) $(SH_DEPS_SED_SCRIPT)
-@@ -75,6 +73,7 @@ groffer: $(GROFFER_PERL) $(GROFFER_SHELL
- -e "s|@g@|$(g)|g" \
- -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
- -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \
-+ -e "s|@groffer_dir@|$(DESTDIR)$(groffer_dir)|g" \
- -e "s|@VERSION@|$(version)$(revision)|g" \
- -e "$(SH_SCRIPT_SED_CMD)" \
- $(srcdir)/perl/groffer.pl >$@; \
-@@ -89,6 +88,7 @@ groffer: $(GROFFER_PERL) $(GROFFER_SHELL
- -e "s|@g@|$(g)|g" \
- -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
- -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \
-+ -e "s|@groffer_dir@|$(DESTDIR)$(groffer_dir)|g" \
- -e "s|@VERSION@|$(version)$(revision)|g" \
- -e "$(SH_SCRIPT_SED_CMD)" \
- $(srcdir)/shell/groffer.sh >$@; \
-diff -uNPrp groff-1.21/contrib/groffer/perl/groffer.pl groff-1.21.fixed/contrib/groffer/perl/groffer.pl
---- groff-1.21/contrib/groffer/perl/groffer.pl 2010-12-31 08:33:09.000000000 +0100
-+++ groff-1.21.fixed/contrib/groffer/perl/groffer.pl 2011-03-21 10:20:21.865418634 +0100
-@@ -132,8 +132,7 @@ BEGIN {
- $at_at{'BINDIR'} = '@BINDIR@';
- $at_at{'G'} = '@g@';
- $at_at{'LIBDIR'} = '@libdir@';
-- $groffer_libdir =
-- File::Spec->catdir($at_at{'LIBDIR'}, 'groff', 'groffer');
-+ $groffer_libdir = '@groffer_dir@';
- $file_perl_test_pl = File::Spec->catfile($groffer_libdir,
- 'perl_test.pl');
- $File_version_sh = File::Spec->catfile($groffer_libdir, 'version.sh');
-diff -uNPrp groff-1.21/Makefile.in groff-1.21.fixed/Makefile.in
---- groff-1.21/Makefile.in 2010-12-31 08:33:08.000000000 +0100
-+++ groff-1.21.fixed/Makefile.in 2011-03-21 10:53:51.551854122 +0100
-@@ -188,6 +188,8 @@ localtmacdir=$(dataprogramdir)/site-tmac
- # gxditview.
- appresdir=@appresdir@
-
-+groffer_dir=@groffer_dir@
-+
- # `tmacpath' says where to look for macro files.
- # The current directory will be prepended in unsafe mode only; the home
- # directory will be always added.
-@@ -493,6 +495,7 @@ MDEFINES= \
- "YACC=$(YACC)" \
- "YACCFLAGS=$(YACCFLAGS)" \
- "appresdir=$(appresdir)" \
-+ "groffer_dir=$(groffer_dir)" \
- "bindir=$(bindir)" \
- "common_words_file=$(common_words_file)" \
- "datadir=$(datadir)" \
-diff -uNPrp groff-1.21/m4/groff.m4 groff-1.21.fixed/m4/groff.m4
---- groff-1.21/m4/groff.m4 2010-12-31 08:33:09.000000000 +0100
-+++ groff-1.21.fixed/m4/groff.m4 2011-03-21 10:54:17.716429483 +0100
-@@ -1193,3 +1193,19 @@ AC_DEFUN([GROFF_APPRESDIR_CHECK],
- ])
- fi
- fi])
-+
-+
-+# Set up the `--with-grofferdir' command line option.
-+
-+AC_DEFUN([GROFF_GROFFERDIR_OPTION],
-+ [AC_ARG_WITH([grofferdir],
-+ AS_HELP_STRING([--with-grofferdir=DIR],
-+ [groffer files location]))])
-+
-+AC_DEFUN([GROFF_GROFFERDIR_DEFAULT],
-+ [if test "x$with_grofferdir" = "x"; then
-+ groffer_dir=$libdir/groff/groffer
-+ else
-+ groffer_dir=$with_grofferdir
-+ fi
-+ AC_SUBST([groffer_dir])])
diff --git a/groff-grotty-wc-no-sgr.patch b/groff-grotty-wc-no-sgr.patch
deleted file mode 100644
index 920979c..0000000
--- a/groff-grotty-wc-no-sgr.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Fix handling of wide characters in no-SGR mode.
-
-Fixes: #712904 Japanese bold/underlined text not displayed correctly
-
-Patch from upstream CVS:
-
-2011-01-20 Colin Watson <cjwatson at debian.org>
-
- Fix handling of wide characters in no-SGR mode.
-
- * src/devices/grotty/tty.cpp (tty_printer::make_underline): Only
- emit a single backspace in no-SGR mode. less (at least) backspaces
- over a character at a time.
- (tty_printer::make_bold): Likewise.
-
-Index: src/devices/grotty/tty.cpp
-===================================================================
-RCS file: /sources/groff/groff/src/devices/grotty/tty.cpp,v
-retrieving revision 1.23
-retrieving revision 1.24
-diff -u -r1.23 -r1.24
---- a/src/devices/grotty/tty.cpp 13 Dec 2010 17:42:28 -0000 1.23
-+++ b/src/devices/grotty/tty.cpp 20 Jan 2011 07:13:57 -0000 1.24
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
--/* Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
-- 2010
-+/* Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006,
-+ 2009-2011
- Free Software Foundation, Inc.
- Written by James Clark (jjc at jclark.com)
-
-@@ -311,11 +311,8 @@
- if (!w)
- warning("can't underline zero-width character");
- else {
-- int n = w / font::hor;
-- for (int i = 0; i < n; i++)
-- putchar('_');
-- for (int j = 0; j < n; j++)
-- putchar('\b');
-+ putchar('_');
-+ putchar('\b');
- }
- }
- else {
-@@ -337,10 +334,8 @@
- if (!w)
- warning("can't print zero-width character in bold");
- else {
-- int n = w / font::hor;
- put_char(c);
-- for (int i = 0; i < n; i++)
-- putchar('\b');
-+ putchar('\b');
- }
- }
- else {
diff --git a/groff-info.patch b/groff-info.patch
new file mode 100644
index 0000000..8c5b312
--- /dev/null
+++ b/groff-info.patch
@@ -0,0 +1,14 @@
+--- groff-1.22.1/doc/groff.texinfo.orig 2012-12-30 09:40:29.000000000 +0100
++++ groff-1.22.1/doc/groff.texinfo 2013-01-12 18:52:31.060191713 +0100
+@@ -472,9 +472,9 @@
+ @c Note: We say `Roman numerals' but `roman font'.
+
+
+- at dircategory Typesetting
++ at dircategory Typesetting:
+ @direntry
+-* Groff: (groff). The GNU troff document formatting system.
++* Groff: (groff). The GNU troff document formatting system
+ @end direntry
+
+
diff --git a/groff-makefile-typo.patch b/groff-makefile-typo.patch
deleted file mode 100644
index be2dbb8..0000000
--- a/groff-makefile-typo.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fixes a typo in Makefile.comm
-
-Upstream fix:
-http://lists.gnu.org/archive/html/bug-groff/2011-01/msg00002.html
-
-diff -ur groff-1.21.old/Makefile.comm groff-1.21/Makefile.comm
---- groff-1.21.old/Makefile.comm 2010-12-31 08:33:08.000000000 +0100
-+++ groff-1.21/Makefile.comm 2011-01-21 16:19:59.762069900 +0100
-@@ -21,7 +21,7 @@
- #
- INCLUDES=-I. -I$(srcdir) \
- -I$(top_builddir)/src/include -I$(top_srcdir)/src/include \
-- -I$(tob_builddir)/src/libs/gnulib/lib
-+ -I$(top_builddir)/src/libs/gnulib/lib
- ALL_CCFLAGS=$(INCLUDES) $(CCDEFINES) $(CCFLAGS) $(CPPFLAGS)
- COMPILE.cpp=$(CCC) $(ALL_CCFLAGS) -c
- ALL_CFLAGS=$(INCLUDES) $(CDEFINES) $(CFLAGS) $(CPPFLAGS)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/groff.git/commitdiff/7786dd3c554712978b78113c491432b80bc08779
More information about the pld-cvs-commit
mailing list