Hello community,
here is the log from the commit of package groff for openSUSE:Factory
checked in at Fri Oct 8 00:23:44 CEST 2010.
--------
--- groff/groff.changes 2009-10-14 15:50:01.000000000 +0200
+++ /mounts/work_src_done/STABLE/groff/groff.changes 2010-10-07 11:38:15.000000000 +0200
@@ -1,0 +2,35 @@
+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
+
+-------------------------------------------------------------------
New Changes file:
--- /dev/null 2010-07-09 01:59:37.000000000 +0200
+++ /mounts/work_src_done/STABLE/groff/gxditview.changes 2010-10-06 14:45:40.000000000 +0200
@@ -0,0 +1,28 @@
+-------------------------------------------------------------------
+Wed Oct 6 12:41:24 UTC 2010 - mvyskocil@suse.cz
+
+- fix bnc#633128: Update groff to 1.20.1
+- rename to gxditview
+
+-------------------------------------------------------------------
+Sun Feb 11 12:01:27 CET 2007 - ro@suse.de
+
+- added defattr
+
+-------------------------------------------------------------------
+Wed Jan 17 14:33:50 CET 2007 - mfabian@suse.de
+
+- Bugzilla #217106: too few arguments in function call.
+
+-------------------------------------------------------------------
+Tue Jan 02 18:58:35 CET 2007 - mfabian@suse.de
+
+- Bugzilla #230030: make Russian and Czech man-pages display
+ correctly again in UTF-8 locales (has been broken by the
+ update to man-2.4.3).
+
+-------------------------------------------------------------------
+Tue Sep 5 12:00:12 CEST 2006 - rguenther@suse.de
+
+- Split from groff spec file.
+
calling whatdependson for head-i586
Old:
----
bnc446710.patch
bugzilla-217106-too-few-arguments-in-function-call.patch
bugzilla-292412-special-encoding-handling-also-for-chinese.patch
debian-fix.patch
double-free.patch
fgets-overflow.patch
gcc4.patch
gcc43.patch
groff-1.17.2-gcc3.patch
groff-1.18.1.1-debian-538330.patch
groff-1.18.1.1-destbufferoverflow.patch
groff-1.18.1.1-gcc41.patch
groff-1.18.1.1.tar.bz2
groff_1.18.1.1-1-debian.diff.bz2
groffer-security.patch
gxdview.changes
gxdview.spec
nroff-empty-LANGUAGE-fix.diff
pic-html.patch
utf8.patch
New:
----
groff-1.20.1-destbufferoverflow.patch
groff-1.20.1-groffer-libexecdir.patch
groff-1.20.1-nroff-empty-LANGUAGE.patch
groff-1.20.1.tar.bz2
groff_1.20.1-10.debian.diff
gxditview.changes
gxditview.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ groff.spec ++++++
--- /var/tmp/diff_new_pack.qWFTUd/_old 2010-10-08 00:21:47.000000000 +0200
+++ /var/tmp/diff_new_pack.qWFTUd/_new 2010-10-08 00:21:47.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package groff (Version 1.18.1.1)
+# spec file for package groff (Version 1.20.1)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 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
@@ -19,44 +19,38 @@
Name: groff
-BuildRequires: bison fdupes gcc-c++
-%define build_groff_docu 1
-#
-License: BSD 3-clause (or similar) ; GPL v2 or later
+License: BSD3c(or similar) ; GPLv2+
Group: Productivity/Publishing/Troff
-Provides: normal-groff, jgroff
-Obsoletes: jgroff
-PreReq: %fillup_prereq %install_info_prereq
-AutoReqProv: on
-Version: 1.18.1.1
-Release: 171
+Version: 1.20.1
+Release: 1
Summary: GNU troff Document Formatting System
Url: http://www.gnu.org/software/groff/groff.html
-# cvs -z3 -d:pserver:anonymous@cvs.savannah.gnu.org:/sources/groff co groff
-Source0: ftp://ftp.gnu.org/gnu/groff/groff-1.18.1.1.tar.bz2
+Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.bz2
Source1: SuSEconfig.groff
Source2: sysconfig.suseconfig-groff
Source3: zzz-groff.sh
Source4: zzz-groff.csh
-Patch0: groff_1.18.1.1-1-debian.diff.bz2
-Patch1: suse.patch
-Patch2: pic-html.patch
-Patch3: gcc4.patch
-Patch4: groff-1.17.2-gcc3.patch
-Patch5: utf8.patch
-Patch6: debian-fix.patch
-Patch7: double-free.patch
-Patch8: groffer-security.patch
-Patch9: groff-1.18.1.1-gcc41.patch
-Patch10: bugzilla-217106-too-few-arguments-in-function-call.patch
-Patch11: bugzilla-292412-special-encoding-handling-also-for-chinese.patch
-Patch12: gcc43.patch
-Patch13: fgets-overflow.patch
-Patch14: groff-1.18.1.1-destbufferoverflow.patch
-Patch446710: bnc446710.patch
-Patch540600: nroff-empty-LANGUAGE-fix.diff
-Patch15: groff-1.18.1.1-debian-538330.patch
+# for file in `cat series | grep -v '^#' | grep '^[a-z]' ` do
+# cat $file >> groff_1.20.1-10.debian.diff
+# done
+Patch0: groff_1.20.1-10.debian.diff
+Patch1: groff-1.20.1-destbufferoverflow.patch
+Patch2: groff-1.20.1-nroff-empty-LANGUAGE.patch
+Patch3: groff-1.20.1-groffer-libexecdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: gcc-c++
+BuildRequires: bison
+BuildRequires: fdupes
+Provides: normal-groff = %{version}-%{release}
+Provides: jgroff = %{version}-%{release}
+Obsoletes: jgroff < %{version}
+Requires(pre): %fillup_prereq
+Requires(pre): %install_info_prereq
+AutoReqProv: on
+# for pre-grohtml and pdfroff
+Recommends: netpbm
+Recommends: ghostscript-library
+Recommends: pssutils
%description
The groff package provides compatible versions of troff, nroff, eqn,
@@ -68,7 +62,24 @@
programs store their man pages in either /usr/share/man/ or
/usr/X11R6/man/.
+Authors:
+--------
+ James Clark
+
+%package doc
+License: BSD3c(or similar) ; GPLv2+
+Group: Productivity/Publishing/Troff
+Summary: HTML documentation and examples for groff
+
+%description 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/.
Authors:
--------
@@ -77,28 +88,11 @@
%prep
%setup -q -n groff-%{version}
%patch0 -p1 -b .debian
-%patch1 -p1 -b .suse
-%patch2 -p1 -b .pic-html
-%patch3 -p1 -b .gcc4
-%patch4 -p1 -b .gcc3
-%patch5 -p1 -b .utf-8
-%patch6 -p1 -b .debian-fix
-%patch7
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p0
-%patch13 -p0
-%patch14
-%patch446710 -p1
-%patch540600 -p1
-%patch15 -p1 -b .debian-538330
+%patch1
+%patch2 -p1 -b .bnc540600
+%patch3 -p1 -b .groffer-libexecdir
%build
-# remove empty backups
-rm -f ChangeLog.jp.debian README.jp.debian
-#
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=
@@ -108,53 +102,45 @@
#
#libtoolize --force
#autoreconf --force --install
-export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" INSTALL_PROGRAM='${INSTALL}'
-./configure --prefix=/usr --mandir=%{_mandir} --infodir=%{_infodir} --enable-multibyte
-make
-%if %{build_groff_docu}
+export CFLAGS="-fno-strict-aliasing"
+export CXXFLAGS="-fno-strict-aliasing"
+%{configure}
+%{__make}
pushd doc
- #echo "papersize a4" > /etc/papersize
- make
+ %{__make}
makeinfo groff.texinfo
popd
-%endif
%install
-if [ ! "x" = "x$RPM_BUILD_ROOT" ] ; then
- install -d -m755 $RPM_BUILD_ROOT
-fi
-mkdir -p $RPM_BUILD_ROOT/usr/share
-mkdir -p $RPM_BUILD_ROOT/etc
-mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/groff
-make install manroot=$RPM_BUILD_ROOT%{_mandir} prefix=$RPM_BUILD_ROOT/usr docdir=$RPM_BUILD_ROOT%{_defaultdocdir}/groff infodir=$RPM_BUILD_ROOT/usr/share/info
-%if %{build_groff_docu}
-install -c -m0444 doc/*.ps $RPM_BUILD_ROOT%{_defaultdocdir}/groff
-#install -c -m0444 doc/*.html $RPM_BUILD_ROOT%{_defaultdocdir}/groff
-install -c -m0444 doc/*.png $RPM_BUILD_ROOT%{_defaultdocdir}/groff
-install -c -m0444 BUG* COPYING ChangeLog* INSTALL* MORE* NEWS PROBLEMS PROJECTS README* REVISION TODO VERSION $RPM_BUILD_ROOT%{_defaultdocdir}/groff
-%endif
-mkdir -p $RPM_BUILD_ROOT%{_infodir}
-install -c -m 444 doc/groff doc/groff-[0-9]* $RPM_BUILD_ROOT%{_infodir}
-ln -sf eqn $RPM_BUILD_ROOT/usr/bin/geqn
-ln -sf tbl $RPM_BUILD_ROOT/usr/bin/gtbl
-mkdir -p $RPM_BUILD_ROOT/sbin/conf.d
-mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
-install -c -m0755 $RPM_SOURCE_DIR/SuSEconfig.groff $RPM_BUILD_ROOT/sbin/conf.d/
-install -c -m0644 $RPM_SOURCE_DIR/sysconfig.suseconfig-groff $RPM_BUILD_ROOT/var/adm/fillup-templates/
-echo "papersize a4" > $RPM_BUILD_ROOT/etc/papersize
-chmod 0644 $RPM_BUILD_ROOT/etc/papersize
+%{makeinstall} docdir=%{_defaultdocdir}/%{name}
+%{__rm} -f %{buildroot}%{_infodir}/dir
+
+# 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}/
+
+# compat symlinks
+%{__ln_s} -f eqn %{buildroot}%{_bindir}/geqn
+%{__ln_s} -f tbl %{buildroot}%{_bindir}/gtbl
+
+# SUSEconfig stuff
+%{__install} -d -m 0755 %{buildroot}/sbin/conf.d
+%{__install} -d -m 0755 %{buildroot}%{_localstatedir}/adm/fillup-templates
+%{__install} -m 0755 %{SOURCE1} %{buildroot}/sbin/conf.d/
+%{__install} -m 0644 %{SOURCE2} %{buildroot}%{_localstatedir}/adm/fillup-templates/
+
+%{__install} -d -m 0755 %{buildroot}%{_sysconfdir}
+echo "a4" > %{buildroot}%{_sysconfdir}/papersize
+%{__chmod} 0644 %{buildroot}%{_sysconfdir}/papersize
+
# install profiles to disable the use of ANSI colour sequences by default:
-mkdir -p $RPM_BUILD_ROOT/etc/profile.d
-install -m 644 $RPM_SOURCE_DIR/zzz-groff.sh $RPM_BUILD_ROOT/etc/profile.d
-install -m 644 $RPM_SOURCE_DIR/zzz-groff.csh $RPM_BUILD_ROOT/etc/profile.d
-pushd $RPM_BUILD_ROOT/usr/share/groff
- test -d 1.18.1 || exit 1
- ln -s 1.18.1 current
-popd
-%fdupes $RPM_BUILD_ROOT
+%{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/profile.d
+%{__install} -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}/%{_sysconfdir}/profile.d/
+
+%fdupes -s %{buildroot}
%clean
-#[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
+rm -rf %{buildroot}
%post
%{fillup_only -an suseconfig}
@@ -166,32 +152,25 @@
%files
%defattr(-, root, root)
%dir %{_defaultdocdir}/groff
-%doc %{_defaultdocdir}/groff/*
+%doc %{_defaultdocdir}/groff/
+%exclude %{_defaultdocdir}/groff/html
+%exclude %{_defaultdocdir}/groff/examples
%doc %{_infodir}/groff*
-/usr/bin/*
%doc %{_mandir}/man?/*
-%config(noreplace) %verify(not md5 size mtime) /etc/papersize
-%config /etc/profile.d/zzz-groff.*sh
-%dir /usr/share/groff/
-%dir /usr/share/groff/site-tmac/
-/usr/share/groff/site-tmac/*
-/usr/share/groff/current
-%dir /usr/share/groff/1.18.1/
-/usr/share/groff/1.18.1/eign
-%dir /usr/share/groff/1.18.1/font/
-/usr/share/groff/1.18.1/font/*
-%dir /usr/share/groff/1.18.1/tmac/
-/usr/share/groff/1.18.1/tmac/*.tmac
-/usr/share/groff/1.18.1/tmac/*rc*
-/usr/share/groff/1.18.1/tmac/hyphen.us
-%dir /usr/share/groff/1.18.1/tmac/mdoc/
-/usr/share/groff/1.18.1/tmac/mdoc/*
-%dir /usr/share/groff/1.18.1/tmac/mm/
-/usr/share/groff/1.18.1/tmac/mm/*cov
-/usr/share/groff/1.18.1/tmac/mm/*MT
-%verify(not md5) /usr/share/groff/1.18.1/tmac/mm/locale
-%verify(not md5) /usr/share/groff/1.18.1/tmac/mm/se_locale
-/sbin/conf.d/SuSEconfig.groff
-/var/adm/fillup-templates/sysconfig.suseconfig-groff
+%{_bindir}/*
+%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/papersize
+%config %{_sysconfdir}/profile.d/zzz-%{name}.*sh
+%{_datadir}/%{name}
+%{_libexecdir}/%{name}
+#%verify(not md5) /usr/share/groff/1.18.1/tmac/mm/locale
+#%verify(not md5) /usr/share/groff/1.18.1/tmac/mm/se_locale
+/sbin/conf.d/SuSEconfig.%{name}
+%{_localstatedir}/adm/fillup-templates/sysconfig.suseconfig-%{name}
+
+%files doc
+%defattr(-, root, root)
+%dir %{_defaultdocdir}/groff
+%doc %{_defaultdocdir}/groff/html
+%doc %{_defaultdocdir}/groff/examples
%changelog
++++++ gxditview.spec ++++++
#
# spec file for package gxditview (Version 1.20.1)
#
# Copyright (c) 2010 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/
#
Name: gxditview
License: MIT
Group: Productivity/Publishing/Troff
AutoReqProv: on
Version: 1.20.1
Release: 1
Summary: Ditroff Output Displayer for Groff
Url: http://www.gnu.org/software/groff/groff.html
Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.bz2
Patch0: groff_1.20.1-10.debian.diff
Patch1: groff-1.20.1-destbufferoverflow.patch
Patch2: groff-1.20.1-nroff-empty-LANGUAGE.patch
Patch3: groff-1.20.1-groffer-libexecdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++
BuildRequires: xorg-x11-devel
Requires: groff
Conflicts: jgxdview
Provides: gxdview = %{version}-%{release}
Obsoletes: gxdview < %{version}
%description
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.
Authors:
--------
James Clark
%prep
%setup -q -n groff-%{version}
%patch0 -p1 -b .debian
%patch1 -p0 -b .destbufferoverflow
%patch2 -p1 -b .bnc540600
%patch3 -p1 -b .groffer-libexecdir
%build
# remove empty backups
rm -f ChangeLog.jp.debian README.jp.debian
#
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
#
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" INSTALL_PROGRAM='${INSTALL}'
%{configure}
%{__make}
%install
%{__install} -d -m 0755 %{buildroot}%{_bindir}
%{__install} -d -m 0755 %{buildroot}%{_datadir}/X11/app-defaults
%{__install} -d -m 0755 %{buildroot}%{_mandir}/man1/
pushd src/devices/xditview/
%{__install} -m 0755 %{name} %{buildroot}%{_bindir}
%{__install} -m 0644 GXditview.ad %{buildroot}%{_datadir}/X11/app-defaults/GXditview
%{__install} -m 0644 %{name}.man %{buildroot}%{_mandir}/man1/%{name}.1
popd
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-,root,root)
%doc src/devices/xditview/ChangeLog src/devices/xditview/README src/devices/xditview/TODO
%{_bindir}/%{name}
%doc %{_mandir}/man1/%{name}.1*
%config %{_datadir}/X11/app-defaults/GXditview
%changelog
++++++ SuSEconfig.groff ++++++
--- /var/tmp/diff_new_pack.qWFTUd/_old 2010-10-08 00:21:47.000000000 +0200
+++ /var/tmp/diff_new_pack.qWFTUd/_new 2010-10-08 00:21:47.000000000 +0200
@@ -25,6 +25,11 @@
}
. /lib/YaST/SuSEconfig.functions
+test -n "$UPDATE_GROFF_CONF" -a "$UPDATE_GROFF_CONF" = "no" && {
+ echo "Warning: UPDATE_GROFF_CONF is deprecated and might be removed in future"
+ echo "SuSEconfig.groff no longer rewrites user modified /etc/papersize"
+}
+
test -n "$UPDATE_GROFF_CONF" -a "$UPDATE_GROFF_CONF" = "yes" || exit 0
function get_paper () {
@@ -43,6 +48,9 @@
# if GROFF_PAGESIZE is set, it overrides the locale information:
if [ -n "$GROFF_PAGESIZE" ] ; then
+ echo "Warning: GROFF_PAGESIZE is deprecated and might be removed in future"
+ echo "Use RC_LANG or RC_LC_PAPER in /etc/sysconfig/language"
+ echo "or write the value to /etc/papersize, it will not be overwritten"
# make GROFF_PAGESIZE lower case only:
GROFF_PAGESIZE=$( echo $GROFF_PAGESIZE | tr '[:upper:]' '[:lower:]' )
case $GROFF_PAGESIZE in
@@ -56,6 +64,7 @@
esac
fi
-echo "$PAPER_SIZE" > /etc/papersize
+echo "$PAPER_SIZE" > /etc/papersize.SuSEconfig
+check_md5_and_move /etc/papersize
exit 0
++++++ groff-1.18.1.1-destbufferoverflow.patch -> groff-1.20.1-destbufferoverflow.patch ++++++
--- groff/groff-1.18.1.1-destbufferoverflow.patch 2008-10-08 11:45:19.000000000 +0200
+++ /mounts/work_src_done/STABLE/groff/groff-1.20.1-destbufferoverflow.patch 2010-08-27 13:39:15.000000000 +0200
@@ -1,8 +1,8 @@
-Index: src/devices/grops/ps.cc
+Index: src/devices/grops/ps.cpp
===================================================================
---- src/devices/grops/ps.cc.orig 2002-06-19 23:07:33.000000000 +0200
-+++ src/devices/grops/ps.cc 2008-10-07 23:57:44.000000000 +0200
-@@ -739,7 +739,7 @@ void ps_printer::encode_fonts()
+--- src/devices/grops/ps.cpp.orig 2009-01-09 15:25:52.000000000 +0100
++++ src/devices/grops/ps.cpp 2010-08-23 15:29:15.848156800 +0200
+@@ -833,7 +833,7 @@
{
if (next_encoding_index == 0)
return;
++++++ groff-1.20.1-groffer-libexecdir.patch ++++++
Index: groff-1.20.1/contrib/groffer/Makefile.sub
===================================================================
--- groff-1.20.1.orig/contrib/groffer/Makefile.sub 2009-01-09 15:25:52.000000000 +0100
+++ groff-1.20.1/contrib/groffer/Makefile.sub 2010-08-27 11:46:36.946469881 +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 @@
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)/shell/groffer.sh >$@; \
@@ -137,7 +137,7 @@
for f in $(GROFFER_PERL_) $(GROFFER_SHELL_) version.sh; do \
$(RM) $(DESTDIR)$(groffer_dir)/$$f; \
done
- -rmdir $(DESTDIR)$(libdir)/groff/groffer
+ -rmdir $(DESTDIR)$(libexecdir)/groff/groffer
########################################################################
# Emacs settings
Index: groff-1.20.1/Makefile.in
===================================================================
--- groff-1.20.1.orig/Makefile.in 2010-08-27 11:44:59.000000000 +0200
+++ groff-1.20.1/Makefile.in 2010-08-27 12:38:22.358157037 +0200
@@ -137,6 +137,9 @@
libdir=@libdir@
libprogramdir=$(libdir)/groff
+# `libexecdir` says where to install script not intended to run as user
+libexecdir=@libexecdir@
+
# `datasubdir' says where to install platform-independent data files.
datadir=@datadir@
dataprogramdir=$(datadir)/groff
@@ -732,7 +735,7 @@
fi; \
test -d $@ || $(mkinstalldirs) $@; \
cd $@; \
- $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \
+ $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) srcdir=$$srcdir libexecdir=$(libexecdir) VPATH=$$srcdir \
-f $(top_srcdir)/Makefile.comm \
-f $$srcdir/Makefile.sub \
-f $(top_srcdir)/Makefile.man $(do)
++++++ groff-1.20.1-nroff-empty-LANGUAGE.patch ++++++
Index: groff-1.20.1/src/roff/nroff/nroff.sh
===================================================================
--- groff-1.20.1.orig/src/roff/nroff/nroff.sh 2010-08-23 15:04:18.000000000 +0200
+++ groff-1.20.1/src/roff/nroff/nroff.sh 2010-08-23 15:46:28.313156532 +0200
@@ -41,7 +41,7 @@
IBM-1047)
Tloc=cp1047 ;;
*)
- case "${LC_ALL-${LC_CTYPE-${LANG}}}" in
+ case "${LC_ALL:-${LC_CTYPE:-${LANG}}}" in
*.UTF-8)
Tloc=utf8 ;;
iso_8859_1 | *.ISO-8859-1 | *.ISO8859-1 | \
++++++ groff-1.18.1.1.tar.bz2 -> groff-1.20.1.tar.bz2 ++++++
++++ 635622 lines of diff (skipped)
++++++ groff_1.20.1-10.debian.diff ++++++
++++ 1014 lines (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org