[plexus-containers] Update to latest upstream
by Stanislav Ochotnicky
commit a8095166b36689ee9f1c771ff08ca9a2bd3faa8a
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Feb 25 13:57:15 2011 +0100
Update to latest upstream
- Remove obsolete patches
- Use maven 3 to build
- Packaging fixes
- Versionless jars & javadocs
.gitignore | 1 +
plexus-containers-javadoc-junit-link.patch | 33 ---------------
plexus-containers-pom.patch | 33 ---------------
plexus-containers-sourcetarget.patch | 17 --------
plexus-containers.depmap | 62 ----------------------------
plexus-containers.spec | 58 ++++++++++++--------------
sources | 2 +-
7 files changed, 29 insertions(+), 177 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6b62fce..9e29462 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
plexus-containers-1.5.4.tar.xz
+/plexus-containers-1.5.5.tar.xz
diff --git a/plexus-containers.spec b/plexus-containers.spec
index fc4f966..e8ec080 100644
--- a/plexus-containers.spec
+++ b/plexus-containers.spec
@@ -9,26 +9,22 @@
%global javadoc_plugin_version 2.7
Name: %{parent}-%{subname}
-Version: 1.5.4
-Release: 5%{?dist}
+Version: 1.5.5
+Release: 1%{?dist}
Summary: Containers for Plexus
License: ASL 2.0 and Plexus
Group: Development/Libraries
URL: http://plexus.codehaus.org/
# svn export \
-# http://svn.codehaus.org/plexus/plexus-containers/tags/plexus-containers-1...
-# tar caf plexus-containers-1.5.4.tar.xz plexus-containers-1.5.4
+# http://svn.codehaus.org/plexus/plexus-containers/tags/plexus-containers-1...
+# tar caf plexus-containers-1.5.5.tar.xz plexus-containers-1.5.5
Source0: %{name}-%{version}.tar.xz
Source1: plexus-container-default-build.xml
Source2: plexus-component-annotations-build.xml
Source3: plexus-containers-settings.xml
-Source4: %{name}.depmap
-Patch0: plexus-containers-javadoc-junit-link.patch
-Patch1: plexus-containers-pom.patch
-Patch2: plexus-containers-test-oom.patch
+Patch0: plexus-containers-test-oom.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -134,10 +130,7 @@ Obsoletes: %{name}-container-default-javadoc < %{version}-%{release}
cp %{SOURCE1} plexus-container-default/build.xml
cp %{SOURCE2} plexus-component-annotations/build.xml
-# Fixit: update patch
-#%patch0 -b .sav0
-%patch1
-%patch2
+%patch0
# to prevent ant from failing
mkdir -p plexus-component-annotations/src/test/java
@@ -151,9 +144,8 @@ export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
%if %{with_maven}
- mvn-jpp \
+ mvn-rpmbuild \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven2.jpp.depmap.file=%{SOURCE4} \
-Dmaven.test.skip=true \
install
@@ -162,9 +154,8 @@ mkdir -p $MAVEN_REPO_LOCAL
sha1sum $file | awk '{print $1}' > $ile.sha1
done
- mvn-jpp \
+ mvn-rpmbuild \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven2.jpp.depmap.file=%{SOURCE4} \
javadoc:aggregate
%else
export OPT_JAR_LIST="ant/ant-junit junit"
@@ -186,20 +177,16 @@ popd
%endif
%install
-rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 plexus-container-default/target/*.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{parent}/containers-container-default-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{parent}/containers-container-default.jar
install -pm 644 plexus-component-annotations/target/*.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{parent}/containers-component-annotations-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{parent}/containers-component-annotations.jar
install -pm 644 plexus-component-metadata/target/*.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{parent}/containers-component-metadata-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{parent}/containers-component-metadata.jar
install -pm 644 plexus-component-annotations/target/*.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{parent}/containers-component-javadoc-%{version}.jar
-
-(cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+ $RPM_BUILD_ROOT%{_javadir}/%{parent}/containers-component-javadoc.jar
# pom
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
@@ -228,12 +215,14 @@ install -pm 644 \
%add_to_maven_depmap org.codehaus.plexus containers-component-api %{version} JPP/%{parent} containers-container-default
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+%pre javadoc
+# workaround for rpm bug, can be removed in F-18
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-%clean
-rm -rf $RPM_BUILD_ROOT
%post component-metadata
%update_maven_depmap
@@ -256,7 +245,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_mavenpomdir}/*
-%{_mavendepmapfragdir}
+%{_mavendepmapfragdir}/%{name}
%files component-annotations
%defattr(-,root,root,-)
@@ -279,6 +268,13 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_javadocdir}/*
%changelog
+* Fri Feb 25 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.5.5-1
+- Update to latest upstream
+- Remove obsolete patches
+- Use maven 3 to build
+- Packaging fixes
+- Versionless jars & javadocs
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.5.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 56b189c..21f784a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c619b8d87478e55037703e6faaacc858 plexus-containers-1.5.4.tar.xz
+78e22c30a99ed7b4e7ac77f37c991b1d plexus-containers-1.5.5.tar.xz
13 years, 2 months
[ant] Change oro to jakarta-oro in BR/R
by Stanislav Ochotnicky
commit c228bfa0aa3c150f87a8ac2c4070f7115d415e9f
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Feb 22 12:34:03 2011 +0100
Change oro to jakarta-oro in BR/R
ant.spec | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index 11f7ffb..949cc9d 100644
--- a/ant.spec
+++ b/ant.spec
@@ -50,7 +50,7 @@
Name: ant
Version: 1.8.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 0
Summary: Build tool for java
Summary(it): Tool per la compilazione di programmi java
@@ -291,8 +291,8 @@ Taches apache log4j optionelles pour %{name}.
Summary: Optional apache oro tasks for %{name}
Group: Development/Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: oro
-BuildRequires: oro
+Requires: jakarta-oro
+BuildRequires: jakarta-oro
Provides: ant-apache-oro = %{epoch}:%{version}-%{release}
Provides: ant-jakarta-oro = %{epoch}:%{version}-%{release}
Obsoletes: ant-jakarta-oro < %{epoch}:%{version}-%{release}
@@ -807,6 +807,9 @@ rm -rf $RPM_BUILD_ROOT
# -----------------------------------------------------------------------------
%changelog
+* Tue Feb 22 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.8.2-4
+- Change oro to jakarta-oro in BR/R
+
* Wed Feb 9 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.8.2-3
- Add backward compatible maven depmap for nodeps jar
- Revert define->global change (different semantic in rpm 4.9.X)
13 years, 2 months
