From: cantor <cantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Date: Thu, 16 Aug 2007 18:26:57 +0000 (+0000)
Subject: Correct dependency syntax and autoconf
X-Git-Tag: 2.4~784
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fsp.git;a=commitdiff_plain;h=1d052a6780ca5e7984e6c36d6577392b4b14e258

Correct dependency syntax and autoconf

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2427 cb58f699-b61c-0410-a6fe-9272a202ed29
---

diff --git a/configure.ac b/configure.ac
index f517be1..110d75b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -233,7 +233,7 @@ AC_SUBST(XMLSEC_LIBS)
 WANT_SUBDIRS="doc schemas configs shibsp shibd util"
 AC_CONFIG_FILES([Makefile doc/Makefile schemas/Makefile \
 	configs/Makefile shibsp/Makefile shibd/Makefile \
-	adfs/Makefile util/Makefile selinux/Makefile])
+	util/Makefile selinux/Makefile])
 
 ## ADFS?
 AC_CONFIG_FILES([adfs/Makefile])
diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index 8019ac7..4313304 100644
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -1,22 +1,18 @@
 Name:		shibboleth
 Summary:	Open source system to enable inter-institutional resource sharing
 Version:	@-VERSION-@
-Release:	2
+Release:	3
 #Copyright:	Internet2
 Group:		System Environment/Libraries
 License:	Apache style
 URL:		http://shibboleth.internet2.edu/
 Source0:	http://shibboleth.internet2.edu/downloads/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-
 BuildRequires:	openssl-devel, curl-devel >= 7.10.6
 BuildRequires:	xerces%{?xercesver}-c-devel >= 2.6.1, xml-security-c-devel >= 1.3.1
 BuildRequires:	zlib-devel, opensaml-devel >= 2.0
-%if %{?_with_log4cpp:1}
-BuildRequires:	log4cpp-devel >= 0.3.5
-%else
-BuildRequires:	log4shib-devel
-%endif
+%{?_with_log4cpp:BuildRequires:	log4cpp-devel >= 0.3.5}
+%{!?_with_log4cpp:BuildRequires: log4shib-devel}
 %{!?_without_odbc:BuildRequires: unixODBC-devel}
 %if "%{_vendor}" == "redhat"
 %{!?_without_builtinapache:BuildRequires: httpd-devel}
@@ -211,11 +207,14 @@ restorecon %{_sbindir}/shibd
 %{_sysconfdir}/selinux/targeted/src/policy/domains/program/*.te
 
 %changelog
+* Thu Aug 16 2007 Scott Cantor  <cantor.2@osu.edu>  - 2.0-3
+- First public beta.
+
 * Fri Jul 13 2007 Scott Cantor	<cantor.2@osu.edu>  - 2.0-2
-- Second alpha release
+- Second alpha release.
 
 * Sun Jun 10 2007 Scott Cantor	<cantor.2@osu.edu>  - 2.0-1
-- First alpha release
+- First alpha release.
 
 * Mon Oct 2 2006 Scott Cantor	<cantor.2@osu.edu>  - 1.3-11
 - Applied fix for secadv 20061002