rpms/ant-contrib/devel ant-contrib.spec,1.6,1.7
Alexander Kurtakov
akurtakov at fedoraproject.org
Fri Sep 4 12:00:59 UTC 2009
- Previous message (by thread): rpms/cproto/devel .cvsignore, 1.6, 1.7 cproto.spec, 1.15, 1.16 sources, 1.6, 1.7
- Next message (by thread): rpms/openssl/devel openssl-1.0.0-beta3-cmll-noasm.patch, NONE, 1.1 openssl.spec, 1.140, 1.141
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: akurtakov
Update of /cvs/pkgs/rpms/ant-contrib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24970/devel
Modified Files:
ant-contrib.spec
Log Message:
- Drop gcj_support.
- Install as proper ant plugin.
Index: ant-contrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ant-contrib/devel/ant-contrib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ant-contrib.spec 24 Jul 2009 16:54:08 -0000 1.6
+++ ant-contrib.spec 4 Sep 2009 12:00:59 -0000 1.7
@@ -1,10 +1,9 @@
-%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.8.%{beta_number}%{?dist}
+Release: 0.9.%{beta_number}%{?dist}
License: ASL 2.0
URL: http://ant-contrib.sourceforge.net/
Group: Development/Libraries
@@ -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-%{versio
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,12 @@ cp -pr build/docs/api/* $RPM_BUILD_ROOT%
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
rm -rf build/docs/api
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
%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
+%{_javadir}/ant/*.jar
%doc build/docs/LICENSE.txt
%doc build/docs/tasks/*
@@ -119,6 +87,10 @@ fi
# -----------------------------------------------------------------------------
%changelog
+* Fri Sep 4 2009 Alexander Kurtakov <akurtako at redhat.com> 1.0-0.9.b2
+- Drop gcj_support.
+- Install as proper ant plugin.
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.8.b2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
- Previous message (by thread): rpms/cproto/devel .cvsignore, 1.6, 1.7 cproto.spec, 1.15, 1.16 sources, 1.6, 1.7
- Next message (by thread): rpms/openssl/devel openssl-1.0.0-beta3-cmll-noasm.patch, NONE, 1.1 openssl.spec, 1.140, 1.141
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list