Attachment 294705 Details for Bug 340571 – follow emacs guidelines and avoid multilib conflict

[patch] follow emacs guidelines and avoid multilib conflict

a2ps-emacs-conflict.diff (text/plain), 4.32 KB, created by Patrice Dumas on 2008-02-12 22:16:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2008-02-12 22:16:56 UTC

Size: 4.32 KB

patch

obsolete

>? .build--.log
>? .build-4.13b-70.fc9.log
>? .build-4.13b-71.fc9.log
>? a2ps-4.13
>? a2ps-4.13-eucjp.patch.bz2
>? a2ps-4.13b-70.fc9.src.rpm
>? a2ps-4.13b-71.fc9.src.rpm
>? a2ps-4.13b-GPL.tar.gz
>? i18n-fonts-0.1.tar.gz
>? i386
>Index: a2ps.spec
>===================================================================
>RCS file: /cvs/extras/rpms/a2ps/devel/a2ps.spec,v
>retrieving revision 1.80
>diff -u -3 -p -r1.80 a2ps.spec
>--- a2ps.spec	12 Feb 2008 18:21:08 -0000	1.80
>+++ a2ps.spec	12 Feb 2008 22:13:38 -0000
>@@ -1,7 +1,19 @@
>+# emacs packaging macros
>+%if %($(pkg-config emacs) ; echo $?)
>+%define emacs_version 22.1
>+%define emacs_lispdir %{_datadir}/emacs/site-lisp
>+%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
>+%else
>+%define emacs_version %(pkg-config emacs --modversion)
>+%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
>+%define emacs_startdir %(pkg-config emacs --variable sitestartdir)
>+%endif
>+
>+
> Summary: Converts text and other types of files to PostScript(TM)
> Name: a2ps
> Version: 4.13b
>-Release: 70%{?dist}
>+Release: 71%{?dist}
> License: GPLv2+
> Group: Applications/Publishing
> #Source0: ftp://ftp.enst.fr/pub/unix/a2ps/%{name}-%{version}.tar.gz 
>@@ -46,7 +58,7 @@ Patch30: a2ps-psset.patch
> Patch31: a2ps-mb.patch
> Patch34: a2ps-external-libtool.patch
> Requires: fileutils sh-utils info
>-BuildRequires: emacs, flex, libtool, texinfo, groff
>+BuildRequires: emacs, emacs-el, flex, libtool, texinfo, groff
> BuildRequires: ImageMagick
> BuildRequires: groff-perl
> BuildRequires: cups
>@@ -69,7 +81,18 @@ Provides: a2ps-i18n = 0.1-1
> %package libs
> Summary: a2ps libraries
> Group: System Environment/Libraries
>-License: GPLv2+
>+
>+
>+%package -n emacs-%{name}
>+Summary: Emacs bindings for a2ps files
>+Group: Applications/Editors
>+Requires: emacs(bin) >= %{emacs_version}
>+
>+
>+%package -n emacs-%{name}-el
>+Summary: Elisp source files for emacs-%{name} under GNU Emacs
>+Group: Applications/Editors
>+Requires:       emacs-%{name} = %{version}-%{release}
> 
> 
> %description
>@@ -82,6 +105,18 @@ and medias.
> %description libs
> The libraries for a2ps.
> 
>+
>+%description -n emacs-%{name}
>+Postscript printing hook for a2ps and major mode for a2ps style sheets
>+for emacs.
>+
>+
>+%description -n emacs-%{name}-el
>+This package contains the elisp source files for emacs-%{name} under GNU 
>+Emacs. You do not need to install this package to run emacs-%{name}. Install 
>+the emacs-%{name} package to use emacs-%{name} with GNU Emacs.
>+
>+
> %prep
> %setup -q -n %{name}-4.13 -a 1
> 
>@@ -176,6 +211,11 @@ touch -r etc/Makefile.am.etc etc/Makefil
> touch -r fonts/Makefile.in src/Makefile.in etc/Makefile.in lib/Makefile.in
> 
> %build
>+# preset the date in README.in to avoid the timestamp of the build time
>+sed -e "s!@date@!`date -r NEWS`!" etc/README.in > etc/README.in.tmp
>+touch -r etc/README.in etc/README.in.tmp
>+mv etc/README.in.tmp etc/README.in
>+
> chmod 644 {po/ja.po,encoding/euc-jp.edf,README.eucJP}.euc
> chmod 644 encoding/euc-kr.edf.euckr
> EMACS=emacs %configure \
>@@ -199,7 +239,10 @@ make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mfl
> 
> %install
> rm -rf %{buildroot}
>-make DESTDIR=%{buildroot} install
>+make DESTDIR=%{buildroot} install INSTALL='install -p'
>+
>+# reset the timestamp for the generated etc/README file
>+touch -r etc/README.in %{buildroot}%{_datadir}/a2ps/README
> 
> mkdir -p %{buildroot}%{_sysconfdir}/a2ps
> 
>@@ -214,9 +257,9 @@ popd
> ### FIXME ###
> inst()
> {
>-mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp/
>+mkdir -p %{buildroot}%{emacs_lispdir}/
> for f in contrib/emacs/*.el; do \
>-  install -p -m 0644 $f %{buildroot}%{_datadir}/emacs/site-lisp/ ; done
>+  install -p -m 0644 $f %{buildroot}%{emacs_lispdir}/ ; done
> }
> 
> # Don't ship the library file or header (bug #203536).
>@@ -274,15 +317,26 @@ exit 0
> %{_datadir}/a2ps/ps
> %{_datadir}/a2ps/sheets
> %{_datadir}/ogonkify/
>-%{_datadir}/emacs/site-lisp/*
> %dir %{_datadir}/a2ps/afm
> %dir %{_datadir}/a2ps
> 
> %files libs
>-%defattr(-,root,root)
>+%defattr(-,root,root,-)
> %{_libdir}/*.so*
> 
>+%files -n emacs-%{name}
>+%defattr(-,root,root,-)
>+%{emacs_lispdir}/*.elc
>+
>+%files -n emacs-%{name}-el
>+%defattr(-,root,root,-)
>+%{emacs_lispdir}/*.el
>+
> %changelog
>+* Tue Feb 12 2008 Patrice Dumas <pertusus@free.fr> 4.13b-71
>+- use a predictable stamp inside the etc/README file
>+- follow emacs packaging guidelines
>+
> * Tue Feb 12 2008 Tim Waugh <twaugh@redhat.com> 4.13b-70
> - Separate out libs sub-package for multilib (bug #340571).
>

Actions: View | Diff

Attachments on bug 340571: 294705