[oath-toolkit] Removed RHEL conditionals (not needed any more)

[Jaroslav Škarvada]

commit fb4e76041973949c8a6e489dadeec7f318a8a4e9
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Tue Nov 11 14:05:47 2014 +0100

    Removed RHEL conditionals (not needed any more)

 oath-toolkit.spec |   19 +++++--------------
 1 files changed, 5 insertions(+), 14 deletions(-)
---
diff --git a/oath-toolkit.spec b/oath-toolkit.spec
index 44cfc47..63438c3 100644
--- a/oath-toolkit.spec
+++ b/oath-toolkit.spec
@@ -1,13 +1,11 @@
 Name:          oath-toolkit
 Version:       2.4.1
-Release:       7%{?dist}
+Release:       8%{?dist}
 License:       GPLv3+
 Group:         System Environment/Libraries
 Summary:       One-time password components
 BuildRequires: pam-devel, gtk-doc, libtool, libtool-ltdl-devel
-%if ! 0%{?rhel:1}
 BuildRequires: xmlsec1-devel, xmlsec1-openssl-devel
-%endif
 Source:        http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.gz
 URL:           http://www.nongnu.org/oath-toolkit/
 # Escape leading single quotes in man pages which are misinterpreted as macros,
@@ -59,7 +57,6 @@ BuildArch: noarch
 %description -n liboath-doc
 Documentation files for liboath.
 
-%if ! 0%{?rhel:1}
 %package -n libpskc
 Summary:          Library for PSKC handling
 Group:            Development/Libraries
@@ -93,7 +90,6 @@ BuildArch: noarch
 
 %description -n libpskc-doc
 Documentation files for libpskc.
-%endif
 
 %package -n oathtool
 Summary:  A command line tool for generating and validating OTPs
@@ -104,7 +100,6 @@ Provides: bundled(gnulib)
 %description -n oathtool
 A command line tool for generating and validating OTPs.
 
-%if ! 0%{?rhel:1}
 %package -n pskctool
 Summary:  A command line tool for manipulating PSKC data
 # https://fedorahosted.org/fpc/ticket/174
@@ -113,7 +108,6 @@ Requires: xmlsec1-openssl%{?_isa}
 
 %description -n pskctool
 A command line tool for manipulating PSKC data.
-%endif
 
 %package -n pam_oath
 Summary:  A PAM module for pluggable login authentication for OATH
@@ -132,7 +126,7 @@ A PAM module for pluggable login authentication for OATH.
 %configure --with-pam-dir=%{_libdir}/security
 
 # Kill rpaths and link with --as-needed
-for d in liboath %{!?rhel:libpskc pskctool} oathtool pam_oath
+for d in liboath libpskc pskctool oathtool pam_oath
 do
   sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' $d/libtool
   sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' $d/libtool
@@ -155,11 +149,9 @@ mkdir -p -m 0600 %{buildroot}%{_sysconfdir}/liboath
 
 %postun -n liboath -p /sbin/ldconfig
 
-%if ! 0%{?rhel:1}
 %post -n libpskc -p /sbin/ldconfig
 
 %postun -n libpskc -p /sbin/ldconfig
-%endif
 
 %files -n liboath
 %doc liboath/COPYING
@@ -175,7 +167,6 @@ mkdir -p -m 0600 %{buildroot}%{_sysconfdir}/liboath
 %{_mandir}/man3/oath*
 %{_datadir}/gtk-doc/html/liboath/*
 
-%if ! 0%{?rhel:1}
 %files -n libpskc
 %doc libpskc/README
 %{_libdir}/libpskc.so.*
@@ -189,24 +180,24 @@ mkdir -p -m 0600 %{buildroot}%{_sysconfdir}/liboath
 %files -n libpskc-doc
 %{_mandir}/man3/pskc*
 %{_datadir}/gtk-doc/html/libpskc/*
-%endif
 
 %files -n oathtool
 %doc oathtool/COPYING
 %{_bindir}/oathtool
 %{_mandir}/man1/oathtool.*
 
-%if ! 0%{?rhel:1}
 %files -n pskctool
 %{_bindir}/pskctool
 %{_mandir}/man1/pskctool.*
-%endif
 
 %files -n pam_oath
 %doc pam_oath/README pam_oath/COPYING
 %{_libdir}/security/pam_oath.so
 
 %changelog
+* Tue Nov 11 2014 Jaroslav Škarvada <jskarvad at redhat.com> - 2.4.1-8
+- Removed RHEL conditionals (not needed any more)
+
 * Fri Nov  7 2014 Jaroslav Škarvada <jskarvad at redhat.com> - 2.4.1-7
 - Added check for strdup failure (by strdup-null-check patch)
   Resolves: rhbz#1161360