commit 37f9a4d17f1c8bd2d932180db335708c8459634c
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Oct 5 11:11:38 2012 +0200
Fix license to MIT and ASL 2.0
- Small cleanups in packaging, update to current guidelines
plexus-cdc.spec | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 deletions(-)
---
diff --git a/plexus-cdc.spec b/plexus-cdc.spec
index 63a7881..c658948 100644
--- a/plexus-cdc.spec
+++ b/plexus-cdc.spec
@@ -32,14 +32,13 @@
%global subname cdc
-%global maven_settings_file %{_builddir}/%{name}/settings.xml
-
Name: %{parent}-%{subname}
Version: 1.0
-Release: 0.12.a14%{?dist}
+Release: 0.13.a14%{?dist}
Epoch: 0
Summary: Plexus Component Descriptor Creator
-License: MIT
+# Almost whole gleaner subpackage is ASL 2.0
+License: MIT and ASL 2.0
Group: Development/Java
URL:
http://plexus.codehaus.org/
# svn export -r 7728
http://svn.codehaus.org/plexus/archive/plexus-tools/tags/plexus-tools-1.0...
plexus-cdc
@@ -68,9 +67,6 @@ Requires: plexus-container-default
Requires: plexus-utils
Requires: qdox
-Requires(post): jpackage-utils >= 0:1.7.2
-Requires(postun): jpackage-utils >= 0:1.7.2
-
%description
The Plexus project seeks to create end-to-end developer tools for
writing applications. At the core is the container, which can be
@@ -101,31 +97,30 @@ mvn-rpmbuild \
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 target/*.jar \
$RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}.jar
-%add_to_maven_depmap org.codehaus.plexus %{name} 1.0-alpha-14 JPP/%{parent} %{subname}
# pom
install -Dpm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
+%add_maven_depmap JPP.%{parent}-%{subname}.pom %{parent}/%{subname}.jar
+
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
-%{_javadir}/plexus
+%{_javadir}/plexus/*
%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%{_mavendepmapfragdir}/%{name}
%files javadoc
-%doc %{_javadocdir}/*
+%doc %{_javadocdir}/%{name}
%changelog
+* Fri Oct 5 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.0-0.13.a14
+- Fix license to MIT and ASL 2.0
+- Small cleanups in packaging, update to current guidelines
+
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:1.0-0.12.a14
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild