Accepting request 308495 from home:pluskalm:branches:Publishing

- Add gpg signature
- Update info scriplet dependencies
- Add a2ps-4.14-gperf.patch (boo#932138)
- Cleanup spec file with spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/308495
OBS-URL: https://build.opensuse.org/package/show/Publishing/a2ps?expand=0&rev=59

a2ps-4.14-gperf.patch

@@ -0,0 +1,14 @@
+--- a2ps-4.14/configure.orig	2015-05-23 14:15:15.532064792 +0200
++++ a2ps-4.14/configure	2015-05-23 14:17:17.108061667 +0200
+@@ -6296,9 +6296,9 @@
+ 	{ echo "$as_me:$LINENO: checking for gperf - version >= $min_gperf_version" >&5
+ echo $ECHO_N "checking for gperf - version >= $min_gperf_version... $ECHO_C" >&6; }
+ 	gperf_major_version=`$GPERF --version | \
+-		sed 's/GNU gperf \([0-9]*\).\([0-9]*\)/\1/'`
++		grep 'GNU gperf' | sed 's/GNU gperf \([0-9]*\).\([0-9]*\).*$/\1/'`
+ 	gperf_minor_version=`$GPERF --version | \
+-		sed 's/GNU gperf \([0-9]*\).\([0-9]*\)/\2/'`
++		grep 'GNU gperf' | sed 's/GNU gperf \([0-9]*\).\([0-9]*\).*$/\2/'`
+ 	no_gperf=""
+ 	if test "$cross_compiling" = yes; then
+   /bin/true

a2ps.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun May 24 10:13:38 UTC 2015 - mpluskal@suse.com
+
+- Add gpg signature
+- Update info scriplet dependencies
+- Add a2ps-4.14-gperf.patch (boo#932138)
+- Cleanup spec file with spec-cleaner
+
 -------------------------------------------------------------------
 Wed Mar  4 14:24:49 UTC 2015 - werner@suse.de
 

a2ps.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package a2ps
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,40 +17,18 @@
 
 
 Name:           a2ps
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  emacs-nox
-BuildRequires:  flex
-BuildRequires:  ghostscript-fonts-std
-BuildRequires:  gv
-BuildRequires:  psutils
-BuildRequires:  texlive-latex
-%if %suse_version > 1220
-BuildRequires:  gperf
-BuildRequires:  groff
-BuildRequires:  makeinfo
-BuildRequires:  texi2html
-BuildRequires:  texinfo
-%endif
-Url:            http://www.gnu.org/software/a2ps/a2ps.html
-Provides:       a2ps-bin
-Requires:       file
-Requires:       ghostscript-fonts-std
-Requires:       glibc
-Requires:       sed
-Requires:       w3m
-Requires:       wdiff
-Suggests:       acroread gv ImageMagick psutils texinfo texlive-latex
-PreReq:         %{install_info_prereq}
 Version:        4.14
 Release:        0
 Summary:        Converts ASCII Text into PostScript
 License:        GPL-3.0+
 Group:          Productivity/Publishing/PS
-Source:         http://ftp.gnu.org/gnu/a2ps/%{name}-%{version}.tar.gz
+Url:            http://www.gnu.org/software/a2ps/a2ps.html
-Source1:        a2ps-ko.po
+Source0:        http://ftp.gnu.org/gnu/a2ps/%{name}-%{version}.tar.gz
-Source2:        a2ps-open
+Source1:        http://ftp.gnu.org/gnu/a2ps/%{name}-%{version}.tar.gz.sig
-Patch:          a2ps-4.14.diff
+Source2:        %{name}.keyring
+Source3:        a2ps-ko.po
+Source4:        a2ps-open
+Patch0:         a2ps-4.14.diff
 Patch1:         a2ps-4.13-security.patch
 Patch2:         a2ps-4.14-ogonkify.patch
 Patch3:         a2ps-4.14-tempfile.patch
@@ -65,7 +43,40 @@ 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
+Patch15:        a2ps-4.14-gperf.patch
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  emacs-nox
+BuildRequires:  flex
+BuildRequires:  ghostscript-fonts-std
+BuildRequires:  gv
+BuildRequires:  psutils
+BuildRequires:  texlive-latex
+Requires:       file
+Requires:       ghostscript-fonts-std
+Requires:       glibc
+Requires:       sed
+Requires:       w3m
+Requires:       wdiff
+# FIXME: use proper Requires(pre/post/preun/...)
+PreReq:         %{install_info_prereq}
+Requires(post): %{install_info_prereq}
+Requires(preun): %{install_info_prereq}
+Suggests:       ImageMagick
+Suggests:       acroread
+Suggests:       gv
+Suggests:       psutils
+Suggests:       texinfo
+Suggests:       texlive-latex
+Provides:       a2ps-bin
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} > 1220
+BuildRequires:  gperf
+BuildRequires:  groff
+BuildRequires:  makeinfo
+BuildRequires:  texi2html
+BuildRequires:  texinfo
+%endif
 
 %description
 a2ps converts ASCII text into PostScript. This feature is used by
@@ -78,9 +89,9 @@ latin encodings are supported.
 %package     -n a2ps-devel
 Summary:        Library and header file for the interface of a2ps
 Group:          Development/Libraries/Other
-Provides:       a2ps:%{_libdir}/liba2ps.a
 Requires:       %{name} = %{version}
 Requires:       glibc-devel
+Provides:       a2ps:%{_libdir}/liba2ps.a
 
 %description -n a2ps-devel
 a2ps converts ASCII text into PostScript. This feature is used by
@@ -93,23 +104,24 @@ latin encodings are supported.
 %prep
 %setup -q -n a2ps-4.14
 touch -r configure.in .ref
-%patch1  -p0 -b .security
+%patch1   -b .security
 %patch2  -p1
 %patch3  -p1
-%patch4  -p0 -b .norefresh
+%patch4   -b .norefresh
 %patch6  -p1 -b .incld
 %ifarch %ix86 x86_64
-%patch7 -p1 
+%patch7 -p1
 %endif
-%patch8  -p0 -b .base
+%patch8   -b .base
-%patch9  -p0 -b .utf8
+%patch9   -b .utf8
-%patch10 -p0 -b .types
+%patch10  -b .types
-%patch11 -p0 -b .psgen
+%patch11  -b .psgen
-%patch12 -p0 -b .iswprint
+%patch12  -b .iswprint
-%patch13 -p1 
+%patch13 -p1
 %patch14 -p1
-%patch   -p0 -b .p0
+%patch15 -p1
-cp -f %SOURCE1 po/ko.po
+%patch0    -b .p0
+cp -f %{SOURCE3} 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
@@ -119,8 +131,8 @@ find -name Makefile.in | xargs touch
  #XXX: ugly hack; necessary??
  #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/
+ cp -p %{_datadir}/automake-*/config.{guess,sub} auxdir/
- export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -funroll-loops -Wall -pipe -fstack-protector -fPIE"
+ export CFLAGS="%{optflags} -D_GNU_SOURCE -funroll-loops -Wall -pipe -fstack-protector -fPIE"
  export LPR=lpr
  export CC=gcc
 %configure --enable-shared --disable-static --with-pic --with-medium=LC_PAPER		\
@@ -148,7 +160,7 @@ find -name Makefile.in | xargs touch
  ln -sf $PWD/ogonkify/*		.root/.a2ps/
  ln -sf $PWD/ppd/*		.root/.a2ps/
  ln -sf $PWD/sheets/*		.root/.a2ps/
- A2PS_CONFIG=$PWD/etc/a2ps.cfg \
+ A2PS_CONFIG=$PWD%{_sysconfdir}/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
@@ -157,9 +169,9 @@ find -name Makefile.in | xargs touch
  make install DESTDIR=%{buildroot} PSFONT_PATH=%{_datadir}/ghostscript/fonts
  rm -r %{buildroot}/%{_infodir}/regex*
  rm -r %{buildroot}/%{_infodir}/dir
- %{find_lang} %{name}
+ %find_lang %{name}
  rm -f %{buildroot}%{_libdir}/liba2ps.la
- install -m 0755 %{S:2} %{buildroot}/%{_bindir}/
+ install -m 0755 %{SOURCE4} %{buildroot}/%{_bindir}/
 
 %post
 /sbin/ldconfig
@@ -170,8 +182,7 @@ find -name Makefile.in | xargs touch
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/ogonkify.info.gz
 
-%postun
+%postun -p /sbin/ldconfig
-/sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -189,8 +200,8 @@ find -name Makefile.in | xargs touch
 %{_bindir}/psmandup
 %{_bindir}/psset
 %{_bindir}/texi2dvi4a2ps
-%doc %{_infodir}/*.gz
+%{_infodir}/*.gz
-%doc %{_mandir}/man1/*.1.gz
+%{_mandir}/man1/*.1.gz
 %{_datadir}/a2ps
 %{_datadir}/emacs/site-lisp/*.el
 %{_datadir}/emacs/site-lisp/*.elc