[plexus-cdc] Removed dependency to plexus-container-default (Resolves: #878570)

Stanislav Ochotnicky sochotni at fedoraproject.org
Tue Dec 11 12:50:24 UTC 2012


commit 656fd6e4d08b23f6efaa921c04896aadbc7171bd
Author: Michal Srb <msrb at redhat.com>
Date:   Tue Dec 11 09:37:43 2012 +0100

    Removed dependency to plexus-container-default (Resolves: #878570)
    
    - Removed forgotten older tarball from sources file
    - Fixed various rpmlint warnings
    
    Signed-off-by: Stanislav Ochotnicky <sochotnicky at redhat.com>

 plexus-cdc.spec |   46 +++++++++++++++++++++++++---------------------
 sources         |    1 -
 2 files changed, 25 insertions(+), 22 deletions(-)
---
diff --git a/plexus-cdc.spec b/plexus-cdc.spec
index 0d85cd4..cea5f6b 100644
--- a/plexus-cdc.spec
+++ b/plexus-cdc.spec
@@ -34,39 +34,38 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.14.a14%{?dist}
+Release:        0.15.a14%{?dist}
 Epoch:          0
 Summary:        Plexus Component Descriptor Creator
 # Almost whole gleaner subpackage is ASL 2.0
 License:        MIT and ASL 2.0
-Group:          Development/Java
+Group:          Development/Tools
 URL:            http://plexus.codehaus.org/
 # svn export -r 7728 http://svn.codehaus.org/plexus/archive/plexus-tools/tags/plexus-tools-1.0.11/plexus-cdc plexus-cdc
 # tar czf plexus-cdc-1.0-alpha-14.tar.gz plexus-cdc/
 Source0:        %{name}-1.0-alpha-14.tar.gz
-Source1:	%{name}-jpp-depmap.xml
+Source1:        %{name}-jpp-depmap.xml
 Source2:        http://www.apache.org/licenses/LICENSE-2.0.txt
-Patch0:     %{name}-qdox-1.9.patch
+Patch0:         %{name}-qdox-1.9.patch
 
 BuildArch:      noarch
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
-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-plugin
-BuildRequires:	jdom
-BuildRequires:	plexus-container-default
-BuildRequires:	plexus-utils
+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-plugin
+BuildRequires:  jdom
+BuildRequires:  plexus-utils
 BuildRequires:  maven-doxia-sitetools
-BuildRequires:	qdox
-Requires:		jdom
-Requires:		plexus-container-default
-Requires:		plexus-utils
-Requires:		qdox
+BuildRequires:  qdox
+
+Requires:       jdom
+Requires:       plexus-utils
+Requires:       qdox
 
 %description
 The Plexus project seeks to create end-to-end developer tools for
@@ -78,7 +77,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}.
@@ -98,7 +97,7 @@ mvn-rpmbuild \
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
 install -pm 644 target/*.jar \
-	  $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}.jar
+        $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}.jar
 
 # pom
 install -Dpm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
@@ -121,6 +120,11 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Mon Dec 10 2012 Michal Srb <msrb at redhat.com> - 0:1.0-0.15.a14
+- Removed dependency to plexus-container-default (Resolves: #878570)
+- Removed forgotten older tarball from sources file
+- Fixed various rpmlint warnings
+
 * Mon Nov 26 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 0:1.0-0.14.a14
 - Install license files
 - Resolves: rhbz#880206
diff --git a/sources b/sources
index be6c968..02cb28c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-715e99df384a0037b2cd5bb107c7be21  plexus-cdc-1.0-alpha-10.tar.gz
 2bbf968e9fac3e26c61def0b60d40280  plexus-cdc-1.0-alpha-14.tar.gz
 3b83ef96387f14655fc854ddc3c6bd57  LICENSE-2.0.txt


More information about the scm-commits mailing list