From 1c1273999c3d82ac508934bb0fab224dd44da0c15068907e709d18e8807048b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Sun, 12 Feb 2012 16:27:21 +0000
Subject: [PATCH] Accepting request 104142 from
 home:elvigia:branches:devel:libraries:c_c++

- Libraries back into %{_libdir}, /usr merge project

OBS-URL: https://build.opensuse.org/request/show/104142
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libgcrypt?expand=0&rev=12
---
 libgcrypt.changes |  5 +++++
 libgcrypt.spec    | 17 +++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/libgcrypt.changes b/libgcrypt.changes
index a4e1f8e..ea4df45 100644
--- a/libgcrypt.changes
+++ b/libgcrypt.changes
@@ -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
 
diff --git a/libgcrypt.spec b/libgcrypt.spec
index 7ac1836..71b2e15 100644
--- a/libgcrypt.spec
+++ b/libgcrypt.spec
@@ -1,7 +1,7 @@
 #
 # 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
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,13 +16,12 @@
 #
 
 
-
 Name:           libgcrypt
 BuildRequires:  libgpg-error-devel
 BuildRequires:  libtool
 Url:            http://www.gnu.org/directory/Security/libgcrypt.html
 Version:        1.5.0
-Release:        1
+Release:        0
 Summary:        The GNU Crypto Library
 License:        GPL-2.0+ ; LGPL-2.1+
 Group:          Development/Libraries/C and C++
@@ -40,6 +39,7 @@ GnuPG (alpha version).
 
 %package -n libgcrypt11
 Summary:        The GNU Crypto Library
+License:        GPL-2.0+ ; LGPL-2.1+
 Group:          Development/Libraries/C and C++
 # bug437293
 %ifarch ppc64
@@ -55,8 +55,8 @@ Libgcrypt is a general purpose crypto library based on the code used in
 GnuPG (alpha version).
 
 %package devel
-License:        GFDL-1.1 ; GPL-2.0+ ; LGPL-2.1+ ; MIT
 Summary:        The GNU Crypto Library
+License:        GFDL-1.1 ; GPL-2.0+ ; LGPL-2.1+ ; MIT
 Group:          Development/Libraries/C and C++
 Requires:       libgcrypt11 = %version libgpg-error-devel
 # bug437293
@@ -88,7 +88,7 @@ ENABLE_DIGEST="crc md4 md5 rmd160 sha1 sha256 sha512 tiger whirlpool"
 #
 %{?suse_update_config}
 autoreconf -fi
-%configure --with-pic --libdir=/%{_lib} \
+%configure --with-pic \
 		--enable-noexecstack \
 		--disable-static \
 %ifarch %sparc
@@ -107,10 +107,7 @@ autoreconf -fi
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
 #
-rm $RPM_BUILD_ROOT/%{_lib}/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
+rm %{buildroot}%{_libdir}/libgcrypt.la
 
 %post -n libgcrypt11 -p /sbin/ldconfig
 
@@ -127,7 +124,7 @@ mkdir -p $RPM_BUILD_ROOT%_libdir
 %files -n libgcrypt11
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README THANKS TODO
-/%_lib/libgcrypt.so.11*
+%{_libdir}/libgcrypt.so.11*
 
 %files devel
 %defattr(-,root,root)