[apache-commons-collections] saxon dependency removed - not needed minor spec file changes according to the latest guidelines
by Jaromír Cápík
commit 4b15a53e945205dbf24ef17513eea0912912f4af
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Wed Feb 8 16:36:23 2012 +0100
saxon dependency removed - not needed
minor spec file changes according to the latest guidelines
apache-commons-collections.spec | 46 +++++++++++++++++---------------------
1 files changed, 21 insertions(+), 25 deletions(-)
---
diff --git a/apache-commons-collections.spec b/apache-commons-collections.spec
index 0ca2d57..f248b8b 100644
--- a/apache-commons-collections.spec
+++ b/apache-commons-collections.spec
@@ -3,7 +3,7 @@
Name: apache-%{short_name}
Version: 3.2.1
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Provides new interfaces, implementations and utilities for Java Collections
License: ASL 2.0
Group: Development/Libraries
@@ -31,13 +31,9 @@ BuildRequires: maven-plugin-bundle
BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: ant
-BuildRequires: saxon
-BuildRequires: saxon-scripts
BuildRequires: apache-commons-parent
Requires: java
Requires: jpackage-utils
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
Provides: jakarta-%{short_name} = %{version}-%{release}
Obsoletes: jakarta-%{short_name} < %{version}-%{release}
@@ -112,18 +108,22 @@ mvn-rpmbuild install javadoc:aggregate
ant tf.javadoc
%install
+
# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
-%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
-install -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-install -m 644 target/%{short_name}-testframework-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-testframework.jar
+install -Dm 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -Dm 644 target/%{short_name}-testframework-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-testframework.jar
+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *; do ln -sf ${jar} `echo $jar| sed "s|apache-||g"`; done)
+
+
+# poms
+install -Dpm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
+
+
+# fragments
+%add_maven_depmap -a "org.apache.commons:%{short_name}" JPP-%{short_name}.pom %{short_name}.jar
%add_to_maven_depmap org.apache.commons %{short_name}-testframework %{version} JPP %{short_name}-testframework
%add_to_maven_depmap %{short_name} %{short_name}-testframework %{version} JPP %{short_name}-testframework
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *; do ln -sf ${jar} `echo $jar| sed "s|apache-||g"`; done)
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -131,42 +131,38 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
rm -rf target/site/apidocs
+
# testframework-javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework-%{version}
cp -pr build/docs/testframework/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework-%{version}
ln -s %{name}-testframework-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
-%defattr(-,root,root,-)
%doc PROPOSAL.html README.txt LICENSE.txt RELEASE-NOTES.html NOTICE.txt
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%{_mavenpomdir}/JPP-%{short_name}.pom
+%{_mavendepmapfragdir}/%{name}
%{_javadir}/%{name}.jar
%{_javadir}/%{short_name}.jar
%files testframework
-%defattr(-,root,root,-)
%{_javadir}/%{name}-testframework.jar
%{_javadir}/%{short_name}-testframework.jar
%files javadoc
-%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%files testframework-javadoc
-%defattr(-,root,root,-)
%{_javadocdir}/%{name}-testframework-%{version}
%{_javadocdir}/%{name}-testframework
+
%changelog
+* Wed Feb 08 2012 Jaromir Capik <jcapik(a)redhat.com> 3.2.1-13
+- saxon dependency removed - not needed
+- minor spec file changes according to the latest guidelines
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.2.1-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
12 years, 2 months
Broken dependencies: maven-scm
by Fedora Koji Build System
maven-scm has broken dependencies in the rawhide tree:
On x86_64:
maven-scm-1.5-4.fc17.noarch requires netbeans-cvsclient >= 0:6.9
On i386:
maven-scm-1.5-4.fc17.noarch requires netbeans-cvsclient >= 0:6.9
Please resolve this as soon as possible.
12 years, 2 months
[tomcat] Dropped indirect dependency to tomcat5.
by Krzysztof Daniel
commit 1daf3ea73cfc6b18d5c20214ce675da2b9b979e1
Author: Krzysztof Daniel <kdaniel(a)redhat.com>
Date: Wed Feb 8 12:01:47 2012 +0100
Dropped indirect dependency to tomcat5.
tomcat.spec | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/tomcat.spec b/tomcat.spec
index 78a979f..7353c68 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -54,7 +54,7 @@
Name: tomcat
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: System Environment/Daemons
@@ -98,7 +98,7 @@ BuildRequires: apache-commons-collections
BuildRequires: apache-commons-daemon
BuildRequires: apache-commons-dbcp
BuildRequires: apache-commons-pool
-BuildRequires: jakarta-taglibs-standard
+BuildRequires: jakarta-taglibs-standard >= 0:1.1.2-4
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils >= 0:1.7.0
BuildRequires: junit
@@ -227,7 +227,7 @@ Expression Language 1.0.
Group: Applications/Internet
Summary: The ROOT and examples web applications for Apache Tomcat
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: jakarta-taglibs-standard >= 0:1.1
+Requires: jakarta-taglibs-standard >= 0:1.1.2-4
%description webapps
The ROOT and examples web applications for Apache Tomcat.
@@ -648,6 +648,9 @@ fi
%attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
%changelog
+* Wed Feb 8 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 0:7.0.25-3
+- Dropped indirect dependecy to tomcat 5
+
* Sun Jan 22 2012 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.25-2
- Added hack for maven depmap of tomcat-juli absolute link [ -f ] pass correctly
12 years, 2 months
Removal of tomcat5 broke eclipse builds
by Krzysztof Daniel
Hello everyone,
I hope you do not mind me contacting you in that way.
My package (Eclipse) requires tomcat to be build. I discovered yesterday
that tomcat 6 and 7 cannot be built, because they indirectly depend on
tomcat5. To be more specific, they depend on jakarta-taglibs-standard,
which in turns depends on tomcat5.
There is a bug opened for this -
https://bugzilla.redhat.com/show_bug.cgi?id=788037.
Jakarta-taglibs-standard is used in tomcat in the sample application.
The problem is that jakarta-taglibs-standard was deprecated in 2009,
and, although not completely, merged into tomcat core (and the rest into
tomcat library/module/part), hence maintaining jakarta-taglibs-standard
seems to not have little sense.
What options do we have to proceed? I think about dropping
jakarta-taglibs-standard, but I am not able to asses what impact may it
have, what changes are required, and how widely it is used by the
community. Could you help me with that?
--
Krzysztof Daniel <kdaniel(a)redhat.com>
Red Hat
12 years, 2 months
[ant] Added patch
by tradej@fedoraproject.org
commit 47e6951153ec87fc1b85c48e5bc3c2c6cfeae154
Author: Tomas Radej <tradej(a)redhat.com>
Date: Tue Feb 7 17:39:39 2012 +0100
Added patch
ant-classpath-check.patch | 19 +++++++++++++++++++
ant.spec | 5 ++++-
2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/ant-classpath-check.patch b/ant-classpath-check.patch
new file mode 100644
index 0000000..6f55541
--- /dev/null
+++ b/ant-classpath-check.patch
@@ -0,0 +1,19 @@
+diff --git a/src/script/.ant.swp b/src/script/.ant.swp
+index 7962473..b214d30 100644
+Binary files a/src/script/.ant.swp and b/src/script/.ant.swp differ
+diff --git a/src/script/ant b/src/script/ant
+index 0dc84e0..11c1b59 100644
+--- a/src/script/ant
++++ b/src/script/ant
+@@ -176,10 +176,7 @@ if $rpm_mode && [ -x /usr/bin/build-classpath ] ; then
+ *.rpmnew) ;;
+ *)
+ for dep in `cat "$file"`; do
+- case "$OPT_JAR_LIST" in
+- *"$dep"*) ;;
+- *) OPT_JAR_LIST="$OPT_JAR_LIST${OPT_JAR_LIST:+ }$dep"
+- esac
++ OPT_JAR_LIST="$OPT_JAR_LIST${OPT_JAR_LIST:+ }$dep"
+ done
+ esac
+ fi
diff --git a/ant.spec b/ant.spec
index f76a640..7979332 100644
--- a/ant.spec
+++ b/ant.spec
@@ -50,7 +50,7 @@
Name: ant
Version: 1.8.2
-Release: 8%{?dist}
+Release: 9%{?dist}
Epoch: 0
Summary: Build tool for java
Summary(it): Tool per la compilazione di programmi java
@@ -767,6 +767,9 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
# -----------------------------------------------------------------------------
%changelog
+* Tue Feb 07 2012 Tomas Radej <tradej(a)redhat.com> - 0:1.8.2-9
+- Added patch
+
* Tue Feb 07 2012 Tomas Radej <tradej(a)redhat.com> - 0:1.8.2-8
- Removed checking for classpath duplicates
- Added ant-junit4.jar into %files and ant.d
12 years, 2 months
[ant] Removed checking for classpath duplicates + ant-junit4.jar integration
by tradej@fedoraproject.org
commit ed545c2a6085fdcac0056c5903087518799cbaf0
Author: Tomas Radej <tradej(a)redhat.com>
Date: Thu Feb 2 16:44:23 2012 +0100
Removed checking for classpath duplicates + ant-junit4.jar integration
ant.spec | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index 504a2ad..f76a640 100644
--- a/ant.spec
+++ b/ant.spec
@@ -50,7 +50,7 @@
Name: ant
Version: 1.8.2
-Release: 7%{?dist}
+Release: 8%{?dist}
Epoch: 0
Summary: Build tool for java
Summary(it): Tool per la compilazione di programmi java
@@ -65,6 +65,7 @@ Source2: apache-ant-%{major_version}.ant.conf
Patch1: apache-ant-bz163689.patch
Patch3: apache-ant-no-test-jar.patch
Patch4: apache-ant-class-path-in-manifest.patch
+Patch5: %{name}-classpath-check.patch
BuildRequires: jpackage-utils >= 0:1.7.5
BuildRequires: java-devel >= 0:1.5.0
@@ -442,6 +443,10 @@ sed -i -e "s|IMAGE_FILE_TYPE|BINARY_FILE_TYPE|g" src/main/org/apache/tools/ant/t
# Fix class-path-in-manifest rpmlint warning
%patch4
+# Removed checking for classpath duplicates (cause for BZ #755325)
+# Accepted in upstream, release pending
+%patch5 -p1
+
# clean jar files
find . -name "*.jar" | %{_bindir}/xargs -t rm
@@ -576,6 +581,7 @@ echo "javamail jaf ant/ant-javamail" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/j
echo "jdepend ant/ant-jdepend" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jdepend
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
@@ -732,8 +738,11 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
%files junit
%{_javadir}/%{name}/%{name}-junit.jar
+%{_javadir}/%{name}/%{name}-junit4.jar
%{ant_home}/lib/%{name}-junit.jar
+%{ant_home}/lib/%{name}-junit4.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/junit
+%config(noreplace) %{_sysconfdir}/%{name}.d/junit4
%{ant_home}/etc/junit-frames.xsl
%{ant_home}/etc/junit-noframes.xsl
@@ -758,6 +767,10 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
# -----------------------------------------------------------------------------
%changelog
+* Tue Feb 07 2012 Tomas Radej <tradej(a)redhat.com> - 0:1.8.2-8
+- Removed checking for classpath duplicates
+- Added ant-junit4.jar into %files and ant.d
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:1.8.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
12 years, 2 months
Broken dependencies: maven-scm
by Fedora Koji Build System
maven-scm has broken dependencies in the rawhide tree:
On x86_64:
maven-scm-1.5-4.fc17.noarch requires netbeans-cvsclient >= 0:6.9
On i386:
maven-scm-1.5-4.fc17.noarch requires netbeans-cvsclient >= 0:6.9
Please resolve this as soon as possible.
12 years, 2 months
[junit4] Retire junit4 due to lack of a maintainer.
by Bill Nottingham
commit 5cf6f7a61accd19b56ce799e6b6507f1ad84d409
Author: Bill Nottingham <notting(a)redhat.com>
Date: Mon Feb 6 14:43:26 2012 -0500
Retire junit4 due to lack of a maintainer.
dead.package | 1 +
junit4.spec | 266 ----------------------------------------------------------
sources | 2 -
3 files changed, 1 insertions(+), 268 deletions(-)
---
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..b8c7442
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+This package was retired on 2012-02-06 due to lack of a maintainer.
12 years, 2 months
Broken dependencies: junit4
by Fedora Koji Build System
junit4 has broken dependencies in the rawhide tree:
On x86_64:
junit4-4.8.2-2.fc15.noarch requires java-1.6.0
On i386:
junit4-4.8.2-2.fc15.noarch requires java-1.6.0
Please resolve this as soon as possible.
12 years, 2 months