new upstream release

- move from /lib to /usr/lib
This commit is contained in:
Tomas Mraz 2014-09-19 11:40:37 +02:00
parent cb9a58c44e
commit dd46788e35
3 changed files with 13 additions and 35 deletions

2
.gitignore vendored
View File

@ -8,3 +8,5 @@ libgpg-error-1.9.tar.bz2.sig
/libgpg-error-1.12.tar.bz2.sig /libgpg-error-1.12.tar.bz2.sig
/libgpg-error-1.13.tar.bz2 /libgpg-error-1.13.tar.bz2
/libgpg-error-1.13.tar.bz2.sig /libgpg-error-1.13.tar.bz2.sig
/libgpg-error-1.16.tar.bz2
/libgpg-error-1.16.tar.bz2.sig

View File

@ -1,7 +1,7 @@
Summary: Library for error values used by GnuPG components Summary: Library for error values used by GnuPG components
Name: libgpg-error Name: libgpg-error
Version: 1.13 Version: 1.16
Release: 3%{?dist} Release: 1%{?dist}
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
@ -38,9 +38,8 @@ contains files necessary to develop applications using libgpg-error.
# set it to a value which we know will be suppressed. # set it to a value which we know will be suppressed.
sed -i -e 's|^libdir=@libdir@$|libdir=@exec_prefix@/lib|g;s|@GPG_ERROR_CONFIG_HOST@|none|g' src/gpg-error-config.in sed -i -e 's|^libdir=@libdir@$|libdir=@exec_prefix@/lib|g;s|@GPG_ERROR_CONFIG_HOST@|none|g' src/gpg-error-config.in
# We need a version of libtool that won't decide to add an rpath of /usr/lib64 # Modify configure to drop rpath for /usr/lib64
# even when we ask it not to. sed -i -e 's|sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/lib /usr/lib %{_libdir}|g' configure
autoreconf -f -i
%build %build
%configure --disable-static --disable-rpath --disable-languages %configure --disable-static --disable-rpath --disable-languages
@ -53,33 +52,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
%find_lang %{name} %find_lang %{name}
# Relocate the shared libraries to /%{_lib}.
mkdir -p $RPM_BUILD_ROOT/%{_lib}
for shlib in $RPM_BUILD_ROOT/%{_libdir}/*.so* ; do
if test -L "$shlib" ; then
rm "$shlib"
else
mv "$shlib" $RPM_BUILD_ROOT/%{_lib}/
fi
done
# Figure out where /%{_lib} is relative to %{_libdir}.
touch $RPM_BUILD_ROOT/root_marker
relroot=..
while ! test -f $RPM_BUILD_ROOT/%{_libdir}/$relroot/root_marker ; do
relroot=$relroot/..
done
# Overwrite development symlinks.
pushd $RPM_BUILD_ROOT/%{_libdir}
for shlib in $relroot/%{_lib}/lib*.so.* ; do
shlib=`echo "$shlib" | sed -e 's,//,/,g'`
target=`basename "$shlib" | sed -e 's,\.so.*,,g'`.so
ln -sf $shlib $target
done
popd
# Add the soname symlink.
/sbin/ldconfig -n $RPM_BUILD_ROOT/%{_lib}/
rm -f $RPM_BUILD_ROOT/root_marker
%check %check
make check make check
@ -96,7 +68,7 @@ rm -fr $RPM_BUILD_ROOT
%license COPYING COPYING.LIB %license COPYING COPYING.LIB
%doc AUTHORS README NEWS ChangeLog %doc AUTHORS README NEWS ChangeLog
%{_bindir}/gpg-error %{_bindir}/gpg-error
/%{_lib}/libgpg-error.so.0* %{_libdir}/libgpg-error.so.0*
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
@ -106,6 +78,10 @@ rm -fr $RPM_BUILD_ROOT
%{_datadir}/aclocal/gpg-error.m4 %{_datadir}/aclocal/gpg-error.m4
%changelog %changelog
* Fri Sep 19 2014 Tomáš Mráz <tmraz@redhat.com> 1.16-1
- new upstream release
- move from /lib to /usr/lib
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.13-3 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.13-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

View File

@ -1,2 +1,2 @@
fe0cfa7e15262ef8fdeee366109e9ff6 libgpg-error-1.13.tar.bz2 ec7f82d92329a535a89b06142e625f8c libgpg-error-1.16.tar.bz2
96e2f6b035e6a6b9bc0d4f88eb605007 libgpg-error-1.13.tar.bz2.sig 172bdc9055b1b08aa15a5cf51f4bcdd2 libgpg-error-1.16.tar.bz2.sig