[cpp-linbuild] 14/15: SSPCPP-969 Replace each empty main package with its lib sub-package
John W. O'Brien
john at saltant.com
Sun Jun 18 15:00:49 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=ab80132e55a5a424956d5481a402f0b3c4bc859f
commit ab80132e55a5a424956d5481a402f0b3c4bc859f
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Sat Jun 17 21:38:17 2023 +0000
SSPCPP-969 Replace each empty main package with its lib sub-package
---
common/SPECS/log4shib.spec | 25 ++++++++-----------------
common/SPECS/opensaml.spec | 27 +++++++++------------------
common/SPECS/shibresolver.spec | 25 ++++++++-----------------
common/SPECS/xerces-c.spec | 29 ++++++++++-------------------
common/SPECS/xml-security-c.spec | 27 +++++++++------------------
common/SPECS/xmltooling.spec | 30 ++++++++----------------------
6 files changed, 52 insertions(+), 111 deletions(-)
diff --git a/common/SPECS/log4shib.spec b/common/SPECS/log4shib.spec
index 5bc97b2..c3e3138 100644
--- a/common/SPECS/log4shib.spec
+++ b/common/SPECS/log4shib.spec
@@ -2,7 +2,7 @@
%define libname lib%{compname}2
%define develname lib%{compname}-devel
-Name: %{compname}
+Name: %{libname}
Version: 2.0.1
Release: 1
Summary: Log for C++, Shibboleth Edition
@@ -11,6 +11,8 @@ Group: Development/Libraries
Vendor: Shibboleth Consortium
URL: https://shibboleth.net/downloads/%{compname}/%{version}
Source0: https://shibboleth.net/downloads/%{compname}/%{version}/%{compname}-%{version}.tar.bz2
+Provides: %{compname} = %{version}-%{release}
+Obsoletes: %{compname} < %{version}-%{release}
BuildRequires: gcc-c++
BuildRequires: pkgconfig
%{!?_without_doxygenrpm:BuildRequires: doxygen}
@@ -33,18 +35,7 @@ Log for C++ is a library of classes for flexible logging to files, syslog,
and other destinations. It is modeled after the Log for Java library and
stays as close to its API as is reasonable.
-%package -n %{libname}
-Summary: Log for C++, Shibboleth Edition
-Group: Development/Libraries
-Provides: %{compname} = %{version}-%{release}
-Obsoletes: %{compname} < %{version}-%{release}
-
-%description -n %{libname}
-Log for C++ is a library of classes for flexible logging to files, syslog,
-and other destinations. It is modeled after the Log for Java library and
-stays as close to its API as is reasonable.
-
-This package contains just the shared library.
+The main package contains just the shared library.
%package -n %{develname}
Summary: Development tools for Log for C++
@@ -57,7 +48,7 @@ Obsoletes: %{compname}-devel < %{version}-%{release}
The static libraries and header files needed for development with log4shib.
%prep
-%setup -q
+%setup -q -n %{compname}-%{version}
%build
%configure %{!?_without_doxygenrpm:--enable-doxygen} %{?_without_doxygenrpm:--disable-doxygen}
@@ -74,16 +65,16 @@ config/install-sh -m 644 -c AUTHORS COPYING INSTALL NEWS README THANKS ChangeLog
%clean
[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
-%post -n %{libname} -p /sbin/ldconfig
+%post -p /sbin/ldconfig
%post -n %{develname}
if test "x$RPM_INSTALL_PREFIX0" != "x" ; then
%{__perl} -pi -e"s|^prefix=\"[^\"]*\"|prefix=\"$RPM_INSTALL_PREFIX0\"|" $RPM_INSTALL_PREFIX0/bin/log4shib-config
fi
-%postun -n %{libname} -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
-%files -n %{libname}
+%files
%defattr(-,root,root,755)
%attr(755,root,root) %{_libdir}/lib*.so.*
diff --git a/common/SPECS/opensaml.spec b/common/SPECS/opensaml.spec
index b2ab306..0627a6b 100644
--- a/common/SPECS/opensaml.spec
+++ b/common/SPECS/opensaml.spec
@@ -4,7 +4,7 @@
%define schemaname %{compname}-schemas
%define utilname %{compname}-bin
-Name: %{compname}
+Name: %{libname}
Version: 3.2.1
Release: 1
Summary: OpenSAML SAML library
@@ -13,6 +13,8 @@ Vendor: Shibboleth Consortium
License: Apache-2.0
URL: http://www.opensaml.org/
Source0: https://shibboleth.net/downloads/c++-%{compname}/%{version}/%{compname}-%{version}.tar.bz2
+Provides: %{compname} = %{version}-%{release}
+Obsoletes: %{compname} < %{version}-%{release}
BuildRequires: libxerces-c-devel >= 3.2
BuildRequires: libxml-security-c-devel >= 2.0.0
BuildRequires: libxmltooling-devel >= 3.2.0
@@ -41,6 +43,8 @@ OpenSAML is an open source implementation of the OASIS Security Assertion
Markup Language Specification. It contains a set of open source C++ classes
that support the SAML 1.0, 1.1, and 2.0 specifications.
+The main package contains just the shared library.
+
%package -n %{utilname}
Summary: Utilities for OpenSAML library
Group: Development/Libraries/C and C++
@@ -52,19 +56,6 @@ that support the SAML 1.0, 1.1, and 2.0 specifications.
This package contains the utility programs.
-%package -n %{libname}
-Summary: OpenSAML SAML library
-Group: Development/Libraries/C and C++
-Provides: %{compname} = %{version}-%{release}
-Obsoletes: %{compname} < %{version}-%{release}
-
-%description -n %{libname}
-OpenSAML is an open source implementation of the OASIS Security Assertion
-Markup Language Specification. It contains a set of open source C++ classes
-that support the SAML 1.0, 1.1, and 2.0 specifications.
-
-This package contains just the shared library.
-
%package -n %{develname}
Summary: OpenSAML development Headers
Group: Development/Libraries/C and C++
@@ -96,7 +87,7 @@ that support the SAML 1.0, 1.1, and 2.0 specifications.
This package includes XML schemas and related files.
%prep
-%setup -q
+%setup -q -n %{compname}-%{version}
%build
%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} >= 1
@@ -117,15 +108,15 @@ This package includes XML schemas and related files.
%clean
[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
-%post -n %{libname} -p /sbin/ldconfig
+%post -p /sbin/ldconfig
-%postun -n %{libname} -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
%files -n %{utilname}
%defattr(-,root,root,-)
%{_bindir}/samlsign
-%files -n %{libname}
+%files
%defattr(-,root,root,-)
%{_libdir}/libsaml.so.*
%exclude %{_libdir}/libsaml.la
diff --git a/common/SPECS/shibresolver.spec b/common/SPECS/shibresolver.spec
index afc5ac7..55eb235 100644
--- a/common/SPECS/shibresolver.spec
+++ b/common/SPECS/shibresolver.spec
@@ -3,7 +3,7 @@
%define libname lib%{compname}6
%define develname lib%{compname}-devel
-Name: %{distname}
+Name: %{libname}
Version: 3.4.0
Summary: Shibboleth SP Attribute Resolver Library
Release: 1
@@ -12,6 +12,8 @@ Group: System Environment/Libraries
License: Apache-2.0
URL: https://www.shibboleth.net/
Source0: https://shibboleth.net/downloads/service-provider/extensions/%{compname}/%{version}/%{distname}-%{version}.tar.bz2
+Provides: %{compname} = %{version}-%{release}
+Obsoletes: %{compname} < %{version}-%{release}
BuildRequires: libxerces-c-devel >= 3.2
BuildRequires: libxml-security-c-devel >= 2.0.0
BuildRequires: libxmltooling-devel >= 3.2.0
@@ -37,18 +39,7 @@ This package contains a Shibboleth SP Extension that provides
externally accessible attribute resolver functionality for processing
local and remote sources of federated attribute information.
-%package -n %{libname}
-Summary: Shibboleth SP Attribute Resolver library
-Group: Development/Libraries
-Provides: %{distname} = %{version}-%{release}
-Obsoletes: %{distname} < %{version}-%{release}
-
-%description -n %{libname}
-This package contains a Shibboleth SP Extension that provides
-externally accessible attribute resolver functionality for processing
-local and remote sources of federated attribute information.
-
-This package contains just the shared library.
+The main package contains just the shared library.
%package -n %{develname}
Summary: Shibboleth SP Attribute Resolver development Headers
@@ -72,7 +63,7 @@ local and remote sources of federated attribute information.
This package includes files needed for development.
%prep
-%setup -q
+%setup -q -n %{distname}-%{version}
%build
%if 0%{?suse_version} >= 1300
@@ -104,11 +95,11 @@ This package includes files needed for development.
%clean
[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
-%post -n %{libname} -p /sbin/ldconfig
+%post -p /sbin/ldconfig
-%postun -n %{libname} -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
-%files -n %{libname}
+%files
%defattr(-,root,root,-)
%{_libdir}/libshibresolver-lite.so.*
%{_libdir}/libshibresolver.so.*
diff --git a/common/SPECS/xerces-c.spec b/common/SPECS/xerces-c.spec
index 2d486b0..f9f9b97 100644
--- a/common/SPECS/xerces-c.spec
+++ b/common/SPECS/xerces-c.spec
@@ -4,13 +4,15 @@
%define utilname %{compname}-bin
Summary: Xerces-C++ validating XML parser
-Name: %{compname}
+Name: %{libname}
Version: 3.2.4
Release: 1
URL: https://xerces.apache.org/%{compname}/
Source0: https://shibboleth.net/downloads/%{compname}/%{compname}-%{version}.tar.bz2
+Provides: %{compname} = %{version}-%{release}
+Obsoletes: %{compname} < %{version}-%{release}
License: Apache-2.0
-Group: Libraries
+Group: Development/Libraries
BuildRequires: gcc-c++
BuildRequires: pkgconfig
%{?_with_curl:BuildRequires: curl-devel}
@@ -29,6 +31,8 @@ Xerces-C++ makes it easy to give your application the ability to read and
write XML data. A shared library is provided for parsing, generating,
manipulating, and validating XML documents.
+The main package contains just the shared library.
+
%package -n %{utilname}
Summary: Utilities for Xerces-C++ validating XML parser
Group: Development/Libraries
@@ -41,19 +45,6 @@ manipulating, and validating XML documents.
This package contains the utility programs.
-%package -n %{libname}
-Summary: Shared library for Xerces-C++ validating XML parser
-Group: Development/Libraries
-Provides: %{compname} = %{version}-%{release}
-
-%description -n %{libname}
-Xerces-C++ is a validating XML parser written in a portable subset of C++.
-Xerces-C++ makes it easy to give your application the ability to read and
-write XML data. A shared library is provided for parsing, generating,
-manipulating, and validating XML documents.
-
-This package contains just the shared library.
-
%package -n %{develname}
Group: Development/Libraries
Summary: Header files for Xerces-C++ validating XML parser
@@ -69,7 +60,7 @@ manipulating, and validating XML documents.
The static libraries and header files needed for development with Xerces-C++.
%prep
-%setup -q
+%setup -q -n %{compname}-%{version}
%build
%configure %{?_with_curl:--enable-netaccessor-curl} %{!?_with_curl:--disable-netaccessor-curl} %{?_with_icu:--enable-transcoder-icu --enable-msgloader-icu} %{?xerces_options}
@@ -81,15 +72,15 @@ The static libraries and header files needed for development with Xerces-C++.
%clean
[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
-%post -n %{libname} -p /sbin/ldconfig
+%post -p /sbin/ldconfig
-%postun -n %{libname} -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
%files -n %{utilname}
%defattr(755,root,root)
%{_bindir}/*
-%files -n %{libname}
+%files
%defattr(755,root,root)
%{_libdir}/libxerces-c-*.so
diff --git a/common/SPECS/xml-security-c.spec b/common/SPECS/xml-security-c.spec
index f69c434..f9dedf0 100644
--- a/common/SPECS/xml-security-c.spec
+++ b/common/SPECS/xml-security-c.spec
@@ -3,7 +3,7 @@
%define develname lib%{compname}-devel
%define utilname %{compname}-bin
-Name: %{compname}
+Name: %{libname}
Version: 2.0.4
Release: 1
Summary: Apache XML security C++ library
@@ -11,6 +11,8 @@ Group: Development/Libraries/C and C++
License: Apache-2.0
URL: http://www.apache.org/dist/santuario/c-library/
Source0: https://downloads.apache.org/santuario/c-library/%{compname}-%{version}.tar.bz2
+Provides: %{compname} = %{version}-%{release}
+Obsoletes: %{compname} < %{version}-%{release}
%{?_with_xalan:BuildRequires: libxalan-c-devel >= 1.11}
BuildRequires: libxerces-c-devel >= 3.2
@@ -29,6 +31,8 @@ and Encryption specifications. The library makes use of the Apache XML project's
Xerces-C XML Parser and Xalan-C XSLT processor. The latter is used for processing
XPath and XSLT transforms.
+The main package contains just the shared library.
+
%package -n %{utilname}
Summary: Utilities for XML security C++ library
Group: Development/Libraries/C and C++
@@ -41,19 +45,6 @@ XPath and XSLT transforms.
This package contains the utility programs.
-%package -n %{libname}
-Summary: Apache XML security C++ library
-Group: Development/Libraries/C and C++
-Provides: %{compname} = %{version}-%{release}
-
-%description -n %{libname}
-The xml-security-c library is a C++ implementation of the XML Digital Signature
-and Encryption specifications. The library makes use of the Apache XML project's
-Xerces-C XML Parser and Xalan-C XSLT processor. The latter is used for processing
-XPath and XSLT transforms.
-
-This package contains just the shared library.
-
%package -n %{develname}
Summary: Development files for the Apache C++ XML security library
Group: Development/Libraries/C and C++
@@ -72,7 +63,7 @@ XPath and XSLT transforms.
This package includes files needed for development with xml-security-c.
%prep
-%setup -q
+%setup -q -n %{compname}-%{version}
%build
%configure --with-openssl %{!?_with_xalan: --without-xalan} %{!?_enable_xkms: --disable-xkms}
@@ -85,15 +76,15 @@ This package includes files needed for development with xml-security-c.
%{__rm} -rf $RPM_BUILD_ROOT
-%post -n %{libname} -p /sbin/ldconfig
+%post -p /sbin/ldconfig
-%postun -n %{libname} -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
%files -n %{utilname}
%defattr(-,root,root,-)
%{_bindir}/*
-%files -n %{libname}
+%files
%defattr(-,root,root,-)
%{_libdir}/*.so.*
diff --git a/common/SPECS/xmltooling.spec b/common/SPECS/xmltooling.spec
index 9ffc57b..88ab4c3 100644
--- a/common/SPECS/xmltooling.spec
+++ b/common/SPECS/xmltooling.spec
@@ -3,7 +3,7 @@
%define develname lib%{compname}-devel
%define schemaname %{compname}-schemas
-Name: %{compname}
+Name: %{libname}
Version: 3.2.4
Release: 1
Summary: OpenSAML XML Processing library
@@ -12,6 +12,8 @@ Vendor: Shibboleth Consortium
License: Apache-2.0
URL: http://www.opensaml.org/
Source0: https://shibboleth.net/downloads/c++-opensaml/3.2.1/%{compname}-%{version}.tar.bz2
+Provides: %{compname} = %{version}-%{release}
+Obsoletes: %{compname} < %{version}-%{release}
BuildRequires: libxerces-c-devel >= 3.2
BuildRequires: libxml-security-c-devel >= 2.0.0
%{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
@@ -55,23 +57,7 @@ for declaring element- and type-specific API and implementation
classes to add value around the DOM, as well as signing and encryption
support.
-%package -n %{libname}
-Summary: OpenSAML XMLTooling library
-Group: Development/Libraries/C and C++
-Provides: %{compname} = %{version}-%{release}
-Obsoletes: %{compname} < %{version}-%{release}
-%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
-Requires: libcurl-openssl >= 7.21.7
-%endif
-
-%description -n %{libname}
-The XMLTooling library contains generic XML parsing and processing
-classes based on the Xerces-C DOM. It adds more powerful facilities
-for declaring element- and type-specific API and implementation
-classes to add value around the DOM, as well as signing and encryption
-support.
-
-This package contains just the shared library.
+The main package contains just the shared library.
%package -n %{develname}
Summary: XMLTooling development Headers
@@ -114,7 +100,7 @@ support.
This package includes XML schemas and related files.
%prep
-%setup -q
+%setup -q -n %{compname}-%{version}
%build
%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
@@ -135,11 +121,11 @@ This package includes XML schemas and related files.
%clean
[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
-%post -n %{libname} -p /sbin/ldconfig
+%post -p /sbin/ldconfig
-%postun -n %{libname} -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
-%files -n %{libname}
+%files
%defattr(-,root,root,-)
%{_libdir}/*.so.*
%exclude %{_libdir}/*.la
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list