From d838cdc6e49b993a54f4bc859b5792f4289e44375f4460562acd19fce1b3025a Mon Sep 17 00:00:00 2001 From: Torsten Gruner Date: Fri, 13 Apr 2018 20:15:21 +0000 Subject: [PATCH] Accepting request 596364 from home:pluskalm:branches:security - Run spe-cleaner - Drop useless conditions OBS-URL: https://build.opensuse.org/request/show/596364 OBS-URL: https://build.opensuse.org/package/show/security/oath-toolkit?expand=0&rev=15 --- oath-toolkit.changes | 6 ++++ oath-toolkit.spec | 73 +++++++++++++++----------------------------- 2 files changed, 30 insertions(+), 49 deletions(-) diff --git a/oath-toolkit.changes b/oath-toolkit.changes index 8b7745f..2b79222 100644 --- a/oath-toolkit.changes +++ b/oath-toolkit.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 13 13:26:47 UTC 2018 - mpluskal@suse.com + +- Run spe-cleaner +- Drop useless conditions + ------------------------------------------------------------------- Wed Apr 11 12:18:59 UTC 2018 - ncutler@suse.com diff --git a/oath-toolkit.spec b/oath-toolkit.spec index d9446a5..d56fddf 100644 --- a/oath-toolkit.spec +++ b/oath-toolkit.spec @@ -1,7 +1,7 @@ # # spec file for package oath-toolkit # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,32 +15,26 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%if 0%{?suse_version} >= 1320 || 0%{?sle_version} >= 120100 -%define build_pskc 1 -%endif Name: oath-toolkit Version: 2.6.2 Release: 0 Summary: Toolkit for one-time password authentication systems -License: GPL-3.0-or-later and LGPL-2.1-or-later +License: GPL-3.0-or-later AND LGPL-2.1-or-later Group: Productivity/Networking/Security -Url: http://www.nongnu.org/oath-toolkit/ +URL: http://www.nongnu.org/oath-toolkit/ Source: http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar.gz Patch1: 0001-Fix-no-return-in-nonvoid-function-errors-reported-by.patch Patch2: 0002-update_gnulibs_files.patch BuildRequires: bison BuildRequires: gengetopt -BuildRequires: gtk-doc BuildRequires: libgcrypt-devel +BuildRequires: libtool BuildRequires: pam-devel BuildRequires: pkgconfig -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %{build_pskc} -BuildRequires: libtool -BuildRequires: libxml2-devel +BuildRequires: pkgconfig(gtk-doc) +BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(xmlsec1) -%endif %description The OATH Toolkit makes it easy to build one-time password @@ -54,7 +48,7 @@ RFC6030 is supported. %package -n pam_oath Summary: PAM module for pluggable login authentication for OATH -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Networking/Security %description -n pam_oath @@ -69,7 +63,7 @@ RFC6030 is supported. %package -n liboath0 Summary: Library for Open AuTHentication (OATH) HOTP support -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Productivity/Networking/Security Requires: %{name}-xml >= %{version} @@ -85,6 +79,7 @@ RFC6030 is supported. %package xml Summary: This package contains xml files needed by liboath0 +License: GPL-3.0-or-later AND LGPL-2.1-or-later Group: Development/Libraries/C and C++ BuildArch: noarch @@ -100,7 +95,7 @@ RFC6030 is supported. %package -n liboath-devel Summary: Library for Open AuTHentication (OATH) HOTP support -- Development Files -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ Requires: glibc-devel Requires: liboath0 = %{version} @@ -115,11 +110,9 @@ organization that specify the algorithms. For managing secret key files, the Portable Symmetric Key Container (PSKC) format described in RFC6030 is supported. -%if %{build_pskc} - %package -n libpskc0 Summary: Library for Portable Symmetric Key Container -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Productivity/Networking/Security %description -n libpskc0 @@ -134,7 +127,7 @@ RFC6030 is supported. %package -n libpskc-devel Summary: Library for Portable Symmetric Key Container -- Development Files -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ Requires: glibc-devel Requires: libpskc0 = %{version} @@ -148,59 +141,47 @@ event-based HOTP algorithm (RFC4226) and the time-based TOTP algorithm organization that specify the algorithms. For managing secret key files, the Portable Symmetric Key Container (PSKC) format described in RFC6030 is supported. -%endif %prep %setup -q %patch1 -p1 %patch2 -p1 -autoreconf -fi %build -%configure --with-pam-dir=/%{_lib}/security \ - --with-libgcrypt \ - --disable-silent-rules \ - --with-pic \ - --disable-static - -make %{?_smp_mflags} +autoreconf -fiv +%configure \ + --with-pam-dir=/%{_lib}/security \ + --with-libgcrypt \ + --disable-silent-rules \ + --with-pic \ + --disable-static +%make_build %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install mv COPYING COPYING.summary find %{buildroot} -type f -name "*.la" -delete -print - %post -n liboath0 -p /sbin/ldconfig - %postun -n liboath0 -p /sbin/ldconfig - -%if %{build_pskc} - %post -n libpskc0 -p /sbin/ldconfig - %postun -n libpskc0 -p /sbin/ldconfig -%endif %files -%defattr(-,root,root) -%doc ChangeLog NEWS README COPYING.summary +%license COPYING.summary +%doc ChangeLog NEWS README %license oathtool/COPYING %{_bindir}/oathtool %{_mandir}/man1/oathtool.* -%if %{build_pskc} %{_bindir}/pskctool %{_mandir}/man1/pskctool.* -%endif %files -n pam_oath -%defattr(-,root,root) %doc pam_oath/README -%license pam_oath/COPYING +%license pam_oath/COPYING /%{_lib}/security/pam_oath.so %files -n liboath0 -%defattr(-,root,root) %license liboath/COPYING %{_libdir}/liboath.so.* @@ -208,29 +189,23 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_datadir}/xml/pskc/ %files -n liboath-devel -%defattr(-,root,root) %{_libdir}/liboath.so %{_includedir}/liboath/ %{_libdir}/pkgconfig/liboath.pc %doc %{_datadir}/gtk-doc/html/liboath %{_mandir}/man3/oath_* -%if %{build_pskc} - %files -n libpskc0 -%defattr(-,root,root) # there's no COPYING for libpskc, but it's LGPL, like liboath %doc libpskc/README %license liboath/COPYING %{_libdir}/libpskc.so.* %files -n libpskc-devel -%defattr(-,root,root) %{_libdir}/libpskc.so %{_includedir}/pskc/ %{_libdir}/pkgconfig/libpskc.pc %doc %{_datadir}/gtk-doc/html/libpskc %{_mandir}/man3/pskc_* -%endif %changelog