rpm/ant
SHA256
1
0
Fork 0
forked from pool/ant
Code Pull Requests Activity

- Fix borked summaries for subpackages.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=58
This commit is contained in:
Tomáš Chvátal 2014-07-04 12:56:47 +00:00 committed by Git OBS Bridge
parent 57700f8c95
commit 92685e5b52
3 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ant-antlr.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jul 4 12:56:17 UTC 2014 - tchvatal@suse.com
- Fix borked summaries for subpackages.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 4 11:54:48 UTC 2014 - tchvatal@suse.com Fri Jul 4 11:54:48 UTC 2014 - tchvatal@suse.com

45
ant-antlr.spec
View File

@ -47,6 +47,8 @@ Source1001: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.
Source1002: ant.keyring Source1002: ant.keyring
Patch0: apache-ant-no-test-jar.patch Patch0: apache-ant-no-test-jar.patch
Patch1: apache-ant-class-path-in-manifest.patch Patch1: apache-ant-class-path-in-manifest.patch
#PATCH-FIX-SLE: fix building with old gcj by working around bugs
Patch2: apache-ant-old-gcj-build.patch
%if %bootstrap %if %bootstrap
BuildRequires: java-1_5_0-gcj-compat-devel BuildRequires: java-1_5_0-gcj-compat-devel
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel #!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel
@ -126,7 +128,7 @@ based on the OS used.
%if %bootstrap %if %bootstrap
%package -n ant-jmf %package -n ant-jmf
Summary: Antlr Task for ant Summary: Optional jmf tasks for ant
License: Apache-2.0 License: Apache-2.0
Group: Development/Tools/Building Group: Development/Tools/Building
Requires: ant = %{version} Requires: ant = %{version}
@ -138,7 +140,7 @@ Apache Ant is a Java-based build tool.
This package contains optional jmf tasks for Apache Ant. This package contains optional jmf tasks for Apache Ant.
%package -n ant-swing %package -n ant-swing
Summary: Antlr Task for ant Summary: Optional swing tasks for ant
License: Apache-2.0 License: Apache-2.0
Group: Development/Tools/Building Group: Development/Tools/Building
Requires: ant = %{version} Requires: ant = %{version}
@ -150,7 +152,7 @@ Apache Ant is a Java-based build tool.
This package contains optional swing tasks for Apache Ant. This package contains optional swing tasks for Apache Ant.
%package -n ant-scripts %package -n ant-scripts
Summary: Antlr Task for ant Summary: Additional scripts for ant
License: Apache-2.0 License: Apache-2.0
Group: Development/Tools/Building Group: Development/Tools/Building
Requires: %{_bindir}/perl Requires: %{_bindir}/perl
@ -167,7 +169,7 @@ Ant.
%if ! %bootstrap %if ! %bootstrap
%package -n ant-apache-bsf %package -n ant-apache-bsf
Summary: Antlr Task for ant Summary: Optional apache bsf tasks for ant
License: Apache-2.0 License: Apache-2.0
Group: Development/Tools/Building Group: Development/Tools/Building
Requires: bsf Requires: bsf
@ -180,7 +182,7 @@ Apache Ant is a Java-based build tool.
This package contains optional apache bsf tasks for Apache Ant. This package contains optional apache bsf tasks for Apache Ant.
%package -n ant-apache-resolver %package -n ant-apache-resolver
Summary: Antlr Task for ant Summary: Optional apache resolver tasks for ant
License: Apache-2.0 License: Apache-2.0
Group: Development/Tools/Building Group: Development/Tools/Building
Requires: xml-commons-resolver Requires: xml-commons-resolver
@ -193,7 +195,7 @@ Apache Ant is a Java-based build tool.
This package contains optional apache resolver tasks for Apache Ant. This package contains optional apache resolver tasks for Apache Ant.
%package -n ant-commons-logging %package -n ant-commons-logging
Summary: Antlr Task for ant Summary: Optional commons logging tasks for ant
License: Apache-2.0 License: Apache-2.0
Group: Development/Tools/Building Group: Development/Tools/Building
Requires: jakarta-commons-logging Requires: jakarta-commons-logging
@ -206,7 +208,7 @@ Apache Ant is a Java-based build tool.
This package contains optional commons logging tasks for Apache Ant. This package contains optional commons logging tasks for Apache Ant.
%package -n ant-commons-net %package -n ant-commons-net
Summary: Antlr Task for ant Summary: Optional commons net tasks for ant
License: Apache-2.0 License: Apache-2.0
Group: Development/Tools/Building Group: Development/Tools/Building
Requires: jakarta-commons-net Requires: jakarta-commons-net
@ -221,7 +223,7 @@ This package contains optional commons net tasks for Apache Ant.
# Disable because we don't ship the dependencies # Disable because we don't ship the dependencies
%if 0 %if 0
%package -n ant-jai %package -n ant-jai
Summary: Antlr Task for ant Summary: Optional jai tasks for ant
License: Apache-2.0 License: Apache-2.0
Group: Development/Tools/Building Group: Development/Tools/Building
Requires: jai Requires: jai
@ -233,7 +235,7 @@ Optional jai tasks for ant.
%endif %endif
%package -n ant-apache-bcel %package -n ant-apache-bcel
Summary: Antlr Task for ant Summary: Optional apache bcel tasks for ant
License: Apache-2.0 License: Apache-2.0
Group: Development/Tools/Building Group: Development/Tools/Building
Requires: bcel Requires: bcel
@ -248,7 +250,7 @@ Apache Ant is a Java-based build tool.
This package contains optional apache bcel tasks for Apache Ant. This package contains optional apache bcel tasks for Apache Ant.
%package -n ant-apache-log4j %package -n ant-apache-log4j
Summary: Antlr Task for ant Summary: Optional apache log4j tasks for ant
License: Apache-2.0 License: Apache-2.0
Group: Development/Tools/Building Group: Development/Tools/Building
Requires: log4j Requires: log4j
@ -263,7 +265,7 @@ Apache Ant is a Java-based build tool.
This package contains optional apache log4j tasks for Apache Ant. This package contains optional apache log4j tasks for Apache Ant.
%package -n ant-apache-oro %package -n ant-apache-oro
Summary: Antlr Task for ant Summary: Optional apache oro tasks for ant
License: Apache-2.0 License: Apache-2.0
Group: Development/Tools/Building Group: Development/Tools/Building
Requires: oro Requires: oro
@ -278,7 +280,7 @@ Apache Ant is a Java-based build tool.
This package contains optional apache oro tasks for Apache Ant. This package contains optional apache oro tasks for Apache Ant.
%package -n ant-apache-regexp %package -n ant-apache-regexp
Summary: Antlr Task for ant Summary: Optional apache regexp tasks for ant
License: Apache-2.0 License: Apache-2.0
Group: Development/Tools/Building Group: Development/Tools/Building
Requires: regexp Requires: regexp
@ -293,7 +295,7 @@ Apache Ant is a Java-based build tool.
This package contains optional apache regexp tasks for Apache Ant. This package contains optional apache regexp tasks for Apache Ant.
%package -n ant-apache-xalan2 %package -n ant-apache-xalan2
Summary: Antlr Task for ant Summary: Optional apache xalan2 tasks for ant
License: Apache-2.0 License: Apache-2.0
Group: Development/Tools/Building Group: Development/Tools/Building
BuildRequires: regexp BuildRequires: regexp
@ -304,7 +306,7 @@ Requires: regexp
Optional apache xalan2 tasks for %{name}. Optional apache xalan2 tasks for %{name}.
%package -n ant-javamail %package -n ant-javamail
Summary: Antlr Task for ant Summary: Optional javamail tasks for ant
License: CDDL-1.0 License: CDDL-1.0
Group: Development/Tools/Building Group: Development/Tools/Building
BuildRequires: javamail >= 1.2-5jpp BuildRequires: javamail >= 1.2-5jpp
@ -317,7 +319,7 @@ Apache Ant is a Java-based build tool.
This package contains optional javamail tasks for Apache Ant. This package contains optional javamail tasks for Apache Ant.
%package -n ant-jdepend %package -n ant-jdepend
Summary: Antlr Task for ant Summary: Optional jdepend tasks for ant
License: Apache-2.0 License: Apache-2.0
Group: Development/Tools/Building Group: Development/Tools/Building
Requires: jdepend Requires: jdepend
@ -330,7 +332,7 @@ Apache Ant is a Java-based build tool.
This package contains optional jdepend tasks for Apache Ant. This package contains optional jdepend tasks for Apache Ant.
%package -n ant-jsch %package -n ant-jsch
Summary: Antlr Task for ant Summary: Optional jsch tasks for ant
License: Apache-2.0 License: Apache-2.0
Group: Development/Tools/Building Group: Development/Tools/Building
Requires: jsch Requires: jsch
@ -343,7 +345,7 @@ Apache Ant is a Java-based build tool.
This package contains optional jsch tasks for Apache Ant. This package contains optional jsch tasks for Apache Ant.
%package -n ant-junit %package -n ant-junit
Summary: Antlr Task for ant Summary: Optional junit tasks for ant
License: Apache-2.0 License: Apache-2.0
Group: Development/Tools/Building Group: Development/Tools/Building
Requires: junit4 Requires: junit4
@ -355,7 +357,7 @@ Apache Ant is a Java-based build tool.
This package contains optional JUnit tasks for Apache Ant. This package contains optional JUnit tasks for Apache Ant.
%package -n ant-testutil %package -n ant-testutil
Summary: Antlr Task for ant Summary: Test utility classes for ant
License: Apache-2.0 License: Apache-2.0
Group: Development/Tools/Building Group: Development/Tools/Building
Requires: junit4 Requires: junit4
@ -365,7 +367,7 @@ Requires: junit4
Test utility tasks for %{name}. Test utility tasks for %{name}.
%package -n ant-manual %package -n ant-manual
Summary: Antlr Task for ant Summary: Manual for ant
License: Apache-2.0 License: Apache-2.0
Group: Development/Tools/Building Group: Development/Tools/Building
@ -376,7 +378,7 @@ This package contains the manual for Apache Ant.
%if 0%{?build_javadoc} %if 0%{?build_javadoc}
%package -n ant-javadoc %package -n ant-javadoc
Summary: Antlr Task for ant Summary: Javadoc for ant
License: Apache-2.0 License: Apache-2.0
Group: Development/Tools/Building Group: Development/Tools/Building
@ -395,6 +397,9 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
# When bootstrapping, we don't have junit # When bootstrapping, we don't have junit
%if %bootstrap %if %bootstrap
%patch0 -p1 %patch0 -p1
%if 0%{?suse_version} < 1200
%patch2 -p1
%endif
%endif %endif
# Fix class-path-in-manifest rpmlint warning # Fix class-path-in-manifest rpmlint warning

2
pre_checkin.sh
View File

@ -2,5 +2,5 @@
EDIT_WARNING="##### WARNING: please do not edit this auto generated spec file. Use the ant.spec! #####\n" EDIT_WARNING="##### WARNING: please do not edit this auto generated spec file. Use the ant.spec! #####\n"
sed "s/^%global bootstrap.*$/${EDIT_WARNING}%global bootstrap 0/; sed "s/^%global bootstrap.*$/${EDIT_WARNING}%global bootstrap 0/;
s/^\(Name:.*\)$/\1-antlr/; s/^\(Name:.*\)$/\1-antlr/;
s/^Summary:.*/Summary: Antlr Task for ant/; 0,/^Summary:.*/{s/^Summary:.*/Summary: Antlr Task for ant/};
" < ant.spec > ant-antlr.spec " < ant.spec > ant-antlr.spec