[Bug 915437] New: bootstrap has installed but unpackaged files
by Red Hat Bugzilla
Product: Fedora
https://bugzilla.redhat.com/show_bug.cgi?id=915437
Bug ID: 915437
Summary: bootstrap has installed but unpackaged files
Product: Fedora
Version: rawhide
Component: ant
Severity: unspecified
Priority: unspecified
Reporter: gregswift(a)gmail.com
Created attachment 702472
--> https://bugzilla.redhat.com/attachment.cgi?id=702472&action=edit
Patch that clens out unpackaged files.
Description of problem:
Went to use spec to build ANT for RHEL and when I ran through the build in
bootstrap mode it found a bunch of files that were installed but unpackaged.
These files belong to the subpackages that are conditionally excluded during
bootstrap. I updated the bootstrap cleanup section of %install to remove the
files.
Version-Release number of selected component (if applicable):
1.8.4-6
How reproducible:
I'll concede I only tried in rhel6, not fedora.
Steps to Reproduce:
1. git clone http://pkgs.fedoraproject.org/cgit/ant.git/
2. move the spec and sources to appropriate directories in rpmbuild tree
3. rpmbuild --define 'with_bootstrap 1' ant.spec
Actual results:
error: Installed (but unpackaged) file(s) found:
/usr/share/ant/lib/ant-antlr.jar
/usr/share/ant/lib/ant-apache-bcel.jar
/usr/share/ant/lib/ant-apache-bsf.jar
/usr/share/ant/lib/ant-apache-log4j.jar
/usr/share/ant/lib/ant-apache-oro.jar
/usr/share/ant/lib/ant-apache-regexp.jar
/usr/share/ant/lib/ant-apache-resolver.jar
/usr/share/ant/lib/ant-apache-xalan2.jar
/usr/share/ant/lib/ant-commons-logging.jar
/usr/share/ant/lib/ant-commons-net.jar
/usr/share/ant/lib/ant-javamail.jar
/usr/share/ant/lib/ant-jdepend.jar
/usr/share/ant/lib/ant-jsch.jar
/usr/share/ant/lib/ant-junit4.jar
/usr/share/java/ant/ant-antlr.jar
/usr/share/java/ant/ant-apache-bcel.jar
/usr/share/java/ant/ant-apache-bsf.jar
/usr/share/java/ant/ant-apache-log4j.jar
/usr/share/java/ant/ant-apache-oro.jar
/usr/share/java/ant/ant-apache-regexp.jar
/usr/share/java/ant/ant-apache-resolver.jar
/usr/share/java/ant/ant-apache-xalan2.jar
/usr/share/java/ant/ant-commons-logging.jar
/usr/share/java/ant/ant-commons-net.jar
/usr/share/java/ant/ant-javamail.jar
/usr/share/java/ant/ant-jdepend.jar
/usr/share/java/ant/ant-jsch.jar
/usr/share/java/ant/ant-junit4.jar
RPM build errors:
Installed (but unpackaged) file(s) found:
/usr/share/ant/lib/ant-antlr.jar
/usr/share/ant/lib/ant-apache-bcel.jar
/usr/share/ant/lib/ant-apache-bsf.jar
/usr/share/ant/lib/ant-apache-log4j.jar
/usr/share/ant/lib/ant-apache-oro.jar
/usr/share/ant/lib/ant-apache-regexp.jar
/usr/share/ant/lib/ant-apache-resolver.jar
/usr/share/ant/lib/ant-apache-xalan2.jar
/usr/share/ant/lib/ant-commons-logging.jar
/usr/share/ant/lib/ant-commons-net.jar
/usr/share/ant/lib/ant-javamail.jar
/usr/share/ant/lib/ant-jdepend.jar
/usr/share/ant/lib/ant-jsch.jar
/usr/share/ant/lib/ant-junit4.jar
/usr/share/java/ant/ant-antlr.jar
/usr/share/java/ant/ant-apache-bcel.jar
/usr/share/java/ant/ant-apache-bsf.jar
/usr/share/java/ant/ant-apache-log4j.jar
/usr/share/java/ant/ant-apache-oro.jar
/usr/share/java/ant/ant-apache-regexp.jar
/usr/share/java/ant/ant-apache-resolver.jar
/usr/share/java/ant/ant-apache-xalan2.jar
/usr/share/java/ant/ant-commons-logging.jar
/usr/share/java/ant/ant-commons-net.jar
/usr/share/java/ant/ant-javamail.jar
/usr/share/java/ant/ant-jdepend.jar
/usr/share/java/ant/ant-jsch.jar
/usr/share/java/ant/ant-junit4.jar
Expected results:
Checking for unpackaged file(s): /usr/lib/rpm/check-files
/home/greg5320/rpmbuild/BUILDROOT/ant-1.8.4-7.el6.x86_64
Wrote: /home/greg5320/rpmbuild/SRPMS/ant-1.8.4-7.el6.src.rpm
Wrote: /home/greg5320/rpmbuild/RPMS/noarch/ant-1.8.4-7.el6.noarch.rpm
Wrote: /home/greg5320/rpmbuild/RPMS/noarch/ant-jmf-1.8.4-7.el6.noarch.rpm
Wrote: /home/greg5320/rpmbuild/RPMS/noarch/ant-swing-1.8.4-7.el6.noarch.rpm
Wrote: /home/greg5320/rpmbuild/RPMS/noarch/ant-antlr-1.8.4-7.el6.noarch.rpm
Wrote:
/home/greg5320/rpmbuild/RPMS/noarch/ant-apache-bsf-1.8.4-7.el6.noarch.rpm
Wrote:
/home/greg5320/rpmbuild/RPMS/noarch/ant-apache-resolver-1.8.4-7.el6.noarch.rpm
Wrote:
/home/greg5320/rpmbuild/RPMS/noarch/ant-commons-logging-1.8.4-7.el6.noarch.rpm
Wrote:
/home/greg5320/rpmbuild/RPMS/noarch/ant-commons-net-1.8.4-7.el6.noarch.rpm
Wrote:
/home/greg5320/rpmbuild/RPMS/noarch/ant-apache-bcel-1.8.4-7.el6.noarch.rpm
Wrote:
/home/greg5320/rpmbuild/RPMS/noarch/ant-apache-log4j-1.8.4-7.el6.noarch.rpm
Wrote:
/home/greg5320/rpmbuild/RPMS/noarch/ant-apache-oro-1.8.4-7.el6.noarch.rpm
Wrote:
/home/greg5320/rpmbuild/RPMS/noarch/ant-apache-regexp-1.8.4-7.el6.noarch.rpm
Wrote:
/home/greg5320/rpmbuild/RPMS/noarch/ant-apache-xalan2-1.8.4-7.el6.noarch.rpm
Wrote: /home/greg5320/rpmbuild/RPMS/noarch/ant-javamail-1.8.4-7.el6.noarch.rpm
Wrote: /home/greg5320/rpmbuild/RPMS/noarch/ant-jdepend-1.8.4-7.el6.noarch.rpm
Wrote: /home/greg5320/rpmbuild/RPMS/noarch/ant-jsch-1.8.4-7.el6.noarch.rpm
Wrote: /home/greg5320/rpmbuild/RPMS/noarch/ant-junit-1.8.4-7.el6.noarch.rpm
Wrote: /home/greg5320/rpmbuild/RPMS/noarch/ant-testutil-1.8.4-7.el6.noarch.rpm
Wrote: /home/greg5320/rpmbuild/RPMS/noarch/ant-scripts-1.8.4-7.el6.noarch.rpm
Wrote: /home/greg5320/rpmbuild/RPMS/noarch/ant-manual-1.8.4-7.el6.noarch.rpm
Wrote: /home/greg5320/rpmbuild/RPMS/noarch/ant-javadoc-1.8.4-7.el6.noarch.rpm
Executing(%clean): /bin/sh -e /var/tmp/rpm-tmp.s26iaq
+ umask 022
+ cd /home/greg5320/rpmbuild/BUILD
+ cd apache-ant-1.8.4
+ /bin/rm -rf /home/greg5320/rpmbuild/BUILDROOT/ant-1.8.4-7.el6.x86_64
+ exit 0
Additional info:
patch to fix attached
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=Chd94bBkxD&a=cc_unsubscribe
10 years, 9 months
[Bug 798975] New: Please merge ant-scripts into the main package
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: Please merge ant-scripts into the main package
https://bugzilla.redhat.com/show_bug.cgi?id=798975
Summary: Please merge ant-scripts into the main package
Product: Fedora
Version: rawhide
Platform: Unspecified
OS/Version: Unspecified
Status: NEW
Severity: unspecified
Priority: unspecified
Component: ant
AssignedTo: jcapik(a)redhat.com
ReportedBy: akurtako(a)redhat.com
QAContact: extras-qa(a)fedoraproject.org
CC: akurtako(a)redhat.com, mmatejov(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org,
jcapik(a)redhat.com
Classification: Fedora
Story Points: ---
Type: ---
Regression: ---
Mount Type: ---
Documentation: ---
By doing that we will have bash autocomplete enabled by default when someone
installs ant and one less subpackage to care about.
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
10 years, 9 months
[ant] Merge scripts into main package
by Mikolaj Izdebski
commit 0db65d2949e8eeebd95e9a4be0868f76b5b4ef67
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Jul 2 10:40:03 2013 +0200
Merge scripts into main package
ant.spec | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index 8670afe..2150abe 100644
--- a/ant.spec
+++ b/ant.spec
@@ -58,6 +58,11 @@ BuildRequires: xalan-j2
Requires: jpackage-utils >= 0:1.7.5
Requires: java-devel >= 0:1.5.0
+Requires: perl
+Requires: python
+
+Obsoletes: %{name}-scripts < %{epoch}:%{version}-%{release}
+Provides: %{name}-scripts = %{epoch}:%{version}-%{release}
BuildArch: noarch
@@ -287,19 +292,6 @@ Requires: junit
%description testutil
Test utility tasks for %{name}.
-%package scripts
-Summary: Additional scripts for %{name}
-AutoReqProv: no
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: %{_bindir}/perl
-Requires: %{_bindir}/python
-
-%description scripts
-Additional Perl and Python scripts for %{name}.
-
-%description scripts -l fr
-Scripts additionels pour %{name}.
-
%package manual
Summary: Manual for %{name}
@@ -461,6 +453,8 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}.conf
%attr(0755,root,root) %{_bindir}/ant
%attr(0755,root,root) %{_bindir}/antRun
+%attr(0755,root,root) %{_bindir}/*.pl
+%attr(0755,root,root) %{_bindir}/*.py*
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-launcher.jar
%{_javadir}/%{name}-bootstrap.jar
@@ -589,10 +583,6 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{ant_home}/lib/%{name}-testutil.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/testutil
-%files scripts
-%attr(0755,root,root) %{_bindir}/*.pl
-%attr(0755,root,root) %{_bindir}/*.py*
-
%files manual
%doc LICENSE NOTICE
%doc manual/*
@@ -617,6 +607,7 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
- Remove bootstrap code, resolves: rhbz#915437
- Fail the build if any of JARs is empty
- Skip running tests that fail on Koji, resolves: rhbz#979496
+- Merge scripts into main package, resolves: rhbz#798975
* Mon Jun 03 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.9.1-2
- Enable unit tests
10 years, 9 months
[ant] Skip running some tests that fail on Koji
by Mikolaj Izdebski
commit 6d776f19cc1ef0d68656ac7c4ee707d0d8dc7189
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Jul 2 09:28:59 2013 +0200
Skip running some tests that fail on Koji
ant.spec | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index 4c862d4..8670afe 100644
--- a/ant.spec
+++ b/ant.spec
@@ -339,7 +339,9 @@ find . -name "*.jar" | %{_bindir}/xargs -t rm
# failing testcases. TODO see why
rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java \
src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsFileSelectedTest.java \
- src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsSignedTest.java
+ src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsSignedTest.java \
+ src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java \
+ src/tests/junit/org/apache/tools/mail/MailMessageTest.java
#install jars
build-jar-repository -s -p lib/optional antlr bcel javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer
@@ -610,10 +612,11 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
- Remove Group tags
- Update to current packaging guidelines
- Run tests in %%check instead of %%build
-- Remove dependencies on xerces-j2 and xml-commons-apis
+- Remove dependencies on xerces-j2 and xml-commons-apis, resolves: rhbz#838711
- Convert %%global build_javadoc to conditional
-- Remove bootstrap code
+- Remove bootstrap code, resolves: rhbz#915437
- Fail the build if any of JARs is empty
+- Skip running tests that fail on Koji, resolves: rhbz#979496
* Mon Jun 03 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.9.1-2
- Enable unit tests
10 years, 9 months
[ant] Fail the build if any of JARs is empty
by Mikolaj Izdebski
commit e4027657772f607c480a0419b280e15f3c8caaef
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Jul 2 08:52:26 2013 +0200
Fail the build if any of JARs is empty
ant.spec | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index 51e4c92..4c862d4 100644
--- a/ant.spec
+++ b/ant.spec
@@ -372,6 +372,9 @@ install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
for jar in build/lib/*.jar
do
+ # Make sure that installed JARs are not empty
+ jar tf ${jar} | egrep -q *.class
+
jarname=$(basename $jar .jar)
pomname="JPP.%{name}-${jarname}.pom"
@@ -610,6 +613,7 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
- Remove dependencies on xerces-j2 and xml-commons-apis
- Convert %%global build_javadoc to conditional
- Remove bootstrap code
+- Fail the build if any of JARs is empty
* Mon Jun 03 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.9.1-2
- Enable unit tests
10 years, 9 months
[ant] Remove bootstrap code
by Mikolaj Izdebski
commit a0d3b1e9e6e661006617a93e5e360c9d6e6ca31e
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Jul 2 08:38:43 2013 +0200
Remove bootstrap code
ant.spec | 79 +----------------------------------------
apache-ant-no-test-jar.patch | 11 ------
2 files changed, 2 insertions(+), 88 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index f3ced10..51e4c92 100644
--- a/ant.spec
+++ b/ant.spec
@@ -28,20 +28,10 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%bcond_with bootstrap
-
-%if %with bootstrap
-%bcond_with tests
-%bcond_with javadoc
-%else
%bcond_without tests
%bcond_without javadoc
-%endif
-
-%global with_manifest_only 0
%global ant_home %{_datadir}/ant
-
%global major_version 1.8
Name: ant
@@ -57,17 +47,14 @@ Source0: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.
Source2: apache-ant-%{major_version}.ant.conf
# Fix some places where copies of classes are included in the wrong jarfiles
-Patch3: apache-ant-no-test-jar.patch
Patch4: apache-ant-class-path-in-manifest.patch
BuildRequires: jpackage-utils >= 0:1.7.5
BuildRequires: java-devel >= 0:1.5.0
-%if %without bootstrap
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: junit
BuildRequires: xalan-j2
-%endif
Requires: jpackage-utils >= 0:1.7.5
Requires: java-devel >= 0:1.5.0
@@ -108,24 +95,6 @@ Optional swing tasks for %{name}.
%description swing -l fr
Taches swing optionelles pour %{name}.
-%if %without bootstrap
-%if %{with_manifest_only}
-%package manifest-only
-Summary: Manifest-only jars for %{name}
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Provides: %{name}-icontract = %{epoch}:%{version}-%{release}
-Provides: %{name}-netrexx = %{epoch}:%{version}-%{release}
-Provides: %{name}-starteam = %{epoch}:%{version}-%{release}
-Provides: %{name}-stylebook = %{epoch}:%{version}-%{release}
-Provides: %{name}-vaj = %{epoch}:%{version}-%{release}
-Provides: %{name}-weblogic = %{epoch}:%{version}-%{release}
-Provides: %{name}-xalan1 = %{epoch}:%{version}-%{release}
-Provides: %{name}-xslp = %{epoch}:%{version}-%{release}
-
-%description manifest-only
-Manifest-only jars for %{name}.
-%endif
-
%package antlr
Summary: Optional antlr tasks for %{name}
Requires: %{name} = %{epoch}:%{version}-%{release}
@@ -351,7 +320,6 @@ Javadoc for %{name}.
%description javadoc -l fr
Javadoc pour %{name}.
-%endif
# -----------------------------------------------------------------------------
@@ -362,9 +330,6 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
sed -i "s/ jaxp_parser_impl xml-commons-apis//" src/script/ant
-# When bootstrapping, we don't have junit
-%patch3
-
# Fix class-path-in-manifest rpmlint warning
%patch4
@@ -377,9 +342,7 @@ rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java
src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsSignedTest.java
#install jars
-%if %without bootstrap
build-jar-repository -s -p lib/optional antlr bcel javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer
-%endif
# Fix file-not-utf8 rpmlint warning
iconv KEYS -f iso-8859-1 -t utf-8 -o KEYS.utf8
@@ -388,17 +351,12 @@ iconv LICENSE -f iso-8859-1 -t utf-8 -o LICENSE.utf8
mv LICENSE.utf8 LICENSE
%build
-%if %without bootstrap
%{ant} jars test-jar
+
%if %with javadoc
export CLASSPATH=$(build-classpath antlr bcel javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver)
%{ant} javadocs
%endif
-%else
-export JAVA_HOME=%{java_home}
-export CLASSPATH=$JAVA_HOME/lib/tools.jar
-sh ./build.sh --noconfig jars
-%endif
#remove empty jai and netrexx jars. Due to missing dependencies they contain only manifests.
rm -fr build/lib/ant-jai.jar build/lib/ant-netrexx.jar
@@ -451,11 +409,7 @@ cp -p src/etc/*.xsl $RPM_BUILD_ROOT%{ant_home}/etc
# install everything else
mkdir -p $RPM_BUILD_ROOT%{_bindir}
-%if %without bootstrap
cp -p src/script/* $RPM_BUILD_ROOT%{_bindir}
-%else
-cp -p src/script/ant{,Run} $RPM_BUILD_ROOT%{_bindir}
-%endif
# default ant.conf
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
@@ -465,7 +419,6 @@ cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d
echo "ant/ant-jmf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jmf
echo "ant/ant-swing" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/swing
-%if %without bootstrap
echo "antlr ant/ant-antlr" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/antlr
echo "bsf ant/ant-apache-bsf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-bsf
echo "xml-commons-resolver ant/ant-apache-resolver" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-resolver
@@ -483,7 +436,6 @@ echo "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jsch
echo "junit ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit
echo "junit ant/ant-junit4" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit4
echo "testutil ant/ant-testutil" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/testutil
-%endif
%if %with javadoc
# javadoc
@@ -494,18 +446,6 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# fix link between manual and javadoc
(cd manual; ln -sf %{_javadocdir}/%{name} api)
-%if %with bootstrap
-find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
- -a ! -name ant-update.xsl \
- -a ! -name changelog.xsl \
- -a ! -name coverage-frames.xsl \
- -a ! -name junit-frames-xalan1.xsl \
- -a ! -name log.xsl \
- -a ! -name mmetrics-frames.xsl \
- -a ! -name tagdiff.xsl \
- | xargs -t rm
-%endif
-
%if %with tests
%check
%{ant} test
@@ -532,10 +472,8 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
%{ant_home}/etc/log.xsl
%{ant_home}/etc/tagdiff.xsl
%{ant_home}/etc/junit-frames-xalan1.xsl
-%if %without bootstrap
%{ant_home}/etc/common2master.xsl
%{ant_home}/etc/printFailingTests.xsl
-%endif
%dir %{ant_home}/lib
%{ant_home}/lib/%{name}.jar
%{ant_home}/lib/%{name}-launcher.jar
@@ -554,19 +492,6 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
%{ant_home}/lib/%{name}-swing.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/swing
-%if %without bootstrap
-%if %{with_manifest_only}
-%files manifest-only
-%{_javadir}/%{name}/ant-icontract.jar
-%{_javadir}/%{name}/ant-netrexx.jar
-%{_javadir}/%{name}/ant-starteam.jar
-%{_javadir}/%{name}/ant-stylebook.jar
-%{_javadir}/%{name}/ant-vaj.jar
-%{_javadir}/%{name}/ant-weblogic.jar
-%{_javadir}/%{name}/ant-xalan1.jar
-%{_javadir}/%{name}/ant-xslp.jar
-%endif
-
%files antlr
%{_javadir}/%{name}/%{name}-antlr.jar
%{ant_home}/lib/%{name}-antlr.jar
@@ -672,7 +597,6 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
%doc LICENSE NOTICE
%{_javadocdir}/%{name}
%endif
-%endif
# -----------------------------------------------------------------------------
@@ -685,6 +609,7 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
- Run tests in %%check instead of %%build
- Remove dependencies on xerces-j2 and xml-commons-apis
- Convert %%global build_javadoc to conditional
+- Remove bootstrap code
* Mon Jun 03 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.9.1-2
- Enable unit tests
10 years, 9 months
[ant] Fix bootstrap build
by Mikolaj Izdebski
commit 397502e00df72f899152a4014326184c478d2083
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Jul 2 08:22:58 2013 +0200
Fix bootstrap build
ant.spec | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index b060aa7..f3ced10 100644
--- a/ant.spec
+++ b/ant.spec
@@ -29,11 +29,12 @@
#
%bcond_with bootstrap
-%bcond_without tests
%if %with bootstrap
+%bcond_with tests
%bcond_with javadoc
%else
+%bcond_without tests
%bcond_without javadoc
%endif
@@ -416,11 +417,6 @@ do
jarname=$(basename $jar .jar)
pomname="JPP.%{name}-${jarname}.pom"
-%if %with bootstrap
- #Bootstracp builds an incomplete ant-junit, don't ship it
- [ $jarname == ant-bootstrap ] && continue
-%endif
-
#instal jar
install -m 644 ${jar} $RPM_BUILD_ROOT%{_javadir}/%{name}/${jarname}.jar
# jar aliases
10 years, 9 months
[ant] Convert %global build_javadoc to conditional
by Mikolaj Izdebski
commit 50e1f9ed5ebdbf6a77c03017a10eece2ef349db8
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Jul 2 07:48:53 2013 +0200
Convert %global build_javadoc to conditional
ant.spec | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index b12d8d0..b060aa7 100644
--- a/ant.spec
+++ b/ant.spec
@@ -32,9 +32,9 @@
%bcond_without tests
%if %with bootstrap
-%global build_javadoc 0
+%bcond_with javadoc
%else
-%global build_javadoc 1
+%bcond_without javadoc
%endif
%global with_manifest_only 0
@@ -389,7 +389,7 @@ mv LICENSE.utf8 LICENSE
%build
%if %without bootstrap
%{ant} jars test-jar
-%if %{build_javadoc}
+%if %with javadoc
export CLASSPATH=$(build-classpath antlr bcel javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver)
%{ant} javadocs
%endif
@@ -489,7 +489,7 @@ echo "junit ant/ant-junit4" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit4
echo "testutil ant/ant-testutil" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/testutil
%endif
-%if %{build_javadoc}
+%if %with javadoc
# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -671,7 +671,7 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
%doc LICENSE NOTICE
%doc manual/*
-%if %{build_javadoc}
+%if %with javadoc
%files javadoc
%doc LICENSE NOTICE
%{_javadocdir}/%{name}
@@ -688,6 +688,7 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
- Update to current packaging guidelines
- Run tests in %%check instead of %%build
- Remove dependencies on xerces-j2 and xml-commons-apis
+- Convert %%global build_javadoc to conditional
* Mon Jun 03 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.9.1-2
- Enable unit tests
10 years, 9 months
[ant] Remove dependencies on xerces-j2 and xml-commons-apis
by Mikolaj Izdebski
commit c7830d9ec12b450d55cf3f94ca7522f7299c95d3
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Jul 2 07:45:39 2013 +0200
Remove dependencies on xerces-j2 and xml-commons-apis
ant.spec | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index c2ef6b6..b12d8d0 100644
--- a/ant.spec
+++ b/ant.spec
@@ -66,14 +66,10 @@ BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: junit
BuildRequires: xalan-j2
-BuildRequires: xerces-j2
%endif
Requires: jpackage-utils >= 0:1.7.5
Requires: java-devel >= 0:1.5.0
-%if %without bootstrap
-Requires: xerces-j2
-%endif
BuildArch: noarch
@@ -363,6 +359,8 @@ Javadoc pour %{name}.
#Fixup version
find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
+sed -i "s/ jaxp_parser_impl xml-commons-apis//" src/script/ant
+
# When bootstrapping, we don't have junit
%patch3
@@ -379,7 +377,7 @@ rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java
#install jars
%if %without bootstrap
-build-jar-repository -s -p lib/optional xerces-j2 antlr bcel javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xml-commons-apis xalan-j2-serializer
+build-jar-repository -s -p lib/optional antlr bcel javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer
%endif
# Fix file-not-utf8 rpmlint warning
@@ -392,7 +390,7 @@ mv LICENSE.utf8 LICENSE
%if %without bootstrap
%{ant} jars test-jar
%if %{build_javadoc}
-export CLASSPATH=$(build-classpath xerces-j2 antlr bcel javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver)
+export CLASSPATH=$(build-classpath antlr bcel javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver)
%{ant} javadocs
%endif
%else
@@ -689,6 +687,7 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
- Remove Group tags
- Update to current packaging guidelines
- Run tests in %%check instead of %%build
+- Remove dependencies on xerces-j2 and xml-commons-apis
* Mon Jun 03 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.9.1-2
- Enable unit tests
10 years, 9 months