[maven-filtering/f16] Added Provides/Obsoletes, added depmap
Tomas Radej
tradej at fedoraproject.org
Wed Aug 31 09:50:33 UTC 2011
commit 8fb2fc18a72abc5aedb744073e0fcd6addff84dd
Author: Tomas Radej <tradej at redhat.com>
Date: Wed Aug 31 10:26:01 2011 +0200
Added Provides/Obsoletes, added depmap
maven-filtering.depmap | 13 +++++++++++++
maven-filtering.spec | 11 +++++++++--
2 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/maven-filtering.depmap b/maven-filtering.depmap
new file mode 100644
index 0000000..78fd786
--- /dev/null
+++ b/maven-filtering.depmap
@@ -0,0 +1,13 @@
+<dependencies>
+ <dependency>
+ <maven>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-filtering</artifactId>
+ </maven>
+ <jpp>
+ <groupId>JPP</groupId>
+ <artifactId>maven-filtering</artifactId>
+ </jpp>
+ </dependency>
+</dependencies>
+
diff --git a/maven-filtering.spec b/maven-filtering.spec
index 590ad3e..38b3c58 100644
--- a/maven-filtering.spec
+++ b/maven-filtering.spec
@@ -1,12 +1,13 @@
Name: maven-filtering
Version: 1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Shared component providing resource filtering
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/shared/%{name}/index.html
Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
+Source1: maven-filtering.depmap
BuildArch: noarch
@@ -20,6 +21,9 @@ Requires: java >= 1:1.6.0
Requires: jpackage-utils
Requires: maven
+Provides: maven-shared-filtering = %{version}%{release}
+Obsoletes: maven-shared-filtering < %{version}%{release}
+
%description
These Plexus components have been built from the filtering process/code in
Maven Resources Plugin. The goal is to provide a shared component for all
@@ -39,7 +43,7 @@ This package contains the API documentation for %{name}.
%build
# Tests use a package that is no longer present in plexus-build-api (v0.0.7)
-mvn-rpmbuild install javadoc:aggregate -Dmaven.test.skip=true
+mvn-rpmbuild install javadoc:aggregate -Dmaven.test.skip=true -Dmaven.local.depmap.file="%{SOURCE1}"
%install
# jars
@@ -67,6 +71,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Wed Aug 31 2011 Tomas Radej <tradej at redhat.com> - 1.0-3
+- Added Provides/Obsoletes
+
* Tue Aug 16 2011 Tomas Radej <tradej at redhat.com> 1.0-2
- Removed rm -rf {buildroot}
More information about the scm-commits
mailing list