[cpp-linbuild] 13/15: Parameterize (sub-)package names

John W. O'Brien john at saltant.com
Sun Jun 18 15:00:48 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=89e861a110138663c37ac960f835855cc0a6db82

commit 89e861a110138663c37ac960f835855cc0a6db82
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Fri Jun 16 16:12:18 2023 +0000

    Parameterize (sub-)package names
---
 common/SPECS/log4shib.spec       | 42 +++++++++++++++++---------------
 common/SPECS/opensaml.spec       | 52 ++++++++++++++++++++++------------------
 common/SPECS/shibresolver.spec   | 35 +++++++++++++++------------
 common/SPECS/xerces-c.spec       | 39 +++++++++++++++++-------------
 common/SPECS/xml-security-c.spec | 37 +++++++++++++++-------------
 common/SPECS/xmltooling.spec     | 45 ++++++++++++++++++----------------
 6 files changed, 140 insertions(+), 110 deletions(-)

diff --git a/common/SPECS/log4shib.spec b/common/SPECS/log4shib.spec
index 3d4c861..5bc97b2 100644
--- a/common/SPECS/log4shib.spec
+++ b/common/SPECS/log4shib.spec
@@ -1,12 +1,16 @@
-Name: log4shib
+%define compname log4shib
+%define libname lib%{compname}2
+%define develname lib%{compname}-devel
+
+Name: %{compname}
 Version: 2.0.1
 Release: 1
 Summary: Log for C++, Shibboleth Edition
 License: LGPL-2.1-only
 Group: Development/Libraries
 Vendor: Shibboleth Consortium
-URL: http://shibboleth.net/downloads/log4shib/%version%
-Source0: https://shibboleth.net/downloads/%{name}/%{version}/%{name}-%{version}.tar.bz2
+URL: https://shibboleth.net/downloads/%{compname}/%{version}
+Source0: https://shibboleth.net/downloads/%{compname}/%{version}/%{compname}-%{version}.tar.bz2
 BuildRequires: gcc-c++
 BuildRequires: pkgconfig
 %{!?_without_doxygenrpm:BuildRequires: doxygen}
@@ -19,9 +23,9 @@ BuildRequires: gdb
 %endif
 
 %if "%{_vendor}" == "suse"
-%define pkgdocdir %{_docdir}/%{name}
+%define pkgdocdir %{_docdir}/%{compname}
 %else
-%define pkgdocdir %{_docdir}/%{name}-%{version}
+%define pkgdocdir %{_docdir}/%{compname}-%{version}
 %endif
 
 %description
@@ -29,27 +33,27 @@ 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 liblog4shib2
+%package -n %{libname}
 Summary: Log for C++, Shibboleth Edition
 Group: Development/Libraries
-Provides: log4shib = %{version}-%{release}
-Obsoletes: log4shib < %{version}-%{release}
+Provides: %{compname} = %{version}-%{release}
+Obsoletes: %{compname} < %{version}-%{release}
 
-%description -n liblog4shib2
+%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.
 
-%package -n liblog4shib-devel
+%package -n %{develname}
 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: %{libname} = %{version}-%{release}
+Provides: %{compname}-devel = %{version}-%{release}
+Obsoletes: %{compname}-devel < %{version}-%{release}
 
-%description -n liblog4shib-devel
+%description -n %{develname}
 The static libraries and header files needed for development with log4shib.
 
 %prep
@@ -70,20 +74,20 @@ config/install-sh -m 644 -c AUTHORS COPYING INSTALL NEWS README THANKS ChangeLog
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
 
-%post -n liblog4shib2 -p /sbin/ldconfig
+%post -n %{libname} -p /sbin/ldconfig
 
-%post -n liblog4shib-devel
+%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 liblog4shib2 -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
 
-%files -n liblog4shib2
+%files -n %{libname}
 %defattr(-,root,root,755)
 %attr(755,root,root) %{_libdir}/lib*.so.*
 
