[js-embedded-discovery] branch main updated: Sync specfile with our build version.

Scott Cantor cantor.2 at osu.edu
Tue Feb 27 15:30:58 UTC 2024


This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository js-embedded-discovery.

View the commit online:
http://git.shibboleth.net/view/?p=js-embedded-discovery.git;a=commit;h=a930540c443c29c140df5de7d19c05c9c345b950

The following commit(s) were added to refs/heads/main by this push:
     new a930540  Sync specfile with our build version.
a930540 is described below

commit a930540c443c29c140df5de7d19c05c9c345b950
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Feb 27 10:30:52 2024 -0500

    Sync specfile with our build version.
---
 shibboleth-embedded-ds.spec | 41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/shibboleth-embedded-ds.spec b/shibboleth-embedded-ds.spec
index 5135caa..a4f48f8 100644
--- a/shibboleth-embedded-ds.spec
+++ b/shibboleth-embedded-ds.spec
@@ -1,14 +1,13 @@
-Name:		shibboleth-embedded-ds
-Version:	1.2.3
-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.3
+Release: 1%{?dist}
+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/
+Source0: https://shibboleth.net/downloads/embedded-discovery-service/%{version}/%{name}-%{version}.tar.gz
+BuildArch: noarch
 %if "%{_vendor}" == "redhat"
 BuildRequires: redhat-rpm-config
 %{!?_without_builtinapache:BuildRequires: httpd}
@@ -29,7 +28,7 @@ single sign-on implementations such as Shibboleth.
 
 
 %install
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 
 # Plug the DS into the built-in Apache on a recognized system.
 touch rpm.filelist
@@ -45,7 +44,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 +54,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 +63,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
@@ -93,6 +92,16 @@ cd /
 %config %{_sysconfdir}/shibboleth-ds/shibboleth-ds.conf
 
 %changelog
+* Tue Feb 27 2024 Scott Cantor <cantor.2 at osu.edu> - 1.2.3-1
+- Update version.
+
+* Sat Jun 17 2023 John W. O'Brien <john at saltant.com> - 1.2.2-2
+- Normalize SPEC file whitespace
+- Delete obsolete BuildRoot macro
+- Ensure Source is valid and fetchable
+- Adopt %make_install
+- Append %dist to Release
+
 * Mon Jun 6 2016 Scott Cantor <cantor.2 at osu.edu> - 1.2.0-1
 - Update version
 - Fix license name

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


More information about the commits mailing list