[geronimo-osgi-support] Depmap removed (not needed anymore)

Mikolaj Izdebski mizdebsk at fedoraproject.org
Thu Dec 20 08:25:36 UTC 2012


commit 2793ed61e33cd6e76955994072c77c7d15c40ae5
Author: Jaromir Capik <jcapik at redhat.com>
Date:   Wed Dec 7 18:46:25 2011 +0100

    Depmap removed (not needed anymore)
    
    Signed-off-by: Mikolaj Izdebski <mizdebsk at redhat.com>

 geronimo-osgi-support.depmap |   22 ----------------------
 geronimo-osgi-support.spec   |   15 ++++++++-------
 2 files changed, 8 insertions(+), 29 deletions(-)
---
diff --git a/geronimo-osgi-support.spec b/geronimo-osgi-support.spec
index 97d671c..1f578c8 100644
--- a/geronimo-osgi-support.spec
+++ b/geronimo-osgi-support.spec
@@ -3,14 +3,13 @@
 
 Name:             geronimo-osgi-support
 Version:          1.0
-Release:          9%{?dist}
+Release:          10%{?dist}
 Summary:          OSGI spec bundle support
 Group:            Development/Libraries
 License:          ASL 2.0 and W3C
 URL:              http://geronimo.apache.org/
 
 Source0:          http://repo2.maven.org/maven2/org/apache/geronimo/specs/%{name}/%{version}/%{name}-%{version}-source-release.tar.gz
-Source1:          %{name}.depmap
 # Use parent pom files instead of unavailable 'genesis-java5-flava'
 Patch1:           use_parent_pom.patch
 # Remove itests due to unavailable dependencies
@@ -19,7 +18,7 @@ BuildArch:        noarch
 
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    jpackage-utils
-BuildRequires:    maven 
+BuildRequires:    maven
 BuildRequires:    felix-osgi-core
 BuildRequires:    felix-osgi-compendium
 BuildRequires:    geronimo-parent-poms
@@ -37,7 +36,7 @@ Provides:         geronimo-osgi-registry = %{version}-%{release}
 %description
 This project is a set of bundles and integration tests for implementing
 OSGi-specific lookup in the Geronimo spec projects.
-    
+
 
 %package javadoc
 Group:            Documentation
@@ -59,9 +58,7 @@ sed -i 's/\r//' LICENSE NOTICE
     <Export-Package>!*</Export-Package>" geronimo-osgi-locator
 
 %build
-mvn-rpmbuild \
-        -Dmaven.local.depmap.file="%{SOURCE1}" \
-        install javadoc:aggregate
+mvn-rpmbuild install javadoc:aggregate
 
 %install
 # jars
@@ -94,6 +91,10 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Dec 07 2012 Jaromir Capik <jcapik at redhat.com> 1.0-10
+- Depmap removed (not needed anymore)
+- Removing EOL whitespaces in the spec file
+
 * Thu Aug 23 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.0-9
 - Fix license tag
 - Install NOTICE files


More information about the scm-commits mailing list