From 3e791ec947a3c19eaa7dd440be818edeecdc6c07 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Mon, 31 Aug 2009 19:23:36 +0000 Subject: [PATCH] Bump version. --- config_win32.h | 6 +++--- configure.ac | 4 ++-- opensaml.spec.in | 15 +++++++++------ saml/Makefile.am | 2 +- saml/saml.rc | 16 ++++++++-------- saml/saml.vcproj | 8 ++++---- saml/version.h | 4 ++-- 7 files changed, 29 insertions(+), 26 deletions(-) diff --git a/config_win32.h b/config_win32.h index 9e4e2d6..8e5d874 100644 --- a/config_win32.h +++ b/config_win32.h @@ -70,13 +70,13 @@ #define PACKAGE_NAME "opensaml" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "opensaml 2.2.1" +#define PACKAGE_STRING "opensaml 2.3" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "opensaml" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.2.1" +#define PACKAGE_VERSION "2.3" /* Define to the necessary symbol if this constant uses a non-standard name on your system. */ @@ -89,7 +89,7 @@ /* #undef TM_IN_SYS_TIME */ /* Version number of package */ -#define VERSION "2.2.1" +#define VERSION "2.3" /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ diff --git a/configure.ac b/configure.ac index 58a57b1..7ad9034 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ([2.50]) -AC_INIT([opensaml], [2.2.1], [mace-opensaml-users@internet2.edu], [saml]) +AC_INIT([opensaml], [2.3], [mace-opensaml-users@internet2.edu], [saml]) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE([opensaml], [2.2.1]) +AM_INIT_AUTOMAKE([opensaml], [2.3]) sinclude(doxygen.m4) sinclude(acx_pthread.m4) diff --git a/opensaml.spec.in b/opensaml.spec.in index 352f2a8..9d24213 100644 --- a/opensaml.spec.in +++ b/opensaml.spec.in @@ -36,12 +36,12 @@ Markup Language Specification. It contains a set of open source C++ classes that support the SAML 1.0, 1.1, and 2.0 specifications. %if 0%{?suse_version} > 1030 -%package -n libsaml4 +%package -n libsaml5 Summary: OpenSAML SAML library Group: Development/Libraries Provides: @PACKAGE@ = %{version} -%description -n libsaml4 +%description -n libsaml5 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. @@ -51,7 +51,7 @@ This package contains just the shared library. %if 0%{?suse_version} > 1030 %package -n libsaml-devel -Requires: libsaml4 = %version +Requires: libsaml5 = %version %else %package devel Requires: %name = %version @@ -104,7 +104,7 @@ This package includes files needed for development with OpenSAML. %ifnos solaris2.8 solaris2.9 solaris2.10 %if 0%{?suse_version} > 1030 -%post -n libsaml4 -p /sbin/ldconfig +%post -n libsaml5 -p /sbin/ldconfig %else %post -p /sbin/ldconfig %endif @@ -112,7 +112,7 @@ This package includes files needed for development with OpenSAML. %ifnos solaris2.8 solaris2.9 solaris2.10 %if 0%{?suse_version} > 1030 -%postun -n libsaml4 -p /sbin/ldconfig +%postun -n libsaml5 -p /sbin/ldconfig %else %postun -p /sbin/ldconfig %endif @@ -122,7 +122,7 @@ This package includes files needed for development with OpenSAML. %defattr(-,root,root,-) %{_bindir}/samlsign %if 0%{?suse_version} > 1030 -%files -n libsaml4 +%files -n libsaml5 %defattr(-,root,root,-) %endif %{_libdir}/libsaml.so.* @@ -140,6 +140,9 @@ This package includes files needed for development with OpenSAML. %doc %{pkgdocdir} %changelog +* Mon Aug 31 2009 Scott Cantor - 2.3-1 +- Bump soname for SUSE packaging. + * Sat Aug 8 2009 Scott Cantor - 2.2.1-1 - SuSE conventions - Stop packaging unit tester diff --git a/saml/Makefile.am b/saml/Makefile.am index fc4c9ed..f552599 100644 --- a/saml/Makefile.am +++ b/saml/Makefile.am @@ -180,7 +180,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 4:1:0 +libsaml_la_LDFLAGS = -version-info 5:0:0 install-exec-hook: for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done diff --git a/saml/saml.rc b/saml/saml.rc index 2b2d06c..52440f6 100644 --- a/saml/saml.rc +++ b/saml/saml.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,2,1,0 - PRODUCTVERSION 2,2,1,0 + FILEVERSION 2,3,0,0 + PRODUCTVERSION 2,3,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -46,8 +46,8 @@ BEGIN BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "Internet2\0" - VALUE "FileDescription", "OpenSAML 2.2.1 Library\0" - VALUE "FileVersion", "2, 2, 1, 0\0" + VALUE "FileDescription", "OpenSAML 2.3 Library\0" + VALUE "FileVersion", "2, 3, 0, 0\0" #ifdef _DEBUG VALUE "InternalName", "saml2_2D\0" #else @@ -56,13 +56,13 @@ BEGIN VALUE "LegalCopyright", "Copyright © 2009 Internet2\0" VALUE "LegalTrademarks", "\0" #ifdef _DEBUG - VALUE "OriginalFilename", "saml2_2D.dll\0" + VALUE "OriginalFilename", "saml2_3D.dll\0" #else - VALUE "OriginalFilename", "saml2_2.dll\0" + VALUE "OriginalFilename", "saml2_3.dll\0" #endif VALUE "PrivateBuild", "\0" - VALUE "ProductName", "OpenSAML 2.2.1\0" - VALUE "ProductVersion", "2, 2, 1, 0\0" + VALUE "ProductName", "OpenSAML 2.3\0" + VALUE "ProductVersion", "2, 3, 0, 0\0" VALUE "SpecialBuild", "\0" END END diff --git a/saml/saml.vcproj b/saml/saml.vcproj index da8f63f..8d1427e 100644 --- a/saml/saml.vcproj +++ b/saml/saml.vcproj @@ -67,7 +67,7 @@