Attachment 149673 Details for Bug 225235 – add sysconfdir/a2ps to the path searched for config and data files

[patch] add sysconfdir/a2ps to the path searched for config and data files

a2ps-sysconfdir-keep_lib.diff (text/plain), 4.56 KB, created by Patrice Dumas on 2007-03-09 11:38:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2007-03-09 11:38:49 UTC

Size: 4.56 KB

patch

obsolete

>? a2ps-4.13
>? a2ps-4.13-save
>? a2ps-4.13b-60.src.rpm
>? a2ps-4.13b-62.src.rpm
>? a2ps-sysconfdir-keep_lib.diff
>? a2ps.out
>? a2ps.spec-conflict
>? i386
>Index: a2ps-4.13-etc.patch
>===================================================================
>RCS file: /cvs/dist/rpms/a2ps/devel/a2ps-4.13-etc.patch,v
>retrieving revision 1.1
>diff -u -3 -p -r1.1 a2ps-4.13-etc.patch
>--- a2ps-4.13-etc.patch	9 Sep 2004 02:51:02 -0000	1.1
>+++ a2ps-4.13-etc.patch	9 Mar 2007 10:44:37 -0000
>@@ -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
>+--- a2ps-4.13/etc/Makefile.in.etc	2000-02-24 18:55:34.000000000 +0100
>++++ a2ps-4.13/etc/Makefile.in	2007-03-09 11:05:59.000000000 +0100
>+@@ -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,8 +20,30 @@
>  
>  # 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
>+--- 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	2000-02-24 19:37:44.000000000 +0100
>++++ a2ps-4.13/etc/a2ps_cfg.in	2007-03-09 11:04:14.000000000 +0100
> @@ -73,6 +73,7 @@
>  # It may be useful to extend it so that a2ps can see some
>  # TeX or X11 resources: it likes AFM files and PF[AB] files.
>Index: a2ps.spec
>===================================================================
>RCS file: /cvs/dist/rpms/a2ps/devel/a2ps.spec,v
>retrieving revision 1.66
>diff -u -3 -p -r1.66 a2ps.spec
>--- a2ps.spec	8 Mar 2007 17:52:11 -0000	1.66
>+++ a2ps.spec	9 Mar 2007 10:44:38 -0000
>@@ -67,7 +67,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
>@@ -145,6 +145,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
>@@ -173,6 +174,8 @@ make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mfl
> 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
>@@ -190,7 +193,7 @@ for f in contrib/emacs/*.el; do \
> }
> 
> # Don't ship the library file or header (bug #203536).
>-rm -f %{buildroot}%{_libdir}/*
>+rm -f %{buildroot}%{_libdir}/*.{so,a,la}
> rm -f %{buildroot}%{_includedir}/*
> 
> rm -f %{buildroot}%{_infodir}/dir
>@@ -222,15 +225,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
> %{_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

Actions: View | Diff

Attachments on bug 225235: 148925 | 148967 | 148968 | 149673