From 40575a67c8c2bb94850cd5245ec3863c01d933c3 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Mon, 28 Dec 2009 16:17:22 +0000 Subject: [PATCH] Roll back schema directory changes, didn't consider impact on upgrades. --- configure.ac | 91 ++++++++++++++++++----------------------------------- schemas/Makefile.am | 2 +- shibboleth.spec.in | 8 ++--- 3 files changed, 36 insertions(+), 65 deletions(-) diff --git a/configure.ac b/configure.ac index ab07705..a37af1c 100644 --- a/configure.ac +++ b/configure.ac @@ -61,7 +61,6 @@ fi AC_DISABLE_STATIC AC_PROG_LIBTOOL -AC_PATH_PROG(PKG_CONFIG, pkg-config) AC_LANG(C) @@ -94,6 +93,7 @@ AC_ARG_WITH(openssl, fi]) if test "x$SSLFLAGS" = "x" ; then + AC_PATH_PROG(PKG_CONFIG, pkg-config) if test "x$PKG_CONFIG" != x && test "x$PKG_CONFIG" != "xno" ; then if pkg-config openssl ; then SSLFLAGS="`$PKG_CONFIG --cflags openssl`" @@ -198,11 +198,11 @@ fi # Xerces settings AC_ARG_WITH(xerces, - AC_HELP_STRING([--with-xerces=PATH], [where xerces-c is installed]), - [if test x_$with_xerces != x_/usr; then - LDFLAGS="-L${with_xerces}/lib $LDFLAGS" - CPPFLAGS="-I${with_xerces}/include $CPPFLAGS" - fi]) + AC_HELP_STRING([--with-xerces=PATH], [where xerces-c is installed]), + [if test x_$with_xerces != x_/usr; then + LDFLAGS="-L${with_xerces}/lib $LDFLAGS" + CPPFLAGS="-I${with_xerces}/include $CPPFLAGS" + fi]) LIBS="-lxerces-c $LIBS" AC_CHECK_HEADER([xercesc/dom/DOM.hpp],, AC_MSG_ERROR([unable to find xerces header files])) @@ -217,10 +217,10 @@ int i = 0; [AC_MSG_RESULT(OK)], [AC_MSG_FAILURE([Xerces-C v2.6.0 has bugs that inhibit use with signed XML, please use a newer version])]) AC_TRY_LINK( - [#include ], - [xercesc::XMLPlatformUtils::Initialize()], - [AC_DEFINE(HAVE_LIBXERCESC,1,[Define if Xerces-C library was found])], - [AC_MSG_ERROR([unable to link with Xerces])]) + [#include ], + [xercesc::XMLPlatformUtils::Initialize()], + [AC_DEFINE(HAVE_LIBXERCESC,1,[Define if Xerces-C library was found])], + [AC_MSG_ERROR([unable to link with Xerces])]) AC_MSG_CHECKING([whether Xerces XMLString::release(XMLByte**) exists]) AC_TRY_COMPILE([#include ], @@ -249,12 +249,11 @@ AC_TRY_COMPILE([#include ], #XML-Tooling settings AC_ARG_WITH(xmltooling, - AC_HELP_STRING([--with-xmltooling=PATH], [where xmltooling-c is installed]), - [if test x_$with_xmltooling != x_/usr; then - LDFLAGS="-L${with_xmltooling}/lib $LDFLAGS" - CPPFLAGS="-I${with_xmltooling}/include $CPPFLAGS" - export PKG_CONFIG_PATH="${with_xmltooling}/lib/pkgconfig" - fi]) + AC_HELP_STRING([--with-xmltooling=PATH], [where xmltooling-c is installed]), + [if test x_$with_xmltooling != x_/usr; then + LDFLAGS="-L${with_xmltooling}/lib $LDFLAGS" + CPPFLAGS="-I${with_xmltooling}/include $CPPFLAGS" + fi]) LITE_LIBS="-lxmltooling-lite" XMLSEC_LIBS="-lxmltooling" AC_CHECK_HEADER([xmltooling/base.h],, @@ -274,42 +273,28 @@ AC_TRY_LINK( # restore master libs LIBS="$save_LIBS" -# Determine xmltooling version. -XMLTOOLINGVER="" -AC_ARG_WITH(xmltoolingver, - AC_HELP_STRING([--with-xmltoolingver=VERSION], [xmltooling version, normally derived via pkg-config]), - [XMLTOOLINGVER="-$with_xmltoolingver"], - [if test "x$PKG_CONFIG" != "x" && test "x$PKG_CONFIG" != "xno" ; then - if pkg-config xmltooling ; then - XMLTOOLINGVER="-`$PKG_CONFIG --modversion xmltooling`" - fi - fi]) -if test "x$XMLTOOLINGVER" = "x" ; then - AC_MSG_WARN([pkgconfig not usable, assuming unversioned xmltooling schemas, may need --with-xmltoolingver]) -fi - # Establish location of xmltooling catalog. XMLTOOLINGXMLDIR="" if test "x$with_xmltooling" = "x" ; then with_xmltooling="/usr" fi -if test -f $with_xmltooling/share/xml/xmltooling$XMLTOOLINGVER/catalog.xml ; then +if test -f $with_xmltooling/share/xml/xmltooling/catalog.xml ; then XMLTOOLINGXMLDIR="$with_xmltooling" -elif test -f $with_xerces/share/xml/xmltooling$XMLTOOLINGVER/catalog.xml ; then +elif test -f $with_xerces/share/xml/xmltooling/catalog.xml ; then XMLTOOLINGXMLDIR="$with_xerces" -elif test -f $with_log4shib/share/xml/xmltooling$XMLTOOLINGVER/catalog.xml ; then +elif test -f $with_log4shib/share/xml/xmltooling/catalog.xml ; then XMLTOOLINGXMLDIR="$with_log4shib" fi if test "x$XMLTOOLINGXMLDIR" = "x" ; then - AC_MSG_ERROR([xmltooling XML catalog not found, may need to use --with-xmltooling or --with-xmltoolingver options]) + AC_MSG_ERROR([xmltooling XML catalog not found, may need to use --with-xmltooling option]) fi -XMLTOOLINGXMLDIR="$XMLTOOLINGXMLDIR/share/xml/xmltooling$XMLTOOLINGVER" +XMLTOOLINGXMLDIR="$XMLTOOLINGXMLDIR/share/xml/xmltooling" AC_SUBST(XMLTOOLINGXMLDIR) # XML-Security settings AC_ARG_WITH(xmlsec, - AC_HELP_STRING([--with-xmlsec=PATH], [where xmlsec is installed]),, - [with_xmlsec=/usr]) + AC_HELP_STRING([--with-xmlsec=PATH], [where xmlsec is installed]),, + [with_xmlsec=/usr]) if test x_$with_xmlsec != x_/usr; then LDFLAGS="-L${with_xmlsec}/lib $LDFLAGS" @@ -333,9 +318,9 @@ int i = 0; [AC_MSG_RESULT(OK)], [AC_MSG_FAILURE([XML-Security version 1.4.0 or greater is required.])]) AC_TRY_LINK( - [#include ], - [XSECPlatformUtils::Initialise()],, - [AC_MSG_ERROR([unable to link with XML-Security])]) + [#include ], + [XSECPlatformUtils::Initialise()],, + [AC_MSG_ERROR([unable to link with XML-Security])]) # restore master libs LIBS="$save_LIBS" @@ -369,38 +354,24 @@ opensaml::SAMLConfig::getConfig(); # restore master libs LIBS="$save_LIBS" -# Determine opensaml version. -OPENSAMLVER="" -AC_ARG_WITH(samlver, - AC_HELP_STRING([--with-samlver=VERSION], [opensaml version, normally derived via pkg-config]), - [OPENSAMLVER="-$with_samlver"], - [if test "x$PKG_CONFIG" != "x" && test "x$PKG_CONFIG" != "xno" ; then - if pkg-config opensaml ; then - OPENSAMLVER="-`$PKG_CONFIG --modversion opensaml`" - fi - fi]) -if test "x$OPENSAMLVER" = "x" ; then - AC_MSG_WARN([pkgconfig not usable, assuming unversioned opensaml schemas, may need --with-samlver]) -fi - # Establish location of opensaml catalogs. OPENSAMLXMLDIR="" if test "x$with_saml" = "x" ; then with_saml="/usr" fi -if test -f $with_saml/share/xml/opensaml$OPENSAMLVER/saml20-catalog.xml ; then +if test -f $with_saml/share/xml/opensaml/saml20-catalog.xml ; then OPENSAMLXMLDIR="$with_saml" -elif test -f $with_xmltooling/share/xml/opensaml$OPENSAMLVER/saml20-catalog.xml ; then +elif test -f $with_xmltooling/share/xml/opensaml/saml20-catalog.xml ; then OPENSAMLXMLDIR="$with_xmltooling" -elif test -f $with_xerces/share/xml/opensaml$OPENSAMLVER/saml20-catalog.xml ; then +elif test -f $with_xerces/share/xml/opensaml/saml20-catalog.xml ; then OPENSAMLXMLDIR="$with_xerces" -elif test -f $with_log4shib/share/xml/opensaml$OPENSAMLVER/saml20-catalog.xml ; then +elif test -f $with_log4shib/share/xml/opensaml/saml20-catalog.xml ; then OPENSAMLXMLDIR="$with_log4shib" fi if test "x$OPENSAMLXMLDIR" = "x" ; then - AC_MSG_ERROR([opensaml XML catalogs not found, may need to use --with-saml or --with-samlver options]) + AC_MSG_ERROR([opensaml XML catalogs not found, may need to use --with-saml option]) fi -OPENSAMLXMLDIR="$OPENSAMLXMLDIR/share/xml/opensaml$OPENSAMLVER" +OPENSAMLXMLDIR="$OPENSAMLXMLDIR/share/xml/opensaml" AC_SUBST(OPENSAMLXMLDIR) AC_SUBST(LITE_LIBS) diff --git a/schemas/Makefile.am b/schemas/Makefile.am index 4a1cec5..666c0e6 100644 --- a/schemas/Makefile.am +++ b/schemas/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign -pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@-@PACKAGE_VERSION@ +pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@ schemafiles = \ shibboleth.xsd \ diff --git a/shibboleth.spec.in b/shibboleth.spec.in index c493a6f..7db75c6 100644 --- a/shibboleth.spec.in +++ b/shibboleth.spec.in @@ -25,7 +25,7 @@ BuildRequires: opensaml-devel >= 2.3 %{?_with_log4cpp:BuildRequires: log4cpp-devel >= 1.0} %{!?_with_log4cpp:BuildRequires: log4shib-devel} %endif -BuildRequires: gcc-c++, pkgconfig, zlib-devel +BuildRequires: gcc-c++, zlib-devel %{!?_without_doxygen:BuildRequires: doxygen} %{!?_without_odbc:BuildRequires:unixODBC-devel} %{?_with_fastcgi:BuildRequires: fcgi-devel} @@ -214,8 +214,8 @@ cd / %exclude %{_libdir}/%{name}/*.la %dir %{_localstatedir}/log/%{name} %dir %{_localstatedir}/run/%{name} -%dir %{_datadir}/xml/%{name}-%{version} -%{_datadir}/xml/%{name}-%{version}/* +%dir %{_datadir}/xml/%{name} +%{_datadir}/xml/%{name}/* %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/*.xml %config(noreplace) %{_sysconfdir}/%{name}/*.html @@ -244,7 +244,7 @@ cd / %changelog * Fri Dec 25 2009 Scott Cantor - 2.4-1 -- Bump version and version schema folder. +- Bump version. * Mon Nov 23 2009 Scott Cantor - 2.3.1-1 - Reset revision for 2.3.1 release -- 2.1.4