[cpp-sp-resolver] branch master updated: Bump version.
Scott Cantor
cantor.2 at osu.edu
Mon Apr 6 08:36:08 EDT 2020
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository cpp-sp-resolver.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp-resolver.git;a=commit;h=b43db4aae23105e20d93c97aa7e7fb69789f03b1
The following commit(s) were added to refs/heads/master by this push:
new b43db4a Bump version.
b43db4a is described below
commit b43db4aae23105e20d93c97aa7e7fb69789f03b1
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Apr 6 08:36:04 2020 -0400
Bump version.
---
config_win32.h | 6 +++---
configure.ac | 2 +-
resolver.spec.in | 25 ++++++++++++++-----------
src/Makefile.am | 4 ++--
src/shibresolver/resolver.rc | 10 +++++-----
5 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/config_win32.h b/config_win32.h
index dc4de17..73d86cf 100644
--- a/config_win32.h
+++ b/config_win32.h
@@ -55,13 +55,13 @@
#define PACKAGE_NAME "shibboleth-resolver"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "shibboleth-resolver 3.0.0"
+#define PACKAGE_STRING "shibboleth-resolver 3.1.0"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "shibboleth-resolver"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "3.0.0"
+#define PACKAGE_VERSION "3.1.0"
/* Define to the necessary symbol if this constant uses a non-standard name on
your system. */
@@ -74,7 +74,7 @@
/* #undef TM_IN_SYS_TIME */
/* Version number of package */
-#define VERSION "3.0.0"
+#define VERSION "3.1.0"
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
diff --git a/configure.ac b/configure.ac
index 3cfbf3a..eaec72f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.50])
-AC_INIT([shibboleth-resolver], [3.0.0], [MOONSHOT-COMMUNITY at JISCMAIL.AC.UK], [shibboleth-resolver])
+AC_INIT([shibboleth-resolver], [3.1.0], [MOONSHOT-COMMUNITY at JISCMAIL.AC.UK], [shibboleth-resolver])
AC_CONFIG_SRCDIR(src)
AC_CONFIG_AUX_DIR(build-aux)
AC_CONFIG_MACRO_DIR(m4)
diff --git a/resolver.spec.in b/resolver.spec.in
index dc141b6..8789f7b 100644
--- a/resolver.spec.in
+++ b/resolver.spec.in
@@ -10,9 +10,9 @@ Source0: https://shibboleth.net/downloads/extensions/sp/%{name}-%{version}.tar.b
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: libxerces-c-devel >= 3.2
BuildRequires: libxml-security-c-devel >= 2.0.0
-BuildRequires: libxmltooling-devel >= 3.0.0
-BuildRequires: libsaml-devel >= 3.0.0
-BuildRequires: shibboleth-devel >= 3.0.0
+BuildRequires: libxmltooling-devel >= 3.1.0
+BuildRequires: libsaml-devel >= 3.1.0
+BuildRequires: shibboleth-devel >= 3.1.0
%{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
%{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.4}
%{!?_without_gssapi:BuildRequires: krb5-devel}
@@ -32,13 +32,13 @@ 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 libshibresolver2
+%package -n libshibresolver3
Summary: Shibboleth SP Attribute Resolver library
Group: Development/Libraries
Provides: @PACKAGE_NAME@ = %{version}-%{release}
Obsoletes: @PACKAGE_NAME@ < %{version}-%{release}
-%description -n libshibresolver2
+%description -n libshibresolver3
This package contains a Shibboleth SP Extension that provides
externally accessible attribute resolver functionality for processing
local and remote sources of federated attribute information.
@@ -48,13 +48,13 @@ This package contains just the shared library.
%package -n libshibresolver-devel
Summary: Shibboleth SP Attribute Resolver development Headers
Group: Development/Libraries
-Requires: libshibresolver2 = %{version}-%{release}
+Requires: libshibresolver3 = %{version}-%{release}
Provides: @PACKAGE_NAME at -devel = %{version}-%{release}
Obsoletes: @PACKAGE_NAME at -devel < %{version}-%{release}
Requires: libxerces-c-devel >= 3.2
Requires: libxml-security-c-devel >= 2.0.0
-Requires: libxmltooling-devel >= 3.0.0
-Requires: shibboleth-devel >= 3.0.0
+Requires: libxmltooling-devel >= 3.1.0
+Requires: shibboleth-devel >= 3.1.0
%{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
%{!?_with_log4cpp:Requires: liblog4shib-devel >= 1.0.4}
@@ -102,11 +102,11 @@ This package includes files needed for development.
%clean
[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
-%post -n libshibresolver2 -p /sbin/ldconfig
+%post -n libshibresolver3 -p /sbin/ldconfig
-%postun -n libshibresolver2 -p /sbin/ldconfig
+%postun -n libshibresolver3 -p /sbin/ldconfig
-%files -n libshibresolver2
+%files -n libshibresolver3
%defattr(-,root,root,-)
%{_libdir}/libshibresolver-lite.so.*
%{_libdir}/libshibresolver.so.*
@@ -121,6 +121,9 @@ This package includes files needed for development.
%doc %{pkgdocdir}
%changelog
+* Thu Apr 2 2020 Scott Cantor <cantor.2 at osu.edu> - 3.1.0-1
+- Bump version
+
* Mon Sep 30 2019 Scott Cantor <cantor.2 at osu.edu> - 3.0.0-2
- CentOS 8 changes
diff --git a/src/Makefile.am b/src/Makefile.am
index 7699b22..625d0e1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@ libshibresolver_lite_la_SOURCES = \
# this is different from the project version
# http://sources.redhat.com/autobook/autobook/autobook_91.html
-libshibresolver_la_LDFLAGS = -version-info 2:0:0
+libshibresolver_la_LDFLAGS = -version-info 3:0:0
libshibresolver_la_CXXFLAGS = \
$(PTHREAD_CFLAGS) \
$(gss_CFLAGS) $(gnu_gss_CFLAGS) \
@@ -43,7 +43,7 @@ libshibresolver_la_LIBADD = \
$(xmlsec_LIBS) \
$(xmltooling_LIBS)
-libshibresolver_lite_la_LDFLAGS = -version-info 2:0:0
+libshibresolver_lite_la_LDFLAGS = -version-info 3:0:0
libshibresolver_lite_la_CPPFLAGS = -DSHIBSP_LITE \
$(PTHREAD_CFLAGS) \
$(gss_CFLAGS) $(gnu_gss_CFLAGS) \
diff --git a/src/shibresolver/resolver.rc b/src/shibresolver/resolver.rc
index a685de2..bc49e74 100644
--- a/src/shibresolver/resolver.rc
+++ b/src/shibresolver/resolver.rc
@@ -54,8 +54,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,2,0,0
- PRODUCTVERSION 0,2,0,0
+ FILEVERSION 3,1,0,0
+ PRODUCTVERSION 3,1,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -73,7 +73,7 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "JANET(UK)\0"
VALUE "FileDescription", "Shibboleth SP Attribute Resolver Extension\0"
- VALUE "FileVersion", "0, 2, 0, 0\0"
+ VALUE "FileVersion", "3, 1, 0, 0\0"
#ifdef SHIBSP_LITE
#ifdef _DEBUG
VALUE "InternalName", "shibresolver-lite1_0D\0"
@@ -87,7 +87,7 @@ BEGIN
VALUE "InternalName", "shibresolver1_0\0"
#endif
#endif
- VALUE "LegalCopyright", "Copyright � 2011 JANET(UK)\0"
+ VALUE "LegalCopyright", "Copyright � 2020 JANET(UK)\0"
VALUE "LegalTrademarks", "\0"
#ifdef XMLTOOLING_LITE
#ifdef _DEBUG
@@ -104,7 +104,7 @@ BEGIN
#endif
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Project Moonshot\0"
- VALUE "ProductVersion", "0, 2, 0, 0\0"
+ VALUE "ProductVersion", "3, 1, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
END
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list