-%files -n liblog4shib-devel
+%files -n %{develname}
 %defattr(-,root,root,755)
 %{_includedir}/*
 %{!?_without_doxygenrpm:%{_mandir}/man?/*}
diff --git a/common/SPECS/opensaml.spec b/common/SPECS/opensaml.spec
index a65a956..b2ab306 100644
--- a/common/SPECS/opensaml.spec
+++ b/common/SPECS/opensaml.spec
@@ -1,4 +1,10 @@
-Name: opensaml
+%define compname opensaml
+%define libname libsaml12
+%define develname libsaml-devel
+%define schemaname %{compname}-schemas
+%define utilname %{compname}-bin
+
+Name: %{compname}
 Version: 3.2.1
 Release: 1
 Summary: OpenSAML SAML library
@@ -6,7 +12,7 @@ Group: Development/Libraries/C and C++
 Vendor: Shibboleth Consortium
 License: Apache-2.0
 URL: http://www.opensaml.org/
-Source0: https://shibboleth.net/downloads/c++-%{name}/%{version}/%{name}-%{version}.tar.bz2
+Source0: https://shibboleth.net/downloads/c++-%{compname}/%{version}/%{compname}-%{version}.tar.bz2
 BuildRequires: libxerces-c-devel >= 3.2
 BuildRequires: libxml-security-c-devel >= 2.0.0
 BuildRequires: libxmltooling-devel >= 3.2.0
@@ -25,9 +31,9 @@ BuildRequires: gdb
 %endif
 
 %if "%{_vendor}" == "suse"
-%define pkgdocdir %{_docdir}/%{name}
+%define pkgdocdir %{_docdir}/%{compname}
 %else
-%define pkgdocdir %{_docdir}/%{name}-%{version}
+%define pkgdocdir %{_docdir}/%{compname}-%{version}
 %endif
 
 %description
@@ -35,54 +41,54 @@ 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.
 
-%package -n opensaml-bin
+%package -n %{utilname}
 Summary: Utilities for OpenSAML library
 Group: Development/Libraries/C and C++
 
-%description -n opensaml-bin
+%description -n %{utilname}
 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 the utility programs.
 
-%package -n libsaml12
+%package -n %{libname}
 Summary: OpenSAML SAML library
 Group: Development/Libraries/C and C++
-Provides: opensaml = %{version}-%{release}
-Obsoletes: opensaml < %{version}-%{release}
+Provides: %{compname} = %{version}-%{release}
+Obsoletes: %{compname} < %{version}-%{release}
 
-%description -n libsaml12
+%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 libsaml-devel
+%package -n %{develname}
 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: %{libname} = %{version}-%{release}
+Provides: %{compname}-devel = %{version}-%{release}
+Obsoletes: %{compname}-devel < %{version}-%{release}
 Requires: libxerces-c-devel >= 3.2
 Requires: libxml-security-c-devel >= 2.0.0
 Requires: libxmltooling-devel >= 3.2.0
 %{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:Requires: liblog4shib-devel >= 1.0.4}
 
-%description -n libsaml-devel
+%description -n %{develname}
 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 includes files needed for development with OpenSAML.
 
-%package -n opensaml-schemas
+%package -n %{schemaname}
 Summary: OpenSAML schemas and catalog
 Group: Development/Libraries/C and C++
 
-%description -n opensaml-schemas
+%description -n %{schemaname}
 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.
@@ -111,25 +117,25 @@ This package includes XML schemas and related files.
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
 
-%post -n libsaml12 -p /sbin/ldconfig
+%post -n %{libname} -p /sbin/ldconfig
 
-%postun -n libsaml12 -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
 
-%files -n opensaml-bin
+%files -n %{utilname}
 %defattr(-,root,root,-)
 %{_bindir}/samlsign
 
-%files -n libsaml12
+%files -n %{libname}
 %defattr(-,root,root,-)
 %{_libdir}/libsaml.so.*
 %exclude %{_libdir}/libsaml.la
 
-%files -n opensaml-schemas
+%files -n %{schemaname}
 %defattr(-,root,root,-)
 %dir %{_datadir}/xml/opensaml
 %{_datadir}/xml/opensaml/*
 
-%files -n libsaml-devel
+%files -n %{develname}
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/*.so
diff --git a/common/SPECS/shibresolver.spec b/common/SPECS/shibresolver.spec
index 0ffdd67..afc5ac7 100644
--- a/common/SPECS/shibresolver.spec
+++ b/common/SPECS/shibresolver.spec
@@ -1,4 +1,9 @@
-Name: shibboleth-resolver
+%define compname shibresolver
+%define distname shibboleth-resolver
+%define libname lib%{compname}6
+%define develname lib%{compname}-devel
+
+Name: %{distname}
 Version: 3.4.0
 Summary: Shibboleth SP Attribute Resolver Library
 Release: 1
@@ -6,7 +11,7 @@ Vendor: Shibboleth Consortium
 Group: System Environment/Libraries
 License: Apache-2.0
 URL: https://www.shibboleth.net/
-Source0: https://shibboleth.net/downloads/service-provider/extensions/shibresolver/%{version}/%{name}-%{version}.tar.bz2
+Source0: https://shibboleth.net/downloads/service-provider/extensions/%{compname}/%{version}/%{distname}-%{version}.tar.bz2
 BuildRequires: libxerces-c-devel >= 3.2
 BuildRequires: libxml-security-c-devel >= 2.0.0
 BuildRequires: libxmltooling-devel >= 3.2.0
@@ -32,25 +37,25 @@ 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 libshibresolver6
+%package -n %{libname}
 Summary: Shibboleth SP Attribute Resolver library
 Group: Development/Libraries
-Provides: shibboleth-resolver = %{version}-%{release}
-Obsoletes: shibboleth-resolver < %{version}-%{release}
+Provides: %{distname} = %{version}-%{release}
+Obsoletes: %{distname} < %{version}-%{release}
 
-%description -n libshibresolver6
+%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.
 
-%package -n libshibresolver-devel
+%package -n %{develname}
 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: %{libname} = %{version}-%{release}
+Provides: %{distname}-devel = %{version}-%{release}
+Obsoletes: %{distname}-devel < %{version}-%{release}
 Requires: libxerces-c-devel >= 3.2
 Requires: libxml-security-c-devel >= 2.0.0
 Requires: libxmltooling-devel >= 3.2.0
@@ -59,7 +64,7 @@ Requires: shibboleth-devel >= 3.4.0
 %{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:Requires: liblog4shib-devel >= 1.0.4}
 
-%description -n libshibresolver-devel
+%description -n %{develname}
 This package contains a Shibboleth SP Extension that provides
 externally accessible attribute resolver functionality for processing
 local and remote sources of federated attribute information.
@@ -99,17 +104,17 @@ This package includes files needed for development.
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
 
-%post -n libshibresolver6 -p /sbin/ldconfig
+%post -n %{libname} -p /sbin/ldconfig
 
-%postun -n libshibresolver6 -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
 
-%files -n libshibresolver6
+%files -n %{libname}
 %defattr(-,root,root,-)
 %{_libdir}/libshibresolver-lite.so.*
 %{_libdir}/libshibresolver.so.*
 %exclude %{_libdir}/*.la
 
-%files -n libshibresolver-devel
+%files -n %{develname}
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/*.so
diff --git a/common/SPECS/xerces-c.spec b/common/SPECS/xerces-c.spec
index 18fff6f..2d486b0 100644
--- a/common/SPECS/xerces-c.spec
+++ b/common/SPECS/xerces-c.spec
@@ -1,9 +1,14 @@
+%define compname xerces-c
+%define libname lib%{compname}-3_2
+%define develname lib%{compname}-devel
+%define utilname %{compname}-bin
+
 Summary: Xerces-C++ validating XML parser
-Name: xerces-c
+Name: %{compname}
 Version: 3.2.4
 Release: 1
-URL: http://xerces.apache.org/xerces-c/
-Source0: https://shibboleth.net/downloads/%{name}/%{name}-%{version}.tar.bz2
+URL: https://xerces.apache.org/%{compname}/
+Source0: https://shibboleth.net/downloads/%{compname}/%{compname}-%{version}.tar.bz2
 License: Apache-2.0
 Group: Libraries
 BuildRequires: gcc-c++
@@ -24,11 +29,11 @@ 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.
 
-%package -n xerces-c-bin
+%package -n %{utilname}
 Summary: Utilities for Xerces-C++ validating XML parser
 Group: Development/Libraries
 
-%description -n xerces-c-bin
+%description -n %{utilname}
 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,
@@ -36,12 +41,12 @@ manipulating, and validating XML documents.
 
 This package contains the utility programs.
 
-%package -n libxerces-c-3_2
+%package -n %{libname}
 Summary: Shared library for Xerces-C++ validating XML parser
 Group: Development/Libraries
-Provides: xerces-c = %{version}-%{release}
+Provides: %{compname} = %{version}-%{release}
 
-%description -n libxerces-c-3_2
+%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,
@@ -49,13 +54,13 @@ manipulating, and validating XML documents.
 
 This package contains just the shared library.
 
-%package -n libxerces-c-devel
+%package -n %{develname}
 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}
+Requires: %{libname} = %{version}-%{release}
+Provides: %{compname}-devel = %{version}-%{release}
 
-%description -n libxerces-c-devel
+%description -n %{develname}
 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,
@@ -76,19 +81,19 @@ The static libraries and header files needed for development with Xerces-C++.
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
 
-%post -n libxerces-c-3_2 -p /sbin/ldconfig
+%post -n %{libname} -p /sbin/ldconfig
 
-%postun -n libxerces-c-3_2 -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
 
-%files -n xerces-c-bin
+%files -n %{utilname}
 %defattr(755,root,root)
 %{_bindir}/*
 
-%files -n libxerces-c-3_2
+%files -n %{libname}
 %defattr(755,root,root)
 %{_libdir}/libxerces-c-*.so
 
-%files -n libxerces-c-devel
+%files -n %{develname}
 %defattr(-,root,root)
 %{_includedir}/xercesc
 %{_libdir}/libxerces-c.so
diff --git a/common/SPECS/xml-security-c.spec b/common/SPECS/xml-security-c.spec
index 4f49ed8..f69c434 100644
--- a/common/SPECS/xml-security-c.spec
+++ b/common/SPECS/xml-security-c.spec
@@ -1,11 +1,16 @@
-Name: xml-security-c
+%define compname xml-security-c
+%define libname lib%{compname}20
+%define develname lib%{compname}-devel
+%define utilname %{compname}-bin
+
+Name: %{compname}
 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/
-Source0: https://downloads.apache.org/santuario/c-library/%{name}-%{version}.tar.bz2
+Source0: https://downloads.apache.org/santuario/c-library/%{compname}-%{version}.tar.bz2
 
 %{?_with_xalan:BuildRequires: libxalan-c-devel >= 1.11}
 BuildRequires: libxerces-c-devel >= 3.2
@@ -24,11 +29,11 @@ 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.
 
-%package -n xml-security-c-bin
+%package -n %{utilname}
 Summary: Utilities for XML security C++ library
 Group: Development/Libraries/C and C++
 
-%description -n xml-security-c-bin
+%description -n %{utilname}
 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
@@ -36,12 +41,12 @@ XPath and XSLT transforms.
 
 This package contains the utility programs.
 
-%package -n libxml-security-c20
+%package -n %{libname}
 Summary: Apache XML security C++ library
 Group: Development/Libraries/C and C++
-Provides: xml-security-c = %{version}-%{release}
+Provides: %{compname} = %{version}-%{release}
 
-%description -n libxml-security-c20
+%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
@@ -49,16 +54,16 @@ XPath and XSLT transforms.
 
 This package contains just the shared library.
 
-%package -n libxml-security-c-devel
+%package -n %{develname}
 Summary: Development files for the Apache C++ XML security library
 Group: Development/Libraries/C and C++
-Requires: libxml-security-c20 = %{version}-%{release}
+Requires: %{libname} = %{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: %{compname}-devel = %{version}-%{release}
 
-%description -n libxml-security-c-devel
+%description -n %{develname}
 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
@@ -80,19 +85,19 @@ This package includes files needed for development with xml-security-c.
 %{__rm} -rf $RPM_BUILD_ROOT
 
 
-%post -n libxml-security-c20 -p /sbin/ldconfig
+%post -n %{libname} -p /sbin/ldconfig
 
-%postun -n libxml-security-c20 -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
 
-%files -n xml-security-c-bin
+%files -n %{utilname}
 %defattr(-,root,root,-)
 %{_bindir}/*
 
-%files -n libxml-security-c20
+%files -n %{libname}
 %defattr(-,root,root,-)
 %{_libdir}/*.so.*
 
-%files -n libxml-security-c-devel
+%files -n %{develname}
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/*.so
diff --git a/common/SPECS/xmltooling.spec b/common/SPECS/xmltooling.spec
index 11e13e8..9ffc57b 100644
--- a/common/SPECS/xmltooling.spec
+++ b/common/SPECS/xmltooling.spec
@@ -1,4 +1,9 @@
-Name: xmltooling
+%define compname xmltooling
+%define libname lib%{compname}10
+%define develname lib%{compname}-devel
+%define schemaname %{compname}-schemas
+
+Name: %{compname}
 Version: 3.2.4
 Release: 1
 Summary: OpenSAML XML Processing library
@@ -6,7 +11,7 @@ Group: Development/Libraries/C and C++
 Vendor: Shibboleth Consortium
 License: Apache-2.0
 URL: http://www.opensaml.org/
-Source0: https://shibboleth.net/downloads/c++-opensaml/3.2.1/%{name}-%{version}.tar.bz2
+Source0: https://shibboleth.net/downloads/c++-opensaml/3.2.1/%{compname}-%{version}.tar.bz2
 BuildRequires: libxerces-c-devel >= 3.2
 BuildRequires: libxml-security-c-devel >= 2.0.0
 %{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
@@ -32,9 +37,9 @@ BuildRequires: gdb
 %endif
 
 %if "%{_vendor}" == "suse"
-%define pkgdocdir %{_docdir}/%{name}
+%define pkgdocdir %{_docdir}/%{compname}
 %else
-%define pkgdocdir %{_docdir}/%{name}-%{version}
+%define pkgdocdir %{_docdir}/%{compname}-%{version}
 %endif
 
 # Prevent the RHEL/etc 6+ package from requiring a vanilla libcurl.
@@ -50,16 +55,16 @@ 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 libxmltooling10
+%package -n %{libname}
 Summary: OpenSAML XMLTooling library
 Group: Development/Libraries/C and C++
-Provides: xmltooling = %{version}-%{release}
-Obsoletes: xmltooling < %{version}-%{release}
+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 libxmltooling10
+%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
@@ -68,12 +73,12 @@ support.
 
 This package contains just the shared library.
 
-%package -n libxmltooling-devel
+%package -n %{develname}
 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: %{libname} = %{version}-%{release}
+Provides: %{compname}-devel = %{version}-%{release}
+Obsoletes: %{compname}-devel < %{version}-%{release}
 Requires: libxerces-c-devel >= 3.2
 Requires: libxml-security-c-devel >= 2.0.0
 %{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
@@ -86,7 +91,7 @@ Requires: libcurl-openssl-devel >= 7.21.7
 Requires: curl-devel >= 7.10.6
 %endif
 
-%description -n libxmltooling-devel
+%description -n %{develname}
 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
@@ -95,11 +100,11 @@ support.
 
 This package includes files needed for development with XMLTooling.
 
-%package -n xmltooling-schemas
+%package -n %{schemaname}
 Summary: XMLTooling schemas and catalog
 Group: Development/Libraries/C and C++
 
-%description -n xmltooling-schemas
+%description -n %{schemaname}
 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
@@ -130,21 +135,21 @@ This package includes XML schemas and related files.
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
 
-%post -n libxmltooling10 -p /sbin/ldconfig
+%post -n %{libname} -p /sbin/ldconfig
 
-%postun -n libxmltooling10 -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
 
-%files -n libxmltooling10
+%files -n %{libname}
 %defattr(-,root,root,-)
 %{_libdir}/*.so.*
 %exclude %{_libdir}/*.la
 
-%files -n xmltooling-schemas
+%files -n %{schemaname}
 %defattr(-,root,root,-)
 %dir %{_datadir}/xml/xmltooling
 %{_datadir}/xml/xmltooling/*
 
-%files -n libxmltooling-devel
+%files -n %{develname}
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/*.so

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list