projects / shibboleth / cpp-opensaml.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f981de7)
Bump version.
authorScott Cantor <cantor.2@osu.edu>
Mon, 31 Aug 2009 19:23:36 +0000 (19:23 +0000)
committerScott Cantor <cantor.2@osu.edu>
Mon, 31 Aug 2009 19:23:36 +0000 (19:23 +0000)
config_win32.h patch | blob | history
configure.ac patch | blob | history
opensaml.spec.in patch | blob | history
saml/Makefile.am patch | blob | history
saml/saml.rc patch | blob | history
saml/saml.vcproj patch | blob | history
saml/version.h patch | blob | history

diff --git a/config_win32.h b/config_win32.h
index 9e4e2d6..8e5d874 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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  <cantor.2@osu.edu>  - 2.3-1
+- Bump soname for SUSE packaging.
+
 * Sat Aug 8 2009  Scott Cantor  <cantor.2@osu.edu>  - 2.2.1-1
 - SuSE conventions
 - Stop packaging unit tester
diff --git a/saml/Makefile.am b/saml/Makefile.am
index fc4c9ed..f552599 100644 (file)
--- 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 (file)
--- a/saml/saml.rc
+++ b/saml/saml.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,2,1,0\r
- PRODUCTVERSION 2,2,1,0\r
+ FILEVERSION 2,3,0,0\r
+ PRODUCTVERSION 2,3,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -46,8 +46,8 @@ BEGIN
         BEGIN\r
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Internet2\0"\r
-            VALUE "FileDescription", "OpenSAML 2.2.1 Library\0"\r
-            VALUE "FileVersion", "2, 2, 1, 0\0"\r
+            VALUE "FileDescription", "OpenSAML 2.3 Library\0"\r
+            VALUE "FileVersion", "2, 3, 0, 0\0"\r
 #ifdef _DEBUG\r
             VALUE "InternalName", "saml2_2D\0"\r
 #else\r
@@ -56,13 +56,13 @@ BEGIN
             VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"\r
             VALUE "LegalTrademarks", "\0"\r
 #ifdef _DEBUG\r
-            VALUE "OriginalFilename", "saml2_2D.dll\0"\r
+            VALUE "OriginalFilename", "saml2_3D.dll\0"\r
 #else\r
-            VALUE "OriginalFilename", "saml2_2.dll\0"\r
+            VALUE "OriginalFilename", "saml2_3.dll\0"\r
 #endif\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "OpenSAML 2.2.1\0"\r
-            VALUE "ProductVersion", "2, 2, 1, 0\0"\r
+            VALUE "ProductName", "OpenSAML 2.3\0"\r
+            VALUE "ProductVersion", "2, 3, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r
diff --git a/saml/saml.vcproj b/saml/saml.vcproj
index da8f63f..8d1427e 100644 (file)
--- a/saml/saml.vcproj
+++ b/saml/saml.vcproj
@@ -67,7 +67,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="..\..\cpp-xmltooling\$(ConfigurationName)\xmltooling1D.lib xerces-c_3D.lib xsec_1D.lib log4shib1D.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)2_2D.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)2_3D.dll"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -147,7 +147,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)\xmltooling1D.lib xerces-c_3D.lib xsec_1D.lib log4shib1D.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)2_2D.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)2_3D.dll"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -222,7 +222,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="..\..\cpp-xmltooling\$(ConfigurationName)\xmltooling1.lib xerces-c_3.lib xsec_1.lib log4shib1.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)2_2.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)2_3.dll"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -300,7 +300,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)\xmltooling1.lib xerces-c_3.lib xsec_1.lib log4shib1.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)2_2.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)2_3.dll"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
diff --git a/saml/version.h b/saml/version.h
index 9824ac2..7e4d82a 100644 (file)
--- a/saml/version.h
+++ b/saml/version.h
@@ -38,8 +38,8 @@
  */
 
 #define OPENSAML_VERSION_MAJOR 2
-#define OPENSAML_VERSION_MINOR 2
-#define OPENSAML_VERSION_REVISION 1
+#define OPENSAML_VERSION_MINOR 3
+#define OPENSAML_VERSION_REVISION 0
 
 /** DO NOT MODIFY BELOW THIS LINE */
 
Unnamed repository; edit this file 'description' to name the repository.