packages: lenya/lenya.spec - wrong. It does not build with system ant. But ...

[pawelz]

Author: pawelz                       Date: Fri Oct  9 11:47:02 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- wrong. It does not build with system ant. But it requiers /usr/bin/ant
  scripts, so it BRs ant. Maybe we should modify %ant macro to use bin/ant
  from $ANT_HOME?
- install (webapproot)/lenya into /var/lib, and symlink it to (webapproot)/lenya

---- Files affected:
packages/lenya:
   lenya.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: packages/lenya/lenya.spec
diff -u packages/lenya/lenya.spec:1.7 packages/lenya/lenya.spec:1.8
--- packages/lenya/lenya.spec:1.7	Fri Oct  9 11:03:47 2009
+++ packages/lenya/lenya.spec	Fri Oct  9 13:46:57 2009
@@ -47,6 +47,9 @@
 cp %{SOURCE5} mysql-schema.sql
 
 %build
+
+export ANT_HOME=tools
+
 # some libs
 CLASSPATH=$(build-classpath-directory externals/cocoon_2_1_x/lib/endorsed)
 CLASSPATH=$CLASSPATH:externals/cocoon_2_1_x/tools/lib/ant-contrib-0.6.jar
@@ -59,6 +62,8 @@
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/lenya,%{_datadir},%{_sharedstatedir}/{lenya,tomcat/conf/Catalina/localhost},/var/log/lenya}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sharedstatedir}/tomcat/conf/Catalina/localhost/lenya.xml
 cp -a build/lenya/webapp $RPM_BUILD_ROOT%{_datadir}/lenya
+mv $RPM_BUILD_ROOT%{_datadir}/lenya/lenya $RPM_BUILD_ROOT%{_sharedstatedir}/lenya
+ln -s %{_sharedstatedir}/lenya $RPM_BUILD_ROOT%{_datadir}/lenya
 
 # use libraries provided by lenya. Lenya need exact version of these jars.
 # Don't try to use system libraries. It won't work.
@@ -83,7 +88,7 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lenya/*
 %config(noreplace) %verify(not md5 mtime size) %{_sharedstatedir}/tomcat/conf/Catalina/localhost/lenya.xml
 %{_datadir}/lenya
-%attr(2775,root,servlet) %dir %{_sharedstatedir}/lenya
+%attr(2775,root,servlet) %{_sharedstatedir}/lenya
 %attr(2775,root,servlet) %dir /var/log/lenya
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -92,6 +97,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2009/10/09 11:46:57  pawelz
+- wrong. It does not build with system ant. But it requiers /usr/bin/ant
+  scripts, so it BRs ant. Maybe we should modify %ant macro to use bin/ant
+  from $ANT_HOME?
+- install (webapproot)/lenya into /var/lib, and symlink it to (webapproot)/lenya
+
 Revision 1.7  2009/10/09 09:03:47  pawelz
 - it does compile with system ant, so use it.
 - BR: ant
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lenya/lenya.spec?r1=1.7&r2=1.8&f=u