From d4f9914608c4f32fd4cb5ff425f5e033f1f104a0 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Dec 22 2009 16:39:56 +0000 Subject: Initial import from devel --- diff --git a/ant-contrib.spec b/ant-contrib.spec index 7003929..341edf1 100644 --- a/ant-contrib.spec +++ b/ant-contrib.spec @@ -1,11 +1,10 @@ -%define gcj_support 1 %define beta_number b2 Summary: Collection of tasks for Ant -Name: ant-contrib +Name: ant-contrib Version: 1.0 -Release: 0.4.%{beta_number}%{?dist} -License: Apache Software License +Release: 0.10.%{beta_number}%{?dist} +License: ASL 2.0 URL: http://ant-contrib.sourceforge.net/ Group: Development/Libraries Source0: http://prdownloads.sourceforge.net/ant-contrib/ant-contrib-%{version}%{beta_number}-src.tar.gz @@ -17,22 +16,17 @@ BuildRequires: ant-junit >= 1.6.2 BuildRequires: ant-nodeps >= 1.6.2 BuildRequires: xerces-j2 BuildRequires: bcel >= 5.0 -%if %{gcj_support} -BuildRequires: java-gcj-compat-devel >= 1.0.31 -Requires(post): java-gcj-compat >= 1.0.31 -Requires(postun): java-gcj-compat >= 1.0.31 -%else BuildRequires: java-devel >= 1.4.2 Requires: java >= 1.4.2 -%endif Requires: junit >= 3.8.0 Requires: ant >= 1.6.2 Requires: xerces-j2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch %description -The Ant-Contrib project is a collection of tasks -(and at one point maybe types and other tools) +The Ant-Contrib project is a collection of tasks +(and at one point maybe types and other tools) for Apache Ant. %package javadoc @@ -40,7 +34,7 @@ Summary: Javadoc for %{name} Group: Documentation %description javadoc -%{summary}. +Api documentation for %{name}. %prep %setup -q -n %{name} @@ -62,14 +56,13 @@ CLASSPATH=build/lib/ant-contrib-%{version}.jar:$CLASSPATH echo $ANT_HOME ant -Dsource=1.4 -Dversion=%{version} -Dbcel.jar=file://%{_javadir}/bcel.jar all - %install rm -rf $RPM_BUILD_ROOT # jars install -Dpm 644 build/lib/%{name}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar + $RPM_BUILD_ROOT%{_javadir}/ant/%{name}-%{version}.jar +ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{name}.jar # javadoc install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} @@ -77,37 +70,16 @@ cp -pr build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink rm -rf build/docs/api - -%if %{gcj_support} -%{_bindir}/aot-compile-rpm -%endif +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d +echo "ant/ant-contrib" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/ant-contrib %clean rm -rf $RPM_BUILD_ROOT -%post -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - - -%postun -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - %files %defattr(-,root,root,-) -%{_javadir}/*.jar -%if %{gcj_support} -%{_libdir}/gcj/%{name} -%endif +%{_sysconfdir}/ant.d/ant-contrib +%{_javadir}/ant/*.jar %doc build/docs/LICENSE.txt %doc build/docs/tasks/* @@ -119,6 +91,25 @@ fi # ----------------------------------------------------------------------------- %changelog +* Fri Sep 4 2009 Alexander Kurtakov 1.0-0.10.b2 +- Install ant contrib in ant.d. + +* Fri Sep 4 2009 Alexander Kurtakov 1.0-0.9.b2 +- Drop gcj_support. +- Install as proper ant plugin. + +* Fri Jul 24 2009 Fedora Release Engineering - 1.0-0.8.b2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Feb 23 2009 Fedora Release Engineering - 1.0-0.7.b2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Jul 14 2008 Tom "spot" Callaway - 1.0-0.6.b2 +- fix license tag + +* Tue Feb 19 2008 Fedora Release Engineering - 1.0-0.5.b2 +- Autorebuild for GCC 4.3 + * Sun Aug 03 2006 Igor Foox - 1.0-0.4.b2 - Added dist tag to release. diff --git a/import.log b/import.log new file mode 100644 index 0000000..cb6218b --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +ant-contrib-1_0-0_10_b2_fc13:EL-5:ant-contrib-1.0-0.10.b2.fc13.src.rpm:1261499981