Bump soname to bypass accidental overlap with 1.x library.

diff --git a/opensaml.spec.in b/opensaml.spec.in
index 796b95c..845210a 100644 (file)
--- a/opensaml.spec.in
+++ b/opensaml.spec.in
@@ -39,12 +39,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 libsaml5
+%package -n libsaml6
 Summary:    OpenSAML SAML library
 Group:      Development/Libraries
 Provides:   @PACKAGE@ = %{version}
 
-%description -n libsaml5
+%description -n libsaml6
 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.
@@ -54,7 +54,7 @@ This package contains just the shared library.
 
 %if 0%{?suse_version} > 1030
 %package -n libsaml-devel
-Requires: libsaml5 = %version
+Requires: libsaml6 = %version
 %else
 %package devel
 Requires: %name = %version
@@ -107,7 +107,7 @@ This package includes files needed for development with OpenSAML.
 
 %ifnos solaris2.8 solaris2.9 solaris2.10
 %if 0%{?suse_version} > 1030
-%post -n libsaml5 -p /sbin/ldconfig
+%post -n libsaml6 -p /sbin/ldconfig
 %else
 %post -p /sbin/ldconfig
 %endif
@@ -115,7 +115,7 @@ This package includes files needed for development with OpenSAML.
 
 %ifnos solaris2.8 solaris2.9 solaris2.10
 %if 0%{?suse_version} > 1030
-%postun -n libsaml5 -p /sbin/ldconfig
+%postun -n libsaml6 -p /sbin/ldconfig
 %else
 %postun -p /sbin/ldconfig
 %endif
@@ -125,7 +125,7 @@ This package includes files needed for development with OpenSAML.
 %defattr(-,root,root,-)
 %{_bindir}/samlsign
 %if 0%{?suse_version} > 1030
-%files -n libsaml5
+%files -n libsaml6
 %defattr(-,root,root,-)
 %endif
 %{_libdir}/libsaml.so.*

diff --git a/saml/Makefile.am b/saml/Makefile.am
index 4942b5d..51587fc 100644 (file)
--- a/saml/Makefile.am
+++ b/saml/Makefile.am
@@ -115,8 +115,8 @@ libsaml_la_SOURCES = \
        binding/impl/SOAPClient.cpp \
        binding/impl/XMLSigningRule.cpp \
        profile/impl/AudienceRestrictionRule.cpp \
-    profile/impl/ConditionsRule.cpp \
-    profile/impl/IgnoreRule.cpp \
+       profile/impl/ConditionsRule.cpp \
+       profile/impl/IgnoreRule.cpp \
        saml1/core/impl/AssertionsImpl.cpp \
        saml1/core/impl/AssertionsSchemaValidators.cpp \
        saml1/core/impl/ProtocolsImpl.cpp \
@@ -145,7 +145,7 @@ libsaml_la_SOURCES = \
        saml2/metadata/impl/DynamicMetadataProvider.cpp \
        saml2/metadata/impl/EntityRoleMetadataFilter.cpp \
        saml2/metadata/impl/MetadataCredentialContext.cpp \
-    saml2/metadata/impl/MetadataCredentialCriteria.cpp \
+       saml2/metadata/impl/MetadataCredentialCriteria.cpp \
        saml2/metadata/impl/MetadataImpl.cpp \
        saml2/metadata/impl/MetadataProvider.cpp \
        saml2/metadata/impl/MetadataSchemaValidators.cpp \
@@ -159,9 +159,9 @@ libsaml_la_SOURCES = \
        saml2/binding/impl/SAML2ArtifactType0004.cpp \
        saml2/binding/impl/SAML2ArtifactDecoder.cpp \
        saml2/binding/impl/SAML2ArtifactEncoder.cpp \
-    saml2/binding/impl/SAML2ECPDecoder.cpp \
-    saml2/binding/impl/SAML2ECPEncoder.cpp \
-    saml2/binding/impl/SAML2MessageDecoder.cpp \
+       saml2/binding/impl/SAML2ECPDecoder.cpp \
+       saml2/binding/impl/SAML2ECPEncoder.cpp \
+       saml2/binding/impl/SAML2MessageDecoder.cpp \
        saml2/binding/impl/SAML2POSTDecoder.cpp \
        saml2/binding/impl/SAML2POSTEncoder.cpp \
        saml2/binding/impl/SAML2Redirect.cpp \
@@ -172,8 +172,8 @@ libsaml_la_SOURCES = \
        saml2/binding/impl/SAML2SOAPClient.cpp \
        saml2/profile/impl/Assertion20Validator.cpp \
        saml2/profile/impl/BrowserSSOProfile20Validator.cpp \
-    saml2/profile/impl/BearerConfirmationRule.cpp \
-    saml2/profile/impl/DelegationRestrictionRule.cpp \
+       saml2/profile/impl/BearerConfirmationRule.cpp \
+       saml2/profile/impl/DelegationRestrictionRule.cpp \
        saml2/profile/impl/SAML2AssertionPolicy.cpp \
        encryption/EncryptedKeyResolver.cpp \
        signature/ContentReference.cpp \
@@ -183,7 +183,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 5:0:0
+libsaml_la_LDFLAGS = -version-info 6:0:0
 
 install-exec-hook:
        for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done