packages: cas-server/cas-server.spec - use %_tomcatconfdir, BR: rpm(macros)...

[pawelz]

Author: pawelz                       Date: Thu Feb 18 14:49:52 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use %_tomcatconfdir, BR: rpm(macros) >= 1.540

---- Files affected:
packages/cas-server:
   cas-server.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: packages/cas-server/cas-server.spec
diff -u packages/cas-server/cas-server.spec:1.14 packages/cas-server/cas-server.spec:1.15
--- packages/cas-server/cas-server.spec:1.14	Thu Feb 18 15:24:36 2010
+++ packages/cas-server/cas-server.spec	Thu Feb 18 15:49:46 2010
@@ -17,7 +17,7 @@
 URL:		http://www.ja-sig.org/products/cas/
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
-BuildRequires:	rpmbuild(macros) >= 1.300
+BuildRequires:	rpmbuild(macros) >= 1.540
 Requires:	jpackage-utils
 Requires:	tomcat >= 6
 BuildArch:	noarch
@@ -141,7 +141,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/cas-server,%{_datadir},%{_sharedstatedir}/{cas-server,tomcat/conf/Catalina/localhost}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/cas-server,%{_datadir},%{_sharedstatedir}/cas-server,%{_tomcatconfdir}}
 
 cp -a webapp $RPM_BUILD_ROOT%{webappdir}
 
@@ -163,14 +163,14 @@
   install modules/%{name}-$i-%{version}.jar $RPM_BUILD_ROOT%{libdir}/%{name}-$i-%{version}.jar
 done
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sharedstatedir}/tomcat/conf/Catalina/localhost/cas-server.xml
+install %{SOURCE1} $RPM_BUILD_ROOT%{_tomcatconfdir}/cas-server.xml
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%config(noreplace) %{_sharedstatedir}/tomcat/conf/Catalina/localhost/cas-server.xml
+%config(noreplace) %{_tomcatconfdir}/cas-server.xml
 %{_datadir}/cas-server
 %exclude %{libdir}/cas-server-support-spnego-3.3.5.jar
 %exclude %{libdir}/cas-server-integration-berkeleydb-3.3.5.jar
@@ -245,6 +245,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2010/02/18 14:49:46  pawelz
+- use %_tomcatconfdir, BR: rpm(macros) >= 1.540
+
 Revision 1.14  2010/02/18 14:24:36  pawelz
 - install context.xml
 - cleanup %files
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cas-server/cas-server.spec?r1=1.14&r2=1.15&f=u