packages: cas/cas.spec - mark all config files as %config, and install them...

[pawelz]

Author: pawelz                       Date: Fri Feb 19 12:13:41 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- mark all config files as %config, and install them into /etc
- more readable %install section
- install context descriptor into /etc/cas and link it to %{_tomcatconfdir}

---- Files affected:
packages/cas:
   cas.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: packages/cas/cas.spec
diff -u packages/cas/cas.spec:1.22 packages/cas/cas.spec:1.23
--- packages/cas/cas.spec:1.22	Fri Feb 19 08:25:53 2010
+++ packages/cas/cas.spec	Fri Feb 19 13:13:36 2010
@@ -160,28 +160,43 @@
 
 cp -a webapp $RPM_BUILD_ROOT%{webappdir}
 
-MODULES="integration-berkeleydb
-integration-jboss
-integration-memcached
-integration-restlet
-support-generic
-support-jdbc
-support-ldap
-support-legacy
-support-openid
-support-radius
-support-spnego
-support-trusted
-support-x509"
+MODULES="
+  integration-berkeleydb
+  integration-jboss
+  integration-memcached
+  integration-restlet
+  support-generic
+  support-jdbc
+  support-ldap
+  support-legacy
+  support-openid
+  support-radius
+  support-spnego
+  support-trusted
+  support-x509
+"
+
+CONFIGFILES="
+  classes/log4j.properties
+  cas.properties
+  deployerConfigContext.xml
+  login-webflow.xml
+  restlet-servlet.xml
+  cas-servlet.xml
+  web.xml
+"
 
 for i in $MODULES; do
   install modules/%{name}-server-$i-%{version}.jar $RPM_BUILD_ROOT%{libdir}/%{name}-$i-%{version}.jar
 done
 
-mv $RPM_BUILD_ROOT%{webappdir}/WEB-INF/classes/log4j.properties $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-ln -s %{_sysconfdir}/%{name}/log4j.properties $RPM_BUILD_ROOT%{webappdir}/WEB-INF/classes/log4j.properties
+for i in $CONFIGFILES; do
+  mv $RPM_BUILD_ROOT%{webappdir}/WEB-INF/$i $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$(basename i)
+  ln -s %{_sysconfdir}/%{name}/$(basename $i) $RPM_BUILD_ROOT%{webappdir}/WEB-INF/$i
+done
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_tomcatconfdir}/%{name}.xml
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/context.xml
+ln -s %{_sysconfdir}/%{name}/context.xml $RPM_BUILD_ROOT%{_tomcatconfdir}/%{name}.xml
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -189,7 +204,7 @@
 %files
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}
-%config(noreplace) %verify(not md5 mtime size) %{_tomcatconfdir}/%{name}.xml
+%{_tomcatconfdir}/%{name}.xml
 %{_datadir}/%{name}
 %exclude %{libdir}/%{name}-support-spnego-%{version}.jar
 %exclude %{libdir}/%{name}-integration-berkeleydb-%{version}.jar
@@ -265,6 +280,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2010/02/19 12:13:36  pawelz
+- mark all config files as %config, and install them into /etc
+- more readable %install section
+- install context descriptor into /etc/cas and link it to %{_tomcatconfdir}
+
 Revision 1.22  2010/02/19 07:25:53  paszczus
 - renamed to cas.spec
 
================================================================

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