Hello community,
here is the log from the commit of package groff for openSUSE:Factory checked in at 2013-06-11 06:33:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/groff (Old)
and /work/SRC/openSUSE:Factory/.groff.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "groff"
Changes:
--------
New Changes file:
--- /dev/null 2013-06-08 20:45:13.000037006 +0200
+++ /work/SRC/openSUSE:Factory/.groff.new/groff-full.changes 2013-06-11 09:27:45.000000000 +0200
@@ -0,0 +1,748 @@
+-------------------------------------------------------------------
+Thu May 9 09:16:49 UTC 2013 - mvyskocil@suse.com
+
+- update to groff 1.22.2
+ * gropdf: A new driver for generating PDF output directly,
+ contributed by Deri James and written in Perl
+ * The -mom macro package has reached version 2.0, focusing on
+ PDF output with gropdf (using the new `pdfmom' wrapper script).
+ See the file`version-2.html' of the -mom documentation for a list
+ of the many changes.
+ * pdfmom: A new wrapper around groff that facilitates the production of PDF
+ documents from files formatted with the -mom macros.
+ * and a lot more, see NEWS for details
+- obsoletes:
+ groff-1.21-groffer-libexecdir.patch, already fixed upstream
+ config-guess-sub-update.patch, dtto
+ groff_1.21-6.debian.diff, replaced by
+- added groff_1.22.2-2.debian.diff
+- create a stripped-down version of groff usable for viewing of manual pages
+- new groff-full package contains the rest of groff tools capable to work with
+ images, html or pdf. It contains the devx fonts, thus obsoletes groff-devx
+ it aims to fix bnc#755533 - grohtml built without pnm* tools in PATH
+- gxdview.spec is removed as gxdview is built from groff-full.spec
+- verify the tarball using gpg-offline - this is done in groff-full only
+ to retain a limited list of dependencies for base groff
+
+-------------------------------------------------------------------
+Tue May 7 14:40:06 UTC 2013 - schwab@suse.de
+
+- config-guess-sub-update.patch: Update config.guess/sub for aarch64
+
+-------------------------------------------------------------------
+Mon Feb 4 14:33:41 UTC 2013 - coolo@suse.com
+
+- update license to new format
+
+-------------------------------------------------------------------
+Fri Sep 7 13:02:36 UTC 2012 - coolo@suse.com
+
+- add explicit buildrequire makeinfo
+
+-------------------------------------------------------------------
+Sun Mar 18 00:14:49 UTC 2012 - jengelh@medozas.de
+
+- Remove redundant tags/sections from specfile
+- Enable parallel build with %_smp_mflags
+
+-------------------------------------------------------------------
+Thu Sep 29 12:49:28 UTC 2011 - adrian@suse.de
+
+- use RPM_OPT_FLAGS for compile
+
+-------------------------------------------------------------------
+Thu Sep 29 08:09:33 UTC 2011 - mvyskocil@suse.cz
+
+- implemented FATE#312586 - Add locales support for groff papersize
+ * the default papersize is now determined from system locale (LC_PAPER)
+ * /etc/papersize is no longer owned by the groff package
+
+-------------------------------------------------------------------
+Thu Sep 22 12:50:27 UTC 2011 - mvyskocil@suse.cz
+
+- fix bnc#703665 - VUL-1: groff: missing checks for mktemp failures
+ (CVE-2009-5080)
+- fix bnc#703666 - VUL-1: groff: insufficient number of X for mktemp
+ (CVE-2009-5081)
+
+-------------------------------------------------------------------
+Mon Jun 27 11:14:25 UTC 2011 - mvyskocil@suse.cz
+
+- update to 1.21 a bugfix release
+ * use new groff_1.21-6.debian.diff
+ * refresh libexecdir and pdfroff patch
+- fix FATE#311297: Get rid of SuSEconfig.groff
+ * removed
+
+-------------------------------------------------------------------
+Wed Jun 8 09:06:44 UTC 2011 - mvyskocil@suse.cz
+
+- fix bnc#698290: insecure temporary file handling in pdfroff
+ * groff-1.20.1-CVE-2009-5044.patch
+- fix bnc#683857: Unicode characters in use properly
+ * change the soft hyphenation char to - in tty.tmac
+
+-------------------------------------------------------------------
+Mon Jun 6 10:10:08 UTC 2011 - mvyskocil@suse.cz
+
+-
+- fix bnc#682913: device X100 is missing
+ * create new groff-devx package containing all devX devices, as they
+ need X for build
+- fix bnc#683857: Unicode characters in use
+ * groff-1.20.1-deunicode.patch adds deunicode.tmac to tty.tmac removes
+ all unecessary unicode characters in tty output
+
+-------------------------------------------------------------------
+Tue Mar 15 08:34:56 UTC 2011 - mvyskocil@suse.cz
+
+- fix bnc#679585 - groff.info is not installed
+ * install info files as %{name}.info.gz
+
+-------------------------------------------------------------------
+Thu Oct 7 09:33:18 UTC 2010 - mvyskocil@suse.cz
+
+- fix bnc#644467: SuSEconfig.groff overwrites /etc/papersize
+ use the check_md5_and_move to prevent it
+- deprecation warning for GROFF* variables in /etc/sysconfig/suseconfig
+
+-------------------------------------------------------------------
+Tue Oct 5 12:25:28 UTC 2010 - mvyskocil@suse.cz
+
+- fix bnc#633128: Update groff to 1.20.1
+ this update obsoletes a big number of SUSE patches
+ * groff_1.18.1.1-1-debian.diff.bz2 - adds Japanese support, which is now
+ upstreamed. However new groff_1.20.1-10.debian.diff has been added
+ * suse.patch - not needed
+ * pic-html.patch - probably not needed
+ * gcc4.patch - already fixed by upstream
+ * groff-1.17.2-gcc3.patch - seems not needed
+ * utf8.patch - http://www.mail-archive.com/groff@gnu.org/msg05273.html says
+ iconv hack is no longer needed, new version uses preconv
+ * debian-fix.patch - already fixed by upstream
+ * double-free.patch - already fixed by upstream
+ * groffer-security.patch - in debian diff
+ * groff-1.18.1.1-gcc41.patch - already fixed by upstream
+ * bugzilla-217106-too-few-arguments-in-function-call.patch - makes sense
+ only with ENABLE_MULTIBYTE, which was added by old debian diff
+ * bugzilla-292412-special-encoding-handling-also-for-chinese.patch - seems not necessary
+ * gcc43.patch - already fixed by upstream
+ * fgets-overflow.patch - already fixed by upstream
+ * bnc446710.patch - seems not needed anymore
+ * groff-1.18.1.1-debian-538330.patch - part of debian diff
+- fix bnc#643083 - groff: default /etc/papersize should be "a4"
+ no "papersize a4" without SuSEconfig anymore
+- move docs and examples to groff-docs subpackage
+
+-------------------------------------------------------------------
+Wed Oct 14 13:48:20 UTC 2009 - mvyskocil@suse.cz
+
+- fixed bnc#529557 - groff: insecure file handling
+
+-------------------------------------------------------------------
+Mon Sep 21 11:11:05 CEST 2009 - tiwai@suse.de
+
+- fix broken output of man page when $LANGUAGE is set empty
+ (bnc#540600)
+
+-------------------------------------------------------------------
+Mon Feb 02 18:47:32 CET 2009 - mfabian@suse.de
+
+- bnc#470921: add more workarounds for Korean to fix the truncation
+ of some non-Korean man-pages in ko_KR.UTF-8 locale.
+
+-------------------------------------------------------------------
+Mon Dec 22 15:18:31 CET 2008 - mls@suse.de
+
+- keep zzz-groff.csh from aborting if LANG is unset
+
+-------------------------------------------------------------------
+Tue Nov 25 15:15:44 CET 2008 - mfabian@suse.de
+
+- bnc#448185: improve workaround for bnc#446710. After the
+ tmandocdb workaround was removed from "man", the new
+ workaround in groff failed in some locales.
+
+-------------------------------------------------------------------
+Fri Nov 21 15:54:34 CET 2008 - mfabian@suse.de
+
+- bnc#401952: Add a workaround to /usr/bin/nroff to make Korean
+ man-pages display correctly again.
+- /etc/profile.d/groff.{sh,csh} moved to
+ /etc/profile.d/zzz-groff.{sh,csh} to be able to check for LANG.
+ Changes in these scripts:
+ • Don’t set GROFF_NO_SGR by default anymore, it causes problems
+ with Korean man pages.
+ • For CJK languages, set MAN_KEEP_FORMATTING by default.
+ Without MAN_KEEP_FORMATTING man will use GROFF_NO_SGR when
+ writing to a pipe or file and will also pipe the result
+ through "col -b -p -x". This doesn’t work well for CJK, at
+ least not with the current version of groff.
+
+-------------------------------------------------------------------
+Thu Nov 20 17:48:24 CET 2008 - mfabian@suse.de
+
+- bnc#446710: add the workarounds from
+ /usr/share/groff/site-tmac/tmac.andocdb (man package) directly
+ to groff. These workarounds are to avoid rendering - as
+ U+2010 (HYPHEN), \- as U+2212 (MINUS SIGN), ` as U+2018
+ (LEFT SINGLE QUOTATION MARK), and ' as U+2019 (RIGHT SINGLE
+ QUOTATION MARK). Using these non-ASCII characters for rendering
+ man-pages with programm examples and command line options is
+ confusing and prevents cut and paste of code examples
+ impossible.
+
+-------------------------------------------------------------------
+Wed Oct 8 02:10:33 CEST 2008 - crrodriguez@suse.de
+
++++ 551 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:Factory/.groff.new/groff-full.changes
--- /work/SRC/openSUSE:Factory/groff/groff.changes 2013-02-04 21:10:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.groff.new/groff.changes 2013-06-11 09:27:45.000000000 +0200
@@ -1,0 +2,36 @@
+Wed Jun 5 09:00:09 UTC 2013 - mvyskocil@suse.com
+
+- modify groff_1.22.2-2.debian.diff - remove the part related to
+ src/preproc/html/pre-html.cpp, fixes bnc#755533
+
+-------------------------------------------------------------------
+Thu May 9 09:16:49 UTC 2013 - mvyskocil@suse.com
+
+- update to groff 1.22.2
+ * gropdf: A new driver for generating PDF output directly,
+ contributed by Deri James and written in Perl
+ * The -mom macro package has reached version 2.0, focusing on
+ PDF output with gropdf (using the new `pdfmom' wrapper script).
+ See the file`version-2.html' of the -mom documentation for a list
+ of the many changes.
+ * pdfmom: A new wrapper around groff that facilitates the production of PDF
+ documents from files formatted with the -mom macros.
+ * and a lot more, see NEWS for details
+- obsoletes:
+ config-guess-sub-update.patch, dtto
+ groff_1.21-6.debian.diff, replaced by
+- added groff_1.22.2-2.debian.diff
+- create a stripped-down version of groff usable for viewing of manual pages
+- new groff-full package contains the rest of groff tools capable to work with
+ images, html or pdf. It contains the devx fonts, thus obsoletes groff-devx
+ it aims to fix bnc#755533 - grohtml built without pnm* tools in PATH
+- gxdview.spec is removed as gxdview is built from groff-full.spec
+- verify the tarball using gpg-offline - this is done in groff-full only
+ to retain a limited list of dependencies for base groff
+
+-------------------------------------------------------------------
+Tue May 7 14:40:06 UTC 2013 - schwab@suse.de
+
+- config-guess-sub-update.patch: Update config.guess/sub for aarch64
+
+-------------------------------------------------------------------
@@ -251 +287 @@
- With -Tascii8, "\(:u" for ������t work.
+ With -Tascii8, "\(:u" for ü won't work.
Old:
----
groff-1.21.tar.gz
groff_1.21-6.debian.diff
gxditview.changes
gxditview.spec
New:
----
groff-1.22.2.tar.gz
groff-1.22.2.tar.gz.sig
groff-full.changes
groff-full.keyring
groff-full.spec
groff_1.22.2-2.debian.diff
pre_checkin.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ groff-full.spec ++++++
#
# spec file for package groff-full
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
##### WARNING: please do not edit this auto generated spec file. Use the groff.spec! #####
%global groff_base_only 0
Name: groff-full
Version: 1.22.2
Release: 0
Summary: GNU troff Document Formatting System
License: BSD-3-Clause and GPL-2.0+
Group: Productivity/Publishing/Troff
Url: http://www.gnu.org/software/groff/groff.html
Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
Source1: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz.sig
Source2: groff-full.keyring
Source3: zzz-groff.sh
Source4: zzz-groff.csh
# for file in `cat series | grep -v '^#' | grep '^[a-z]' `; do
# cat $file >> groff_1.21-6.debian.diff
# done
Patch0: groff_1.22.2-2.debian.diff
Patch1: groff-1.20.1-destbufferoverflow.patch
Patch2: groff-1.20.1-nroff-empty-LANGUAGE.patch
Patch3: groff-1.21-groffer-libexecdir.patch
Patch4: groff-1.20.1-deunicode.patch
Patch5: groff-1.21-CVE-2009-5044.patch
#PATCH-FIX-OPENSUSE: splitted patch6 and patch7 from
#http://cvsweb.openwall.com/cgi/cvsweb.cgi/Owl/packages/groff/groff-1.20.1-ow...
Patch6: groff-1.21-CVE-2009-5080.patch
Patch7: groff-1.21-CVE-2009-5081.patch
#PATCH-FIX-OPENSUSE: FATE#312586
#sent upstream http://lists.gnu.org/archive/html/bug-groff/2011-09/msg00002.html
#so they would be available on next release of groff
Patch8: 0001-locale-support-in-papersize-definition.patch
Patch9: 0002-documentation-for-the-locale-keyword.patch
# change the papersize definition to force the locale usage
# it can be supressed by /etc/papersize if needed
Patch10: groff-force-locale-usage.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bison
BuildRequires: fdupes
BuildRequires: gcc-c++
%if 0%{suse_version} > 1220
BuildRequires: makeinfo
%endif
%if %{groff_base_only}
Recommends: groff-full
%else
BuildRequires: ghostscript-library
%if 0%{suse_version} > 1220
BuildRequires: gpg-offline
%endif
BuildRequires: groff
BuildRequires: netpbm
BuildRequires: psutils
# for gxditview and X fontx
BuildRequires: xorg-x11-devel
Provides: jgroff = %{version}-%{release}
Provides: normal-groff = %{version}-%{release}
Obsoletes: jgroff < %{version}
# X fonts were moved back
Provides: groff-devx = %{version}-%{release}
Obsoletes: groff-devx <= 1.21
# requires the -base package
Requires: groff = %{version}
Requires(pre): %install_info_prereq
# for pre-grohtml and pdfroff
Requires: ghostscript-library
Requires: netpbm
Requires: psutils
%endif
%if %{groff_base_only}
%description
The groff package is a stripped-down package containing the necessary
components to read manual pages in ASCII, Latin-1, and UTF-8, plus the
PostScript device (groff's default). Users who want a full groff installation,
with the standard set of devices, fonts, macros, and documentation, should
install the groff-full package.
%else #groff_base_only
%description
The groff-full package provides aditional tools excluded from base groff
package, like grohtml, X fonts et. all.
Groff is used to "compile" man pages stored in groff or nroff format
for different output devices, for example, displaying to a screen or in
PostScript(tm) format for printing on a PostScript(tm) printer. Most
programs store their man pages in either /usr/share/man/ or
/usr/X11R6/man/.
%package -n groff-doc
Summary: HTML documentation and examples for groff
Group: Productivity/Publishing/Troff
%description -n groff-doc
The groff package provides compatible versions of troff, nroff, eqn,
tbl, and other Unix text formatting utilities.
Groff is used to "compile" man pages stored in groff or nroff format
for different output devices, for example, displaying to a screen or in
PostScript(tm) format for printing on a PostScript(tm) printer. Most
programs store their man pages in either /usr/share/man/ or
/usr/X11R6/man/.
%package -n gxditview
Summary: Ditroff Output Displayer for Groff
Group: Productivity/Publishing/Troff
Requires: groff-full = %{version}
# bnc#668254
Supplements: packageand(groff:xorg-x11-libX11)
Conflicts: jgxdview
Provides: gxdview = %{version}-%{release}
Obsoletes: gxdview < %{version}
%description -n gxditview
This version of xditview is called gxditview and has some extensions
used by the groff command. gxditview is used by groff if called with
the -X option.
%endif #groff_base_only
%prep
%if ! %{groff_base_only}
%if 0%{suse_version} > 1220
# we do a verification on non-base package in order to not add more dependencies to Base:build ...
%gpg_verify %{SOURCE1}
%endif
%endif
%setup -q -n groff-%{version}
%patch0 -p1 -b .debian
%patch1
%patch2 -p1 -b .bnc540600
%patch3 -p1 -b .groffer-libexecdir
%patch4 -p1 -b .deunicode
%patch5 -p1 -b .CVE-2009-5044
%patch6 -p1 -b .CVE-2009-5080
%patch7 -p1
%patch8 -p1 -b .locale
%patch9 -p1 -b .locale
%patch10 -p1 -b .force-locale
#from patch7
rm doc/groff.info-2.orig
%build
PATH=$PWD/src/roff/troff:$PWD/src/preproc/pic:$PWD/src/preproc/eqn:$PWD/src/preproc/tbl:$PWDsrc/preproc/refer:$PWD/src/preproc/soelim:$PATH
PATH=$PWD/src/roff/grog:$PWD/src/roff/groff:$PWD/src/devices/grops:$PWD/src/devices/grotty:$PWD/src/devices/grodvi:$PWD/src/devices/grohtml:$PATH
GROFF_COMMAND_PREFIX=
GROFF_FONT_PATH=$PWD
GROFF_TMAC_PATH=$PWD/tmac:$PWD/src/roff/troff
export PATH GROFF_COMMAND_PREFIX GROFF_FONT_PATH GROFF_TMAC_PATH
#
#libtoolize --force
#autoreconf --force --install
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%{configure} \
--with-appresdir=%{_datadir}/X11/app-defaults \
--with-grofferdir=%{_libexecdir}/groff/groffer
#ulimit -c unlimited
make %{?_smp_mflags}
%if ! %{groff_base_only}
#pushd doc
# make %{?_smp_mflags}
# makeinfo groff.texinfo
#popd
%endif
%install
%if %{groff_base_only}
install -d -m 0755 %{buildroot}%{_bindir}
install -d -m 0755 %{buildroot}%{_mandir}/man1
install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/
install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/font/
install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/tmac/
install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/tmac/mdoc/
%else
%{makeinstall} docdir=%{_defaultdocdir}/groff
%endif
### see Debian's groff-base.install.in ###
for BIN in eqn groff grog grops grotty neqn nroff pic preconv soelim tbl troff; do
%if %{groff_base_only}
# install binary
install -m 0755 $(find . -type f -name ${BIN}) %{buildroot}/%{_bindir}/
# install man
MAN_SOURCE=$(find src -name "${BIN}.n")
MAN_DEST="${MAN_SOURCE%.n}.1" # replace suffix .n by .1
MAN_DEST="${MAN_DEST##*/}" # remove the path/before/
install -m 0644 "${MAN_SOURCE}" "%{buildroot}%{_mandir}/man1/${MAN_DEST}"
%else
# remove binary already in groff.rpm
rm %{buildroot}/%{_bindir}/${BIN}
# remove manual already in groff.rpm
rm %{buildroot}/%{_mandir}/man1/${BIN}.*
%endif
done
%if %{groff_base_only}
# datadir
install -m 0644 src/utils/indxbib/eign %{buildroot}%{_datadir}/%{name}/%{version}/
%else
rm %{buildroot}%{_datadir}/groff/%{version}/eign
%endif
for FONT in devascii devlatin1 devps devutf8; do
%if %{groff_base_only}
cp -pr "font/${FONT}" %{buildroot}%{_datadir}/%{name}/%{version}/font/
%else
rm -r %{buildroot}%{_datadir}/groff/%{version}/font/${FONT}
%endif
done
for TMAC in an-ext.tmac an-old.tmac an.tmac andoc.tmac composite.tmac cp1047.tmac cs.tmac de.tmac den.tmac \
devtag.tmac doc.tmac doc-old.tmac eqnrc europs.tmac fr.tmac hyphen.cs hyphen.den hyphen.det \
hyphen.fr hyphen.sv hyphen.us hyphenex.cs hyphenex.det hyphenex.us ja.tmac latin1.tmac latin2.tmac \
latin5.tmac latin9.tmac man.tmac mandoc.tmac mdoc.tmac papersize.tmac pic.tmac ps.tmac psatk.tmac \
psold.tmac pspic.tmac safer.tmac sv.tmac trans.tmac troffrc troffrc-end tty-char.tmac tty.tmac \
unicode.tmac www.tmac; do
%if %{groff_base_only}
cp tmac/${TMAC} %{buildroot}%{_datadir}/%{name}/%{version}/tmac/
%else
rm %{buildroot}%{_datadir}/groff/%{version}/tmac/${TMAC}
%endif
done
%if %{groff_base_only}
install -m 0644 tmac/doc-common tmac/doc-ditroff tmac/doc-nroff tmac/doc-syms \
%{buildroot}%{_datadir}/%{name}/%{version}/tmac/mdoc/
%else
rm -rf %{buildroot}%{_datadir}/groff/%{version}/tmac/mdoc
%endif
%if %{groff_base_only}
%{__ln_s} -f current %{buildroot}%{_datadir}/%{name}/%{version}
# compat symlinks
%{__ln_s} -f eqn %{buildroot}%{_bindir}/geqn
%{__ln_s} -f tbl %{buildroot}%{_bindir}/gtbl
# install profiles to disable the use of ANSI colour sequences by default:
%{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/profile.d
%{__install} -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}/%{_sysconfdir}/profile.d/
%endif #groff_base_only
%fdupes -s %{buildroot}
%if ! %{groff_base_only}
%post
%install_info --info-dir=%{_infodir} %{_infodir}/groff.info.gz
%postun
%install_info_delete --info-dir=%{_infodir} %{_infodir}/groff.info.gz
%endif
%if %{groff_base_only}
%files
%defattr(-,root,root)
%doc BUG-REPORT ChangeLog* COPYING FDL LICENSES MANIFEST MORE.STUFF NEWS PROBLEMS PROJECTS README REVISION VERSION
%doc %{_mandir}/man1/*
%{_bindir}/*
%config %{_sysconfdir}/profile.d/zzz-%{name}.*sh
%{_datadir}/%{name}
%else #groff_base_only
%files
%defattr(-,root,root)
%dir %{_datadir}/groff/%{version}
%dir %{_libexecdir}/groff
%doc %{_docdir}/groff
%exclude %{_docdir}/groff/html
%exclude %{_docdir}/groff/examples
%doc %{_infodir}/groff*
%doc %{_mandir}/man*/*
%exclude %{_mandir}/man1/gxditview.1*
%{_bindir}/*
%exclude %{_bindir}/gxditview
%{_datadir}/groff/%{version}/font
%{_datadir}/groff/%{version}/oldfont
%{_datadir}/groff/%{version}/pic
%{_datadir}/groff/%{version}/tmac
%{_datadir}/groff/current
%{_datadir}/groff/site-tmac
%{_libexecdir}/groff/groffer
%files -n groff-doc
%defattr(-, root, root)
%dir %{_docdir}/groff
%doc %{_docdir}/groff/html
%doc %{_docdir}/groff/examples
%files -n gxditview
%defattr(-,root,root)
%dir %{_datadir}/X11/app-defaults
%doc src/devices/xditview/ChangeLog
%doc src/devices/xditview/README
%doc src/devices/xditview/TODO
%{_bindir}/gxditview
%doc %{_mandir}/man1/gxditview.1*
%{_datadir}/X11/app-defaults/GXditview
%{_datadir}/X11/app-defaults/GXditview-color
%endif #groff_base_only
%changelog
++++++ groff.spec ++++++
--- /var/tmp/diff_new_pack.FiC4uE/_old 2013-06-11 09:27:46.000000000 +0200
+++ /var/tmp/diff_new_pack.FiC4uE/_new 2013-06-11 09:27:46.000000000 +0200
@@ -16,20 +16,27 @@
#
+%global groff_base_only 1
+
Name: groff
-Version: 1.21
+Version: 1.22.2
Release: 0
Summary: GNU troff Document Formatting System
License: BSD-3-Clause and GPL-2.0+
Group: Productivity/Publishing/Troff
Url: http://www.gnu.org/software/groff/groff.html
Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
+Source1: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz.sig
+Source2: groff-full.keyring
Source3: zzz-groff.sh
Source4: zzz-groff.csh
+# rm -f foo
# for file in `cat series | grep -v '^#' | grep '^[a-z]' `; do
-# cat $file >> groff_1.21-6.debian.diff
+# cat $file >> foo
# done
-Patch0: groff_1.21-6.debian.diff
+##remove a part related to src/preproc/html/pre-html.cpp - see bnc#755533
+# filterdiff -x 'src/preproc/html/pre-html.cpp' foo > groff_1.22.2-2.debian.diff
+Patch0: groff_1.22.2-2.debian.diff
Patch1: groff-1.20.1-destbufferoverflow.patch
Patch2: groff-1.20.1-nroff-empty-LANGUAGE.patch
Patch3: groff-1.21-groffer-libexecdir.patch
@@ -55,19 +62,48 @@
%if 0%{suse_version} > 1220
BuildRequires: makeinfo
%endif
+
+%if %{groff_base_only}
+Recommends: groff-full
+%else
+BuildRequires: ghostscript-library
+%if 0%{suse_version} > 1220
+BuildRequires: gpg-offline
+%endif
+BuildRequires: groff
+BuildRequires: netpbm
+BuildRequires: psutils
+# for gxditview and X fontx
+BuildRequires: xorg-x11-devel
+
Provides: jgroff = %{version}-%{release}
Provides: normal-groff = %{version}-%{release}
Obsoletes: jgroff < %{version}
-Requires(pre): %fillup_prereq
+# X fonts were moved back
+Provides: groff-devx = %{version}-%{release}
+Obsoletes: groff-devx <= 1.21
+# requires the -base package
+Requires: groff = %{version}
Requires(pre): %install_info_prereq
# for pre-grohtml and pdfroff
-Recommends: netpbm
-Recommends: ghostscript-library
-Recommends: pssutils
+Requires: ghostscript-library
+Requires: netpbm
+Requires: psutils
+%endif
+%if %{groff_base_only}
%description
-The groff package provides compatible versions of troff, nroff, eqn,
-tbl, and other Unix text formatting utilities.
+The groff package is a stripped-down package containing the necessary
+components to read manual pages in ASCII, Latin-1, and UTF-8, plus the
+PostScript device (groff's default). Users who want a full groff installation,
+with the standard set of devices, fonts, macros, and documentation, should
+install the groff-full package.
+
+%else #groff_base_only
+
+%description
+The groff-full package provides aditional tools excluded from base groff
+package, like grohtml, X fonts et. all.
Groff is used to "compile" man pages stored in groff or nroff format
for different output devices, for example, displaying to a screen or in
@@ -75,11 +111,11 @@
programs store their man pages in either /usr/share/man/ or
/usr/X11R6/man/.
-%package doc
+%package -n groff-doc
Summary: HTML documentation and examples for groff
Group: Productivity/Publishing/Troff
-%description doc
+%description -n groff-doc
The groff package provides compatible versions of troff, nroff, eqn,
tbl, and other Unix text formatting utilities.
@@ -89,8 +125,32 @@
programs store their man pages in either /usr/share/man/ or
/usr/X11R6/man/.
+%package -n gxditview
+Summary: Ditroff Output Displayer for Groff
+Group: Productivity/Publishing/Troff
+Requires: groff-full = %{version}
+# bnc#668254
+Supplements: packageand(groff:xorg-x11-libX11)
+Conflicts: jgxdview
+Provides: gxdview = %{version}-%{release}
+Obsoletes: gxdview < %{version}
+
+%description -n gxditview
+This version of xditview is called gxditview and has some extensions
+used by the groff command. gxditview is used by groff if called with
+the -X option.
+
+%endif #groff_base_only
+
%prep
-%setup -q
+%if ! %{groff_base_only}
+%if 0%{suse_version} > 1220
+# we do a verification on non-base package in order to not add more dependencies to Base:build ...
+%gpg_verify %{SOURCE1}
+%endif
+%endif
+
+%setup -q -n groff-%{version}
%patch0 -p1 -b .debian
%patch1
%patch2 -p1 -b .bnc540600
@@ -103,6 +163,9 @@
%patch9 -p1 -b .locale
%patch10 -p1 -b .force-locale
+#from patch7
+rm doc/groff.info-2.orig
+
%build
PATH=$PWD/src/roff/troff:$PWD/src/preproc/pic:$PWD/src/preproc/eqn:$PWD/src/preproc/tbl:$PWDsrc/preproc/refer:$PWD/src/preproc/soelim:$PATH
PATH=$PWD/src/roff/grog:$PWD/src/roff/groff:$PWD/src/devices/grops:$PWD/src/devices/grotty:$PWD/src/devices/grodvi:$PWD/src/devices/grohtml:$PATH
@@ -115,22 +178,92 @@
#autoreconf --force --install
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-%{configure}
-ulimit -c unlimited
+%{configure} \
+ --with-appresdir=%{_datadir}/X11/app-defaults \
+ --with-grofferdir=%{_libexecdir}/groff/groffer
+
+#ulimit -c unlimited
make %{?_smp_mflags}
-pushd doc
- make %{?_smp_mflags}
- makeinfo groff.texinfo
-popd
+
+%if ! %{groff_base_only}
+#pushd doc
+# make %{?_smp_mflags}
+# makeinfo groff.texinfo
+#popd
+%endif
%install
-%{makeinstall} docdir=%{_defaultdocdir}/%{name}
+%if %{groff_base_only}
+install -d -m 0755 %{buildroot}%{_bindir}
+install -d -m 0755 %{buildroot}%{_mandir}/man1
+install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/
+install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/font/
+install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/tmac/
+install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/tmac/mdoc/
+%else
+ %{makeinstall} docdir=%{_defaultdocdir}/groff
+%endif
+
+### see Debian's groff-base.install.in ###
+for BIN in eqn groff grog grops grotty neqn nroff pic preconv soelim tbl troff; do
+
+%if %{groff_base_only}
+ # install binary
+ install -m 0755 $(find . -type f -name ${BIN}) %{buildroot}/%{_bindir}/
+
+ # install man
+ MAN_SOURCE=$(find src -name "${BIN}.n")
+ MAN_DEST="${MAN_SOURCE%.n}.1" # replace suffix .n by .1
+ MAN_DEST="${MAN_DEST##*/}" # remove the path/before/
+ install -m 0644 "${MAN_SOURCE}" "%{buildroot}%{_mandir}/man1/${MAN_DEST}"
+%else
+ # remove binary already in groff.rpm
+ rm %{buildroot}/%{_bindir}/${BIN}
+ # remove manual already in groff.rpm
+ rm %{buildroot}/%{_mandir}/man1/${BIN}.*
+%endif
+
+done
+
+%if %{groff_base_only}
+# datadir
+install -m 0644 src/utils/indxbib/eign %{buildroot}%{_datadir}/%{name}/%{version}/
+%else
+rm %{buildroot}%{_datadir}/groff/%{version}/eign
+%endif
+
+for FONT in devascii devlatin1 devps devutf8; do
+%if %{groff_base_only}
+ cp -pr "font/${FONT}" %{buildroot}%{_datadir}/%{name}/%{version}/font/
+%else
+ rm -r %{buildroot}%{_datadir}/groff/%{version}/font/${FONT}
+%endif
+done
+
+for TMAC in an-ext.tmac an-old.tmac an.tmac andoc.tmac composite.tmac cp1047.tmac cs.tmac de.tmac den.tmac \
+ devtag.tmac doc.tmac doc-old.tmac eqnrc europs.tmac fr.tmac hyphen.cs hyphen.den hyphen.det \
+ hyphen.fr hyphen.sv hyphen.us hyphenex.cs hyphenex.det hyphenex.us ja.tmac latin1.tmac latin2.tmac \
+ latin5.tmac latin9.tmac man.tmac mandoc.tmac mdoc.tmac papersize.tmac pic.tmac ps.tmac psatk.tmac \
+ psold.tmac pspic.tmac safer.tmac sv.tmac trans.tmac troffrc troffrc-end tty-char.tmac tty.tmac \
+ unicode.tmac www.tmac; do
+
+%if %{groff_base_only}
+ cp tmac/${TMAC} %{buildroot}%{_datadir}/%{name}/%{version}/tmac/
+%else
+ rm %{buildroot}%{_datadir}/groff/%{version}/tmac/${TMAC}
+%endif
+done
-%{__rm} -f %{buildroot}%{_infodir}/dir
+%if %{groff_base_only}
+install -m 0644 tmac/doc-common tmac/doc-ditroff tmac/doc-nroff tmac/doc-syms \
+ %{buildroot}%{_datadir}/%{name}/%{version}/tmac/mdoc/
+%else
+rm -rf %{buildroot}%{_datadir}/groff/%{version}/tmac/mdoc
+%endif
+
+%if %{groff_base_only}
-# documentation
-%{__cp} -pr BUG-REPORT ChangeLog* COPYING FDL LICENSES MANIFEST MORE.STUFF NEWS PROBLEMS PROJECTS README README.MinGW REVISION VERSION doc/*ps \
- %{buildroot}/%{_defaultdocdir}/%{name}/
+%{__ln_s} -f current %{buildroot}%{_datadir}/%{name}/%{version}
# compat symlinks
%{__ln_s} -f eqn %{buildroot}%{_bindir}/geqn
@@ -140,31 +273,65 @@
%{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/profile.d
%{__install} -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}/%{_sysconfdir}/profile.d/
+%endif #groff_base_only
+
%fdupes -s %{buildroot}
+%if ! %{groff_base_only}
%post
-%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
+%install_info --info-dir=%{_infodir} %{_infodir}/groff.info.gz
%postun
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
+%install_info_delete --info-dir=%{_infodir} %{_infodir}/groff.info.gz
+%endif
+%if %{groff_base_only}
%files
-%defattr(-, root, root)
-%dir %{_defaultdocdir}/groff
-%doc %{_defaultdocdir}/groff/
-%exclude %{_defaultdocdir}/groff/html
-%exclude %{_defaultdocdir}/groff/examples
-%doc %{_infodir}/groff*
-%doc %{_mandir}/man?/*
+%defattr(-,root,root)
+%doc BUG-REPORT ChangeLog* COPYING FDL LICENSES MANIFEST MORE.STUFF NEWS PROBLEMS PROJECTS README REVISION VERSION
+%doc %{_mandir}/man1/*
%{_bindir}/*
%config %{_sysconfdir}/profile.d/zzz-%{name}.*sh
%{_datadir}/%{name}
-%{_libexecdir}/%{name}
-%files doc
+%else #groff_base_only
+%files
+%defattr(-,root,root)
+%dir %{_datadir}/groff/%{version}
+%dir %{_libexecdir}/groff
+%doc %{_docdir}/groff
+%exclude %{_docdir}/groff/html
+%exclude %{_docdir}/groff/examples
+%doc %{_infodir}/groff*
+%doc %{_mandir}/man*/*
+%exclude %{_mandir}/man1/gxditview.1*
+%{_bindir}/*
+%exclude %{_bindir}/gxditview
+%{_datadir}/groff/%{version}/font
+%{_datadir}/groff/%{version}/oldfont
+%{_datadir}/groff/%{version}/pic
+%{_datadir}/groff/%{version}/tmac
+%{_datadir}/groff/current
+%{_datadir}/groff/site-tmac
+%{_libexecdir}/groff/groffer
+
+%files -n groff-doc
%defattr(-, root, root)
-%dir %{_defaultdocdir}/groff
-%doc %{_defaultdocdir}/groff/html
-%doc %{_defaultdocdir}/groff/examples
+%dir %{_docdir}/groff
+%doc %{_docdir}/groff/html
+%doc %{_docdir}/groff/examples
+
+%files -n gxditview
+%defattr(-,root,root)
+%dir %{_datadir}/X11/app-defaults
+%doc src/devices/xditview/ChangeLog
+%doc src/devices/xditview/README
+%doc src/devices/xditview/TODO
+%{_bindir}/gxditview
+%doc %{_mandir}/man1/gxditview.1*
+%{_datadir}/X11/app-defaults/GXditview
+%{_datadir}/X11/app-defaults/GXditview-color
+
+%endif #groff_base_only
%changelog
++++++ groff-1.21-groffer-libexecdir.patch ++++++
--- /var/tmp/diff_new_pack.FiC4uE/_old 2013-06-11 09:27:46.000000000 +0200
+++ /var/tmp/diff_new_pack.FiC4uE/_new 2013-06-11 09:27:46.000000000 +0200
@@ -1,35 +1,17 @@
-Index: groff-1.21/contrib/groffer/Makefile.sub
+Index: groff-1.22.2/contrib/groffer/Makefile.sub
===================================================================
---- groff-1.21.orig/contrib/groffer/Makefile.sub 2010-12-31 08:33:09.000000000 +0100
-+++ groff-1.21/contrib/groffer/Makefile.sub 2011-06-27 13:10:49.646150367 +0200
-@@ -63,7 +63,7 @@
- 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
-+groffer_dir=$(libexecdir)/groff/groffer
-
- # TODO: Add perl check to configure script.
- groffer: $(GROFFER_PERL) $(GROFFER_SHELL) \
-@@ -74,7 +74,7 @@
- sed -f "$(SH_DEPS_SED_SCRIPT)" \
- -e "s|@g@|$(g)|g" \
- -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
-- -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \
-+ -e "s|@libdir@|$(DESTDIR)$(libexecdir)|g" \
- -e "s|@VERSION@|$(version)$(revision)|g" \
- -e "$(SH_SCRIPT_SED_CMD)" \
- $(srcdir)/perl/groffer.pl >$@; \
-@@ -88,7 +88,7 @@
+--- groff-1.22.2.orig/contrib/groffer/Makefile.sub
++++ groff-1.22.2/contrib/groffer/Makefile.sub
+@@ -73,7 +73,7 @@ groffer: $(GROFFER_PERL) $(GROFFER_SHELL
sed -f "$(SH_DEPS_SED_SCRIPT)" \
-e "s|@g@|$(g)|g" \
-e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
- -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \
-+ -e "s|@libdir@|$(DESTDIR)$(libexecdir)|g" \
++ -e "s|@libexecdir@|$(DESTDIR)$(libexecdir)|g" \
+ -e "s|@groffer_dir@|$(DESTDIR)$(groffer_dir)|g" \
-e "s|@VERSION@|$(version)$(revision)|g" \
-e "$(SH_SCRIPT_SED_CMD)" \
- $(srcdir)/shell/groffer.sh >$@; \
-@@ -137,7 +137,7 @@
+@@ -138,7 +138,7 @@ uninstall_sub:
for f in $(GROFFER_PERL_) $(GROFFER_SHELL_) version.sh; do \
$(RM) $(DESTDIR)$(groffer_dir)/$$f; \
done
@@ -38,11 +20,11 @@
########################################################################
# Emacs settings
-Index: groff-1.21/Makefile.in
+Index: groff-1.22.2/Makefile.in
===================================================================
---- groff-1.21.orig/Makefile.in 2011-06-27 13:10:49.595148562 +0200
-+++ groff-1.21/Makefile.in 2011-06-27 13:10:49.647150402 +0200
-@@ -139,6 +139,9 @@
+--- groff-1.22.2.orig/Makefile.in
++++ groff-1.22.2/Makefile.in
+@@ -139,6 +139,9 @@ bindir=@bindir@
libdir=@libdir@
libprogramdir=$(libdir)/groff
@@ -52,7 +34,7 @@
# `datasubdir' says where to install platform-independent data files.
datadir=@datadir@
datarootdir=@datarootdir@
-@@ -786,7 +789,7 @@
+@@ -811,7 +814,7 @@ $(INCDIRS) $(PROGDEPDIRS) $(OTHERDIRS):
fi; \
test -d $@ || $(mkinstalldirs) $@; \
cd $@; \
++++++ groff-1.21.tar.gz -> groff-1.22.2.tar.gz ++++++
++++ 109237 lines of diff (skipped)
++++++ groff-full.keyring ++++++
pub 1024D/E707FDA5 2003-10-25
uid Werner Lemberg
participants (1)
-
root@hilbert.suse.de