packages: ice/ice.spec - instal ant task jar into ant directory - register ...

[pawelz]

Author: pawelz                       Date: Sun Apr  4 21:30:54 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- instal ant task jar into ant directory
- register ant task
- moved ant stuff to -devel subpackage

---- Files affected:
packages/ice:
   ice.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: packages/ice/ice.spec
diff -u packages/ice/ice.spec:1.16 packages/ice/ice.spec:1.17
--- packages/ice/ice.spec:1.16	Sun Apr  4 23:24:25 2010
+++ packages/ice/ice.spec	Sun Apr  4 23:30:49 2010
@@ -282,12 +282,16 @@
 
 # Move Java stuff where it should be
 install -d $RPM_BUILD_ROOT%{_javadir}
-mv $RPM_BUILD_ROOT/lib/ant-ice.jar $RPM_BUILD_ROOT%{_javadir}/ant-ice-%{version}.jar
-ln -s ant-ice-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ant-ice.jar
 mv $RPM_BUILD_ROOT/lib/Ice.jar $RPM_BUILD_ROOT%{_javadir}/Ice-%{version}.jar
 ln -s Ice-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/Ice.jar
 mv $RPM_BUILD_ROOT/lib/Freeze.jar $RPM_BUILD_ROOT%{_javadir}/Freeze-%{version}.jar
 ln -s Freeze-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/Freeze.jar
+
+# Register ant target
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/ant.d,%{_javadir}/ant}
+mv $RPM_BUILD_ROOT/lib/ant-ice.jar $RPM_BUILD_ROOT%{_javadir}/ant/ant-ice-%{version}.jar
+ln -s ant-ice-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ant/ant-ice.jar
+echo 'ice ant/ant-ice' > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/ice
 %endif
 
 %if %{with gui}
@@ -493,6 +497,11 @@
 %{_includedir}/Slice
 %{_mandir}/man1/slice2cpp.1*
 %{_mandir}/man1/slice2freeze.1*
+%if %{with java}
+%{_sysconfdir}/ant.d/ant
+%{_javadir}/ant/ant-ice-%{version}.jar
+%{_javadir}/ant/ant-ice.jar
+%endif
 
 %if %{with dotnet}
 %{_pkgconfigdir}/Glacier2.pc
@@ -591,8 +600,6 @@
 %{_javadir}/Freeze.jar
 %{_javadir}/Ice-%{version}.jar
 %{_javadir}/Ice.jar
-%{_javadir}/ant-ice-%{version}.jar
-%{_javadir}/ant-ice.jar
 %endif
 
 %if %{with php}
@@ -620,6 +627,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2010/04/04 21:30:49  pawelz
+- instal ant task jar into ant directory
+- register ant task
+- moved ant stuff to -devel subpackage
+
 Revision 1.16  2010/04/04 21:24:25  glen
 - java deps can be included conditionally
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ice/ice.spec?r1=1.16&r2=1.17&f=u