[cpp-opensaml] branch master updated: Bump version to 3.1.0
Scott Cantor
cantor.2 at osu.edu
Tue Feb 4 07:52:07 EST 2020
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository cpp-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-opensaml.git;a=commit;h=08ee43d1c34ae0b309b907ce25d72147805c1a9c
The following commit(s) were added to refs/heads/master by this push:
new 08ee43d Bump version to 3.1.0
08ee43d is described below
commit 08ee43d1c34ae0b309b907ce25d72147805c1a9c
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Feb 4 07:51:57 2020 -0500
Bump version to 3.1.0
---
Projects/vc15/saml/saml.vcxproj | 8 ++++----
config_win32.h | 6 +++---
configure.ac | 2 +-
opensaml.spec.in | 22 +++++++++++-----------
saml/Makefile.am | 2 +-
saml/saml.rc | 20 ++++++++++----------
saml/version.h | 4 ++--
7 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/Projects/vc15/saml/saml.vcxproj b/Projects/vc15/saml/saml.vcxproj
index c971be1..f3713a5 100644
--- a/Projects/vc15/saml/saml.vcxproj
+++ b/Projects/vc15/saml/saml.vcxproj
@@ -91,10 +91,10 @@
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)3_0D</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)3_0D</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)3_0</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)3_0</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)3_1D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)3_1D</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)3_1</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)3_1</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
diff --git a/config_win32.h b/config_win32.h
index d782b49..b79b858 100644
--- a/config_win32.h
+++ b/config_win32.h
@@ -81,13 +81,13 @@
#define PACKAGE_NAME "opensaml"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "opensaml 3.0.1"
+#define PACKAGE_STRING "opensaml 3.1.0"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "opensaml"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "3.0.1"
+#define PACKAGE_VERSION "3.1.0"
/* Define to the necessary symbol if this constant uses a non-standard name on
your system. */
@@ -100,7 +100,7 @@
/* #undef TM_IN_SYS_TIME */
/* Version number of package */
-#define VERSION "3.0.1"
+#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 d6f7439..363a4a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.50])
-AC_INIT([opensaml],[3.0.1],[https://issues.shibboleth.net/],[opensaml])
+AC_INIT([opensaml],[3.1.0],[https://issues.shibboleth.net/],[opensaml])
AC_CONFIG_SRCDIR(saml)
AC_CONFIG_AUX_DIR(build-aux)
AC_CONFIG_MACRO_DIR(m4)
diff --git a/opensaml.spec.in b/opensaml.spec.in
index dead54b..e267874 100644
--- a/opensaml.spec.in
+++ b/opensaml.spec.in
@@ -10,7 +10,7 @@ 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.0.0
+BuildRequires: libxmltooling-devel >= 3.1.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
@@ -51,7 +51,7 @@ Group: Development/Libraries/C and C++
Provides: @PACKAGE_NAME@ = %{version}-%{release}
Obsoletes: @PACKAGE_NAME@ < %{version}-%{release}
-%description -n libsaml10
+%description -n libsaml11
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.
@@ -61,12 +61,12 @@ This package contains just the shared library.
%package -n libsaml-devel
Summary: OpenSAML development Headers
Group: Development/Libraries/C and C++
-Requires: libsaml10 = %{version}-%{release}
+Requires: libsaml11 = %{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: libxmltooling-devel >= 3.1.0
%{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
%{!?_with_log4cpp:Requires: liblog4shib-devel >= 1.0.4}
@@ -110,19 +110,15 @@ i%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} >= 1
%clean
[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
-%ifnos solaris2.8 solaris2.9 solaris2.10
-%post -n libsaml10 -p /sbin/ldconfig
-%endif
+%post -n libsaml11 -p /sbin/ldconfig
-%ifnos solaris2.8 solaris2.9 solaris2.10
-%postun -n libsaml10 -p /sbin/ldconfig
-%endif
+%postun -n libsaml11 -p /sbin/ldconfig
%files -n @PACKAGE_NAME at -bin
%defattr(-,root,root,-)
%{_bindir}/samlsign
-%files -n libsaml10
+%files -n libsaml11
%defattr(-,root,root,-)
%{_libdir}/libsaml.so.*
%exclude %{_libdir}/libsaml.la
@@ -140,6 +136,10 @@ i%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} >= 1
%doc %{pkgdocdir}
%changelog
+* Mon Feb 3 2020 Scott Cantor <cantor.2 at osu.edu> - 3.1.0-1
+- Version and lib bump
+- Remove Solaris conditionals
+
* Mon Sep 30 2019 Scott Cantor <cantor.2 at osu.edu> - 3.0.1-1
- CentOS 8 cleanup
diff --git a/saml/Makefile.am b/saml/Makefile.am
index f7aa95c..251a314 100644
--- a/saml/Makefile.am
+++ b/saml/Makefile.am
@@ -179,7 +179,7 @@ libsaml_la_SOURCES = \
# this is different from the project version
# http://sources.redhat.com/autobook/autobook/autobook_91.html
-libsaml_la_LDFLAGS = -version-info 10:1:0
+libsaml_la_LDFLAGS = -version-info 11:0:0
libsaml_la_CPPFLAGS = \
$(BOOST_CPPFLAGS)
libsaml_la_CXXFLAGS = \
diff --git a/saml/saml.rc b/saml/saml.rc
index 5842c15..8859163 100644
--- a/saml/saml.rc
+++ b/saml/saml.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,0,1,0
- PRODUCTVERSION 3,0,1,0
+ FILEVERSION 3,1,0,0
+ PRODUCTVERSION 3,1,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -47,22 +47,22 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Shibboleth Consortium\0"
VALUE "FileDescription", "OpenSAML Library\0"
- VALUE "FileVersion", "3, 0, 1, 0\0"
+ VALUE "FileVersion", "3, 1, 0, 0\0"
#ifdef _DEBUG
- VALUE "InternalName", "saml3_0D\0"
+ VALUE "InternalName", "saml3_1D\0"
#else
- VALUE "InternalName", "saml3_0\0"
+ VALUE "InternalName", "saml3_1\0"
#endif
- VALUE "LegalCopyright", "Copyright � 2018 UCAID\0"
+ VALUE "LegalCopyright", "Copyright � 2020 Various\0"
VALUE "LegalTrademarks", "\0"
#ifdef _DEBUG
- VALUE "OriginalFilename", "saml3_0D.dll\0"
+ VALUE "OriginalFilename", "saml3_1D.dll\0"
#else
- VALUE "OriginalFilename", "saml3_0.dll\0"
+ VALUE "OriginalFilename", "saml3_1.dll\0"
#endif
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "OpenSAML 3.0.1\0"
- VALUE "ProductVersion", "3, 0, 1, 0\0"
+ VALUE "ProductName", "OpenSAML 3.1.0\0"
+ VALUE "ProductVersion", "3, 1, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/saml/version.h b/saml/version.h
index a1c9c73..952e41f 100644
--- a/saml/version.h
+++ b/saml/version.h
@@ -43,8 +43,8 @@
*/
#define OPENSAML_VERSION_MAJOR 3
-#define OPENSAML_VERSION_MINOR 0
-#define OPENSAML_VERSION_REVISION 1
+#define OPENSAML_VERSION_MINOR 1
+#define OPENSAML_VERSION_REVISION 0
/** DO NOT MODIFY BELOW THIS LINE */
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list