- use requires_eq instead of manual call of rpm -q
- use requires_eq instead of manual call of rpm -q OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=45
This commit is contained in:
Michal Vyskocil
Git OBS Bridge
parent
6b75cb899c
commit
a38947ead8
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 4 14:58:13 UTC 2013 - mvyskocil@suse.com
|
||||
|
||||
- use requires_eq instead of manual call of rpm -q
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 2 09:52:33 UTC 2013 - mvyskocil@suse.com
|
||||
|
||||
|
||||
@ -92,7 +92,7 @@ Provides: ant-trax = %{version}
|
||||
%else
|
||||
# ant-antlr requires
|
||||
Requires: antlr
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
Provides: ant-antlr = %{version}-%{release}
|
||||
%endif
|
||||
BuildArch: noarch
|
||||
@ -192,7 +192,7 @@ Summary: Optional apache bsf tasks for ant
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
Requires: bsf
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
BuildRequires: bsf
|
||||
Provides: ant-apache-bsf = %{version}-%{release}
|
||||
|
||||
@ -208,7 +208,7 @@ Summary: Optional apache resolver tasks for ant
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
Requires: xml-commons-resolver
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
BuildRequires: xml-commons-resolver
|
||||
Provides: ant-apache-resolver = %{version}-%{release}
|
||||
|
||||
@ -224,7 +224,7 @@ Summary: Optional commons logging tasks for ant
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
Requires: jakarta-commons-logging
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
BuildRequires: jakarta-commons-logging
|
||||
Provides: ant-commons-logging = %{version}-%{release}
|
||||
|
||||
@ -240,7 +240,7 @@ Summary: Optional commons net tasks for ant
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
Requires: jakarta-commons-net
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
BuildRequires: jakarta-commons-net
|
||||
Provides: ant-commons-net = %{version}-%{release}
|
||||
|
||||
@ -260,7 +260,7 @@ Summary: Optional jai tasks for ant
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
Requires: jai
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
BuildRequires: jai
|
||||
Provides: ant-jai = %{version}-%{release}
|
||||
|
||||
@ -273,7 +273,7 @@ Summary: Optional apache bcel tasks for ant
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
Requires: bcel
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
BuildRequires: bcel
|
||||
Provides: ant-apache-bcel = %{version}
|
||||
Provides: ant-jakarta-bcel = %{version}
|
||||
@ -291,7 +291,7 @@ Summary: Optional apache log4j tasks for ant
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
Requires: log4j
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
BuildRequires: log4j-mini
|
||||
Provides: ant-apache-log4j = %{version}
|
||||
Provides: ant-jakarta-log4j = %{version}
|
||||
@ -309,7 +309,7 @@ Summary: Optional apache oro tasks for ant
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
Requires: oro
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
BuildRequires: oro
|
||||
Provides: ant-apache-oro = %{version}
|
||||
Provides: ant-jakarta-oro = %{version}
|
||||
@ -327,7 +327,7 @@ Summary: Optional apache regexp tasks for ant
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
Requires: regexp
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
BuildRequires: regexp
|
||||
Provides: ant-apache-regexp = %{version}
|
||||
Provides: ant-jakarta-regexp = %{version}
|
||||
@ -344,7 +344,7 @@ License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
BuildRequires: regexp
|
||||
Requires: regexp
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
Provides: ant-apache-xalan2 = %{version}
|
||||
|
||||
%description -n ant-apache-xalan2
|
||||
@ -357,7 +357,7 @@ License: CDDL-1.0
|
||||
Group: Development/Tools/Building
|
||||
BuildRequires: javamail >= 1.2-5jpp
|
||||
Requires: javamail >= 1.2-5jpp
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
Provides: ant-javamail = %{version}
|
||||
|
||||
%description -n ant-javamail
|
||||
@ -372,7 +372,7 @@ Summary: Optional jdepend tasks for ant
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
Requires: jdepend
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
BuildRequires: jdepend
|
||||
Provides: ant-jdepend = %{version}
|
||||
|
||||
@ -388,7 +388,7 @@ Summary: Optional jsch tasks for ant
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
Requires: jsch
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
BuildRequires: jsch
|
||||
Provides: ant-jsch = %{version}
|
||||
|
||||
@ -404,7 +404,7 @@ Summary: Optional junit tasks for ant
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
Requires: junit4
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
Provides: ant-junit = %{version}
|
||||
|
||||
%description -n ant-junit
|
||||
@ -417,7 +417,7 @@ Summary: Test utility classes for ant
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
Requires: junit4
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
Provides: ant-testutil = %{version}
|
||||
|
||||
%description -n ant-testutil
|
||||
@ -475,7 +475,7 @@ rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java
|
||||
src/tests/junit/org/apache/tools/mail/MailMessageTest.java
|
||||
|
||||
#FIXME: need newer junit4 package
|
||||
rm src/tests/junit/org/example/junit/JUnit4Skippable.java
|
||||
#rm src/tests/junit/org/example/junit/JUnit4Skippable.java
|
||||
|
||||
#install jars
|
||||
%if ! %bootstrap
|
||||
@ -588,6 +588,8 @@ cp -p src/etc/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}
|
||||
# install everything else
|
||||
mkdir -p %{buildroot}%{_bindir}
|
||||
cp -p src/script/* %{buildroot}%{_bindir}/
|
||||
mkdir -p %{buildroot}%{_datadir}/%{name}/bin/
|
||||
ln -sf %{_bindir}/antRun %{buildroot}/%{_datadir}/%{name}/bin/antRun
|
||||
%endif
|
||||
%if %bootstrap
|
||||
# default ant.conf
|
||||
@ -657,6 +659,7 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
|
||||
%dir %{_javadir}/%{name}
|
||||
%dir %{ant_home}
|
||||
%dir %{ant_home}/etc
|
||||
%{ant_home}/bin
|
||||
%{ant_home}/etc/ant-update.xsl
|
||||
%{ant_home}/etc/changelog.xsl
|
||||
%{ant_home}/etc/coverage-frames.xsl
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 4 14:58:13 UTC 2013 - mvyskocil@suse.com
|
||||
|
||||
- use requires_eq instead of manual call of rpm -q
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 2 09:52:33 UTC 2013 - mvyskocil@suse.com
|
||||
|
||||
|
||||
34
ant.spec
34
ant.spec
@ -91,7 +91,7 @@ Provides: ant-trax = %{version}
|
||||
%else
|
||||
# ant-antlr requires
|
||||
Requires: antlr
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
Provides: ant-antlr = %{version}-%{release}
|
||||
%endif
|
||||
BuildArch: noarch
|
||||
@ -191,7 +191,7 @@ Summary: Optional apache bsf tasks for ant
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
Requires: bsf
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
BuildRequires: bsf
|
||||
Provides: ant-apache-bsf = %{version}-%{release}
|
||||
|
||||
@ -207,7 +207,7 @@ Summary: Optional apache resolver tasks for ant
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
Requires: xml-commons-resolver
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
BuildRequires: xml-commons-resolver
|
||||
Provides: ant-apache-resolver = %{version}-%{release}
|
||||
|
||||
@ -223,7 +223,7 @@ Summary: Optional commons logging tasks for ant
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
Requires: jakarta-commons-logging
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
BuildRequires: jakarta-commons-logging
|
||||
Provides: ant-commons-logging = %{version}-%{release}
|
||||
|
||||
@ -239,7 +239,7 @@ Summary: Optional commons net tasks for ant
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
Requires: jakarta-commons-net
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
BuildRequires: jakarta-commons-net
|
||||
Provides: ant-commons-net = %{version}-%{release}
|
||||
|
||||
@ -259,7 +259,7 @@ Summary: Optional jai tasks for ant
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
Requires: jai
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
BuildRequires: jai
|
||||
Provides: ant-jai = %{version}-%{release}
|
||||
|
||||
@ -272,7 +272,7 @@ Summary: Optional apache bcel tasks for ant
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
Requires: bcel
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
BuildRequires: bcel
|
||||
Provides: ant-apache-bcel = %{version}
|
||||
Provides: ant-jakarta-bcel = %{version}
|
||||
@ -290,7 +290,7 @@ Summary: Optional apache log4j tasks for ant
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
Requires: log4j
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
BuildRequires: log4j-mini
|
||||
Provides: ant-apache-log4j = %{version}
|
||||
Provides: ant-jakarta-log4j = %{version}
|
||||
@ -308,7 +308,7 @@ Summary: Optional apache oro tasks for ant
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
Requires: oro
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
BuildRequires: oro
|
||||
Provides: ant-apache-oro = %{version}
|
||||
Provides: ant-jakarta-oro = %{version}
|
||||
@ -326,7 +326,7 @@ Summary: Optional apache regexp tasks for ant
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
Requires: regexp
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
BuildRequires: regexp
|
||||
Provides: ant-apache-regexp = %{version}
|
||||
Provides: ant-jakarta-regexp = %{version}
|
||||
@ -343,7 +343,7 @@ License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
BuildRequires: regexp
|
||||
Requires: regexp
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
Provides: ant-apache-xalan2 = %{version}
|
||||
|
||||
%description -n ant-apache-xalan2
|
||||
@ -356,7 +356,7 @@ License: CDDL-1.0
|
||||
Group: Development/Tools/Building
|
||||
BuildRequires: javamail >= 1.2-5jpp
|
||||
Requires: javamail >= 1.2-5jpp
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
Provides: ant-javamail = %{version}
|
||||
|
||||
%description -n ant-javamail
|
||||
@ -371,7 +371,7 @@ Summary: Optional jdepend tasks for ant
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
Requires: jdepend
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
BuildRequires: jdepend
|
||||
Provides: ant-jdepend = %{version}
|
||||
|
||||
@ -387,7 +387,7 @@ Summary: Optional jsch tasks for ant
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
Requires: jsch
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
BuildRequires: jsch
|
||||
Provides: ant-jsch = %{version}
|
||||
|
||||
@ -403,7 +403,7 @@ Summary: Optional junit tasks for ant
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
Requires: junit4
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
Provides: ant-junit = %{version}
|
||||
|
||||
%description -n ant-junit
|
||||
@ -416,7 +416,7 @@ Summary: Test utility classes for ant
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools/Building
|
||||
Requires: junit4
|
||||
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
|
||||
%requires_eq ant
|
||||
Provides: ant-testutil = %{version}
|
||||
|
||||
%description -n ant-testutil
|
||||
@ -474,7 +474,7 @@ rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java
|
||||
src/tests/junit/org/apache/tools/mail/MailMessageTest.java
|
||||
|
||||
#FIXME: need newer junit4 package
|
||||
rm src/tests/junit/org/example/junit/JUnit4Skippable.java
|
||||
#rm src/tests/junit/org/example/junit/JUnit4Skippable.java
|
||||
|
||||
#install jars
|
||||
%if ! %bootstrap
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user