From 57983037f69a470d0a88150f20d718f0056de72d Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Mar 28 2017 10:38:11 +0000 Subject: EPEL 5 End-Of-Life specfile clean-up Remove Group and BuildRoot tags Remove _pkgdocdir macro definition Drop redundant Requires corresponding to autogenerated pkgconfig Requires Don't clear the buildroot in the install section Remove the clean section Drop the globus-gsi-credential-openssl098.patch --- diff --git a/globus-gsi-credential-openssl098.patch b/globus-gsi-credential-openssl098.patch deleted file mode 100644 index c691eb6..0000000 --- a/globus-gsi-credential-openssl098.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -ur globus_gsi_credential-7.11.orig/configure globus_gsi_credential-7.11/configure ---- globus_gsi_credential-7.11.orig/configure 2016-09-09 00:05:56.572422636 +0200 -+++ globus_gsi_credential-7.11/configure 2016-11-04 09:27:32.414046436 +0100 -@@ -11909,12 +11909,12 @@ - pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "openssl >= 1.0") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 0.9.8\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "openssl >= 0.9.8") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 1.0" 2>/dev/null` -+ pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 0.9.8" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes - else - pkg_failed=yes -@@ -11926,12 +11926,12 @@ - pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "openssl >= 1.0") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 0.9.8\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "openssl >= 0.9.8") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl >= 1.0" 2>/dev/null` -+ pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl >= 0.9.8" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes - else - pkg_failed=yes -@@ -11952,9 +11952,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openssl >= 1.0" 2>&1` -+ OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openssl >= 0.9.8" 2>&1` - else -- OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openssl >= 1.0" 2>&1` -+ OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openssl >= 0.9.8" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$OPENSSL_PKG_ERRORS" >&5 -@@ -12155,7 +12155,7 @@ - OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } -- OPENSSL_PKGCONFIG="openssl >= 1.0" -+ OPENSSL_PKGCONFIG="openssl >= 0.9.8" - fi - - diff --git a/globus-gsi-credential.spec b/globus-gsi-credential.spec index 7e969bd..44c6a64 100644 --- a/globus-gsi-credential.spec +++ b/globus-gsi-credential.spec @@ -1,20 +1,14 @@ -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} - Name: globus-gsi-credential %global _name %(tr - _ <<< %{name}) Version: 7.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Globus Toolkit - Globus GSI Credential Library -Group: System Environment/Libraries License: ASL 2.0 URL: http://toolkit.globus.org/ Source: http://toolkit.globus.org/ftppub/gt6/packages/%{_name}-%{version}.tar.gz # README file Source8: GLOBUS-GSIC -# Allow compilation on EPEL 5 (openssl 0.9.8) -Patch0: %{name}-openssl098.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: globus-common-devel >= 15 BuildRequires: globus-gsi-openssl-error-devel >= 2 @@ -26,21 +20,11 @@ BuildRequires: doxygen %package devel Summary: Globus Toolkit - Globus GSI Credential Library Development Files -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: globus-common-devel%{?_isa} >= 15 -Requires: globus-gsi-openssl-error-devel%{?_isa} >= 2 -Requires: globus-gsi-cert-utils-devel%{?_isa} >= 8 -Requires: globus-gsi-sysconfig-devel%{?_isa} >= 5 -Requires: globus-gsi-callback-devel%{?_isa} >= 4 -Requires: openssl-devel%{?_isa} %package doc Summary: Globus Toolkit - Globus GSI Credential Library Documentation Files -Group: Documentation -%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6 BuildArch: noarch -%endif %description The Globus Toolkit is an open source software toolkit used for building Grid @@ -71,7 +55,6 @@ Globus GSI Credential Library Documentation Files %prep %setup -q -n %{_name}-%{version} -%patch0 -p1 %build # Reduce overlinking @@ -88,7 +71,6 @@ sed 's!CC \(.*-shared\) !CC \\\${wl}--as-needed \1 !' -i libtool make %{?_smp_mflags} %install -rm -rf %{buildroot} make install DESTDIR=%{buildroot} # Remove libtool archives (.la files) @@ -100,9 +82,6 @@ install -m 644 -p %{SOURCE8} %{buildroot}%{_pkgdocdir}/README # Remove license file from pkgdocdir if licensedir is used %{?_licensedir: rm %{buildroot}%{_pkgdocdir}/GLOBUS_LICENSE} -%clean -rm -rf %{buildroot} - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -128,6 +107,15 @@ rm -rf %{buildroot} %{?_licensedir: %license GLOBUS_LICENSE} %changelog +* Mon Mar 27 2017 Mattias Ellert - 7.11-3 +- EPEL 5 End-Of-Life specfile clean-up + - Remove Group and BuildRoot tags + - Remove _pkgdocdir macro definition + - Drop redundant Requires corresponding to autogenerated pkgconfig Requires + - Don't clear the buildroot in the install section + - Remove the clean section + - Drop the globus-gsi-credential-openssl098.patch + * Fri Feb 10 2017 Fedora Release Engineering - 7.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild