SHA256
1
0
forked from pool/ant
OBS User unknown 2007-05-08 18:08:03 +00:00 committed by Git OBS Bridge
parent eb27d24d77
commit f88163bb5e
3 changed files with 35 additions and 44 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue May 8 10:39:14 CEST 2007 - dbornkessel@suse.de
- removed all jai stuff as jai was dropped
-------------------------------------------------------------------
Fri Sep 22 15:48:51 CEST 2006 - dbornkessel@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package ant-antlr (Version 1.6.5)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@ -11,21 +11,22 @@
Name: ant-antlr
BuildRequires: ant antlr bcel bsf jaf jakarta-commons-logging java2-devel-packages javamail jdepend junit log4j oro regexp xalan-j2 xerces-j2
%ifarch %ix86
BuildRequires: jai
%endif
# commented out as jai was dropped in 10.3
#% ifarch % ix86
#BuildRequires: jai
#% endif
%define ant_home %{_datadir}/ant
%define ant_name ant
%define section free
Version: 1.6.5
Release: 25
Release: 85
URL: http://jakarta.apache.org/
Group: Development/Tools/Building
Source0: apache-ant-%{version}-src.tar.bz2
# Ant configuration file which is edited when each optional subpackage
# is installed/uninstalled
Summary: Optional antlr Tasks for Ant
License: Other License(s), see package, Apache
License: The Apache Software License
# Ant configuration file which is edited when each optional subpackage
# is installed/uninstalled
# Fix temp directory used for file containing large command strings (> 4k)
@ -40,23 +41,6 @@ antlr tasks for Apache Ant.
%ifarch %ix86
%package -n ant-jai
Summary: Optional jai tasks for ant
Group: Development/Tools/Building
Requires: jai
Provides: ant-jai = %{version}-%{release}
Requires: %{ant_name} = %{version}
Conflicts: ant-optional-clean, ant-optional-full
%description -n ant-jai
Apache Ant is a Java-based build tool.
This package contains optional jai tasks for Apache Ant.
%endif
%package -n ant-commons-logging
Summary: Optional commons logging tasks for ant
Group: Development/Tools/Building
@ -273,7 +257,7 @@ find . -name "*.jar" -exec rm -f {} \;
%build
%ifarch %ix86
export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp commons-logging jai/jai_codec jai/jai_core bsf xml-commons-resolver regexp regexp javamail xml-commons-resolver jakarta-commons-logging jdepend xalan-j2)
export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp commons-logging bsf xml-commons-resolver regexp regexp javamail xml-commons-resolver jakarta-commons-logging jdepend xalan-j2)
%else
export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp commons-logging bsf xml-commons-resolver regexp regexp javamail xml-commons-resolver jakarta-commons-logging jdepend )
%endif
@ -304,9 +288,9 @@ cp -p build/lib/%{ant_name}-commons-logging.jar $RPM_BUILD_ROOT%{_javadir}/ant/%
#cp -p build/lib/% {ant_name}-commons-net.jar $RPM_BUILD_ROOT% {_javadir}/% {ant_name}/% {ant_name}-commons-net-% {version}.jar
cp -p build/lib/%{ant_name}-junit.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{ant_name}-junit-%{version}.jar
#cp -p build/lib/% {ant_name}-jsch.jar $RPM_BUILD_ROOT% {_javadir}/% {ant_name}/% {ant_name}-jsch-% {version}.jar
%ifarch %ix86
cp -p build/lib/%{ant_name}-jai.jar $RPM_BUILD_ROOT%{_javadir}/%{ant_name}/%{ant_name}-jai-%{version}.jar
%endif
#% ifarch % ix86
#cp -p build/lib/% {ant_name}-jai.jar $RPM_BUILD_ROOT% {_javadir}/% {ant_name}/% {ant_name}-jai-% {version}.jar
#% endif
cp -p build/lib/%{ant_name}-nodeps.jar $RPM_BUILD_ROOT%{_javadir}/%{ant_name}/%{ant_name}-nodeps-%{version}.jar
cp -p build/lib/%{ant_name}-swing.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{ant_name}-swing-%{version}.jar
cp -p build/lib/%{ant_name}-trax.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{ant_name}-trax-%{version}.jar
@ -327,9 +311,9 @@ echo "bsf ant/ant-apache-bsf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/apac
echo "xml-commons-resolver ant/ant-apache-resolver" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/apache-resolver
echo "jakarta-commons-logging ant/ant-commons-logging" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/commons-logging
#echo "jakarta-commons-net ant/ant-commons-net" > $RPM_BUILD_ROOT% {_sysconfdir}/% {ant_name}.d/commons-net
%ifarch %ix86
echo "jai ant/ant-jai" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/jai
%endif
#% ifarch % ix86
#echo "jai ant/ant-jai" > $RPM_BUILD_ROOT% {_sysconfdir}/% {ant_name}.d/jai
#% endif
echo "bcel ant/ant-apache-bcel" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/apache-bcel
echo "log4j ant/ant-apache-log4j" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/apache-log4j
echo "oro ant/ant-apache-oro" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_name}.d/apache-oro
@ -371,14 +355,14 @@ echo "jaxp_transform_impl ant/ant-trax" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_na
#% {_javadir}/% {ant_name}/% {ant_name}-commons-net.jar
#% {_javadir}/% {ant_name}/% {ant_name}-commons-net-% {version}.jar
#% {_sysconfdir}/% {ant_name}.d/commons-net
%ifarch %ix86
%files -n ant-jai
%defattr(0644,root,root,0755)
%{_javadir}/%{ant_name}/%{ant_name}-jai.jar
%{_javadir}/%{ant_name}/%{ant_name}-jai-%{version}.jar
%config %{_sysconfdir}/%{ant_name}.d/jai
%endif
#% ifarch % ix86
#
#% files -n ant-jai
#% defattr(0644,root,root,0755)
#% {_javadir}/% {ant_name}/% {ant_name}-jai.jar
#% {_javadir}/% {ant_name}/% {ant_name}-jai-% {version}.jar
#% config % {_sysconfdir}/% {ant_name}.d/jai
#% endif
%files -n ant-apache-bcel
%defattr(0644,root,root,0755)
@ -463,12 +447,14 @@ echo "jaxp_transform_impl ant/ant-trax" > $RPM_BUILD_ROOT%{_sysconfdir}/%{ant_na
%{ant_home}/etc/mmetrics-frames.xsl
%{ant_home}/etc/coverage-frames.xsl
%changelog -n ant-antlr
%changelog
* Tue May 08 2007 - dbornkessel@suse.de
- removed all jai stuff as jai was dropped
* Fri Sep 22 2006 - dbornkessel@suse.de
- added source=1.4
* Mon May 08 2006 - dbornkessel@suse.de
- changed last change (see line below): Requires are only bound to the version, not to the release anymore
--> lrupp: fix Requires for ant (#171473 describes the same for dbus-1)
--> lrupp: fix Requires for ant (#171473 describes the same for dbus-1)
* Thu Feb 02 2006 - dbornkessel@suse.de
* Thu Feb 02 2006 - dbornkessel@suse.de
- fixed rpmlint errors and warnings

View File

@ -1,7 +1,7 @@
#
# spec file for package ant (Version 1.6.5)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@ -16,9 +16,9 @@ BuildRequires: java2-devel-packages xerces-j2
%define section free
%define cvs_name apache-%{name}
Version: 1.6.5
Release: 25
Release: 67
Summary: A Java-Based Build Tool
License: Other License(s), see package, Apache
License: The Apache Software License
URL: http://jakarta.apache.org/
Group: Development/Tools/Building
Source0: %{cvs_name}-%{version}-src.tar.bz2
@ -220,7 +220,7 @@ rm -rf $RPM_BUILD_ROOT
%{_javadocdir}/ant-%{version}
# -----------------------------------------------------------------------------
%changelog -n ant
%changelog
* Fri Sep 22 2006 - dbornkessel@suse.de
- read in properties in /etc/ant.conf
- added source=1.4