Revert "Provide and obsolete classworlds"

This reverts commit a1d004b6a3.
This commit is contained in:
Mikolaj Izdebski 2012-11-21 12:42:43 +01:00
parent a1d004b6a3
commit 7db31a2c9d

View File

@ -34,7 +34,7 @@
Name: %{parent}-%{subname} Name: %{parent}-%{subname}
Version: 2.4 Version: 2.4
Release: 9%{?dist} Release: 10%{?dist}
Summary: Plexus Classworlds Classloader Framework Summary: Plexus Classworlds Classloader Framework
License: ASL 2.0 and Plexus License: ASL 2.0 and Plexus
Group: Development/Libraries Group: Development/Libraries
@ -63,11 +63,6 @@ BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-plugin-bundle BuildRequires: maven-plugin-bundle
BuildRequires: plexus-utils BuildRequires: plexus-utils
Requires: java
Requires: jpackage-utils
Provides: %{subname} = %{version}-%{release}
Obsoletes: %{subname} < %{version}-%{release}
%description %description
Classworlds is a framework for container developers Classworlds is a framework for container developers
who require complex manipulation of Java's ClassLoaders. who require complex manipulation of Java's ClassLoaders.
@ -82,8 +77,6 @@ classworlds.
Summary: Javadoc for %{name} Summary: Javadoc for %{name}
Group: Documentation Group: Documentation
Requires: jpackage-utils Requires: jpackage-utils
Provides: %{subname}-javadoc = %{version}-%{release}
Obsoletes: %{subname}-javadoc < %{version}-%{release}
%description javadoc %description javadoc
API documentation for %{name}. API documentation for %{name}.
@ -122,7 +115,7 @@ install -Dpm 644 target/%{name}-%{version}.jar \
# pom # pom
install -Dpm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.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 # javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} 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} %doc %{_javadocdir}/%{name}
%changelog %changelog
* Wed Nov 21 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4-10
- Revert change from 2.4-9
* Tue Nov 20 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4-9 * Tue Nov 20 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4-9
- Provide and obsolete classworlds - Provide and obsolete classworlds