Structuring mess cleanup (depmap fragments split, removing jar duplicities)

This commit is contained in:
Jaromir Capik 2011-11-10 13:25:50 +01:00
parent 8d633504ea
commit d3db5bc046

View File

@ -2,7 +2,7 @@
Name: maven-plugin-testing
Version: 2.0
Release: 1.alpha1%{?dist}
Release: 2.alpha1%{?dist}
Summary: Maven Plugin Testing
Group: Development/Libraries
@ -55,7 +55,7 @@ Summary: Maven Plugin Testing Mechanism
Group: Development/Libraries
Requires: maven-plugin-testing = %{version}-%{release}
Obsoletes: maven-shared-plugin-testing-harness <= 0:1.2
Provides: maven-shared-plugin-testing-harness = 1:%{version}-%{release}
Provides: maven-shared-plugin-testing-harness = 1:%{version}-%{release}
%description harness
The Maven Plugin Testing Harness provides mechanisms to manage tests on Mojo.
@ -110,22 +110,10 @@ install -pm 644 maven-test-tools/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
#%%add_to_maven_depmap org.apache.maven.plugin-testing %{name} %{version} JPP/%{name} %{name}
#%%add_to_maven_depmap org.apache.maven.shared %{name}-harness %{version} JPP/%{name} %{name}
#%%add_to_maven_depmap org.apache.maven.plugin-testing %{name}-harness %{version} JPP/%{name} %{name}-harness
#%%add_to_maven_depmap org.apache.maven.shared %{name}-harness %{version} JPP/%{name} %{name}-harness
#%%add_to_maven_depmap org.apache.maven.plugin-testing %{name}-tools %{version} JPP/%{name} %{name}-tools
#%%add_to_maven_depmap org.apache.maven.shared %{name}-tools %{version} JPP/%{name} %{name}-tools
#%%add_to_maven_depmap org.apache.maven.plugin-testing maven-test-tools %{version} JPP/%{name} maven-test-tools
#%%add_to_maven_depmap org.apache.maven.shared maven-test-tools %{version} JPP/%{name} maven-test-tools
%add_maven_depmap -a "org.apache.maven.shared:%{name}-harness" JPP.%{name}-%{name}.pom
%add_maven_depmap -a "org.apache.maven.shared:%{name}-harness" JPP.%{name}-%{name}-harness.pom %{name}/%{name}-harness.jar
%add_maven_depmap -a "org.apache.maven.shared:%{name}-tools" JPP.%{name}-%{name}-tools.pom %{name}/%{name}-tools.jar
%add_maven_depmap -a "org.apache.maven.shared:maven-test-tools" JPP.%{name}-maven-test-tools.pom %{name}/maven-test-tools.jar
%add_maven_depmap -a "org.apache.maven.shared:%{name}" JPP.%{name}-%{name}.pom
%add_maven_depmap -f harness -a "org.apache.maven.shared:%{name}-harness" JPP.%{name}-%{name}-harness.pom %{name}/%{name}-harness.jar
%add_maven_depmap -f tools -a "org.apache.maven.shared:%{name}-tools" JPP.%{name}-%{name}-tools.pom %{name}/%{name}-tools.jar
%add_maven_depmap -f maven-test-tools -a "org.apache.maven.shared:maven-test-tools" JPP.%{name}-maven-test-tools.pom %{name}/maven-test-tools.jar
%pre javadoc
# workaround for rpm bug, can be removed in F-17
@ -133,23 +121,31 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%files
%{_javadir}/%{name}
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%{_mavenpomdir}/JPP.%{name}-%{name}.pom
%{_mavendepmapfragdir}/%{name}
%files javadoc
%{_javadocdir}/*
%files harness
%{_javadir}/%{name}/%{name}-harness*
%{_javadir}/%{name}/%{name}-harness.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-harness.pom
%{_mavendepmapfragdir}/%{name}-harness
%files tools
%{_javadir}/%{name}/%{name}-tools*
%{_javadir}/%{name}/%{name}-tools.jar
%{_mavenpomdir}/JPP.%{name}-%{name}-tools.pom
%{_mavendepmapfragdir}/%{name}-tools
%files -n maven-test-tools
%{_javadir}/%{name}/maven-test-tools*
%{_javadir}/%{name}/maven-test-tools.jar
%{_mavenpomdir}/JPP.%{name}-maven-test-tools.pom
%{_mavendepmapfragdir}/%{name}-maven-test-tools
%changelog
* Thu Nov 10 2011 Jaromir Capik <jcapik@redhat.com> 2.0-2.alpha1
- Structuring mess cleanup (depmap fragments split, removing jar duplicities)
* Wed Nov 09 2011 Jaromir Capik <jcapik@redhat.com> 2.0-1.alpha1
- Update to 2.0-alpha1
- Spec file changes according to the latest guidelines