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

2008-10-27 15:38:28 +00:00 · 2008-10-27 15:38:28 +00:00 · ed233ad451
commit ed233ad451
parent 9c8dd66338
3 changed files with 101 additions and 30 deletions
--- a/a2ps-4.13-types.patch
+++ b/a2ps-4.13-types.patch
@ -0,0 +1,21 @@
+--- lib/liba2ps.h
+++ lib/liba2ps.h	2008-10-27 11:40:05.145358590 +0100
+@@ -57,16 +57,8 @@
+ #  endif
+ #endif
+ 
+-/*
+- * The type bool must be defined, for instance with
+-
+- #if HAVE_STDBOOL_H
+- # include <stdbool.h>
+- #else
+- typedef enum {false = 0, true = 1} bool;
+- #endif
+-
+-*/
+#include <stdbool.h>
+#include <sys/types.h>
+ 
+ __BEGIN_DECLS
+ 
--- a/a2ps.changes
+++ b/a2ps.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct 27 12:57:52 CET 2008 - werner@suse.de
+
+- Make liba2ps.h includable without any further includes also split
+  off a devel package as suggested by Thorsten (bnc#438889)
+
 -------------------------------------------------------------------
 Tue Jul 15 17:23:07 CEST 2008 - werner@suse.de

--- a/a2ps.spec
+++ b/a2ps.spec
@ -2,9 +2,16 @@
 # spec file for package a2ps (Version 4.13)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# 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/
 #

@ -20,7 +27,7 @@ Requires:       /bin/sed /usr/bin/iconv /usr/bin/file /usr/bin/wdiff /usr/bin/w3
 AutoReqProv:    on
 PreReq:         %{install_info_prereq}
 Version:        4.13
-Release:        1285
+Release:        1326
 Summary:        Converts ASCII Text into PostScript
 Source:         a2ps-4.13b.tar.bz2
 Source1:        a2ps-ko.po
@ -34,12 +41,39 @@ Patch6:         a2ps-4.13-include.patch
 Patch7:         a2ps-4.13-acroread.patch
 Patch8:         a2ps-4.13-base.patch
 Patch9:         a2ps-4.13-utf8.patch
+Patch10:        a2ps-4.13-types.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%global         _sysconfdir /etc

 %description
 a2ps converts ASCII text into PostScript. This feature is used by
 apsfilter, for example, to pretty-print ASCII text.

+Warning: a2ps is not able to convert complex unicode (UTF-8) text to
+PostScript.  Only language text which can be converted from UTF-8 to
+latin encodings are supported.
+
+
+
+Authors:
+--------
+    Miguel Santana <M.Santana@frgu.bull.fr>
+
+%package     -n a2ps-devel
+License:        GPL v2 or later
+Summary:        Library and header file for the interface of a2ps
+Group:          Productivity/Publishing/PS
+Provides:       a2ps:%{_libdir}/liba2ps.a
+AutoReqProv:    on
+
+%description -n a2ps-devel
+a2ps converts ASCII text into PostScript. This feature is used by
+apsfilter, for example, to pretty-print ASCII text.
+
+Warning: a2ps is not able to convert complex unicode (UTF-8) text to
+PostScript.  Only language text which can be converted from UTF-8 to
+latin encodings are supported.
+


 Authors:
@ -60,6 +94,7 @@ touch -r configure.in .ref
 %endif
 %patch -P 8 -p 0 -b .base
 %patch -P 9 -p 0 -b .utf8
+%patch -P 10 -p 0 -b .types
 %patch
 cp -f %SOURCE1 po/ko.po
 rename no nb po/no.*
@ -73,13 +108,16 @@ rename no nb po/no.*
 touch -r .ref configure.in
 sh ./configure ${RPM_ARCH}-suse-linux \
 	--with-gnu-ld			\
-	--prefix=/usr			\
-	--libdir=/usr/%_lib		\
+	--prefix=%{_prefix}		\
+	--libdir=%{_libdir}		\
 	--infodir=%{_infodir}		\
 	--mandir=%{_mandir}		\
+	--bindir=%{_bindir}		\
+	--datadir=%{_datadir}		\
+	--includedir=%{_includedir}	\
+	--sysconfdir=%{_sysconfdir}	\
 	--with-medium=LC_PAPER		\
-	--with-encoding=LC_CTYPE	\
-	--sysconfdir=/etc
+	--with-encoding=LC_CTYPE
 con=""
 for m4 in contrib/*.m4; do
 	in=${m4%.*}.in
@ -88,19 +126,20 @@ rename no nb po/no.*
 done
 make -C contrib/ ${con}
 sh ./config.status
- make PSFONT_PATH=/usr/share/ghostscript/fonts
+ make PSFONT_PATH=%{_datadir}/ghostscript/fonts
 pushd doc
  texi2html a2ps.texi
 popd

 %install
- make install DESTDIR=$RPM_BUILD_ROOT PSFONT_PATH=/usr/share/ghostscript/fonts
- rm -r $RPM_BUILD_ROOT/%{_infodir}/regex*
- rm -r $RPM_BUILD_ROOT/%{_infodir}/dir
+ make install DESTDIR=%{buildroot} PSFONT_PATH=%{_datadir}/ghostscript/fonts
+ rm -r %{buildroot}/%{_infodir}/regex*
+ rm -r %{buildroot}/%{_infodir}/dir
 %{find_lang} %{name}
+ rm -f %{buildroot}%{_libdir}/liba2ps.la

 %clean
-test -n "$RPM_BUILD_ROOT" && rm -rf $RPM_BUILD_ROOT
+%{?buildroot: %{__rm} -rf %{buildroot}}

 %post
 %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
@ -115,27 +154,32 @@ test -n "$RPM_BUILD_ROOT" && rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING ABOUT-NLS FAQ ChangeLog NEWS THANKS README doc/a2ps.html
 %config /etc/a2ps-site.cfg
 %config /etc/a2ps.cfg
-/usr/bin/a2ps
-/usr/bin/card
-/usr/bin/composeglyphs
-/usr/bin/fixnt
-/usr/bin/fixps
-/usr/bin/ogonkify
-/usr/bin/pdiff
-/usr/bin/psmandup
-/usr/bin/psset
-/usr/bin/texi2dvi4a2ps
-/usr/include/liba2ps.h
+%{_bindir}/a2ps
+%{_bindir}/card
+%{_bindir}/composeglyphs
+%{_bindir}/fixnt
+%{_bindir}/fixps
+%{_bindir}/ogonkify
+%{_bindir}/pdiff
+%{_bindir}/psmandup
+%{_bindir}/psset
+%{_bindir}/texi2dvi4a2ps
 %doc %{_infodir}/*.gz
-/usr/%_lib/liba2ps.a
-/usr/%_lib/liba2ps.la
 %doc %{_mandir}/man1/*.1.gz
-/usr/share/a2ps
-/usr/share/emacs/site-lisp/*.el
-/usr/share/emacs/site-lisp/*.elc
-/usr/share/ogonkify
+%{_datadir}/a2ps
+%{_datadir}/emacs/site-lisp/*.el
+%{_datadir}/emacs/site-lisp/*.elc
+%{_datadir}/ogonkify
+
+%files -n a2ps-devel
+%defattr(-,root,root)
+%{_includedir}/liba2ps.h
+%{_libdir}/liba2ps.a

 %changelog
+* Mon Oct 27 2008 werner@suse.de
+- Make liba2ps.h includable without any further includes also split
+  off a devel package as suggested by Thorsten (bnc#438889)
 * Tue Jul 15 2008 werner@suse.de
 - Better workaround for UTF-8 files
 * Tue Mar 04 2008 werner@suse.de
@ -253,7 +297,7 @@ test -n "$RPM_BUILD_ROOT" && rm -rf $RPM_BUILD_ROOT
 - merged patches
 * Thu Jul 06 2000 werner@suse.de
 - Add `,' to atan2 in for77kwds.ssh to distinguish atan2 from cabs.
-* Sat Apr 08 2000 bk@suse.de
+* Fri Apr 07 2000 bk@suse.de
 - added suse update config macro
 * Fri Feb 25 2000 kukuk@suse.de
 - Fill out copyright and group tag