From aadac53807ee72c70dee6ce847e5930e8b58b838ddde7040dd03f1e1beba1947 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Wed, 13 Jun 2012 07:19:23 +0000
Subject: [PATCH] Accepting request 124757 from home:computersalat:devel:libs

fix deps
  * libgpg-error-devel >= 1.8
add libsoname macro

OBS-URL: https://build.opensuse.org/request/show/124757
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libgcrypt?expand=0&rev=16
---
 libgcrypt.changes |  7 +++++++
 libgcrypt.spec    | 53 ++++++++++++++++++++++++-----------------------
 2 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/libgcrypt.changes b/libgcrypt.changes
index 5ef2ab8..a174a2e 100644
--- a/libgcrypt.changes
+++ b/libgcrypt.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jun 12 21:19:18 UTC 2012 - chris@computersalat.de
+
+- fix deps
+  * libgpg-error-devel >= 1.8
+- add libsoname macro
+
 -------------------------------------------------------------------
 Sun Feb 12 15:23:56 UTC 2012 - crrodriguez@opensuse.org
 
diff --git a/libgcrypt.spec b/libgcrypt.spec
index 7d5c365..f530e1f 100644
--- a/libgcrypt.spec
+++ b/libgcrypt.spec
@@ -17,43 +17,44 @@
 
 
 Name:           libgcrypt
-BuildRequires:  libgpg-error-devel
-BuildRequires:  libtool
+%define libsoname %{name}11
 Url:            http://directory.fsf.org/wiki/Libgcrypt
 Version:        1.5.0
 Release:        0
 Summary:        The GNU Crypto Library
 License:        GPL-2.0+ ; LGPL-2.1+
 Group:          Development/Libraries/C and C++
-Source:         %name-%version.tar.bz2
+Source:         %{name}-%{version}.tar.bz2
 Source2:        baselibs.conf
 Source3:        idea.c.gz
-Patch0:         %name-ppc64.patch
-Patch1:         libgcrypt-strict-aliasing.patch
-Patch3:         libgcrypt-1.4.1-rijndael_no_strict_aliasing.patch
-Patch4:         libgcrypt-sparcv9.diff
-Patch5:         libgcrypt-1.5.0-idea.patch
-Patch6:         libgcrypt-1.5.0-idea_codecleanup.patch
+Patch0:         %{name}-ppc64.patch
+Patch1:         %{name}-strict-aliasing.patch
+Patch3:         %{name}-1.4.1-rijndael_no_strict_aliasing.patch
+Patch4:         %{name}-sparcv9.diff
+Patch5:         %{name}-1.5.0-idea.patch
+Patch6:         %{name}-1.5.0-idea_codecleanup.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  libgpg-error-devel >= 1.8
+BuildRequires:  libtool
 
 %description
 Libgcrypt is a general purpose crypto library based on the code used in
 GnuPG (alpha version).
 
-%package -n libgcrypt11
+%package -n %{libsoname}
 Summary:        The GNU Crypto Library
 License:        GPL-2.0+ ; LGPL-2.1+
 Group:          Development/Libraries/C and C++
 # bug437293
 %ifarch ppc64
-Obsoletes:      libgcrypt-64bit
+Obsoletes:      %{name}-64bit
 %endif
 #
 # libgcrypt last used in 10.3
-Obsoletes:      libgcrypt < %{version}
-Provides:       libgcrypt = %{version}
+Obsoletes:      %{name} < %{version}
+Provides:       %{name} = %{version}
 
-%description -n libgcrypt11
+%description -n %{libsoname}
 Libgcrypt is a general purpose crypto library based on the code used in
 GnuPG (alpha version).
 
@@ -61,12 +62,12 @@ GnuPG (alpha version).
 Summary:        The GNU Crypto Library
 License:        GFDL-1.1 ; GPL-2.0+ ; LGPL-2.1+ ; MIT
 Group:          Development/Libraries/C and C++
+Requires:       %{libsoname} = %{version}
 Requires:       glibc-devel
-Requires:       libgcrypt11 = %version
-Requires:       libgpg-error-devel
+Requires:       libgpg-error-devel >= 1.8
 # bug437293
 %ifarch ppc64
-Obsoletes:      libgcrypt-devel-64bit
+Obsoletes:      %{name}-devel-64bit
 %endif
 #
 PreReq:         %install_info_prereq
@@ -79,7 +80,7 @@ This package contains needed files to compile and link against the
 library.
 
 %prep
-%setup -q -n libgcrypt-%version
+%setup -q -n %{name}-%{version}
 gzip -dc < %{S:3} > cipher/idea.c
 %patch0 -p1
 %patch1
@@ -115,11 +116,11 @@ autoreconf -fi
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
 #
-rm %{buildroot}%{_libdir}/libgcrypt.la
+rm %{buildroot}%{_libdir}/%{name}.la
 
-%post -n libgcrypt11 -p /sbin/ldconfig
+%post -n %{libsoname} -p /sbin/ldconfig
 
-%postun -n libgcrypt11 -p /sbin/ldconfig
+%postun -n %{libsoname} -p /sbin/ldconfig
 
 %post devel
 %install_info --info-dir=%{_infodir} %{_infodir}/gcrypt.info.gz
@@ -129,10 +130,10 @@ rm %{buildroot}%{_libdir}/libgcrypt.la
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/gcrypt.info.gz
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/gcrypt-1.info.gz
 
-%files -n libgcrypt11
+%files -n %{libsoname}
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README THANKS TODO
-%{_libdir}/libgcrypt.so.11*
+%{_libdir}/%{name}.so.11*
 
 %files devel
 %defattr(-,root,root)
@@ -140,9 +141,9 @@ rm %{buildroot}%{_libdir}/libgcrypt.la
 %_infodir/gcrypt.info-1.gz
 %_bindir/dumpsexp
 %_bindir/hmac256
-%_bindir/libgcrypt-config
-%_libdir/libgcrypt.so
+%_bindir/%{name}-config
+%_libdir/%{name}.so
 %_includedir/gcrypt*.h
-%_datadir/aclocal/libgcrypt.m4
+%_datadir/aclocal/%{name}.m4
 
 %changelog