[plexus-classworlds/f18] Revert "Provide and obsolete classworlds"
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Wed Nov 21 11:44:33 UTC 2012
commit 7db31a2c9db03d7df1c947ad4d713f6e1fe50c3e
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Wed Nov 21 12:42:43 2012 +0100
Revert "Provide and obsolete classworlds"
This reverts commit a1d004b6a3c874e59a01f32d4e6cdb069fd31529.
plexus-classworlds.spec | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/plexus-classworlds.spec b/plexus-classworlds.spec
index 6a7fbda..fd97d8a 100644
--- a/plexus-classworlds.spec
+++ b/plexus-classworlds.spec
@@ -34,7 +34,7 @@
Name: %{parent}-%{subname}
Version: 2.4
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Plexus Classworlds Classloader Framework
License: ASL 2.0 and Plexus
Group: Development/Libraries
@@ -63,11 +63,6 @@ BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-plugin-bundle
BuildRequires: plexus-utils
-Requires: java
-Requires: jpackage-utils
-Provides: %{subname} = %{version}-%{release}
-Obsoletes: %{subname} < %{version}-%{release}
-
%description
Classworlds is a framework for container developers
who require complex manipulation of Java's ClassLoaders.
@@ -82,8 +77,6 @@ classworlds.
Summary: Javadoc for %{name}
Group: Documentation
Requires: jpackage-utils
-Provides: %{subname}-javadoc = %{version}-%{release}
-Obsoletes: %{subname}-javadoc < %{version}-%{release}
%description javadoc
API documentation for %{name}.
@@ -122,7 +115,7 @@ install -Dpm 644 target/%{name}-%{version}.jar \
# pom
install -Dpm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
-%add_maven_depmap JPP.%{parent}-%{subname}.pom plexus/%{subname}.jar -a classworlds:classworlds
+%add_maven_depmap JPP.%{parent}-%{subname}.pom plexus/%{subname}.jar
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -139,6 +132,9 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%doc %{_javadocdir}/%{name}
%changelog
+* Wed Nov 21 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.4-10
+- Revert change from 2.4-9
+
* Tue Nov 20 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.4-9
- Provide and obsolete classworlds
More information about the scm-commits
mailing list