Broken dependencies: joda-time
by Fedora Koji Build System
joda-time has broken dependencies in the epel-6 tree:
On ppc64:
joda-time-1.6-3.tzdata2008i.el6.noarch requires java > 0:1.5.0
Please resolve this as soon as possible.
13 years, 3 months
[maven-surefire] Update to 2.7.1.
by Alexander Kurtakov
commit 5ceba67eed6d33984b665b1c427f708d2c192ef9
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Dec 29 23:55:55 2010 +0200
Update to 2.7.1.
.gitignore | 1 +
0002-Fix-failsafe-plugin-dependency-version.patch | 22 +------
maven-surefire.spec | 63 +++++++-------------
sources | 2 +-
4 files changed, 28 insertions(+), 60 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 370370a..9bd27c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ maven-surefire-1.5.3.tar.gz
maven-surefire-booter-1.5.3.tar.gz
maven-surefire-2.3-src.tar.gz
/maven-surefire-2.6-src.tar.xz
+surefire-2.7.1-source-release.zip
diff --git a/0002-Fix-failsafe-plugin-dependency-version.patch b/0002-Fix-failsafe-plugin-dependency-version.patch
index 175c545..0ee9248 100644
--- a/0002-Fix-failsafe-plugin-dependency-version.patch
+++ b/0002-Fix-failsafe-plugin-dependency-version.patch
@@ -1,25 +1,11 @@
-From 7b09e4dc7828c0be5d87c90510a91c6aaba44067 Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
-Date: Tue, 24 Aug 2010 13:37:37 +0200
-Subject: [PATCH 2/2] Fix failsafe-plugin dependency version
-
----
- surefire-integration-tests/pom.xml | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/surefire-integration-tests/pom.xml b/surefire-integration-tests/pom.xml
-index 0029fed..f3f0364 100644
---- a/surefire-integration-tests/pom.xml
-+++ b/surefire-integration-tests/pom.xml
-@@ -153,7 +153,7 @@
+--- surefire-integration-tests/pom.xml.sav 2010-12-23 00:27:02.000000000 +0200
++++ surefire-integration-tests/pom.xml 2010-12-29 23:41:18.701266133 +0200
+@@ -173,7 +173,7 @@
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
-- <version>2.5</version>
+- <version>2.7</version>
+ <version>${project.version}</version>
<configuration>
<!-- Pass current surefire version to the main suite so that it -->
<!-- can forward to all integration test projects. SUREFIRE-513 -->
---
-1.7.2.1
-
diff --git a/maven-surefire.spec b/maven-surefire.spec
index 43cdeda..cf4954a 100644
--- a/maven-surefire.spec
+++ b/maven-surefire.spec
@@ -1,17 +1,13 @@
-
Name: maven-surefire
-Version: 2.6
-Release: 3%{?dist}
+Version: 2.7.1
+Release: 1%{?dist}
Epoch: 0
Summary: Test framework project
License: ASL 2.0
Group: Development/Libraries
URL: http://maven.apache.org/surefire/
-# svn export
-# http://svn.apache.org/repos/asf/maven/surefire/tags/surefire-2.6 maven-surefire
-# tar caf maven-surefire-2.6-src.tar.xz maven-surefire/
-Source0: %{name}-%{version}-src.tar.xz
+Source0: http://repo2.maven.org/maven2/org/apache/maven/surefire/surefire/%{versio...
Source1: %{name}-jpp-depmap.xml
# mockito is not available in Fedora yet
@@ -20,9 +16,6 @@ Patch1: 0001-Remove-mockito-dependency.patch
# use current version of maven-failsafe-plugin present in maven-surefire
Patch2: 0002-Fix-failsafe-plugin-dependency-version.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
BuildArch: noarch
BuildRequires: ant
BuildRequires: ant-nodeps
@@ -50,7 +43,7 @@ BuildRequires: maven-surefire-maven-plugin
BuildRequires: plexus-containers-component-api >= 1.0-0.a34
BuildRequires: tomcat6
BuildRequires: tomcat6-servlet-2.5-api
-BuildRequires: maven-shared-plugin-testing-harness
+BuildRequires: maven-plugin-testing-harness
BuildRequires: bsf
Requires: classworlds
@@ -152,20 +145,12 @@ Group: Documentation
Javadoc for %{name}.
%prep
-%setup -q -n %{name}
-
-
-# We use plexus 1.2. Delete deprecated files accordingly.
-rm -f surefire-booter/src/main/java/org/apache/maven/surefire/booter/shell/CommandShell.java
-rm -f surefire-booter/src/main/java/org/apache/maven/surefire/booter/shell/Shell.java
-rm -f surefire-booter/src/main/java/org/apache/maven/surefire/booter/shell/CmdShell.java
+%setup -q -n surefire-%{version}
%patch1 -p1 -b .sav
-%patch2 -p1 -b .sav
-
+%patch2 -b .sav
%build
-
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
# tests turned off because they need jmock
@@ -175,63 +160,59 @@ mvn-jpp -e \
-Dmaven.test.skip=true \
install javadoc:aggregate
-
%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/maven-surefire
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 maven-surefire-plugin/target/maven-surefire-plugin-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/maven-plugin-%{version}.jar
+install -pm 644 maven-surefire-plugin/target/maven-surefire-plugin-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/maven-plugin.jar
%add_to_maven_depmap org.apache.maven.surefire maven-surefire-plugin %{version} JPP/maven-surefire maven-plugin
install -pm 644 maven-surefire-plugin/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-maven-plugin.pom
install -pm 644 maven-surefire-plugin/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven2.plugins-surefire-plugin.pom
-install -pm 644 maven-surefire-common/target/maven-surefire-common-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/common-%{version}.jar
+install -pm 644 maven-surefire-common/target/maven-surefire-common-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/common.jar
%add_to_maven_depmap org.apache.maven.surefire maven-surefire-common %{version} JPP/maven-surefire common
install -pm 644 maven-surefire-common/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-common.pom
-install -pm 644 maven-surefire-report-plugin/target/maven-surefire-report-plugin-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/report-maven-plugin-%{version}.jar
+install -pm 644 maven-surefire-report-plugin/target/maven-surefire-report-plugin-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/report-maven-plugin.jar
%add_to_maven_depmap org.apache.maven.surefire maven-surefire-report-plugin %{version} JPP/maven-surefire report-maven-plugin
install -pm 644 maven-surefire-report-plugin/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-report-maven-plugin.pom
-install -pm 644 surefire-api/target/original-surefire-api-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/api-%{version}.jar
+install -pm 644 surefire-api/target/original-surefire-api-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/api.jar
%add_to_maven_depmap org.apache.maven.surefire surefire-api %{version} JPP/maven-surefire api
install -pm 644 surefire-api/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-api.pom
-install -pm 644 surefire-booter/target/original-surefire-booter-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/booter-%{version}.jar
+install -pm 644 surefire-booter/target/surefire-booter-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/booter.jar
%add_to_maven_depmap org.apache.maven.surefire surefire-booter %{version} JPP/maven-surefire booter
install -pm 644 surefire-booter/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-booter.pom
-install -pm 644 surefire-providers/surefire-junit/target/surefire-junit-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/junit-%{version}.jar
+install -pm 644 surefire-providers/surefire-junit/target/surefire-junit3-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/junit.jar
%add_to_maven_depmap org.apache.maven.surefire surefire-junit %{version} JPP/maven-surefire junit
install -pm 644 surefire-providers/surefire-junit/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-junit.pom
-install -pm 644 surefire-providers/surefire-junit4/target/surefire-junit4-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/junit4-%{version}.jar
+install -pm 644 surefire-providers/surefire-junit4/target/surefire-junit4-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/junit4.jar
%add_to_maven_depmap org.apache.maven.surefire surefire-junit4 %{version} JPP/maven-surefire junit4
install -pm 644 surefire-providers/surefire-junit4/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-junit4.pom
-install -pm 644 surefire-providers/surefire-testng/target/surefire-testng-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/testng-%{version}.jar
+install -pm 644 surefire-providers/surefire-junit47/target/surefire-junit47-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/junit47.jar
+%add_to_maven_depmap org.apache.maven.surefire surefire-junit47 %{version} JPP/maven-surefire junit47
+install -pm 644 surefire-providers/surefire-junit47/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-junit47.pom
+
+install -pm 644 surefire-providers/surefire-testng/target/surefire-testng-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/testng.jar
%add_to_maven_depmap org.apache.maven.surefire surefire-testng %{version} JPP/maven-surefire testng
install -pm 644 surefire-providers/surefire-testng/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-testng.pom
%add_to_maven_depmap org.apache.maven.surefire providers %{version} JPP/maven-surefire providers
install -pm 644 surefire-providers/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-providers.pom
-install -pm 644 maven-failsafe-plugin/target/maven-failsafe-plugin*.jar $RPM_BUILD_ROOT%{_javadir}/maven-failsafe-plugin-%{version}.jar
+install -pm 644 maven-failsafe-plugin/target/maven-failsafe-plugin*.jar $RPM_BUILD_ROOT%{_javadir}/maven-failsafe-plugin.jar
%add_to_maven_depmap org.apache.maven.plugins maven-failsafe-plugin %{version} JPP maven-failsafe-plugin
install -pm 644 maven-failsafe-plugin/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-maven-failsafe-plugin.pom
install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-main.pom
%add_to_maven_depmap org.apache.maven.surefire surefire %{version} JPP/maven-surefire main
-
-(cd $RPM_BUILD_ROOT%{_javadir}/ && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-
-(cd $RPM_BUILD_ROOT%{_javadir}/maven-surefire && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -248,9 +229,6 @@ ln -s %{_javadir}/maven-surefire/maven-plugin.jar \
ln -s %{_javadir}/maven-surefire/report-maven-plugin.jar \
$RPM_BUILD_ROOT%{_datadir}/maven2/plugins/surefire-report-plugin.jar
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post
%update_maven_depmap
@@ -300,6 +278,9 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_javadocdir}/*
%changelog
+* Wed Dec 29 2010 Alexander Kurtakov <akurtako(a)redhat.com> 0:2.7.1-1
+- Update to 2.7.1.
+
* Wed Dec 8 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.6-3
- Add proper Requires on junit/junit4/testng to providers
diff --git a/sources b/sources
index 02f39cd..57cb67b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-66abae17d027030af680344d18e98c1e maven-surefire-2.6-src.tar.xz
+3c21b19c8aaf0f1666a45246b352cd6e surefire-2.7.1-source-release.zip
13 years, 3 months
Broken dependencies: joda-time
by Fedora Koji Build System
joda-time has broken dependencies in the epel-6 tree:
On ppc64:
joda-time-1.6-3.tzdata2008i.el6.noarch requires java > 0:1.5.0
Please resolve this as soon as possible.
13 years, 3 months
[apache-commons-math: 2/2] Drop versioned jars and javadocs, fixes F15 upgrade path.
by Mat Booth
commit 8840285d082732a8925006762a567ad543cd6a7d
Author: mbooth <fedora(a)matbooth.co.uk>
Date: Wed Dec 29 16:50:59 2010 +0000
Drop versioned jars and javadocs, fixes F15 upgrade path.
apache-commons-math.spec | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/apache-commons-math.spec b/apache-commons-math.spec
index b109fcc..16d1d0a 100644
--- a/apache-commons-math.spec
+++ b/apache-commons-math.spec
@@ -3,7 +3,7 @@
Name: apache-%{short_name}
Version: 2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Java library of lightweight mathematics and statistics components
Group: Development/Libraries
@@ -67,9 +67,8 @@ rm -rf %{buildroot}
# jars
install -d -m 0755 %{buildroot}%{_javadir}
-install -pm 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|apache-||g"`; done)
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -pm 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+(cd %{buildroot}%{_javadir} && for jar in *; do ln -sf ${jar} `echo $jar| sed "s|apache-||g"`; done)
# pom
install -d -m 755 %{buildroot}%{_mavenpomdir}
@@ -77,9 +76,8 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%clean
@@ -93,6 +91,13 @@ rm -rf %{buildroot}
%postun
%update_maven_depmap
+
+%pre javadoc
+# workaround for rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+
+
%files
%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
@@ -103,12 +108,14 @@ rm -rf %{buildroot}
%files javadoc
%defattr(-,root,root,-)
%doc LICENSE.txt
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Wed Dec 29 2010 Mat Booth <fedora(a)matbooth.co.uk> 2.1-3
+- Drop versioned jars and javadocs, fixes F15 upgrade path.
+
* Fri Oct 22 2010 Chris Spike <chris.spike(a)arcor.de> 2.1-2
- Fixed maven-surefire-plugin BR for F14
13 years, 3 months
[maven-assembly-plugin] Update to final release.
by Alexander Kurtakov
commit f1b6a7fd7214cf5fc25ea9d6b67c485f3a014a88
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Dec 29 07:15:21 2010 +0200
Update to final release.
.gitignore | 1 +
maven-assembly-plugin.spec | 44 +++++++++++++++++---------------------------
sources | 1 +
3 files changed, 19 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3bb37c4..2622ee9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
maven-assembly-plugin-2.2-beta-5-src.tar.gz
+maven-assembly-plugin-2.2-source-release.zip
diff --git a/maven-assembly-plugin.spec b/maven-assembly-plugin.spec
index 2505361..7badc47 100644
--- a/maven-assembly-plugin.spec
+++ b/maven-assembly-plugin.spec
@@ -1,18 +1,13 @@
-%global project_version 2.2-beta-5
-
Name: maven-assembly-plugin
Version: 2.2
-Release: 0.4.beta5%{?dist}
+Release: 1%{?dist}
Summary: Maven Assembly Plugin
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-assembly-plugin/
-#svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-...
-#tar zcvf maven-assembly-plugin-2.2-beta-5-src.tar.gz maven-assembly-plugin-2.2-beta-5/
-Source0: %{name}-%{project_version}-src.tar.gz
+Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
Source1: %{name}-jpp-depmap.xml
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -23,16 +18,16 @@ BuildRequires: java >= 1:1.6.0
BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: ant, ant-nodeps
BuildRequires: maven2 >= 0:2.0.4-9
-BuildRequires: maven2-plugin-assembly
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-site
-BuildRequires: maven2-plugin-plugin
+BuildRequires: maven-assembly-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-site-plugin
+BuildRequires: maven-plugin-plugin
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven2-plugin-javadoc
+BuildRequires: maven-javadoc-plugin
BuildRequires: maven-shared-filtering
BuildRequires: maven-doxia
BuildRequires: maven-doxia-sitetools
@@ -88,7 +83,7 @@ API documentation for %{name}.
%prep
-%setup -q -n %{name}-%{project_version}
+%setup -q -n %{name}-%{version}
mkdir -p target/classes/
cp -pr src/main/resources/META-INF/ target/classes/
@@ -108,10 +103,7 @@ rm -rf %{buildroot}
# jars
install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{project_version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
%add_to_maven_depmap org.apache.maven.plugins maven-assembly-plugin %{version} JPP maven-assembly-plugin
@@ -121,9 +113,8 @@ install -pm 644 pom.xml \
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
rm -rf target/site/api*
%post
@@ -132,9 +123,6 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
-%clean
-rm -rf %{buildroot}
-
%files
%defattr(-,root,root,-)
%{_javadir}/*
@@ -143,10 +131,12 @@ rm -rf %{buildroot}
%files javadoc
%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Wed Dec 29 2010 Alexander Kurtakov <akurtako(a)redhat.com> 2.2-1
+- Update to final release.
+
* Tue Jun 15 2010 Alexander Kurtakov <akurtako(a)redhat.com> 2.2-0.4.beta5
- Add missing BuildRequires.
diff --git a/sources b/sources
index e54d1a8..b70937d 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
db8cff1a3bf57fca8ba3899d053d48f2 maven-assembly-plugin-2.2-beta-5-src.tar.gz
+eec14f1ba55f53710542e85562a7b003 maven-assembly-plugin-2.2-source-release.zip
13 years, 3 months