Roll back schema directory changes, didn't consider impact on upgrades.

diff --git a/opensaml.spec.in b/opensaml.spec.in
index abb5d0b..4460df4 100644 (file)
--- a/opensaml.spec.in
+++ b/opensaml.spec.in
@@ -129,8 +129,8 @@ This package includes files needed for development with OpenSAML.
 %defattr(-,root,root,-)
 %endif
 %{_libdir}/libsaml.so.*
 %defattr(-,root,root,-)
 %endif
 %{_libdir}/libsaml.so.*

-%dir %{_datadir}/xml/@PACKAGE_NAME@-@PACKAGE_VERSION@
-%{_datadir}/xml/@PACKAGE_NAME@-@PACKAGE_VERSION@/*
+%dir %{_datadir}/xml/@PACKAGE_NAME@
+%{_datadir}/xml/@PACKAGE_NAME@/*

 
 %if 0%{?suse_version} > 1030
 %files -n libsaml-devel
 
 %if 0%{?suse_version} > 1030
 %files -n libsaml-devel

diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index d291991..8148a2c 100644 (file)
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -1,7 +1,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 
 
 AUTOMAKE_OPTIONS = foreign
 

-pkgxmldir = $(datadir)/xml/@PACKAGE@-@PACKAGE_VERSION@
+pkgxmldir = $(datadir)/xml/@PACKAGE@

 
 schemafiles = \
        cs-sstc-schema-assertion-01.xsd \
 
 schemafiles = \
        cs-sstc-schema-assertion-01.xsd \