- remove conditionals for unsupported distributions (before 13.2),

it would not build anyway because of new dependencies

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libgcrypt?expand=0&rev=82

libgcrypt.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 16 14:37:45 UTC 2016 - pjanouch@suse.de
+
+- remove conditionals for unsupported distributions (before 13.2),
+  it would not build anyway because of new dependencies
+
 -------------------------------------------------------------------
 Mon May 16 12:36:14 UTC 2016 - pjanouch@suse.de
 

libgcrypt.spec

@@ -70,12 +70,10 @@ Patch32:        libgcrypt-fips_run_selftest_at_constructor.patch
 Patch33:        libgcrypt-fips_ecdsa.patch
 Patch34:        libgcrypt-1.6.3-aliasing.patch
 BuildRequires:  automake >= 1.14
+BuildRequires:  fipscheck
 BuildRequires:  libgpg-error-devel >= 1.11
 BuildRequires:  libtool
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} > 1310
-BuildRequires:  fipscheck
-%endif
 
 %description
 Libgcrypt is a general purpose library of cryptographic building
@@ -156,7 +154,6 @@ understanding of applied cryptography is required to use Libgcrypt.
 %patch4 -p1
 %patch5 -p1
 %patch7 -p1
-%if 0%{?suse_version} > 1310
 %patch12 -p1
 %patch21 -p1
 %patch22 -p1
@@ -172,7 +169,6 @@ understanding of applied cryptography is required to use Libgcrypt.
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
-%endif
 %patch13 -p1
 %patch14 -p1
 
@@ -202,26 +198,14 @@ make %{?_smp_mflags}
 #
 # this shows up earlier because otherwise the %expand of
 # the macro is too late.
-%if 0%{?suse_version} > 1310
 %{expand:%%global __os_install_post {%__os_install_post
     fipshmac %{buildroot}/%{_bindir}/hmac256
     fipshmac %{buildroot}/%{_libdir}/*.so.??
 }}
-%else
-%{expand:%%global __os_install_post {%__os_install_post
-
-%{buildroot}/%{_bindir}/hmac256 "What am I, a doctor or a moonshuttle conductor?"      \
-  < %{buildroot}/%{_bindir}/hmac256 > %{buildroot}/%{_bindir}/.hmac256.hmac
-%{buildroot}/%{_bindir}/hmac256 "What am I, a doctor or a moonshuttle conductor?"      \
-  < %{buildroot}/%{_libdir}/libgcrypt.so.%{sosuffix} > %{buildroot}/%{_libdir}/.libgcrypt.so.20.hmac
-}}
-%endif
 %endif
 
 %check
-%if 0%{?suse_version} > 1310
 fipshmac src/.libs/libgcrypt.so.??
-%endif
 # Nice idea. however this uses /dev/random, which hangs
 # on hardware without random feeds.
 # so lets not run it inside OBS
@@ -236,11 +220,9 @@ install -m 0755 -d %{buildroot}%{cavs_dir}
 install -m 0755 %{SOURCE5} %{buildroot}%{cavs_dir}
 install -m 0755 %{SOURCE6} %{buildroot}%{cavs_dir}
 
-%if 0%{?suse_version} > 1310
 mv %{buildroot}%{_bindir}/fips186_dsa %{buildroot}%{cavs_dir}
 mv %{buildroot}%{_bindir}/fipsdrv %{buildroot}%{cavs_dir}
 mv %{buildroot}%{_bindir}/drbg_test %{buildroot}%{cavs_dir}
-%endif
 
 %post -n %{libsoname} -p /sbin/ldconfig