Accepting request 104143 from devel:libraries:c_c++

- Libraries back into %{_libdir}, /usr merge project (forwarded request 104142 from elvigia)

OBS-URL: https://build.opensuse.org/request/show/104143
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libgcrypt?expand=0&rev=27
This commit is contained in:
Stephan Kulow 2012-02-15 15:15:59 +00:00 committed by Git OBS Bridge
commit 606ee81da6
2 changed files with 12 additions and 10 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Feb 12 15:23:56 UTC 2012 - crrodriguez@opensuse.org
- Libraries back into %{_libdir}, /usr merge project
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Nov 13 14:37:29 UTC 2011 - jengelh@medozas.de Sun Nov 13 14:37:29 UTC 2011 - jengelh@medozas.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package libgcrypt # spec file for package libgcrypt
# #
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,13 +16,12 @@
# #
Name: libgcrypt Name: libgcrypt
BuildRequires: libgpg-error-devel BuildRequires: libgpg-error-devel
BuildRequires: libtool BuildRequires: libtool
Url: http://www.gnu.org/directory/Security/libgcrypt.html Url: http://www.gnu.org/directory/Security/libgcrypt.html
Version: 1.5.0 Version: 1.5.0
Release: 1 Release: 0
Summary: The GNU Crypto Library Summary: The GNU Crypto Library
License: GPL-2.0+ ; LGPL-2.1+ License: GPL-2.0+ ; LGPL-2.1+
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
@ -40,6 +39,7 @@ GnuPG (alpha version).
%package -n libgcrypt11 %package -n libgcrypt11
Summary: The GNU Crypto Library Summary: The GNU Crypto Library
License: GPL-2.0+ ; LGPL-2.1+
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
@ -55,8 +55,8 @@ Libgcrypt is a general purpose crypto library based on the code used in
GnuPG (alpha version). GnuPG (alpha version).
%package devel %package devel
License: GFDL-1.1 ; GPL-2.0+ ; LGPL-2.1+ ; MIT
Summary: The GNU Crypto Library Summary: The GNU Crypto Library
License: GFDL-1.1 ; GPL-2.0+ ; LGPL-2.1+ ; MIT
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libgcrypt11 = %version libgpg-error-devel Requires: libgcrypt11 = %version libgpg-error-devel
# bug437293 # bug437293
@ -88,7 +88,7 @@ ENABLE_DIGEST="crc md4 md5 rmd160 sha1 sha256 sha512 tiger whirlpool"
# #
%{?suse_update_config} %{?suse_update_config}
autoreconf -fi autoreconf -fi
%configure --with-pic --libdir=/%{_lib} \ %configure --with-pic \
--enable-noexecstack \ --enable-noexecstack \
--disable-static \ --disable-static \
%ifarch %sparc %ifarch %sparc
@ -107,10 +107,7 @@ autoreconf -fi
%install %install
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
# #
rm $RPM_BUILD_ROOT/%{_lib}/libgcrypt.la rm %{buildroot}%{_libdir}/libgcrypt.la
mkdir -p $RPM_BUILD_ROOT%_libdir
%{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/%{name}.so) %{buildroot}%{_libdir}/%{name}.so
%{__rm} -v %{buildroot}/%{_lib}/%{name}.so
%post -n libgcrypt11 -p /sbin/ldconfig %post -n libgcrypt11 -p /sbin/ldconfig
@ -127,7 +124,7 @@ mkdir -p $RPM_BUILD_ROOT%_libdir
%files -n libgcrypt11 %files -n libgcrypt11
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README THANKS TODO %doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README THANKS TODO
/%_lib/libgcrypt.so.11* %{_libdir}/libgcrypt.so.11*
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)