[maven-rar-plugin/f20] Update for latest guidelines, rhbz #992198
by Mat Booth
commit 84176bbf308ea485f1b1d4a3b130d2ca2659ad01
Author: Mat Booth <fedora(a)matbooth.co.uk>
Date: Mon Sep 2 14:00:13 2013 +0100
Update for latest guidelines, rhbz #992198
- Update to latest upstream version 2.3
.gitignore | 1 +
maven-rar-plugin.spec | 72 +++++++++++++-----------------------------------
sources | 2 +-
3 files changed, 22 insertions(+), 53 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b77852a..204d854 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
maven-rar-plugin-2.2.tar.bz2
+/maven-rar-plugin-2.3-source-release.zip
diff --git a/maven-rar-plugin.spec b/maven-rar-plugin.spec
index 28b4d34..63ea562 100644
--- a/maven-rar-plugin.spec
+++ b/maven-rar-plugin.spec
@@ -1,15 +1,12 @@
Name: maven-rar-plugin
-Version: 2.2
-Release: 11%{?dist}
+Version: 2.3
+Release: 1%{?dist}
Summary: Plugin to create Resource Adapter Archive which can be deployed to a J2EE server
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-rar-plugin/
-# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-rar-plugin-2.2/
-# tar jcf maven-rar-plugin-2.2.tar.bz2 maven-rar-plugin-2.2/
-Source0: %{name}-%{version}.tar.bz2
-Patch0: add-maven-core.patch
+Source0: http://archive.apache.org/dist/maven/plugins/%{name}-%{version}-source-re...
BuildArch: noarch
@@ -17,21 +14,7 @@ BuildRequires: java-devel >= 1:1.6.0
BuildRequires: plexus-utils
BuildRequires: ant
BuildRequires: maven-local
-BuildRequires: maven-install-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-plugin-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
BuildRequires: jpackage-utils
-Requires: ant
-Requires: maven
-Requires: jpackage-utils
-Requires: java
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
Obsoletes: maven2-plugin-rar <= 0:2.0.8
Provides: maven2-plugin-rar = 1:%{version}-%{release}
@@ -47,52 +30,37 @@ to store these resource adapters to an archive
%package javadoc
Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
API documentation for %{name}.
-
%prep
%setup -q
-%patch0
-
-%build
-mvn-rpmbuild \
- -Dmaven.test.failure.ignore=true \
- install javadoc:javadoc
-
-%install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-%add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}
+# Fix deps to build against maven 3
+%pom_remove_dep org.apache.maven:maven-project
+%pom_add_dep org.apache.maven:maven-compat
+%pom_add_dep org.apache.maven:maven-core
-# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml \
- %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%mvn_file : %{name}
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-
-%post
-%update_maven_depmap
+%build
+%mvn_build -- -Dmaven.test.failure.ignore=true
-%postun
-%update_maven_depmap
+%install
+%mvn_install
-%files
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%files -f .mfiles
+%doc LICENSE NOTICE DEPENDENCIES
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE NOTICE
%changelog
+* Mon Sep 02 2013 Mat Booth <fedora(a)matbooth.co.uk> - 2.3-1
+- Update for latest guidelines, rhbz #992198
+- Update to latest upstream version 2.3
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index fbcd771..339289c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d0609124bcd473816f758e4c5cf75191 maven-rar-plugin-2.2.tar.bz2
+b316dc74d47bfb53e964f36e6de34d69 maven-rar-plugin-2.3-source-release.zip
10 years, 7 months
[maven-antrun-plugin] Adapt to current guidelines
by Michal Srb
commit 88976606e346c0d1b57e50e8c16ab77902e02308
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Sep 2 13:37:43 2013 +0200
Adapt to current guidelines
fix-deps.patch | 14 ---------
maven-antrun-plugin.spec | 74 ++++++++++++++++-----------------------------
2 files changed, 26 insertions(+), 62 deletions(-)
---
diff --git a/maven-antrun-plugin.spec b/maven-antrun-plugin.spec
index b3e56c4..91b818c 100644
--- a/maven-antrun-plugin.spec
+++ b/maven-antrun-plugin.spec
@@ -1,81 +1,59 @@
Name: maven-antrun-plugin
Version: 1.7
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Maven AntRun Plugin
-Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-antrun-plugin/
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
-Patch0: fix-deps.patch
-
-BuildArch: noarch
-
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: plexus-utils
-BuildRequires: ant
-BuildRequires: maven-local
-BuildRequires: maven-install-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-plugin-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-Requires: ant
-Requires: maven
-Requires: jpackage-utils
-Requires: java
+
+BuildArch: noarch
+
+BuildRequires: maven-local
+BuildRequires: mvn(org.apache.ant:ant)
+BuildRequires: mvn(org.apache.maven.plugins:maven-plugins)
+BuildRequires: mvn(org.apache.maven:maven-artifact)
+BuildRequires: mvn(org.apache.maven:maven-compat)
+BuildRequires: mvn(org.apache.maven:maven-plugin-api)
+BuildRequires: mvn(org.apache.maven:maven-project)
+BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
+
Obsoletes: maven2-plugin-antrun <= 0:2.0.8
Provides: maven2-plugin-antrun = 1:%{version}-%{release}
%description
-Runs Ant scripts embedded in the POM
+This plugin provides the ability to run Ant tasks from within Maven.
+It is even possible to embed Ant scripts in the POM.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
-API documentation for %{name}.
+This package contains the API documentation for %{name}.
%prep
%setup -q
-%patch0
-#%patch1
+
+%pom_add_dep org.apache.maven:maven-compat
%build
-mvn-rpmbuild install javadoc:javadoc
+%mvn_build
%install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+%mvn_install
-# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-
-%files
+%files -f .mfiles
+%dir %{_javadir}/%{name}
%doc LICENSE NOTICE
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%files javadoc
+%files javadoc -f .mfiles-javadoc
%doc LICENSE NOTICE
-%{_javadocdir}/%{name}
%changelog
+* Mon Sep 02 2013 Michal Srb <msrb(a)redhat.com> - 1.7-6
+- Adapt to current guidelines
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.7-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
10 years, 7 months
[maven-hpi-plugin] Add BR: ant-apache-regexp
by Michal Srb
commit 18dd6f3022274d55063a14892101b2c37d781bfb
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Sep 2 13:35:20 2013 +0200
Add BR: ant-apache-regexp
maven-hpi-plugin.spec | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/maven-hpi-plugin.spec b/maven-hpi-plugin.spec
index 0d3585e..8ac7a59 100644
--- a/maven-hpi-plugin.spec
+++ b/maven-hpi-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-hpi-plugin
Version: 1.98
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Maven plugin to build Jenkins plugins
# Project is licensed under ASL 2.0, but following
@@ -37,6 +37,7 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-interactivity-api)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: mvn(org.jenkins-ci:version-number)
BuildRequires: mvn(org.kohsuke.stapler:stapler-groovy)
+BuildRequires: ant-apache-regexp
%description
@@ -63,6 +64,10 @@ rm ./src/main/java/org/jenkinsci/maven/plugins/hpi/VersionNumber.java
%pom_add_dep org.jenkins-ci:version-number
%patch1 -p1
+# Fix groupId for ant-apache-regexp
+%pom_xpath_replace "pom:dependency[pom:artifactId[text()='ant-apache-regexp']]/pom:groupId" \
+ "<groupId>org.apache.ant</groupId>"
+
# Nothing really interesting in parent
%pom_remove_parent
@@ -95,6 +100,9 @@ rm src/main/java/org/jenkinsci/maven/plugins/hpi/CreateMojo.java
%changelog
+* Mon Sep 02 2013 Michal Srb <msrb(a)redhat.com> - 1.98-2
+- Add BR: ant-apache-regexp
+
* Mon Sep 02 2013 Michal Srb <msrb(a)redhat.com> - 1.98-1
- Update to upstream version 1.98
10 years, 7 months