Hello community,
here is the log from the commit of package a2ps for openSUSE:Factory checked in
at 2015-03-09 10:09:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/a2ps (Old)
and /work/SRC/openSUSE:Factory/.a2ps.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "a2ps"
Changes:
--------
--- /work/SRC/openSUSE:Factory/a2ps/a2ps.changes 2015-02-16
15:01:36.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.a2ps.new/a2ps.changes 2015-03-09
10:09:11.000000000 +0100
@@ -1,0 +2,23 @@
+Wed Mar 4 14:24:49 UTC 2015 - wer...@suse.de
+
+- Add a test case to be able to detect any broken backport
+
+-------------------------------------------------------------------
+Tue Mar 3 13:55:27 UTC 2015 - wer...@suse.de
+
+- Avoid zero length FAQ
+
+-------------------------------------------------------------------
+Tue Mar 3 11:14:04 UTC 2015 - wer...@suse.de
+
+- Avoid automake-1.9 as there is no automake-1.9 anymore
+ therefore add patch a2ps-4.14-automake.patch
+- Avoid useless warning and add patch a2ps-4.14-iswprint.patch
+
+-------------------------------------------------------------------
+Mon Mar 2 12:06:41 UTC 2015 - wer...@suse.de
+
+- Fix ported patch a2ps-4.14.diff to avoid bug in locale handling
+ as well in font format definition (boo#919249, boo#919243)
+
+-------------------------------------------------------------------
New:
----
a2ps-4.14-automake.patch
a2ps-4.14-iswprint.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ a2ps.spec ++++++
--- /var/tmp/diff_new_pack.3gcpH6/_old 2015-03-09 10:09:12.000000000 +0100
+++ /var/tmp/diff_new_pack.3gcpH6/_new 2015-03-09 10:09:12.000000000 +0100
@@ -27,6 +27,7 @@
BuildRequires: texlive-latex
%if %suse_version > 1220
BuildRequires: gperf
+BuildRequires: groff
BuildRequires: makeinfo
BuildRequires: texi2html
BuildRequires: texinfo
@@ -53,12 +54,14 @@
Patch1: a2ps-4.13-security.patch
Patch2: a2ps-4.14-ogonkify.patch
Patch3: a2ps-4.14-tempfile.patch
+Patch4: a2ps-4.14-automake.patch
Patch6: a2ps-4.13-include.patch
Patch7: a2ps-4.14-acroread.patch
Patch8: a2ps-4.13-base.patch
Patch9: a2ps-4.13-utf8.patch
Patch10: a2ps-4.13-types.patch
Patch11: a2ps-4.13-psgen.patch
+Patch12: a2ps-4.14-iswprint.patch
Patch13: a2ps-4.14-linker.patch
# PATCH-FIX-USTREAM Bug 871097 - CVE-2014-0466: a2ps: fixps does not use
-dSAFER
Patch14: CVE-2014-0466.diff
@@ -90,43 +93,65 @@
%prep
%setup -q -n a2ps-4.14
touch -r configure.in .ref
-%patch -P 1 -p 0 -b .security
+%patch1 -p0 -b .security
%patch2 -p1
%patch3 -p1
-%patch -P 6 -p 1 -b .incld
+%patch4 -p0 -b .norefresh
+%patch6 -p1 -b .incld
%ifarch %ix86 x86_64
%patch7 -p1
%endif
-%patch -P 8 -p 0 -b .base
-%patch -P 9 -p 0 -b .utf8
-%patch -P 10 -p 0 -b .types
-%patch -P 11 -p 0 -b .psgen
+%patch8 -p0 -b .base
+%patch9 -p0 -b .utf8
+%patch10 -p0 -b .types
+%patch11 -p0 -b .psgen
+%patch12 -p0 -b .iswprint
%patch13 -p1
%patch14 -p1
-%patch -p1
+%patch -p0 -b .p0
cp -f %SOURCE1 po/ko.po
+find -type f | grep -vE '(parseppd|parsessh).y' | xargs \
+sed -ri 's/59 Temple Place(,| -) Suite 330/51 Franklin Street, Fifth
Floor/;s/02111-1307/02110-1301/'
+touch -r .ref configure.in
+find -name Makefile.in | xargs touch
%build
#XXX: ugly hack; necessary??
- cp /usr/share/automake-*/config.{guess,sub} auxdir/
+ #YYY: Not a hack and it is necessary!!
+ # The a2ps source is much to old to (re)run auto conf tools
+ cp -p /usr/share/automake-*/config.{guess,sub} auxdir/
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -funroll-loops -Wall -pipe
-fstack-protector -fPIE"
export LPR=lpr
export CC=gcc
- touch -r .ref configure.in
%configure --enable-shared --disable-static --with-pic --with-medium=LC_PAPER
\
--with-encoding=LC_CTYPE
con=""
- for m4 in contrib/*.m4; do
+ pushd contrib
+ for m4 in *.m4; do
in=${m4%.*}.in
rm -f ${in} ${m4%.*}
con="$con ${in##*/}"
done
+ popd
make %{?_smp_mflags} -C contrib/ ${con} LDFLAGS="-pie"
sh ./config.status
- make %{?_smp_mflags} PSFONT_PATH=%{_datadir}/ghostscript/fonts LDFLAGS="-pie"
+ make %{?_smp_mflags} PSFONT_PATH=%{_datadir}/ghostscript/fonts LDFLAGS="-pie"
MAKEINFO='makeinfo --force'
pushd doc
texi2html a2ps.texi
popd
+ # Run a test with UTF-8 Umlauts
+ mkdir -p .root/.a2ps
+ echo "This is a test text äöüßœéïçèãøæđ" > test.utf8
+ ln -sf $PWD/ps/* .root/.a2ps/
+ ln -sf $PWD/afm/* .root/.a2ps/
+ ln -sf $PWD/encoding/* .root/.a2ps/
+ ln -sf $PWD/ogonkify/* .root/.a2ps/
+ ln -sf $PWD/ppd/* .root/.a2ps/
+ ln -sf $PWD/sheets/* .root/.a2ps/
+ A2PS_CONFIG=$PWD/etc/a2ps.cfg \
+ HOME=$PWD/.root \
+ LC_CTYPE=en_US.UTF-8 ./src/a2ps --output=test.latin test.utf8
+ grep '(This is a test text' test.latin | iconv -f latin1 -t utf8
%install
make install DESTDIR=%{buildroot} PSFONT_PATH=%{_datadir}/ghostscript/fonts
@@ -141,14 +166,16 @@
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
%install_info --info-dir=%{_infodir} %{_infodir}/ogonkify.info.gz
-%postun
-/sbin/ldconfig
+%preun
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
%install_info_delete --info-dir=%{_infodir} %{_infodir}/ogonkify.info.gz
+%postun
+/sbin/ldconfig
+
%files -f %{name}.lang
%defattr(-,root,root)
-%doc AUTHORS COPYING ABOUT-NLS FAQ ChangeLog NEWS THANKS README doc/a2ps.html
+%doc AUTHORS COPYING ABOUT-NLS ChangeLog NEWS THANKS README doc/a2ps.html
%config %{_sysconfdir}/a2ps-site.cfg
%config %{_sysconfdir}/a2ps.cfg
%{_bindir}/a2ps
++++++ a2ps-4.14-automake.patch ++++++
---
Makefile.in | 2 --
contrib/Makefile.in | 22 ----------------------
2 files changed, 24 deletions(-)
--- Makefile.in
+++ Makefile.in 2015-03-03 12:08:59.000000000 +0000
@@ -286,8 +286,6 @@ all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
-am--refresh:
- @:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
--- contrib/Makefile.in
+++ contrib/Makefile.in 2015-03-03 13:03:12.306018770 +0000
@@ -320,28 +320,6 @@ all: all-recursive
.SUFFIXES:
.SUFFIXES: .m4 .in .c .l .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu contrib/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe);; \
- esac;
-
$(top_builddir)/config.status: $(top_srcdir)/configure
$(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++++++ a2ps-4.14-iswprint.patch ++++++
---
lib/quotearg.c | 1 +
1 file changed, 1 insertion(+)
--- lib/quotearg.c
+++ lib/quotearg.c 2015-03-03 11:23:16.174018578 +0000
@@ -60,6 +60,7 @@
#if HAVE_MBRTOWC && HAVE_WCHAR_H
# include <wchar.h>
+# include <wctype.h>
#else
# define iswprint(wc) 1
# define mbrtowc(pwc, s, n, ps) 1
++++++ a2ps-4.14.diff ++++++
++++ 763 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/a2ps/a2ps-4.14.diff
++++ and /work/SRC/openSUSE:Factory/.a2ps.new/a2ps-4.14.diff
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
