From 4149a4a8b20ab91487ef12e5a5d999342df7932c Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Mar 09 2007 12:34:21 +0000
Subject: - Add sysconfdir/a2ps to search path (bug #225235).

- Resolves: rhbz#225235

---

diff --git a/a2ps-4.13-etc.patch b/a2ps-4.13-etc.patch
index 0af364c..1aaee86 100644
--- a/a2ps-4.13-etc.patch
+++ b/a2ps-4.13-etc.patch
@@ -1,5 +1,14 @@
 --- a2ps-4.13/etc/Makefile.in.etc	Wed Feb  9 09:32:55 2000
 +++ a2ps-4.13/etc/Makefile.in	Thu Apr 27 22:45:03 2000
+@@ -132,7 +132,7 @@
+ 
+ 
+ ogonkifydir = $(datadir)/ogonkify
+-libpath = $(pkgdatadir)/sheets:$(pkgdatadir)/ps:$(pkgdatadir)/encoding:$(pkgdatadir)/afm:$(ogonkifydir)/afm:$(pkgdatadir)/ppd:$(pkgdatadir)/fonts:$(ogonkifydir)/fonts:$(pkgdatadir)
++libpath = $(sysconfdir)/$(PACKAGE):$(pkgdatadir)/sheets:$(pkgdatadir)/ps:$(pkgdatadir)/encoding:$(pkgdatadir)/afm:$(ogonkifydir)/afm:$(pkgdatadir)/ppd:$(pkgdatadir)/fonts:$(ogonkifydir)/fonts:$(pkgdatadir)
+ 
+ pkgdata_DATA = README
+ 
 @@ -297,7 +297,9 @@
  
  # Building the correct a2ps.cfg
@@ -11,6 +20,28 @@
  
  # Building a time stamp to know the version.
  README: README.in Makefile
+--- a2ps-4.13/etc/Makefile.am.etc	1999-11-30 09:20:09.000000000 +0100
++++ a2ps-4.13/etc/Makefile.am	2007-03-09 11:05:43.000000000 +0100
+@@ -2,7 +2,7 @@
+ ## Makefile for a2ps' etc library directory.
+ 
+ ogonkifydir=$(datadir)/ogonkify
+-libpath = $(pkgdatadir)/sheets:$(pkgdatadir)/ps:$(pkgdatadir)/encoding:$(pkgdatadir)/afm:$(ogonkifydir)/afm:$(pkgdatadir)/ppd:$(pkgdatadir)/fonts:$(ogonkifydir)/fonts:$(pkgdatadir)
++libpath = $(sysconfdir)/$(PACKAGE):$(pkgdatadir)/sheets:$(pkgdatadir)/ps:$(pkgdatadir)/encoding:$(pkgdatadir)/afm:$(ogonkifydir)/afm:$(pkgdatadir)/ppd:$(pkgdatadir)/fonts:$(ogonkifydir)/fonts:$(pkgdatadir)
+ 
+ pkgdata_DATA = README
+ 
+@@ -40,7 +40,9 @@
+ 
+ # Building the correct a2ps.cfg
+ a2ps.cfg: a2ps_cfg Makefile
+-	sed "s!@libpath@!$(libpath)!" a2ps_cfg > a2ps.cfg
++	sed -e "s!@libpath@!$(libpath)!" \
++	    -e "s!@apppath@!$(PSFONT_PATH)!" \
++	    a2ps_cfg > a2ps.cfg
+ 
+ # Building a time stamp to know the version.
+ README: README.in Makefile
 --- a2ps-4.13/etc/a2ps_cfg.in.etc	Tue Feb  8 03:24:03 2000
 +++ a2ps-4.13/etc/a2ps_cfg.in	Thu Apr 27 20:49:04 2000
 @@ -73,6 +73,7 @@
diff --git a/a2ps.spec b/a2ps.spec
index 08c694d..d4d7178 100644
--- a/a2ps.spec
+++ b/a2ps.spec
@@ -69,7 +69,7 @@ and medias.
 touch -r configure.in __timestamp_configure.in
 
 %patch0 -p1
-%patch1 -p1
+%patch1 -p1 -b .etc
 %patch2 -p1
 %patch3 -p1 -b .security
 %patch4 -p1 -b .glibcpaper
@@ -147,6 +147,7 @@ rm __timestamp_configure.in
 touch -r config.h.in.euc config.h.in
 touch -r configure.orig configure Makefile.in
 touch -r src/Makefile.am.euc src/Makefile.am
+touch -r etc/Makefile.am.etc etc/Makefile.am
 touch -r fonts/Makefile.in src/Makefile.in etc/Makefile.in lib/Makefile.in
 
 %build
@@ -175,6 +176,8 @@ make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
+mkdir -p %{buildroot}%{_sysconfdir}/a2ps
+
 mkdir -p %{buildroot}%{_datadir}/a2ps/{afm,fonts}
 pushd i18n-fonts-0.1/afm
 install -p -m 0644 *.afm %{buildroot}%{_datadir}/a2ps/afm
@@ -224,16 +227,17 @@ exit 0
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
+%dir %{_sysconfdir}/a2ps
 %{_sysconfdir}/a2ps.cfg
 %config(noreplace) %{_sysconfdir}/a2ps-site.cfg
 %doc AUTHORS ChangeLog COPYING NEWS README TODO THANKS
-%{_libdir}/liba2ps.so.*
 %{_bindir}/*
+%{_libdir}/liba2ps.so.*
 %{_infodir}/a2ps.info*
 %{_infodir}/ogonkify.info*
 %{_infodir}/regex.info*
 %{_mandir}/*/*
-%config(noreplace) %verify(not md5 size mtime) %{_datadir}/a2ps/afm/fonts.map
+%{_datadir}/a2ps/afm/fonts.map
 %{_datadir}/a2ps/afm/*.afm
 %{_datadir}/a2ps/afm/make_fonts_map.sh
 %{_datadir}/a2ps/README
@@ -248,7 +252,8 @@ exit 0
 %dir %{_datadir}/a2ps
 
 %changelog
-- Fri Mar  9 2007 Tim Waugh <twaugh@redhat.com>
+* Fri Mar  9 2007 Tim Waugh <twaugh@redhat.com>
+- Add sysconfdir/a2ps to search path (bug #225235).
 - Build does not require gperf after all (bug #225235).
 - Don't remove needed library (bug #225235).