Accepting request 284461 from Publishing

- BuildRequire texi2html

- Correct patch a2ps-4.14.diff (boo#915483)
- Make a2ps-open smart now

- build with PIE

OBS-URL: https://build.opensuse.org/request/show/284461
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/a2ps?expand=0&rev=37

a2ps-4.14.diff

@@ -306,7 +306,7 @@ diff -rupN a2ps-4.14.old/etc/a2ps_cfg.in a2ps-4.14/etc/a2ps_cfg.in
 -@COM_gv@Variable: ghostview @gv@ -antialias --arguments=-dNOPLATFONTS
 +##@COM_ghostview@Variable: ghostview @ghostview@ --arguments=-dNOPLATFONTS
 +#@COM_gv@Variable: ghostview @gv@ -antialias --arguments=-dNOPLATFONTS
-+variable: ghostview a2ps-open
++Variable: a2ps-open
  
  # Used for the `pdf' printer.
  # Use as `#{ps2pdf} INPUT OUTPUT'.

a2ps-open

@@ -41,12 +41,18 @@
 # Checks for known desktop environments
 # set variable DE to the desktop environments name, lowercase
 
+DE=generic
 detectDE()
 {
     if test "$KDE_FULL_SESSION" = "true" ; then DE=kde;
     elif test -n "$GNOME_DESKTOP_SESSION_ID" ; then DE=gnome;
     elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' &>/dev/null ; then DE=xfce;
     fi
+    case "$DE" in
+    kde)    ;;
+    gnome)  type -p kioclient &>/dev/null || DE=generic ;;
+    xfce)   type -p exo-open &>/dev/null || DE=generic ;;
+    esac
 }
 
 #----------------------------------------------------------------------------
@@ -69,26 +75,30 @@ kfmclient_fix_exit_code()
 
 open_kde()
 {
-    kfmclient exec "$1"
-    kfmclient_fix_exit_code $?
+    if type -p kioclient &>/dev/null ; then
+	kioclient exec ${1+"$@"}
+    else
+	kfmclient exec ${1+"$@"}
+	kfmclient_fix_exit_code $?
+    fi
     test $? -eq 0 || exit 1
 }
 
 open_gnome()
 {
-    gnome-open "$1"
+    gnome-open ${1+"$@"}
     test $? -eq 0 || exit 1
 }
 
 open_xfce()
 {
-    exo-open "$1"
+    exo-open ${1+"$@"}
     test $? -eq 0 || exit 1
 }
 
 open_generic()
 {
-    gv -antialias ${1+"$@"}
+    gv ${1+"$@"}
     test $? -eq 0 || exit 1
 }
 
@@ -98,8 +108,8 @@ GS_DEVICE=x11alpha
 GS_OPTIONS=-dNOPLATFONTS
 export GS_DEVICE GS_OPTIONS
 case "$DE" in
-#   kde)    open_kde	    ${1+"$@"} ;;
-#   gnome)  open_gnome	    ${1+"$@"} ;;
-#   xfce)   open_xfce	    ${1+"$@"} ;;
+    kde)    open_kde	    ${1+"$@"} ;;
+    gnome)  open_gnome	    ${1+"$@"} ;;
+    xfce)   open_xfce	    ${1+"$@"} ;;
     *)	    open_generic    ${1+"$@"}
 esac

a2ps.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Fri Feb  6 11:23:03 UTC 2015 - werner@suse.de
+
+- BuildRequire texi2html
+
+-------------------------------------------------------------------
+Mon Feb  2 13:42:36 UTC 2015 - werner@suse.de
+
+- Correct patch a2ps-4.14.diff (boo#915483)
+- Make a2ps-open smart now
+
+-------------------------------------------------------------------
+Tue Dec 23 13:23:34 UTC 2014 - meissner@suse.com
+
+- build with PIE
+
 -------------------------------------------------------------------
 Mon Nov 10 17:00:14 UTC 2014 - sfalken@opensuse.org
 

a2ps.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package a2ps
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -28,6 +28,7 @@ BuildRequires:  texlive-latex
 %if %suse_version > 1220
 BuildRequires:  gperf
 BuildRequires:  makeinfo
+BuildRequires:  texi2html
 BuildRequires:  texinfo
 %endif
 Url:            http://www.gnu.org/software/a2ps/a2ps.html
@@ -108,7 +109,7 @@ cp -f %SOURCE1 po/ko.po
 %build
  #XXX: ugly hack; necessary??
  cp /usr/share/automake-*/config.{guess,sub} auxdir/
- export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -funroll-loops -Wall -pipe -fstack-protector"
+ 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
@@ -120,9 +121,9 @@ cp -f %SOURCE1 po/ko.po
 	rm -f ${in} ${m4%.*}
 	con="$con ${in##*/}"
  done
- make %{?_smp_mflags} -C contrib/ ${con}
+ make %{?_smp_mflags} -C contrib/ ${con} LDFLAGS="-pie"
  sh ./config.status
- make %{?_smp_mflags} PSFONT_PATH=%{_datadir}/ghostscript/fonts
+ make %{?_smp_mflags} PSFONT_PATH=%{_datadir}/ghostscript/fonts LDFLAGS="-pie"
  pushd doc
   texi2html a2ps.texi
  popd