- give gpg-error-config libdir=@exec_prefix@/lib instead of @libdir@, so

that it agrees on 32- and 64-bit arches (it suppresses the -L argument
    if @libdir@ is /usr/lib, so this should be cleaner than adding a
    non-standard .pc file which upstream developers might inadvertently
    think they can depend to be on every system which provides this
    library)
This commit is contained in:
Nalin Dahyabhai 2006-06-05 17:54:01 +00:00
parent a0cd2edf2d
commit cf2d64bcdc

View File

@ -1,8 +1,7 @@
# This is a template. The dist target uses it to create the real file.
Summary: libgpg-error Summary: libgpg-error
Name: libgpg-error Name: libgpg-error
Version: 1.3 Version: 1.3
Release: 2 Release: 3
URL: ftp://ftp.gnupg.org/gcrypt/libgpg-error/ URL: ftp://ftp.gnupg.org/gcrypt/libgpg-error/
Source0: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2 Source0: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2
Source1: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2.sig Source1: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2.sig
@ -32,19 +31,19 @@ contains files necessary to develop applications using libgpg-error.
%prep %prep
%setup -q %setup -q
%patch0 -p1 #%patch0 -p1 -b .pkgconfig
sed -i -e 's|^libdir=@libdir@$|libdir=@exec_prefix@/lib|g' src/gpg-error-config.in
%build %build
cp -f %{SOURCE3} . #cp -f %{SOURCE3} .
%configure %configure
make make
%install %install
rm -fr $RPM_BUILD_ROOT rm -fr $RPM_BUILD_ROOT
%makeinstall %makeinstall
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig #mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
cp -f gpg-error.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/gpg-error.pc #cp -f gpg-error.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/gpg-error.pc
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
%find_lang %{name} %find_lang %{name}
@ -67,11 +66,18 @@ rm -fr $RPM_BUILD_ROOT
%{_bindir}/gpg-error-config %{_bindir}/gpg-error-config
%{_libdir}/libgpg-error.so %{_libdir}/libgpg-error.so
%{_libdir}/libgpg-error.a %{_libdir}/libgpg-error.a
%{_libdir}/pkgconfig/gpg-error.pc #%{_libdir}/pkgconfig/gpg-error.pc
%{_includedir}/gpg-error.h %{_includedir}/gpg-error.h
%{_datadir}/aclocal/gpg-error.m4 %{_datadir}/aclocal/gpg-error.m4
%changelog %changelog
* Mon Jun 5 2006 Nalin Dahyabhai <nalin@redhat.com> 1.3-3
- give gpg-error-config libdir=@exec_prefix@/lib instead of @libdir@, so that
it agrees on 32- and 64-bit arches (it suppresses the -L argument if @libdir@
is /usr/lib, so this should be cleaner than adding a non-standard .pc file
which upstream developers might inadvertently think they can depend to be on
every system which provides this library)
* Mon May 15 2006 Karsten Hopp <karsten@redhat.de> 1.3-2 * Mon May 15 2006 Karsten Hopp <karsten@redhat.de> 1.3-2
- switch to pkgconfig so that gpg-error-config can be the same on - switch to pkgconfig so that gpg-error-config can be the same on
32bit and 64bit archs 32bit and 64bit archs