[cpp-linbuild] 01/15: Normalize SPEC file whitespace
John W. O'Brien
john at saltant.com
Sun Jun 18 15:00:36 UTC 2023
This is an automated email from the git hooks/post-receive script.
obrienjw pushed a commit to branch main
in repository cpp-linbuild.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-linbuild.git;a=commit;h=f6f764ef8f335089a00916d44505086570ad36fc
commit f6f764ef8f335089a00916d44505086570ad36fc
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Sun Jun 11 22:33:33 2023 +0000
Normalize SPEC file whitespace
* Tabs vs. spaces: pick one (spaces)
* Abandon any attempt to align the values of the "key: value" pairs
* Eliminate trailing whitespace
---
common/SPECS/curl-openssl.spec | 31 ++--
common/SPECS/log4shib.spec | 42 ++---
common/SPECS/opensaml.spec | 52 +++---
common/SPECS/shibboleth-embedded-ds.spec | 30 +--
common/SPECS/shibboleth.spec | 304 +++++++++++++++----------------
common/SPECS/shibresolver.spec | 50 ++---
common/SPECS/xerces-c.spec | 38 ++--
common/SPECS/xml-security-c.spec | 44 ++---
common/SPECS/xmltooling.spec | 48 ++---
9 files changed, 319 insertions(+), 320 deletions(-)
diff --git a/common/SPECS/curl-openssl.spec b/common/SPECS/curl-openssl.spec
index eee82ac..f0c110a 100644
--- a/common/SPECS/curl-openssl.spec
+++ b/common/SPECS/curl-openssl.spec
@@ -30,10 +30,10 @@ BuildRequires: stunnel
BuildRequires: zlib-devel
Requires: libcurl-openssl = %{version}-%{release}
-# We do not want curl-openssl to provide or require the
-#.so and similar files that the real curl provides so we must
+# We do not want curl-openssl to provide or require the
+#.so and similar files that the real curl provides so we must
# filter them out.
-%filter_provides_in %{_libdir}/.*\.so.*$
+%filter_provides_in %{_libdir}/.*\.so.*$
%filter_from_provides /pkgconfig(libcurl)/d
%filter_from_requires /libcurl\.so\..*/d
%filter_setup
@@ -69,19 +69,19 @@ developing applications which can use cURL's capabilities internally.
# Convert docs to UTF-8
for f in CHANGES README; do
- iconv -f iso-8859-1 -t utf8 < ${f} > ${f}.utf8
- mv -f ${f}.utf8 ${f}
+ iconv -f iso-8859-1 -t utf8 < ${f} > ${f}.utf8
+ mv -f ${f}.utf8 ${f}
done
%build
%configure --with-ssl --enable-ipv6 --without-ca-bundle --with-libidn \
- --with-gssapi --enable-ldaps --disable-static --enable-manual
+ --with-gssapi --enable-ldaps --disable-static --enable-manual
sed -i -e 's,-L/usr/lib ,,g;s,-L/usr/lib64 ,,g;s,-L/usr/lib$,,g;s,-L/usr/lib64$,,g' \
- Makefile libcurl.pc
+ Makefile libcurl.pc
# Remove bogus rpath
sed -i \
- -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
- -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+ -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
+ -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
@@ -102,7 +102,7 @@ rm -rf $RPM_BUILD_ROOT
%post -n libcurl-openssl
/sbin/ldconfig -N %{_libdir}
-%postun -n libcurl-openssl
+%postun -n libcurl-openssl
/sbin/ldconfig -N %{_libdir}
%files
@@ -549,7 +549,7 @@ rm -rf $RPM_BUILD_ROOT
- update to 7.15.3
* Thu Feb 23 2006 Ivana Varekova <varekova at redhat.com> - 7.15.1-2
-- fix multilib problem - #181290 -
+- fix multilib problem - #181290 -
curl-devel.i386 not installable together with curl-devel.x86-64
* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 7.15.1-1.2.1
@@ -577,11 +577,11 @@ rm -rf $RPM_BUILD_ROOT
- update to 7.14.1
* Thu Jun 16 2005 Ivana Varekova <varekova at redhat.com> 7.14.0-1
-- rebuild new version
+- rebuild new version
* Tue May 03 2005 Ivana Varekova <varekova at redhat.com> 7.13.1-3
- fix bug 150768 - curl-7.12.3-2 breaks basic authentication
- used Daniel Stenberg patch
+ used Daniel Stenberg patch
* Mon Apr 25 2005 Joe Orton <jorton at redhat.com> 7.13.1-2
- update to use ca-bundle in /etc/pki
@@ -628,7 +628,6 @@ rm -rf $RPM_BUILD_ROOT
* Wed Apr 07 2004 Adrian Havill <havill at redhat.com> 7.11.1-1
- upgraded; updated nousr patch
- added COPYING (#115956)
--
* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
@@ -714,7 +713,7 @@ rm -rf $RPM_BUILD_ROOT
- 7.9.6
* Thu Mar 21 2002 Trond Eivind Glomsrød <teg at redhat.com> 7.9.5-2
-- Stop the curl-config script from printing -I/usr/include
+- Stop the curl-config script from printing -I/usr/include
and -L/usr/lib (#59497)
* Fri Mar 8 2002 Trond Eivind Glomsrød <teg at redhat.com> 7.9.5-1
@@ -764,7 +763,7 @@ rm -rf $RPM_BUILD_ROOT
* Fri Oct 20 2000 Nalin Dahyabhai <nalin at redhat.com>
- fix bogus req in -devel package
-* Fri Oct 20 2000 Tim Powers <timp at redhat.com>
+* Fri Oct 20 2000 Tim Powers <timp at redhat.com>
- devel package needed defattr so that root owns the files
* Mon Oct 16 2000 Nalin Dahyabhai <nalin at redhat.com>
diff --git a/common/SPECS/log4shib.spec b/common/SPECS/log4shib.spec
index c3c8c10..575a28c 100644
--- a/common/SPECS/log4shib.spec
+++ b/common/SPECS/log4shib.spec
@@ -1,18 +1,18 @@
-Name: log4shib
-Version: 2.0.1
-Release: 1
-Summary: Log for C++, Shibboleth Edition
-License: LGPL
-Group: Development/Libraries
-Vendor: Shibboleth Consortium
-URL: http://shibboleth.net/downloads/log4shib/%version%
-Source: %name-%version.tar.bz2
-BuildRoot: %_tmppath/%name-%version-root
-BuildRequires: gcc-c++ pkgconfig
+Name: log4shib
+Version: 2.0.1
+Release: 1
+Summary: Log for C++, Shibboleth Edition
+License: LGPL
+Group: Development/Libraries
+Vendor: Shibboleth Consortium
+URL: http://shibboleth.net/downloads/log4shib/%version%
+Source: %name-%version.tar.bz2
+BuildRoot: %_tmppath/%name-%version-root
+BuildRequires: gcc-c++ pkgconfig
%{!?_without_doxygenrpm:BuildRequires: doxygen}
-%if "%{_vendor}" == "redhat"
-BuildRequires: redhat-rpm-config
-%endif
+%if "%{_vendor}" == "redhat"
+BuildRequires: redhat-rpm-config
+%endif
%if 0%{?rhel} >= 8 || 0%{?centos_version} >= 800
BuildRequires: gdb
@@ -30,10 +30,10 @@ and other destinations. It is modeled after the Log for Java library and
stays as close to its API as is reasonable.
%package -n liblog4shib2
-Summary: Log for C++, Shibboleth Edition
-Group: Development/Libraries
-Provides: log4shib = %{version}-%{release}
-Obsoletes: log4shib < %{version}-%{release}
+Summary: Log for C++, Shibboleth Edition
+Group: Development/Libraries
+Provides: log4shib = %{version}-%{release}
+Obsoletes: log4shib < %{version}-%{release}
%description -n liblog4shib2
Log for C++ is a library of classes for flexible logging to files, syslog,
@@ -45,9 +45,9 @@ This package contains just the shared library.
%package -n liblog4shib-devel
Summary: Development tools for Log for C++
Group: Development/Libraries
-Requires: liblog4shib2 = %{version}-%{release}
-Provides: log4shib-devel = %{version}-%{release}
-Obsoletes: log4shib-devel < %{version}-%{release}
+Requires: liblog4shib2 = %{version}-%{release}
+Provides: log4shib-devel = %{version}-%{release}
+Obsoletes: log4shib-devel < %{version}-%{release}
%description -n liblog4shib-devel
The static libraries and header files needed for development with log4shib.
diff --git a/common/SPECS/opensaml.spec b/common/SPECS/opensaml.spec
index f1e0878..a00f7ee 100644
--- a/common/SPECS/opensaml.spec
+++ b/common/SPECS/opensaml.spec
@@ -1,16 +1,16 @@
-Name: opensaml
-Version: 3.2.1
-Release: 1
-Summary: OpenSAML SAML library
-Group: Development/Libraries/C and C++
-Vendor: Shibboleth Consortium
-License: Apache-2.0
-URL: http://www.opensaml.org/
-Source0: %{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libxerces-c-devel >= 3.2
-BuildRequires: libxml-security-c-devel >= 2.0.0
-BuildRequires: libxmltooling-devel >= 3.2.0
+Name: opensaml
+Version: 3.2.1
+Release: 1
+Summary: OpenSAML SAML library
+Group: Development/Libraries/C and C++
+Vendor: Shibboleth Consortium
+License: Apache-2.0
+URL: http://www.opensaml.org/
+Source0: %{name}-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: libxerces-c-devel >= 3.2
+BuildRequires: libxml-security-c-devel >= 2.0.0
+BuildRequires: libxmltooling-devel >= 3.2.0
%{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
%{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.4}
BuildRequires: gcc-c++, pkgconfig, boost-devel >= 1.32.0
@@ -35,8 +35,8 @@ Markup Language Specification. It contains a set of open source C++ classes
that support the SAML 1.0, 1.1, and 2.0 specifications.
%package -n opensaml-bin
-Summary: Utilities for OpenSAML library
-Group: Development/Libraries/C and C++
+Summary: Utilities for OpenSAML library
+Group: Development/Libraries/C and C++
%description -n opensaml-bin
OpenSAML is an open source implementation of the OASIS Security Assertion
@@ -46,10 +46,10 @@ that support the SAML 1.0, 1.1, and 2.0 specifications.
This package contains the utility programs.
%package -n libsaml12
-Summary: OpenSAML SAML library
-Group: Development/Libraries/C and C++
-Provides: opensaml = %{version}-%{release}
-Obsoletes: opensaml < %{version}-%{release}
+Summary: OpenSAML SAML library
+Group: Development/Libraries/C and C++
+Provides: opensaml = %{version}-%{release}
+Obsoletes: opensaml < %{version}-%{release}
%description -n libsaml12
OpenSAML is an open source implementation of the OASIS Security Assertion
@@ -59,11 +59,11 @@ that support the SAML 1.0, 1.1, and 2.0 specifications.
This package contains just the shared library.
%package -n libsaml-devel
-Summary: OpenSAML development Headers
-Group: Development/Libraries/C and C++
-Requires: libsaml12 = %{version}-%{release}
-Provides: opensaml-devel = %{version}-%{release}
-Obsoletes: opensaml-devel < %{version}-%{release}
+Summary: OpenSAML development Headers
+Group: Development/Libraries/C and C++
+Requires: libsaml12 = %{version}-%{release}
+Provides: opensaml-devel = %{version}-%{release}
+Obsoletes: opensaml-devel < %{version}-%{release}
Requires: libxerces-c-devel >= 3.2
Requires: libxml-security-c-devel >= 2.0.0
Requires: libxmltooling-devel >= 3.2.0
@@ -78,8 +78,8 @@ that support the SAML 1.0, 1.1, and 2.0 specifications.
This package includes files needed for development with OpenSAML.
%package -n opensaml-schemas
-Summary: OpenSAML schemas and catalog
-Group: Development/Libraries/C and C++
+Summary: OpenSAML schemas and catalog
+Group: Development/Libraries/C and C++
%description -n opensaml-schemas
OpenSAML is an open source implementation of the OASIS Security Assertion
diff --git a/common/SPECS/shibboleth-embedded-ds.spec b/common/SPECS/shibboleth-embedded-ds.spec
index f4ae7ce..6d18458 100644
--- a/common/SPECS/shibboleth-embedded-ds.spec
+++ b/common/SPECS/shibboleth-embedded-ds.spec
@@ -1,14 +1,14 @@
-Name: shibboleth-embedded-ds
-Version: 1.2.2
-Release: 1
-Summary: Client-side federation discovery service for SAML-based SSO
-Group: Productivity/Networking/Security
-Vendor: Shibboleth Consortium
-License: Apache-2.0
-URL: http://shibboleth.net/
-Source: %{name}-%{version}.tar.gz
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Name: shibboleth-embedded-ds
+Version: 1.2.2
+Release: 1
+Summary: Client-side federation discovery service for SAML-based SSO
+Group: Productivity/Networking/Security
+Vendor: Shibboleth Consortium
+License: Apache-2.0
+URL: http://shibboleth.net/
+Source: %{name}-%{version}.tar.gz
+BuildArch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
%if "%{_vendor}" == "redhat"
BuildRequires: redhat-rpm-config
%{!?_without_builtinapache:BuildRequires: httpd}
@@ -45,7 +45,7 @@ if [ "$APACHE_CONFIG" != "no" ] ; then
fi
if [ "$APACHE_CONFD" != "no" ] ; then
%{__mkdir} -p $RPM_BUILD_ROOT$APACHE_CONFD
- %{__cp} -p $RPM_BUILD_ROOT%{_sysconfdir}/shibboleth-ds/$APACHE_CONFIG $RPM_BUILD_ROOT$APACHE_CONFD/$APACHE_CONFIG
+ %{__cp} -p $RPM_BUILD_ROOT%{_sysconfdir}/shibboleth-ds/$APACHE_CONFIG $RPM_BUILD_ROOT$APACHE_CONFD/$APACHE_CONFIG
echo "%config(noreplace) $APACHE_CONFD/$APACHE_CONFIG" > rpm.filelist
fi
fi
@@ -55,7 +55,7 @@ fi
%post
%if "%{_vendor}" == "redhat"
- # On upgrade, restart components if they're already running.
+ # On upgrade, restart components if they're already running.
if [ "$1" -gt "1" ] ; then
%{!?_without_builtinapache:/sbin/service httpd status 1>/dev/null && /sbin/service httpd restart 1>/dev/null}
exit 0
@@ -64,9 +64,9 @@ fi
%preun
%if "%{_vendor}" == "redhat"
- if [ "$1" = 0 ] ; then
+ if [ "$1" = 0 ] ; then
%{!?_without_builtinapache:/sbin/service httpd status 1>/dev/null && /sbin/service httpd restart 1>/dev/null}
- fi
+ fi
%endif
%if "%{_vendor}" == "suse"
if [ "$1" = 0 ] ; then
diff --git a/common/SPECS/shibboleth.spec b/common/SPECS/shibboleth.spec
index c726b4d..dad0637 100644
--- a/common/SPECS/shibboleth.spec
+++ b/common/SPECS/shibboleth.spec
@@ -1,52 +1,52 @@
-Name: shibboleth
-Version: 3.4.1
-Release: 2
-Summary: Open source system for attribute-based Web SSO
-Group: Productivity/Networking/Security
-Vendor: Shibboleth Consortium
-License: Apache-2.0
-URL: http://shibboleth.net/
-Source: %{name}-sp-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-sp-%{version}-root
-Obsoletes: shibboleth-sp = 2.5.0
-Requires: openssl
+Name: shibboleth
+Version: 3.4.1
+Release: 2
+Summary: Open source system for attribute-based Web SSO
+Group: Productivity/Networking/Security
+Vendor: Shibboleth Consortium
+License: Apache-2.0
+URL: http://shibboleth.net/
+Source: %{name}-sp-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-sp-%{version}-root
+Obsoletes: shibboleth-sp = 2.5.0
+Requires: openssl
%if 0%{?rhel} >= 6 || 0%{?amzn} == 1 || 0%{?amzn} == 2
-PreReq: xmltooling-schemas%{?_isa} >= 3.2.0, opensaml-schemas%{?_isa} >= 3.2.0
+PreReq: xmltooling-schemas%{?_isa} >= 3.2.0, opensaml-schemas%{?_isa} >= 3.2.0
%else
-PreReq: xmltooling-schemas >= 3.2.0, opensaml-schemas >= 3.2.0
+PreReq: xmltooling-schemas >= 3.2.0, opensaml-schemas >= 3.2.0
%endif
%if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130
-PreReq: %{insserv_prereq} %{fillup_prereq}
+PreReq: %{insserv_prereq} %{fillup_prereq}
%endif
%if 0%{?rhel} >= 7
Requires: hostname
-BuildRequires: systemd-devel
+BuildRequires: systemd-devel
%else
Requires: net-tools
%endif
%if 0%{?rhel} >= 8
-BuildRequires: gdb
+BuildRequires: gdb
%endif
-BuildRequires: libxerces-c-devel >= 3.2
-BuildRequires: libxml-security-c-devel >= 2.0.0
-BuildRequires: libxmltooling-devel >= 3.2.0
-BuildRequires: libsaml-devel >= 3.2.0
+BuildRequires: libxerces-c-devel >= 3.2
+BuildRequires: libxml-security-c-devel >= 2.0.0
+BuildRequires: libxmltooling-devel >= 3.2.0
+BuildRequires: libsaml-devel >= 3.2.0
%{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
%{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 2}
%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
-Requires: libcurl-openssl%{?_isa} >= 7.21.7
-BuildRequires: chrpath
+Requires: libcurl-openssl%{?_isa} >= 7.21.7
+BuildRequires: chrpath
%endif
%if 0%{?suse_version} > 1300
-BuildRequires: libtool
+BuildRequires: libtool
%endif
-BuildRequires: gcc-c++, pkgconfig, boost-devel >= 1.32.0
+BuildRequires: gcc-c++, pkgconfig, boost-devel >= 1.32.0
%{!?_without_gssapi:BuildRequires: krb5-devel}
%{!?_without_doxygen:BuildRequires: doxygen}
%{!?_without_odbc:BuildRequires:unixODBC-devel}
%{?_with_fastcgi:BuildRequires: fcgi-devel}
%if 0%{?centos} == 6 || 0%{?centos} == 7
-BuildRequires: libmemcached-devel
+BuildRequires: libmemcached-devel
%endif
%{?_with_memcached:BuildRequires: libmemcached-devel}
%if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon"
@@ -87,14 +87,14 @@ This package contains the Shibboleth Service Provider runtime libraries,
daemon, default plugins, and Apache module(s).
%package devel
-Summary: Shibboleth Development Headers
-Group: Development/Libraries/C and C++
-Requires: %{name} = %{version}-%{release}
-Obsoletes: shibboleth-sp-devel = 2.5.0
-Requires: libxerces-c-devel >= 3.2
-Requires: libxml-security-c-devel >= 2.0.0
-Requires: libxmltooling-devel >= 3.2.0
-Requires: libsaml-devel >= 3.2.0
+Summary: Shibboleth Development Headers
+Group: Development/Libraries/C and C++
+Requires: %{name} = %{version}-%{release}
+Obsoletes: shibboleth-sp-devel = 2.5.0
+Requires: libxerces-c-devel >= 3.2
+Requires: libxml-security-c-devel >= 2.0.0
+Requires: libxmltooling-devel >= 3.2.0
+Requires: libsaml-devel >= 3.2.0
%{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
%{!?_with_log4cpp:Requires: liblog4shib-devel >= 2}
@@ -144,52 +144,52 @@ This package includes files needed for development with Shibboleth.
%{__make} install NOKEYGEN=1 DESTDIR=$RPM_BUILD_ROOT pkgdocdir=%{pkgdocdir}
%if "%{_vendor}" == "suse"
- %{__sed} -i "s/\/var\/log\/httpd/\/var\/log\/apache2/g" \
- $RPM_BUILD_ROOT%{_sysconfdir}/shibboleth/native.logger
+ %{__sed} -i "s/\/var\/log\/httpd/\/var\/log\/apache2/g" \
+ $RPM_BUILD_ROOT%{_sysconfdir}/shibboleth/native.logger
%endif
# Plug the SP into the built-in Apache on a recognized system.
touch rpm.filelist
APACHE_CONFIG="no"
if [ -f $RPM_BUILD_ROOT%{_libdir}/shibboleth/mod_shib_13.so ] ; then
- APACHE_CONFIG="apache.config"
+ APACHE_CONFIG="apache.config"
fi
if [ -f $RPM_BUILD_ROOT%{_libdir}/shibboleth/mod_shib_20.so ] ; then
- APACHE_CONFIG="apache2.config"
+ APACHE_CONFIG="apache2.config"
fi
if [ -f $RPM_BUILD_ROOT%{_libdir}/shibboleth/mod_shib_22.so ] ; then
- APACHE_CONFIG="apache22.config"
+ APACHE_CONFIG="apache22.config"
fi
if [ -f $RPM_BUILD_ROOT%{_libdir}/shibboleth/mod_shib_24.so ] ; then
- APACHE_CONFIG="apache24.config"
+ APACHE_CONFIG="apache24.config"
fi
%{?_without_builtinapache:APACHE_CONFIG="no"}
if [ "$APACHE_CONFIG" != "no" ] ; then
- APACHE_CONFD="no"
- if [ -d %{_sysconfdir}/httpd/conf.d ] ; then
- APACHE_CONFD="%{_sysconfdir}/httpd/conf.d"
- fi
- if [ -d %{_sysconfdir}/apache2/conf.d ] ; then
- APACHE_CONFD="%{_sysconfdir}/apache2/conf.d"
- fi
- if [ "$APACHE_CONFD" != "no" ] ; then
- %{__mkdir} -p $RPM_BUILD_ROOT$APACHE_CONFD
- %{__cp} -p $RPM_BUILD_ROOT%{_sysconfdir}/shibboleth/$APACHE_CONFIG $RPM_BUILD_ROOT$APACHE_CONFD/shib.conf
- echo "%config(noreplace) $APACHE_CONFD/shib.conf" >> rpm.filelist
- fi
+ APACHE_CONFD="no"
+ if [ -d %{_sysconfdir}/httpd/conf.d ] ; then
+ APACHE_CONFD="%{_sysconfdir}/httpd/conf.d"
+ fi
+ if [ -d %{_sysconfdir}/apache2/conf.d ] ; then
+ APACHE_CONFD="%{_sysconfdir}/apache2/conf.d"
+ fi
+ if [ "$APACHE_CONFD" != "no" ] ; then
+ %{__mkdir} -p $RPM_BUILD_ROOT$APACHE_CONFD
+ %{__cp} -p $RPM_BUILD_ROOT%{_sysconfdir}/shibboleth/$APACHE_CONFIG $RPM_BUILD_ROOT$APACHE_CONFD/shib.conf
+ echo "%config(noreplace) $APACHE_CONFD/shib.conf" >> rpm.filelist
+ fi
fi
# Establish location of systemd file, if any.
SYSTEMD_SHIBD="no"
%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7
- %{__mkdir} -p $RPM_BUILD_ROOT%{_unitdir}
- echo "%attr(0444,-,-) %{_unitdir}/shibd.service" >> rpm.filelist
- SYSTEMD_SHIBD="$RPM_BUILD_ROOT%{_unitdir}/shibd.service"
-
- # Get run directory created at boot time.
- %{__mkdir} -p $RPM_BUILD_ROOT%{_tmpfilesdir}
- echo "%attr(0444,-,-) %{_tmpfilesdir}/%{name}.conf" >> rpm.filelist
- cat > $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf <<EOF
+ %{__mkdir} -p $RPM_BUILD_ROOT%{_unitdir}
+ echo "%attr(0444,-,-) %{_unitdir}/shibd.service" >> rpm.filelist
+ SYSTEMD_SHIBD="$RPM_BUILD_ROOT%{_unitdir}/shibd.service"
+
+ # Get run directory created at boot time.
+ %{__mkdir} -p $RPM_BUILD_ROOT%{_tmpfilesdir}
+ echo "%attr(0444,-,-) %{_tmpfilesdir}/%{name}.conf" >> rpm.filelist
+ cat > $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf <<EOF
d /run/%{name} 755 %{runuser} %{runuser} -
EOF
%endif
@@ -198,20 +198,20 @@ EOF
SYSCONFIG_SHIBD="no"
if [ "$SYSTEMD_SHIBD" == "no" ] ; then
%if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon"
- %{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
- echo "%config(noreplace) %{_sysconfdir}/sysconfig/shibd" >> rpm.filelist
- SYSCONFIG_SHIBD="$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/shibd"
+ %{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+ echo "%config(noreplace) %{_sysconfdir}/sysconfig/shibd" >> rpm.filelist
+ SYSCONFIG_SHIBD="$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/shibd"
%endif
%if "%{_vendor}" == "suse"
- %{__mkdir} -p $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates
- echo "%{_localstatedir}/adm/fillup-templates/sysconfig.shibd" >> rpm.filelist
- SYSCONFIG_SHIBD="$RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/sysconfig.shibd"
+ %{__mkdir} -p $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates
+ echo "%{_localstatedir}/adm/fillup-templates/sysconfig.shibd" >> rpm.filelist
+ SYSCONFIG_SHIBD="$RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/sysconfig.shibd"
%endif
fi
if [ "$SYSTEMD_SHIBD" != "no" ] ; then
- # Populate the systemd file
- cat > $SYSTEMD_SHIBD <<EOF
+ # Populate the systemd file
+ cat > $SYSTEMD_SHIBD <<EOF
[Unit]
Description=Shibboleth Service Provider Daemon
Documentation=https://wiki.shibboleth.net/confluence/display/SP3/Home
@@ -238,8 +238,8 @@ RestartSec=30s
WantedBy=multi-user.target
EOF
elif [ "$SYSCONFIG_SHIBD" != "no" ] ; then
- # Populate the sysconfig file.
- cat > $SYSCONFIG_SHIBD <<EOF
+ # Populate the sysconfig file.
+ cat > $SYSCONFIG_SHIBD <<EOF
# Shibboleth SP init script customization
# User account for shibd
@@ -251,30 +251,30 @@ SHIBD_USER=%{runuser}
# Wait period (secs) for configuration (and metadata) to load
SHIBD_WAIT=30
EOF
- %if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
- cat >> $SYSCONFIG_SHIBD <<EOF
+ %if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
+ cat >> $SYSCONFIG_SHIBD <<EOF
# Override OS-supplied libcurl
export LD_LIBRARY_PATH=/opt/shibboleth/%{_lib}
EOF
- %endif
+ %endif
fi
%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
- # Strip existing rpath to libcurl.
- chrpath -d $RPM_BUILD_ROOT%{_sbindir}/shibd
- chrpath -d $RPM_BUILD_ROOT%{_bindir}/mdquery
- chrpath -d $RPM_BUILD_ROOT%{_bindir}/resolvertest
+ # Strip existing rpath to libcurl.
+ chrpath -d $RPM_BUILD_ROOT%{_sbindir}/shibd
+ chrpath -d $RPM_BUILD_ROOT%{_bindir}/mdquery
+ chrpath -d $RPM_BUILD_ROOT%{_bindir}/resolvertest
%endif
%if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon" || "%{_vendor}" == "suse"
if [ "$SYSTEMD_SHIBD" == "no" ] ; then
- # %{_initddir} not yet in RHEL5, use deprecated %{_initrddir}
- install -d -m 0755 $RPM_BUILD_ROOT%{_initrddir}
- install -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/shibboleth/shibd-%{_vendor} $RPM_BUILD_ROOT%{_initrddir}/shibd
+ # %{_initddir} not yet in RHEL5, use deprecated %{_initrddir}
+ install -d -m 0755 $RPM_BUILD_ROOT%{_initrddir}
+ install -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/shibboleth/shibd-%{_vendor} $RPM_BUILD_ROOT%{_initrddir}/shibd
%if "%{_vendor}" == "suse"
- install -d -m 0755 $RPM_BUILD_ROOT/%{_sbindir}
- %{__ln_s} -f %{_initrddir}/shibd $RPM_BUILD_ROOT%{_sbindir}/rcshibd
+ install -d -m 0755 $RPM_BUILD_ROOT/%{_sbindir}
+ %{__ln_s} -f %{_initrddir}/shibd $RPM_BUILD_ROOT%{_sbindir}/rcshibd
%endif
fi
%endif
@@ -288,9 +288,9 @@ fi
%pre
getent group %{runuser} >/dev/null || groupadd -r %{runuser}
getent passwd %{runuser} >/dev/null || useradd -r -g %{runuser} \
- -d %{_localstatedir}/run/shibboleth -s /sbin/nologin -c "Shibboleth SP daemon" %{runuser}
+ -d %{_localstatedir}/run/shibboleth -s /sbin/nologin -c "Shibboleth SP daemon" %{runuser}
%if 0%{?suse_version} >= 1210
- %service_add_pre shibd.service
+ %service_add_pre shibd.service
%endif
exit 0
@@ -299,52 +299,52 @@ exit 0
# Generate two keys on new installs.
if [ $1 -eq 1 ] ; then
- cd %{_sysconfdir}/shibboleth
- /bin/sh ./keygen.sh -b -n sp-signing -u %{runuser} -g %{runuser}
- /bin/sh ./keygen.sh -b -n sp-encrypt -u %{runuser} -g %{runuser}
+ cd %{_sysconfdir}/shibboleth
+ /bin/sh ./keygen.sh -b -n sp-signing -u %{runuser} -g %{runuser}
+ /bin/sh ./keygen.sh -b -n sp-encrypt -u %{runuser} -g %{runuser}
fi
%if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon"
if [ $1 -gt 1 ] ; then
- # On Red Hat with shib.conf installed, clean up old Alias commands
- # by pointing them at new version-independent /usr/share/share tree.
- # Any Aliases we didn't create we assume are custom files.
- # This is to accomodate making shib.conf a noreplace config file.
- # We can't do this for SUSE, because they disallow changes to
- # packaged files in scriplets.
- APACHE_CONF="no"
- if [ -f %{_sysconfdir}/httpd/conf.d/shib.conf ] ; then
- APACHE_CONF="%{_sysconfdir}/httpd/conf.d/shib.conf"
- fi
- if [ "$APACHE_CONF" != "no" ] ; then
- %{__sed} -i "s/\/usr\/share\/doc\/shibboleth\(\-\(.\)\{1,\}\)\{0,1\}\/main\.css/\/usr\/share\/shibboleth\/main.css/g" \
- $APACHE_CONF
- %{__sed} -i "s/\/usr\/share\/doc\/shibboleth\(\-\(.\)\{1,\}\)\{0,1\}\/logo\.jpg/\/usr\/share\/shibboleth\/logo.jpg/g" \
- $APACHE_CONF
- fi
- fi
+ # On Red Hat with shib.conf installed, clean up old Alias commands
+ # by pointing them at new version-independent /usr/share/share tree.
+ # Any Aliases we didn't create we assume are custom files.
+ # This is to accomodate making shib.conf a noreplace config file.
+ # We can't do this for SUSE, because they disallow changes to
+ # packaged files in scriplets.
+ APACHE_CONF="no"
+ if [ -f %{_sysconfdir}/httpd/conf.d/shib.conf ] ; then
+ APACHE_CONF="%{_sysconfdir}/httpd/conf.d/shib.conf"
+ fi
+ if [ "$APACHE_CONF" != "no" ] ; then
+ %{__sed} -i "s/\/usr\/share\/doc\/shibboleth\(\-\(.\)\{1,\}\)\{0,1\}\/main\.css/\/usr\/share\/shibboleth\/main.css/g" \
+ $APACHE_CONF
+ %{__sed} -i "s/\/usr\/share\/doc\/shibboleth\(\-\(.\)\{1,\}\)\{0,1\}\/logo\.jpg/\/usr\/share\/shibboleth\/logo.jpg/g" \
+ $APACHE_CONF
+ fi
+ fi
%if 0%{?rhel} >= 7
- # Initial prep for systemd
- %systemd_post shibd.service
- if [ $1 -gt 1 ] ; then
- systemctl daemon-reload
- fi
+ # Initial prep for systemd
+ %systemd_post shibd.service
+ if [ $1 -gt 1 ] ; then
+ systemctl daemon-reload
+ fi
%else
- # Add the proper /etc/rc*.d links for the script
- /sbin/chkconfig --add shibd
+ # Add the proper /etc/rc*.d links for the script
+ /sbin/chkconfig --add shibd
%endif
%endif
%if "%{_vendor}" == "suse"
%if 0%{?suse_version} >= 1210
- %service_add_post shibd.service
- systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf
+ %service_add_post shibd.service
+ systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf
%else
- # This adds the proper /etc/rc*.d links for the script
- # and populates the sysconfig/shibd file.
- cd /
- %{fillup_only -n shibd}
- %insserv_force_if_yast shibd
+ # This adds the proper /etc/rc*.d links for the script
+ # and populates the sysconfig/shibd file.
+ cd /
+ %{fillup_only -n shibd}
+ %insserv_force_if_yast shibd
%endif
%endif
@@ -352,28 +352,28 @@ if [ $1 -gt 1 ] ; then
# On final removal, stop shibd and remove service, restart Apache if running.
%if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon"
%if 0%{?rhel} >= 7
- %systemd_preun shibd.service
+ %systemd_preun shibd.service
%else
- if [ $1 -eq 0 ] ; then
- /sbin/service shibd stop >/dev/null 2>&1
- /sbin/chkconfig --del shibd
- fi
+ if [ $1 -eq 0 ] ; then
+ /sbin/service shibd stop >/dev/null 2>&1
+ /sbin/chkconfig --del shibd
+ fi
%endif
- if [ $1 -eq 0 ] ; then
- %{!?_without_builtinapache:/sbin/service httpd status 1>/dev/null && /sbin/service httpd restart 1>/dev/null}
- exit 0
- fi
+ if [ $1 -eq 0 ] ; then
+ %{!?_without_builtinapache:/sbin/service httpd status 1>/dev/null && /sbin/service httpd restart 1>/dev/null}
+ exit 0
+ fi
%endif
%if "%{_vendor}" == "suse"
%if 0%{?suse_version} >= 1210
%service_del_preun shibd.service
%else
- %stop_on_removal shibd
+ %stop_on_removal shibd
%endif
- if [ $1 -eq 0 ] ; then
- %{!?_without_builtinapache:/sbin/service apache2 status 1>/dev/null && /sbin/service apache2 restart 1>/dev/null}
- exit 0
- fi
+ if [ $1 -eq 0 ] ; then
+ %{!?_without_builtinapache:/sbin/service apache2 status 1>/dev/null && /sbin/service apache2 restart 1>/dev/null}
+ exit 0
+ fi
%endif
exit 0
@@ -382,26 +382,26 @@ exit 0
%if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon"
# On upgrade, restart components if they're already running.
%if 0%{?rhel} >= 7
- %systemd_postun_with_restart shibd.service
+ %systemd_postun_with_restart shibd.service
%else
- if [ $1 -ge 1 ] ; then
- /sbin/service shibd status 1>/dev/null && /sbin/service shibd restart 1>/dev/null
- fi
+ if [ $1 -ge 1 ] ; then
+ /sbin/service shibd status 1>/dev/null && /sbin/service shibd restart 1>/dev/null
+ fi
%endif
- if [ $1 -ge 1 ] ; then
- %{!?_without_builtinapache:/sbin/service httpd status 1>/dev/null && /sbin/service httpd restart 1>/dev/null}
- exit 0
- fi
+ if [ $1 -ge 1 ] ; then
+ %{!?_without_builtinapache:/sbin/service httpd status 1>/dev/null && /sbin/service httpd restart 1>/dev/null}
+ exit 0
+ fi
%endif
%if "%{_vendor}" == "suse"
%if 0%{?suse_version} >= 1210
- %service_del_postun shibd.service
+ %service_del_postun shibd.service
%else
- cd /
- %restart_on_update shibd
- %{insserv_cleanup}
+ cd /
+ %restart_on_update shibd
+ %{insserv_cleanup}
%endif
- %{!?_without_builtinapache:%restart_on_update apache2}
+ %{!?_without_builtinapache:%restart_on_update apache2}
%endif
%posttrans
@@ -410,8 +410,8 @@ exit 0
# If we remove, upgrades from pre-systemd to post-systemd
# will stop doing the final restart.
%if "%{_vendor}" == "suse" && 0%{?suse_version} >= 1210
- /usr/bin/systemctl try-restart shibd >/dev/null 2>&1 || :
- /usr/bin/systemctl try-restart apache2 >/dev/null 2>&1 || :
+ /usr/bin/systemctl try-restart shibd >/dev/null 2>&1 || :
+ /usr/bin/systemctl try-restart apache2 >/dev/null 2>&1 || :
%endif
exit 0
@@ -427,7 +427,7 @@ exit 0
%{_libdir}/shibboleth/*.so
%exclude %{_libdir}/shibboleth/*.la
%{?_with_fastcgi:%{_libdir}/shibboleth/shibauthorizer}
-%{?_with_fastcgi:%{_libdir}/shibboleth/shibresponder}
+%{?_with_fastcgi:%{_libdir}/shibboleth/shibresponder}
%attr(0750,%{runuser},%{runuser}) %dir %{_localstatedir}/log/shibboleth
%if 0%{?suse_version} < 1300
%attr(0755,%{runuser},%{runuser}) %dir %{_localstatedir}/run/shibboleth
@@ -555,7 +555,7 @@ exit 0
* Sun Jun 26 2011 Scott Cantor <cantor.2 at osu.edu> - 2.4.3-1
- Log files shouldn't be world readable.
- Explicit requirement for libcurl-openssl on RHEL6
-- Uncomment LD_LIBRARY_PATH in init script for RHEL6
+- Uncomment LD_LIBRARY_PATH in init script for RHEL6
- Remove rpath from binaries for RHEL6
* Fri Dec 25 2009 Scott Cantor <cantor.2 at osu.edu> - 2.4-1
@@ -605,13 +605,13 @@ exit 0
* Thu Aug 16 2007 Scott Cantor <cantor.2 at osu.edu> - 2.0-3
- First public beta.
-* Fri Jul 13 2007 Scott Cantor <cantor.2 at osu.edu> - 2.0-2
+* Fri Jul 13 2007 Scott Cantor <cantor.2 at osu.edu> - 2.0-2
- Second alpha release.
-* Sun Jun 10 2007 Scott Cantor <cantor.2 at osu.edu> - 2.0-1
+* Sun Jun 10 2007 Scott Cantor <cantor.2 at osu.edu> - 2.0-1
- First alpha release.
-* Mon Oct 2 2006 Scott Cantor <cantor.2 at osu.edu> - 1.3-11
+* Mon Oct 2 2006 Scott Cantor <cantor.2 at osu.edu> - 1.3-11
- Applied fix for secadv 20061002
- Fix for metadata loader loop
diff --git a/common/SPECS/shibresolver.spec b/common/SPECS/shibresolver.spec
index 9f5e3c8..88dfd36 100644
--- a/common/SPECS/shibresolver.spec
+++ b/common/SPECS/shibresolver.spec
@@ -1,22 +1,22 @@
-Name: shibboleth-resolver
-Version: 3.4.0
-Summary: Shibboleth SP Attribute Resolver Library
-Release: 1
-Vendor: Shibboleth Consortium
-Group: System Environment/Libraries
-License: Apache-2.0
-URL: https://www.shibboleth.net/
-Source0: https://shibboleth.net/downloads/extensions/sp/%{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libxerces-c-devel >= 3.2
-BuildRequires: libxml-security-c-devel >= 2.0.0
-BuildRequires: libxmltooling-devel >= 3.2.0
-BuildRequires: libsaml-devel >= 3.2.0
-BuildRequires: shibboleth-devel >= 3.4.0
+Name: shibboleth-resolver
+Version: 3.4.0
+Summary: Shibboleth SP Attribute Resolver Library
+Release: 1
+Vendor: Shibboleth Consortium
+Group: System Environment/Libraries
+License: Apache-2.0
+URL: https://www.shibboleth.net/
+Source0: https://shibboleth.net/downloads/extensions/sp/%{name}-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: libxerces-c-devel >= 3.2
+BuildRequires: libxml-security-c-devel >= 2.0.0
+BuildRequires: libxmltooling-devel >= 3.2.0
+BuildRequires: libsaml-devel >= 3.2.0
+BuildRequires: shibboleth-devel >= 3.4.0
%{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
%{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.4}
%{!?_without_gssapi:BuildRequires: krb5-devel}
-BuildRequires: gcc-c++, pkgconfig
+BuildRequires: gcc-c++, pkgconfig
%if "%{_vendor}" == "redhat"
BuildRequires: redhat-rpm-config
%endif
@@ -33,10 +33,10 @@ externally accessible attribute resolver functionality for processing
local and remote sources of federated attribute information.
%package -n libshibresolver6
-Summary: Shibboleth SP Attribute Resolver library
-Group: Development/Libraries
-Provides: shibboleth-resolver = %{version}-%{release}
-Obsoletes: shibboleth-resolver < %{version}-%{release}
+Summary: Shibboleth SP Attribute Resolver library
+Group: Development/Libraries
+Provides: shibboleth-resolver = %{version}-%{release}
+Obsoletes: shibboleth-resolver < %{version}-%{release}
%description -n libshibresolver6
This package contains a Shibboleth SP Extension that provides
@@ -46,11 +46,11 @@ local and remote sources of federated attribute information.
This package contains just the shared library.
%package -n libshibresolver-devel
-Summary: Shibboleth SP Attribute Resolver development Headers
-Group: Development/Libraries
-Requires: libshibresolver6 = %{version}-%{release}
-Provides: shibboleth-resolver-devel = %{version}-%{release}
-Obsoletes: shibboleth-resolver-devel < %{version}-%{release}
+Summary: Shibboleth SP Attribute Resolver development Headers
+Group: Development/Libraries
+Requires: libshibresolver6 = %{version}-%{release}
+Provides: shibboleth-resolver-devel = %{version}-%{release}
+Obsoletes: shibboleth-resolver-devel < %{version}-%{release}
Requires: libxerces-c-devel >= 3.2
Requires: libxml-security-c-devel >= 2.0.0
Requires: libxmltooling-devel >= 3.2.0
diff --git a/common/SPECS/xerces-c.spec b/common/SPECS/xerces-c.spec
index a2c012f..98d0a7a 100644
--- a/common/SPECS/xerces-c.spec
+++ b/common/SPECS/xerces-c.spec
@@ -1,13 +1,13 @@
-Summary: Xerces-C++ validating XML parser
-Name: xerces-c
-Version: 3.2.4
-Release: 1
-URL: http://xerces.apache.org/xerces-c/
-Source0: %{name}-%{version}.tar.bz2
-License: Apache
-Group: Libraries
-BuildRoot: %{_tmppath}/%{name}-root
-Prefix: /usr
+Summary: Xerces-C++ validating XML parser
+Name: xerces-c
+Version: 3.2.4
+Release: 1
+URL: http://xerces.apache.org/xerces-c/
+Source0: %{name}-%{version}.tar.bz2
+License: Apache
+Group: Libraries
+BuildRoot: %{_tmppath}/%{name}-root
+Prefix: /usr
BuildRequires: gcc-c++ pkgconfig
%{?_with_curl:BuildRequires: curl-devel}
%{?_with_icu:BuildRequires: libicu-devel}
@@ -26,8 +26,8 @@ write XML data. A shared library is provided for parsing, generating,
manipulating, and validating XML documents.
%package -n xerces-c-bin
-Summary: Utilities for Xerces-C++ validating XML parser
-Group: Development/Libraries
+Summary: Utilities for Xerces-C++ validating XML parser
+Group: Development/Libraries
%description -n xerces-c-bin
Xerces-C++ is a validating XML parser written in a portable subset of C++.
@@ -38,9 +38,9 @@ manipulating, and validating XML documents.
This package contains the utility programs.
%package -n libxerces-c-3_2
-Summary: Shared library for Xerces-C++ validating XML parser
-Group: Development/Libraries
-Provides: xerces-c = %{version}-%{release}
+Summary: Shared library for Xerces-C++ validating XML parser
+Group: Development/Libraries
+Provides: xerces-c = %{version}-%{release}
%description -n libxerces-c-3_2
Xerces-C++ is a validating XML parser written in a portable subset of C++.
@@ -51,10 +51,10 @@ manipulating, and validating XML documents.
This package contains just the shared library.
%package -n libxerces-c-devel
-Group: Development/Libraries
-Summary: Header files for Xerces-C++ validating XML parser
-Requires: libxerces-c-3_2 = %{version}-%{release}
-Provides: xerces-c-devel = %{version}-%{release}
+Group: Development/Libraries
+Summary: Header files for Xerces-C++ validating XML parser
+Requires: libxerces-c-3_2 = %{version}-%{release}
+Provides: xerces-c-devel = %{version}-%{release}
%description -n libxerces-c-devel
Xerces-C++ is a validating XML parser written in a portable subset of C++.
diff --git a/common/SPECS/xml-security-c.spec b/common/SPECS/xml-security-c.spec
index fba275d..c012fb7 100644
--- a/common/SPECS/xml-security-c.spec
+++ b/common/SPECS/xml-security-c.spec
@@ -1,16 +1,16 @@
-Name: xml-security-c
-Version: 2.0.4
-Release: 1
-Summary: Apache XML security C++ library
-Group: Development/Libraries/C and C++
-License: Apache 2.0
-URL: http://www.apache.org/dist/santuario/c-library/
-Source: %{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Name: xml-security-c
+Version: 2.0.4
+Release: 1
+Summary: Apache XML security C++ library
+Group: Development/Libraries/C and C++
+License: Apache 2.0
+URL: http://www.apache.org/dist/santuario/c-library/
+Source: %{name}-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?_with_xalan:BuildRequires: libxalan-c-devel >= 1.11}
-BuildRequires: libxerces-c-devel >= 3.2
-BuildRequires: openssl-devel gcc-c++ pkgconfig
+BuildRequires: libxerces-c-devel >= 3.2
+BuildRequires: openssl-devel gcc-c++ pkgconfig
%if "%{_vendor}" == "redhat"
BuildRequires: redhat-rpm-config
%endif
@@ -26,8 +26,8 @@ Xerces-C XML Parser and Xalan-C XSLT processor. The latter is used for processin
XPath and XSLT transforms.
%package -n xml-security-c-bin
-Summary: Utilities for XML security C++ library
-Group: Development/Libraries/C and C++
+Summary: Utilities for XML security C++ library
+Group: Development/Libraries/C and C++
%description -n xml-security-c-bin
The xml-security-c library is a C++ implementation of the XML Digital Signature
@@ -38,9 +38,9 @@ XPath and XSLT transforms.
This package contains the utility programs.
%package -n libxml-security-c20
-Summary: Apache XML security C++ library
-Group: Development/Libraries/C and C++
-Provides: xml-security-c = %{version}-%{release}
+Summary: Apache XML security C++ library
+Group: Development/Libraries/C and C++
+Provides: xml-security-c = %{version}-%{release}
%description -n libxml-security-c20
The xml-security-c library is a C++ implementation of the XML Digital Signature
@@ -51,13 +51,13 @@ XPath and XSLT transforms.
This package contains just the shared library.
%package -n libxml-security-c-devel
-Summary: Development files for the Apache C++ XML security library
-Group: Development/Libraries/C and C++
-Requires: libxml-security-c20 = %{version}-%{release}
-Requires: openssl-devel
-Requires: libxerces-c-devel >= 3.2
+Summary: Development files for the Apache C++ XML security library
+Group: Development/Libraries/C and C++
+Requires: libxml-security-c20 = %{version}-%{release}
+Requires: openssl-devel
+Requires: libxerces-c-devel >= 3.2
%{?_with_xalan:Requires: libxalan-c-devel >= 1.11}
-Provides: xml-security-c-devel = %{version}-%{release}
+Provides: xml-security-c-devel = %{version}-%{release}
%description -n libxml-security-c-devel
The xml-security-c library is a C++ implementation of the XML Digital Signature
diff --git a/common/SPECS/xmltooling.spec b/common/SPECS/xmltooling.spec
index 2ea8d91..bfdf578 100644
--- a/common/SPECS/xmltooling.spec
+++ b/common/SPECS/xmltooling.spec
@@ -1,15 +1,15 @@
-Name: xmltooling
-Version: 3.2.4
-Release: 1
-Summary: OpenSAML XML Processing library
-Group: Development/Libraries/C and C++
-Vendor: Shibboleth Consortium
-License: Apache-2.0
-URL: http://www.opensaml.org/
-Source: %{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libxerces-c-devel >= 3.2
-BuildRequires: libxml-security-c-devel >= 2.0.0
+Name: xmltooling
+Version: 3.2.4
+Release: 1
+Summary: OpenSAML XML Processing library
+Group: Development/Libraries/C and C++
+Vendor: Shibboleth Consortium
+License: Apache-2.0
+URL: http://www.opensaml.org/
+Source: %{name}-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: libxerces-c-devel >= 3.2
+BuildRequires: libxml-security-c-devel >= 2.0.0
%{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
%{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.4}
BuildRequires: gcc-c++, pkgconfig, zlib-devel, openssl-devel, boost-devel >= 1.32.0
@@ -48,10 +48,10 @@ classes to add value around the DOM, as well as signing and encryption
support.
%package -n libxmltooling10
-Summary: OpenSAML XMLTooling library
-Group: Development/Libraries/C and C++
-Provides: xmltooling = %{version}-%{release}
-Obsoletes: xmltooling < %{version}-%{release}
+Summary: OpenSAML XMLTooling library
+Group: Development/Libraries/C and C++
+Provides: xmltooling = %{version}-%{release}
+Obsoletes: xmltooling < %{version}-%{release}
%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
Requires: libcurl-openssl >= 7.21.7
%endif
@@ -66,12 +66,12 @@ support.
This package contains just the shared library.
%package -n libxmltooling-devel
-Summary: XMLTooling development Headers
-Group: Development/Libraries/C and C++
-Requires: libxmltooling10 = %{version}-%{release}
-Provides: xmltooling-devel = %{version}-%{release}
-Obsoletes: xmltooling-devel < %{version}-%{release}
-Requires: libxerces-c-devel >= 3.2
+Summary: XMLTooling development Headers
+Group: Development/Libraries/C and C++
+Requires: libxmltooling10 = %{version}-%{release}
+Provides: xmltooling-devel = %{version}-%{release}
+Obsoletes: xmltooling-devel < %{version}-%{release}
+Requires: libxerces-c-devel >= 3.2
Requires: libxml-security-c-devel >= 2.0.0
%{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
%{!?_with_log4cpp:Requires: liblog4shib-devel >= 1.0.4}
@@ -92,8 +92,8 @@ support.
This package includes files needed for development with XMLTooling.
%package -n xmltooling-schemas
-Summary: XMLTooling schemas and catalog
-Group: Development/Libraries/C and C++
+Summary: XMLTooling schemas and catalog
+Group: Development/Libraries/C and C++
%description -n xmltooling-schemas
The XMLTooling library contains generic XML parsing and processing
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list