[javapackages] Fix rpm macro expansion problem when not on separate line
by Stanislav Ochotnicky
commit 4e077d783bb8686eac3086998f68069b2e05795a
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Jun 23 14:19:19 2011 +0200
Fix rpm macro expansion problem when not on separate line
We add one empty line at the end so we can use "\\\" in both if-branches
macros.fjava | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/macros.fjava b/macros.fjava
index d96db13..433c542 100644
--- a/macros.fjava
+++ b/macros.fjava
@@ -43,9 +43,13 @@
%add_maven_depmap(f:a:) \
install -dm 755 $RPM_BUILD_ROOT/%{_mavendepmapfragdir}\
-python -m %{_datadir}/java-utils/maven_depmap \\\
+python -m %{_datadir}/java-utils/maven_depmap %{-a} \\\
%{buildroot}%{_mavendepmapfragdir}/%{name}%{-f*:-%{-f*}} \\\
- %{buildroot}%{_mavenpomdir}/%1 %if %# == 2 %{buildroot}/%{_javadir}/%2 %{-a} %endif \
+ %{buildroot}%{_mavenpomdir}/%1 \\\
+%if %# == 2 \
+ %{buildroot}/%{_javadir}/%2 \\\
+%endif \
+\
%{nil}
#==============================================================================
12 years, 10 months
[javapackages] Fix endline slashes with optional arguments
by Stanislav Ochotnicky
commit 397fdf6e91bc00557b32debde239381183d7d718
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Jun 20 18:01:17 2011 +0200
Fix endline slashes with optional arguments
macros.fjava | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/macros.fjava b/macros.fjava
index 7b276f5..d96db13 100644
--- a/macros.fjava
+++ b/macros.fjava
@@ -45,10 +45,7 @@
install -dm 755 $RPM_BUILD_ROOT/%{_mavendepmapfragdir}\
python -m %{_datadir}/java-utils/maven_depmap \\\
%{buildroot}%{_mavendepmapfragdir}/%{name}%{-f*:-%{-f*}} \\\
- %{buildroot}%{_mavenpomdir}/%1 \\\
- %if %# == 2 \
- %{buildroot}/%{_javadir}/%2 %{-a} \
- %endif \
+ %{buildroot}%{_mavenpomdir}/%1 %if %# == 2 %{buildroot}/%{_javadir}/%2 %{-a} %endif \
%{nil}
#==============================================================================
12 years, 10 months
[apache-commons-lang] Use new add_maven_depmap macro
by Stanislav Ochotnicky
commit 1317dfbdb149edf7fe34fccaa0083dcfc188e2a0
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Jun 27 15:52:00 2011 +0200
Use new add_maven_depmap macro
- Fix maven3 build
apache-commons-lang.spec | 39 ++++++++++++++-------------------------
1 files changed, 14 insertions(+), 25 deletions(-)
---
diff --git a/apache-commons-lang.spec b/apache-commons-lang.spec
index 06152a3..3a07bab 100644
--- a/apache-commons-lang.spec
+++ b/apache-commons-lang.spec
@@ -4,7 +4,7 @@
Name: apache-%{short_name}
Version: 2.6
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Provides a host of helper utilities for the java.lang API
License: ASL 2.0
Group: Development/Libraries
@@ -17,6 +17,7 @@ BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: maven-site-plugin
BuildRequires: maven
BuildRequires: apache-commons-parent
+BuildRequires: maven-surefire-provider-junit
Requires: java >= 1:1.6.0
Requires: jpackage-utils >= 0:1.6
@@ -56,56 +57,44 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 0:2.4
sed -i 's/\r//' *.txt
%build
-mvn-local install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc
%install
# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -d -m 755 %{buildroot}%{_javadir}
+install -p -m 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
# pom
-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}
-
-# following line is only for backwards compatibility. New packages
-# should use proper groupid org.apache.commons and also artifactid
-%add_to_maven_depmap %{base_name} %{base_name} %{version} JPP %{short_name}
-
-# Old depmap was wrong and this surfaced as a problem when building
-# other packages
-%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
+%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a "org.apache.commons:%{short_name},%{base_name}:%{base_name}"
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%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} || :
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
-%defattr(-,root,root,-)
%doc PROPOSAL.html LICENSE.txt RELEASE-NOTES.txt NOTICE.txt
%{_javadir}/*
%{_mavenpomdir}/JPP-%{short_name}.pom
%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt
%doc %{_javadocdir}/%{name}
%changelog
+* Mon Jun 27 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.6-4
+- Use new add_maven_depmap macro
+- Fix maven3 build
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
12 years, 10 months
[Bug 715868] New: FTBFS lucene-2.9.4-5.fc16
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: FTBFS lucene-2.9.4-5.fc16
https://bugzilla.redhat.com/show_bug.cgi?id=715868
Summary: FTBFS lucene-2.9.4-5.fc16
Product: Fedora
Version: rawhide
Platform: All
URL: http://linux.dell.com/files/fedora/FixBuildRequires/mo
ck-results/
OS/Version: Linux
Status: NEW
Keywords: Triaged
Severity: high
Priority: high
Component: lucene
AssignedTo: akurtako(a)redhat.com
ReportedBy: ftbfs(a)fedoraproject.org
QAContact: extras-qa(a)fedoraproject.org
CC: akurtako(a)redhat.com, hicham.haouari(a)gmail.com,
java-sig-commits(a)lists.fedoraproject.org
Blocks: 713919
Classification: Fedora
Story Points: ---
lucene-2.9.4-5.fc16.src.rpm Failed To Build From Source against the rawhide
tree. See http://fedoraproject.org/wiki/FTBFS for more information.
If you believe this is actually a bug in another package, do NOT change the
component in this bug or close this bug. Instead, add the appropriate bug
number from the other package to the "Depends on" line in this bug. If the
other package does not yet have a bug created that you think matches, please
create one. Doing so helps us properly track bugs and their dependencies, just
as we track package dependencies. (If you close this bug, and the other
package is not fixed before the next FTBFS run, a new bug will get created.
Please follow the above advice to avoid such duplication.)
--
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.
12 years, 10 months
[lucene] BR zip - fixes FTBFS.
by Alexander Kurtakov
commit b0abd0ced4e09fd22ce1d4b2ca191ac5a1edb52a
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Mon Jun 27 18:44:38 2011 +0300
BR zip - fixes FTBFS.
lucene.spec | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/lucene.spec b/lucene.spec
index d15583f..c24c830 100644
--- a/lucene.spec
+++ b/lucene.spec
@@ -31,7 +31,7 @@
Summary: High-performance, full-featured text search engine
Name: lucene
Version: 2.9.4
-Release: 5%{?dist}
+Release: 6%{?dist}
Epoch: 0
License: ASL 2.0
URL: http://lucene.apache.org/
@@ -53,6 +53,7 @@ BuildRequires: jtidy
BuildRequires: regexp
BuildRequires: apache-commons-digester
BuildRequires: unzip
+BuildRequires: zip
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: apache-commons-compress
BuildRequires: icu4j
@@ -192,7 +193,6 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%files
-%defattr(-,root,root,-)
%doc CHANGES.txt LICENSE.txt README.txt NOTICE.txt
%{_mavenpomdir}/JPP*pom
%{_mavendepmapfragdir}/%{name}
@@ -201,20 +201,20 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_datadir}/%{name}-%{version}
%files javadoc
-%defattr(-,root,root,-)
%doc LICENSE.txt
%{_javadocdir}/%{name}
%files contrib
-%defattr(-,root,root,-)
%{_javadir}/%{name}-contrib
%doc contrib/CHANGES.txt
%files demo
-%defattr(-,root,root,-)
%{_javadir}/%{name}-demos.jar
%changelog
+* Mon Jun 27 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:2.9.4-6
+- BR zip - fixes FTBFS.
+
* Tue May 3 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:2.9.4-5
- Update OSGi manifests.
12 years, 10 months
[maven-surefire] Update to latest upstream (2.9)
by Stanislav Ochotnicky
commit b262ecbd7dc491e580c1d392f2b2434514d6db7d
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Jun 27 16:23:38 2011 +0200
Update to latest upstream (2.9)
- Fix up Requires for juni4 provider
.gitignore | 1 +
0001-Remove-mockito-dependency.patch | 8 +++---
0002-Remove-htmlunit-dependency.patch | 10 ++++----
0003-Fix-maven3-compatibility.patch | 27 ++++++++++++++++++++++
maven-surefire.spec | 40 ++++++++++++++++++++------------
sources | 2 +-
6 files changed, 63 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 20ce40d..22fa7f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ surefire-2.7.1-source-release.zip
/surefire-2.7.2-source-release.zip
/surefire-2.8-source-release.zip
/surefire-2.8.1-source-release.zip
+/surefire-2.9-source-release.zip
diff --git a/0001-Remove-mockito-dependency.patch b/0001-Remove-mockito-dependency.patch
index 3eb0a24..cc267c2 100644
--- a/0001-Remove-mockito-dependency.patch
+++ b/0001-Remove-mockito-dependency.patch
@@ -1,14 +1,14 @@
-From 1432e34bd406b9c9c507f5d02373ff2ef44c97b1 Mon Sep 17 00:00:00 2001
+From f5848da2ad6e95a78bac798f27062f165737610f Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue, 29 Mar 2011 14:44:37 +0200
-Subject: [PATCH 1/2] Remove mockito dependency
+Subject: [PATCH 1/3] Remove mockito dependency
---
surefire-providers/surefire-junit47/pom.xml | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/surefire-providers/surefire-junit47/pom.xml b/surefire-providers/surefire-junit47/pom.xml
-index 604847a..ee11a40 100644
+index 9f4f913..cc68cfd 100644
--- a/surefire-providers/surefire-junit47/pom.xml
+++ b/surefire-providers/surefire-junit47/pom.xml
@@ -43,12 +43,6 @@
@@ -25,5 +25,5 @@ index 604847a..ee11a40 100644
<artifactId>common-junit4</artifactId>
<version>${project.version}</version>
--
-1.7.4.4
+1.7.5.4
diff --git a/0002-Remove-htmlunit-dependency.patch b/0002-Remove-htmlunit-dependency.patch
index 2a2f497..143e20c 100644
--- a/0002-Remove-htmlunit-dependency.patch
+++ b/0002-Remove-htmlunit-dependency.patch
@@ -1,7 +1,7 @@
-From 2fbf5b756733d623079d9764bb9371742b6bc42b Mon Sep 17 00:00:00 2001
+From 32f70674cf1fed176c7bb0f557846bec1b6ffc30 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon, 18 Apr 2011 15:06:00 +0200
-Subject: [PATCH 2/2] Remove htmlunit dependency
+Subject: [PATCH 2/3] Remove htmlunit dependency
---
surefire-integration-tests/pom.xml | 6 ------
@@ -9,7 +9,7 @@ Subject: [PATCH 2/2] Remove htmlunit dependency
2 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/surefire-integration-tests/pom.xml b/surefire-integration-tests/pom.xml
-index 594c0dc..79b299e 100644
+index 09d7f08..6484403 100644
--- a/surefire-integration-tests/pom.xml
+++ b/surefire-integration-tests/pom.xml
@@ -51,12 +51,6 @@
@@ -26,7 +26,7 @@ index 594c0dc..79b299e 100644
<artifactId>commons-io</artifactId>
<version>2.0.1</version>
diff --git a/surefire-setup-integration-tests/pom.xml b/surefire-setup-integration-tests/pom.xml
-index 6face0e..fec0de6 100644
+index bc3b206..dc233ad 100644
--- a/surefire-setup-integration-tests/pom.xml
+++ b/surefire-setup-integration-tests/pom.xml
@@ -90,12 +90,6 @@
@@ -43,5 +43,5 @@ index 6face0e..fec0de6 100644
<artifactId>commons-io</artifactId>
<version>2.0.1</version>
--
-1.7.4.4
+1.7.5.4
diff --git a/0003-Fix-maven3-compatibility.patch b/0003-Fix-maven3-compatibility.patch
new file mode 100644
index 0000000..2a102c9
--- /dev/null
+++ b/0003-Fix-maven3-compatibility.patch
@@ -0,0 +1,27 @@
+From 9b6b5f1d2aa0acd775b3bfee11dd2e0e062ea75d Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Mon, 27 Jun 2011 16:15:23 +0200
+Subject: [PATCH 3/3] Fix maven3 compatibility
+
+---
+ maven-surefire-common/pom.xml | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml
+index 8bc98f1..e93ea97 100644
+--- a/maven-surefire-common/pom.xml
++++ b/maven-surefire-common/pom.xml
+@@ -40,6 +40,10 @@
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ </dependency>
+ <dependency>
+--
+1.7.5.4
+
diff --git a/maven-surefire.spec b/maven-surefire.spec
index 1fca4c4..978ba90 100644
--- a/maven-surefire.spec
+++ b/maven-surefire.spec
@@ -1,6 +1,6 @@
Name: maven-surefire
-Version: 2.8.1
-Release: 4%{?dist}
+Version: 2.9
+Release: 1%{?dist}
Epoch: 0
Summary: Test framework project
License: ASL 2.0
@@ -16,6 +16,9 @@ Patch0: 0001-Remove-mockito-dependency.patch
# remove test dep on htmlunit
Patch1: 0002-Remove-htmlunit-dependency.patch
+# provide compatibility for maven3
+Patch2: 0003-Fix-maven3-compatibility.patch
+
BuildArch: noarch
BuildRequires: ant
BuildRequires: classworlds
@@ -38,7 +41,11 @@ BuildRequires: maven-site-plugin
BuildRequires: maven-shade-plugin
BuildRequires: maven-shared-verifier
BuildRequires: maven-surefire-plugin
-
+BuildRequires: maven-surefire-provider-junit
+BuildRequires: maven-toolchain
+BuildRequires: maven-project
+BuildRequires: maven-shared-common-artifact-filters
+BuildRequires: modello
BuildRequires: plexus-containers-component-api >= 1.0-0.a34
BuildRequires: tomcat6-servlet-2.5-api
BuildRequires: maven-plugin-testing-harness
@@ -46,6 +53,9 @@ BuildRequires: bsf
Requires: classworlds
Requires: maven
+Requires: maven-toolchain
+Requires: maven-project
+Requires: maven-shared-common-artifact-filters
Requires: junit
Requires: plexus-utils
@@ -61,7 +71,7 @@ Surefire is a test framework project.
%package plugin
Summary: Surefire plugin for maven
Group: Development/Libraries
-Requires: maven-surefire = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
Obsoletes: maven2-plugin-surefire <= 0:2.0.4
Provides: maven2-plugin-surefire = %{epoch}:%{version}-%{release}
Obsoletes: maven-surefire-maven-plugin < 0:2.6
@@ -73,7 +83,7 @@ Maven surefire plugin for running tests via the surefire framework.
%package report-plugin
Summary: Surefire reports plugin for maven
Group: Development/Libraries
-Requires: maven-surefire = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
Obsoletes: maven2-plugin-surefire-report <= 0:2.0.4
Provides: maven2-plugin-surefire-report = %{epoch}:%{version}-%{release}
Obsoletes: maven-surefire-report-maven-plugin < 0:2.6
@@ -86,7 +96,7 @@ Plugin for generating reports from surefire test runs.
Summary: JUnit3 provider for Maven Surefire
Group: Development/Libraries
Requires: junit
-Requires: maven-surefire = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
Obsoletes: maven2-plugin-surefire-report <= 0:2.0.4O
#Obsoletes: maven-surefire-junit = 2.3.1
Provides: maven2-plugin-surefire-report = %{epoch}:%{version}-%{release}
@@ -98,7 +108,8 @@ JUnit3 provider for Maven Surefire.
%package provider-junit4
Summary: JUnit4 provider for Maven Surefire
Group: Development/Libraries
-Requires: maven-surefire = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-provider-junit = %{epoch}:%{version}-%{release}
Requires: junit4
%description provider-junit4
@@ -107,7 +118,7 @@ JUnit4 provider for Maven Surefire.
%package provider-testng
Summary: TestNG provider for Maven Surefire
Group: Development/Libraries
-Requires: maven-surefire = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: testng
%description provider-testng
@@ -116,7 +127,7 @@ TestNG provider for Maven Surefire.
%package -n maven-failsafe-plugin
Summary: Maven plugin for running integration tests
Group: Development/Libraries
-Requires: maven-surefire = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description -n maven-failsafe-plugin
The Failsafe Plugin is designed to run integration tests while the
@@ -151,6 +162,7 @@ sed -i 's:<version>2.7.2</version>:<version>${project.version}</version>:' \
%patch0 -p1 -b .sav
%patch1 -p1 -b .sav
+%patch2 -p1 -b .sav
%build
# tests turned off because they need jmock
@@ -245,12 +257,6 @@ ln -s %{_javadir}/maven-surefire/report-maven-plugin.jar \
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
%dir %{_javadir}/maven-surefire
%{_javadir}/maven-surefire/api.jar
@@ -290,6 +296,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%doc %{_javadocdir}/*
%changelog
+* Mon Jun 27 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.9-1
+- Update to latest upstream (2.9)
+- Fix up Requires for juni4 provider
+
* Tue May 24 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.8.1-4
- Fix up providers artifact and report plugin groupid
diff --git a/sources b/sources
index 7b04a29..5d53351 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d45fb94ea990279dd5901ea2baed0b5a surefire-2.8.1-source-release.zip
+a54a56e6dae36aa8dbebcbd186e2d39b surefire-2.9-source-release.zip
12 years, 10 months
[maven-changes-plugin] Update to latest upstream (2.6)
by Stanislav Ochotnicky
commit 4018d44b70d033083d42dcc867972ed19441cc1c
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Jun 27 14:47:09 2011 +0200
Update to latest upstream (2.6)
- Properly complete BR/R
- Fix maven3 compatibility
.gitignore | 1 +
0001-Fix-Maven-3-compatibility.patch | 37 +++++++++++++++++++
maven-changes-plugin.spec | 67 ++++++++++++++++++++++++++--------
sources | 2 +-
4 files changed, 90 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a6ec6c5..de5b366 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
maven-changes-plugin-2.3.tar.xz
/maven-changes-plugin-2.4.tar.xz
/maven-changes-plugin-2.5-source-release.zip
+/maven-changes-plugin-2.6-source-release.zip
diff --git a/0001-Fix-Maven-3-compatibility.patch b/0001-Fix-Maven-3-compatibility.patch
new file mode 100644
index 0000000..53d35f1
--- /dev/null
+++ b/0001-Fix-Maven-3-compatibility.patch
@@ -0,0 +1,37 @@
+From c122cd58ce9f50c3cb99d8399a0cde6493f5fdb6 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Mon, 27 Jun 2011 14:44:36 +0200
+Subject: [PATCH] Fix Maven 3 compatibility
+
+---
+ pom.xml | 7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 271045c..6a1812a 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -76,7 +76,7 @@ under the License.
+ <properties>
+ <doxiaVersion>1.2</doxiaVersion>
+ <doxiaSitetoolsVersion>1.2</doxiaSitetoolsVersion>
+- <mavenVersion>2.2.1</mavenVersion>
++ <mavenVersion>3.0.3</mavenVersion>
+ <sitePluginVersion>2.3-SNAPSHOT</sitePluginVersion>
+ </properties>
+
+@@ -84,6 +84,11 @@ under the License.
+ <!-- maven -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ <version>${mavenVersion}</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+--
+1.7.5.4
+
diff --git a/maven-changes-plugin.spec b/maven-changes-plugin.spec
index 82a9c99..2bd9d4b 100644
--- a/maven-changes-plugin.spec
+++ b/maven-changes-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-changes-plugin
-Version: 2.5
-Release: 2%{?dist}
+Version: 2.6
+Release: 1%{?dist}
Summary: Plugin to support reporting of changes between releases
Group: Development/Libraries
@@ -9,11 +9,19 @@ URL: http://maven.apache.org/plugins/%{name}
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
Source1: %{name}.depmap
+Patch0: 0001-Fix-Maven-3-compatibility.patch
+
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: plexus-utils
+BuildRequires: apache-commons-collections
+BuildRequires: jakarta-commons-httpclient
+BuildRequires: apache-commons-io
+BuildRequires: apache-commons-lang
+BuildRequires: apache-commons-logging
BuildRequires: maven
+BuildRequires: maven-project
+BuildRequires: maven-doxia-sitetools
BuildRequires: maven-install-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-plugin-plugin
@@ -23,16 +31,46 @@ BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-shared-filtering
+BuildRequires: maven-shared-reporting-api
+BuildRequires: maven-shared-reporting-impl
+BuildRequires: modello
+BuildRequires: plexus-containers-container-default
BuildRequires: plexus-maven-plugin
BuildRequires: plexus-mail-sender
+BuildRequires: plexus-i18n
+BuildRequires: plexus-interpolation
+BuildRequires: plexus-utils
+BuildRequires: plexus-velocity
BuildRequires: xmlrpc3-client
BuildRequires: xmlrpc3-common
BuildRequires: xerces-j2
BuildRequires: xml-commons-apis
+BuildRequires: velocity
-Requires: maven
-Requires: jpackage-utils
Requires: java
+Requires: jpackage-utils
+Requires: apache-commons-collections
+Requires: jakarta-commons-httpclient
+Requires: apache-commons-io
+Requires: apache-commons-lang
+Requires: apache-commons-logging
+Requires: maven
+Requires: maven-project
+Requires: maven-doxia-sitetools
+Requires: maven-shared-filtering
+Requires: maven-shared-reporting-api
+Requires: maven-shared-reporting-impl
+Requires: plexus-containers-container-default
+Requires: plexus-i18n
+Requires: plexus-interpolation
+Requires: plexus-mail-sender
+Requires: plexus-utils
+Requires: plexus-velocity
+Requires: xmlrpc3-client
+Requires: xmlrpc3-common
+Requires: xerces-j2
+Requires: xml-commons-apis
+Requires: velocity
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
@@ -58,11 +96,12 @@ API documentation for %{name}.
%prep
-%setup -q
+%setup -q
+%patch0 -p1
%build
mvn-rpmbuild -e \
- -Dmaven.local.depmap.file="%{SOURCE1}" \
+ -Dmaven.local.depmap.file=%{SOURCE1} \
-Dmaven.test.failure.ignore=true \
install javadoc:javadoc
@@ -85,24 +124,20 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
-%defattr(-,root,root,-)
%{_javadir}/*
%{_mavenpomdir}/*
%config(noreplace) %{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
%{_javadocdir}/%{name}
%changelog
+* Mon Jun 27 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.6-1
+- Update to latest upstream (2.6)
+- Properly complete BR/R
+- Fix maven3 compatibility
+
* Tue May 24 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.5-2
- Do not require maven2, require maven.
diff --git a/sources b/sources
index 389515f..359d2a0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-184807a98b7c6c5c59f1f3375f18795b maven-changes-plugin-2.5-source-release.zip
+d826ac51e57d152f4886ff5fce8c5ca6 maven-changes-plugin-2.6-source-release.zip
12 years, 10 months