From 1cf0e051172b47e5b48c8e5b4d1cf57837a87912fa9ac4fd104c0c8b8b5711e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 3 Apr 2014 12:08:53 +0000 Subject: [PATCH] - Cleanup with spec-cleaner to sort out. - Really apply ppc64 patch as it was ommited probably by mistake. OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libgcrypt?expand=0&rev=49 --- libgcrypt.changes | 6 ++++++ libgcrypt.spec | 42 +++++++++++++++++++----------------------- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/libgcrypt.changes b/libgcrypt.changes index 7edb063..a15264b 100644 --- a/libgcrypt.changes +++ b/libgcrypt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 3 12:04:46 UTC 2014 - tchvatal@suse.com + +- Cleanup with spec-cleaner to sort out. +- Really apply ppc64 patch as it was ommited probably by mistake. + ------------------------------------------------------------------- Thu Mar 27 14:57:22 UTC 2014 - meissner@suse.com diff --git a/libgcrypt.spec b/libgcrypt.spec index b83ae86..cd154c1 100644 --- a/libgcrypt.spec +++ b/libgcrypt.spec @@ -18,17 +18,15 @@ %define build_hmac256 1 %define separate_hmac256_binary 0 - %define libsoname %{name}20 %define sosuffix 20.0.1 - Name: libgcrypt -Url: http://directory.fsf.org/wiki/Libgcrypt Version: 1.6.1 Release: 0 Summary: The GNU Crypto Library License: GPL-2.0+ and LGPL-2.1+ and GPL-3.0+ Group: Development/Libraries/C and C++ +Url: http://directory.fsf.org/wiki/Libgcrypt Source: ftp://ftp.gnupg.org/gcrypt/libgcrypt/%{name}-%{version}.tar.bz2 Source1: ftp://ftp.gnupg.org/gcrypt/libgcrypt/%{name}-%{version}.tar.bz2.sig Source2: baselibs.conf @@ -42,25 +40,22 @@ Patch4: %{name}-sparcv9.diff #was: libgcrypt-1.5.0-as-needed.patch Patch5: libgcrypt-unresolved-dladdr.patch #PATCH-FIX-SUSE: N/A - Patch7: libgcrypt-1.5.0-LIBGCRYPT_FORCE_FIPS_MODE-env.diff - #PATCH-FIX-UPSTREAM: internal functions are supposed to be used inside libgcrypt, mvyskocil@suse.com Patch8: libgcrypt-1.6.0-use-intenal-functions.patch Patch10: libgcrypt-fips-allow-legacy.patch Patch11: libgcrypt-fixed-sizet.patch - Patch12: libgcrypt-1.6.1-use-fipscheck.patch Patch13: libgcrypt-1.6.1-fips-cavs.patch #PATCH-FIX-SUSE: bnc#724841, fix a random device opening routine Patch14: libgcrypt-1.6.1-fips-cfgrandom.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake >= 1.11 +BuildRequires: libgpg-error-devel >= 1.11 +BuildRequires: libtool +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1310 BuildRequires: fipscheck %endif -BuildRequires: libgpg-error-devel >= 1.11 -BuildRequires: libtool # not for base packages to avoid huge cycles #BuildRequires: gpg-offline @@ -86,7 +81,7 @@ Group: Development/Libraries/C and C++ Requires: %{libsoname} = %{version} Requires: glibc-devel Requires: libgpg-error-devel >= 1.8 -PreReq: %install_info_prereq +Requires(post): %{install_info_prereq} %description devel Libgcrypt is a general purpose library of cryptographic building @@ -103,9 +98,9 @@ library. Summary: The GNU Crypto Library License: GPL-2.0+ and LGPL-2.1+ Group: Development/Libraries/C and C++ -Requires: %{libsoname} = %version +Requires: %{libsoname} = %{version} Requires: libgpg-error-devel -PreReq: %install_info_prereq +Requires(post): %{install_info_prereq} %description hmac256 Libgcrypt is a general purpose library of cryptographic building @@ -116,7 +111,8 @@ understanding of applied cryptography is required to use Libgcrypt. %endif # #if separate_hmac256_binary %prep -%setup -q -n %{name}-%{version} +%setup -q +%patch0 -p1 %patch1 %patch3 -p1 %patch4 -p1 @@ -135,13 +131,13 @@ understanding of applied cryptography is required to use Libgcrypt. echo building with build_hmac256 set to %{build_hmac256} %{?suse_update_config} autoreconf -fi -export CFLAGS="%optflags $(getconf LFS_CFLAGS)" +export CFLAGS="%{optflags} $(getconf LFS_CFLAGS)" %configure --with-pic \ - --enable-noexecstack \ - --disable-static \ + --enable-noexecstack \ + --disable-static \ --enable-m-guard \ -%ifarch %sparc - --disable-asm \ +%ifarch %{sparc} + --disable-asm \ %endif --enable-hmac-binary-check \ --enable-random=linux @@ -181,7 +177,7 @@ fipshmac src/.libs/libgcrypt.so.?? # make check %install -make DESTDIR=$RPM_BUILD_ROOT install +make DESTDIR=%{buildroot} install %{?_smp_mflags} rm %{buildroot}%{_libdir}/%{name}.la @@ -201,15 +197,15 @@ rm %{buildroot}%{_libdir}/%{name}.la %files -n %{libsoname} %defattr(-,root,root) -%doc COPYING.LIB +%doc COPYING.LIB %{_libdir}/%{name}.so.* %if 0%{?build_hmac256} %{_libdir}/.libgcrypt.so.*.hmac -%endif # %if 0%{?build_hmac256} +%endif # %if 0%{?build_hmac256} %files devel %defattr(-,root,root) -%doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README THANKS TODO +%doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README THANKS TODO %{_infodir}/gcrypt.info.gz %{_infodir}/gcrypt.info-1.gz %{_infodir}/gcrypt.info-2.gz @@ -223,7 +219,7 @@ rm %{buildroot}%{_libdir}/%{name}.la %if 0%{?separate_hmac256_binary} %files hmac256 %defattr(-,root,root) -%endif # %if 0%{?separate_hmac256_binary} +%endif # %if 0%{?separate_hmac256_binary} %{_bindir}/hmac256 %{_bindir}/.hmac256.hmac %doc %{_mandir}/man1/hmac256.1*