- drop obsolete and outdated manual inclusion of rpm macros

[packages/cas.git] / cas.spec

diff --git a/cas.spec b/cas.spec
index edca832978f4aeef93928b7dee583c6f6dc6b665..a53c320dc7453da27a1f808439c98deab2a0f1d0 100644 (file)
--- a/cas.spec
+++ b/cas.spec
@@ -1,12 +1,11 @@
-%include       /usr/lib/rpm/macros.java
 Summary:       JA-SIG Central Authentication Service
 Name:          cas
-Version:       3.3.5
-Release:       1
+Version:       3.4.2
+Release:       3
 License:       MIT License
 Group:         Networking/Daemons/Java/Servlets
 Source0:       http://www.ja-sig.org/downloads/cas/%{name}-server-%{version}-release.tar.gz
-# Source0-md5: c12594a2af98ee2dd11a8c97895d91af
+# Source0-md5: 3a7dfd70be008053b8619509dcc45be9
 Source1:       %{name}-context.xml
 URL:           http://www.ja-sig.org/products/cas/
 BuildRequires: rpm-javaprov
@@ -149,9 +148,7 @@ AbstractDistributedTicketRegistry class.
 %setup -q -n %{name}-server-%{version}
 unzip modules/%{name}-server-webapp-%{version}.war -d webapp
 
-rm webapp/WEB-INF/lib/%{name}-server-support-ldap-%{version}.jar
-
-sed -i 's,^\(log4j.appender.logfile.File=\)cas.log$,\1%{logdir}/%{name}.log,' webapp/WEB-INF/classes/log4j.properties
+sed -i 's,\(name="File" value="\)\([^"]*"\),\1%{logdir}/\2,' webapp/WEB-INF/classes/log4j.xml
 
 %build
 
@@ -178,7 +175,7 @@ MODULES="
 "
 
 CONFIGFILES="
-  classes/log4j.properties
+  classes/log4j.xml
   cas.properties
   deployerConfigContext.xml
   login-webflow.xml