[plexus-utils] Update to upstream 3.0.
by Alexander Kurtakov
commit 86e7b3997b283de028fcaf8a8487ddb03eef14b6
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Sep 7 22:55:14 2011 +0300
Update to upstream 3.0.
.gitignore | 1 +
plexus-utils.spec | 34 ++++++++++------------------------
sources | 2 +-
3 files changed, 12 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ce15345..6b427da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/plexus-utils-2.0.6.tar.bz2
+plexus-utils-3.0.tar.xz
diff --git a/plexus-utils.spec b/plexus-utils.spec
index 5b82984..84a070e 100644
--- a/plexus-utils.spec
+++ b/plexus-utils.spec
@@ -32,22 +32,21 @@
%global subname utils
Name: plexus-utils
-Version: 2.0.6
+Version: 3.0
Release: 1%{?dist}
Summary: Plexus Common Utilities
License: ASL 1.1 and ASL 2.0 and MIT
Group: Development/Libraries
URL: http://plexus.codehaus.org/
-# git clone git://github.com/sonatype/sisu
-# git archive --prefix="plexus-utils-2.0.6/" --format=tar plexus-utils-2.0.6 | bzip2 > plexus-utils-2.0.6.tar.bz2
-Source0: plexus-utils-%{version}.tar.bz2
+# git clone git://github.com/sonatype/plexus-utils
+# git archive --prefix="plexus-utils-3.0/" --format=tar plexus-utils-3.0 | xz > plexus-utils-3.0.tar.xz
+Source0: plexus-utils-%{version}.tar.xz
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.6
Requires: jpackage-utils
-Requires(postun): jpackage-utils
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
@@ -57,9 +56,6 @@ BuildRequires: maven-surefire-plugin
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-surefire-provider-junit
-Requires(post): jpackage-utils >= 0:1.7.2
-Requires(postun): jpackage-utils >= 0:1.7.2
-
%description
The Plexus project seeks to create end-to-end developer tools for
writing applications. At the core is the container, which can be
@@ -72,7 +68,6 @@ is like a J2EE application server, without all the baggage.
Summary: Javadoc for %{name}
Group: Documentation
Requires: jpackage-utils
-Requires(postun): jpackage-utils
%description javadoc
Javadoc for %{name}.
@@ -81,7 +76,7 @@ Javadoc for %{name}.
%setup -q
%build
-mvn-rpmbuild install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc -Dmaven.test.failure.ignore=true
%install
# jars
@@ -101,28 +96,19 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%post
-%update_maven_depmap
-
-%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,-)
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
+%doc NOTICE.txt
%files javadoc
-%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}
%changelog
+* Wed Sep 7 2011 Alexander Kurtakov <akurtako(a)redhat.com> 3.0-1
+- Update to upstream 3.0.
+
* Mon Feb 28 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.0.6-1
- Update to 2.0.6
- Remove obsolete patches
diff --git a/sources b/sources
index c2e14d7..a62f377 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ccf88aa71e17bbf6c15b69d6277a13a8 plexus-utils-2.0.6.tar.bz2
+a204139342ba120aa5388d38c038140b plexus-utils-3.0.tar.xz
12 years, 7 months
[plexus-velocity] Drop ant build.
by Alexander Kurtakov
commit 3fcd896c76fab1db6e4f7141645c32d350121e36
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Sep 7 21:06:32 2011 +0300
Drop ant build.
- Further cleanups.
plexus-velocity.spec | 58 ++++++++++---------------------------------------
1 files changed, 12 insertions(+), 46 deletions(-)
---
diff --git a/plexus-velocity.spec b/plexus-velocity.spec
index 158fb6a..0c715b3 100644
--- a/plexus-velocity.spec
+++ b/plexus-velocity.spec
@@ -28,19 +28,12 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-# If you don't want to build with maven, and use straight ant instead,
-# give rpmbuild option '--without maven'
-
-%define with_maven 1
-%define without_maven 0
-
-%define section free
%define parent plexus
%define subname velocity
Name: plexus-velocity
Version: 1.1.8
-Release: 7%{?dist}
+Release: 8%{?dist}
Epoch: 0
Summary: Plexus Velocity Component
License: ASL 2.0
@@ -49,32 +42,28 @@ URL: http://plexus.codehaus.org/
# svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-velocity-1.1.8/
# tar czf plexus-velocity-1.1.8-src.tar.gz plexus-velocity-1.1.8/
Source0: plexus-velocity-%{version}-src.tar.gz
-Source1: plexus-velocity-1.1.7-build.xml
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: ant >= 0:1.6
-BuildRequires: java-devel >= 1.6.0
-%if %{with_maven}
+BuildRequires: java-devel >= 1:1.6.0
BuildRequires: maven
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-doxia-sitetools
-%endif
BuildRequires: ant-contrib
-BuildRequires: ant-nodeps
BuildRequires: classworlds >= 0:1.1
-BuildRequires: jakarta-commons-collections
+BuildRequires: apache-commons-collections
BuildRequires: plexus-container-default
BuildRequires: plexus-utils
BuildRequires: velocity
Requires: classworlds >= 0:1.1
-Requires: jakarta-commons-collections
+Requires: apache-commons-collections
Requires: plexus-container-default
Requires: plexus-utils
Requires: velocity
@@ -89,7 +78,7 @@ is like a J2EE application server, without all the baggage.
%package javadoc
Summary: Javadoc for %{name}
-Group: Development/Documentation
+Group: Documentation
%description javadoc
Javadoc for %{name}.
@@ -99,36 +88,13 @@ Javadoc for %{name}.
for j in $(find . -name "*.jar"); do
mv $j $j.no
done
-cp %{SOURCE1} build.xml
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mkdir external_repo
-ln -s %{_javadir} external_repo/JPP
-
-%if %{with_maven}
# Use normal pom for now
rm -f release-pom.xml
mvn-rpmbuild \
-e \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
install javadoc:aggregate
-%else
-
-mkdir -p target/lib
-build-jar-repository -s -p target/lib \
-classworlds \
-commons-collections \
-commons-logging-api \
-plexus/container-default \
-plexus/utils \
-velocity \
-
-ant jar javadoc
-
-%endif
%install
# jars
@@ -136,26 +102,26 @@ install -Dpm 644 target/%{name}-%{version}.jar \
%{buildroot}/%{_javadir}/%{parent}/%{subname}.jar
# poms
-%if %{with_maven}
install -Dpm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{name}.pom
%add_maven_depmap JPP.%{name}.pom %{parent}/%{subname}.jar
-%endif
# javadoc
install -d -m 755 %{buildroot}/%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* %{buildroot}/%{_javadocdir}/%{name}
%files
-%{_javadir}/%{parent}
-%{_mavendepmapfragdir}
-%if %{with_maven}
+%{_javadir}/%{parent}/*
+%{_mavendepmapfragdir}/*
%{_mavenpomdir}/*
-%endif
%files javadoc
%doc %{_javadocdir}/*
%changelog
+* Wed Sep 7 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.1.8-8
+- Drop ant build.
+- Further cleanups.
+
* Thu Jul 28 2011 Jaromir Capik <jcapik(a)redhat.com> - 0:1.1.8-7
- Migration to maven3
- Removal of plexus-maven-plugin (not needed)
12 years, 7 months
[plexus-velocity] plexus-maven-plugin removed (not needed)
by Alexander Kurtakov
commit 5d0872217a30eca7c677e861fda88a864d3e0916
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Thu Jul 28 15:36:53 2011 +0200
plexus-maven-plugin removed (not needed)
plexus-velocity.spec | 62 +++++++++++++++++---------------------------------
1 files changed, 21 insertions(+), 41 deletions(-)
---
diff --git a/plexus-velocity.spec b/plexus-velocity.spec
index eb20c25..158fb6a 100644
--- a/plexus-velocity.spec
+++ b/plexus-velocity.spec
@@ -40,7 +40,7 @@
Name: plexus-velocity
Version: 1.1.8
-Release: 6%{?dist}
+Release: 7%{?dist}
Epoch: 0
Summary: Plexus Velocity Component
License: ASL 2.0
@@ -51,20 +51,17 @@ URL: http://plexus.codehaus.org/
Source0: plexus-velocity-%{version}-src.tar.gz
Source1: plexus-velocity-1.1.7-build.xml
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: ant >= 0:1.6
BuildRequires: java-devel >= 1.6.0
%if %{with_maven}
-BuildRequires: maven2 >= 2.0.4-10jpp
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-resources
-BuildRequires: plexus-maven-plugin
+BuildRequires: maven
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-doxia-sitetools
@@ -81,8 +78,6 @@ Requires: jakarta-commons-collections
Requires: plexus-container-default
Requires: plexus-utils
Requires: velocity
-Requires(post): jpackage-utils >= 0:1.7.2
-Requires(postun): jpackage-utils >= 0:1.7.2
%description
The Plexus project seeks to create end-to-end developer tools for
@@ -116,10 +111,10 @@ ln -s %{_javadir} external_repo/JPP
%if %{with_maven}
# Use normal pom for now
rm -f release-pom.xml
- mvn-jpp \
+ mvn-rpmbuild \
-e \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- install javadoc:javadoc
+ install javadoc:aggregate
%else
mkdir -p target/lib
@@ -136,51 +131,36 @@ ant jar javadoc
%endif
%install
-rm -rf $RPM_BUILD_ROOT
-
# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
-install -pm 644 target/%{name}-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/plexus/velocity-%{version}.jar
-%add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/%{parent} %{subname}
-
-(cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; \
-do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -Dpm 644 target/%{name}-%{version}.jar \
+ %{buildroot}/%{_javadir}/%{parent}/%{subname}.jar
# poms
%if %{with_maven}
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -pm 644 pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
+install -Dpm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{name}.pom
+%add_maven_depmap JPP.%{name}.pom %{parent}/%{subname}.jar
%endif
# 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
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+install -d -m 755 %{buildroot}/%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}/%{_javadocdir}/%{name}
%files
-%defattr(-,root,root,-)
%{_javadir}/%{parent}
%{_mavendepmapfragdir}
%if %{with_maven}
-%{_datadir}/maven2
+%{_mavenpomdir}/*
%endif
%files javadoc
-%defattr(-,root,root,-)
%doc %{_javadocdir}/*
%changelog
+* Thu Jul 28 2011 Jaromir Capik <jcapik(a)redhat.com> - 0:1.1.8-7
+- Migration to maven3
+- Removal of plexus-maven-plugin (not needed)
+- Minor spec file changes according to the latest guidelines
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:1.1.8-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
12 years, 7 months
[maven-remote-resources-plugin] (4 commits) ...Added license files
by tradej@fedoraproject.org
Summary of changes:
e700695... Updated to 1.2.1, copy license files (*)
db8b98c... Revert "Updated to 1.2.1, copy license files" (*)
1cbf69a... Merge branch 'master' into f16 (*)
185fd71... Added license files (*)
(*) This commit already existed in another branch; no separate mail sent
12 years, 7 months
[maven-remote-resources-plugin/f16: 4/4] Added license files
by tradej@fedoraproject.org
commit 185fd71d201eb67852fdfa8937e0ddb211e7b682
Author: Tomas Radej <tradej(a)redhat.com>
Date: Wed Sep 7 10:23:28 2011 +0200
Added license files
maven-remote-resources-plugin.spec | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/maven-remote-resources-plugin.spec b/maven-remote-resources-plugin.spec
index b05c7ad..3704dfc 100644
--- a/maven-remote-resources-plugin.spec
+++ b/maven-remote-resources-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-remote-resources-plugin
Version: 1.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Maven Remote Resources Plugin
Group: Development/Libraries
@@ -92,14 +92,19 @@ install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%files
+%doc DEPENDENCIES LICENSE NOTICE
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
+%doc DEPENDENCIES LICENSE NOTICE
%{_javadocdir}/%{name}
%changelog
+* Wed Sep 07 2011 Tomas Radej <tradej(a)redhat.com> - 1.2.1-2
+- Added license files
+
* Tue Sep 6 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.2.1-1
- Update to latest upstream release.
12 years, 7 months