commit e6be87cd2b151fcd03eb15b76c88b869520b4d5d
Author: Tomas Radej <tradej(a)redhat.com>
Date: Wed Aug 17 15:34:48 2011 +0200
Updated to 1.1
.gitignore | 1 +
maven-doap-plugin-fixed-dependencies.patch | 16 +++++++++++
maven-doap-plugin-pom.patch | 29 -------------------
maven-doap-plugin.spec | 41 ++++++++++++++-------------
sources | 2 +-
5 files changed, 39 insertions(+), 50 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b4015ca..5fff8cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
maven-doap-plugin-1.0.tar.bz2
+/maven-doap-plugin-1.1.tar.xz
diff --git a/maven-doap-plugin-fixed-dependencies.patch
b/maven-doap-plugin-fixed-dependencies.patch
new file mode 100644
index 0000000..e9ea31b
--- /dev/null
+++ b/maven-doap-plugin-fixed-dependencies.patch
@@ -0,0 +1,16 @@
+diff --git a/pom.xml b/pom.xml
+index 18289ce..edd0e51 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -63,6 +63,11 @@ under the License.
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ <version>${mavenVersion}</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
diff --git a/maven-doap-plugin.spec b/maven-doap-plugin.spec
index f89a3ad..23a0dab 100644
--- a/maven-doap-plugin.spec
+++ b/maven-doap-plugin.spec
@@ -1,38 +1,39 @@
Name: maven-doap-plugin
-Version: 1.0
-Release: 5%{?dist}
+Version: 1.1
+Release: 1%{?dist}
Summary: Plugins which generate a DOAP file from information in a POM
Group: Development/Libraries
License: ASL 2.0
URL:
http://maven.apache.org/plugins/maven-doap-plugin/
-# svn export
http://svn.apache.org/repos/asf/maven/plugins/tags/maven-doap-plugin-1.0/
-# tar jcf maven-doap-plugin-1.0.tar.gz maven-doap-plugin-1.0/
-Source0: %{name}-%{version}.tar.bz2
-Patch0: %{name}-pom.patch
+# svn export
http://svn.apache.org/repos/asf/maven/plugins/tags/maven-doap-plugin-1.1/
+# tar caf maven-doap-plugin-1.1.tar.xz maven-doap-plugin-1.1/
+Source0: %{name}-%{version}.tar.xz
+Patch0: %{name}-fixed-dependencies.patch
BuildArch: noarch
+BuildRequires: java
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: plexus-utils
-BuildRequires: ant
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-install-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-plugin-plugin
+BuildRequires: maven-dependency-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-plugin-testing-harness
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-artifact-manager
BuildRequires: jpackage-utils
-Requires: ant
+BuildRequires: jena
Requires: maven
Requires: jpackage-utils
Requires: java
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
+Requires: jena
Obsoletes: maven2-plugin-doap <= 0:2.0.8
Provides: maven2-plugin-doap = 1:%{version}-%{release}
@@ -47,7 +48,7 @@ the burden of maintaining two sets of metadata.
%package javadoc
Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
+Requires: jpackage-utils
%description javadoc
API documentation for %{name}.
@@ -55,12 +56,12 @@ API documentation for %{name}.
%prep
%setup -q -n %{name}-%{version}
-%patch0 -b .sav
+%patch0 -b .sav -p1
%build
mvn-rpmbuild \
-Dmaven.test.skip=true \
- install javadoc:javadoc
+ install javadoc:aggregate -X
%install
# jars
@@ -76,14 +77,10 @@ install -pm 644 pom.xml \
# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+# rpmlint complains about a missing shebang in the javascript.sh file
+rm target/site/apidocs/javadoc.sh
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
%{_javadir}/*
%{_mavenpomdir}/*
@@ -93,6 +90,10 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%{_javadocdir}/%{name}
%changelog
+* Wed Sep 14 2011 Tomas Radej <tradej(a)redhat.com> - 1.1-1
+- Update to 1.1
+- Guideline fixes
+
* Fri Jun 17 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.0-5
- Build with maven 3.
diff --git a/sources b/sources
index c8c04f1..b35387f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5d5ed710a217ee42ee009617d018df6a maven-doap-plugin-1.0.tar.bz2
+55154ae07eafe52e0053764c13a1bd5f maven-doap-plugin-1.1.tar.xz