[atinject] Add tck subpackage
Stanislav Ochotnicky
sochotni at fedoraproject.org
Mon Feb 13 16:07:18 UTC 2012
commit 4a9aeae9483f9bc19faf56bcd9620582de332437
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Mon Feb 13 17:01:11 2012 +0100
Add tck subpackage
- Use upstream build method
atinject.spec | 59 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 41 insertions(+), 18 deletions(-)
---
diff --git a/atinject.spec b/atinject.spec
index 78ba496..d8ec4be 100644
--- a/atinject.spec
+++ b/atinject.spec
@@ -2,7 +2,7 @@
Name: atinject
Version: 1
-Release: 4.20100611svn86%{?dist}
+Release: 5.20100611svn86%{?dist}
Summary: Dependency injection specification for Java (JSR-330)
Group: Development/Libraries
@@ -28,8 +28,6 @@ BuildRequires: maven-compiler-plugin
Requires: jpackage-utils
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
%description
This package specifies a means for obtaining objects in such a way as
@@ -46,50 +44,75 @@ Requires: jpackage-utils
%description javadoc
%{summary}.
+%package tck
+Summary: TCK for testing %{name} compatibility with JSR-330
+Group: Development/Libraries
+Requires: jpackage-utils
+Requires: %{name} = %{version}-%{release}
+Requires: junit
+
+%description tck
+%{summary}.
+
%prep
%setup -q
-rm -rf lib/
+rm -rf lib/* javadoc/
+
+ln -sf `build-classpath junit` lib/junit.jar
%build
-mvn-rpmbuild install javadoc:aggregate
+./build.sh
+pushd build
+for i in *.zip; do
+ unzip $i
+done
+popd
%install
install -d -m 755 %{buildroot}%{_javadir}
install -d -m 755 %{buildroot}%{_mavenpomdir}
-%add_to_maven_depmap %{artifactId} %{artifactId} %{version} JPP %{name}
-
# poms
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+install -pm 644 tck-pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-tck.pom
# jar files
-install -pm 644 target/%{artifactId}-*.jar %{buildroot}%{_javadir}/%{name}.jar
+install -pm 644 build/%{artifactId}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -pm 644 build/%{artifactId}-tck.jar %{buildroot}%{_javadir}/%{name}-tck.jar
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%add_maven_depmap JPP-%{name}-tck.pom %{name}-tck.jar -f tck
# javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-
-%post
-%update_maven_depmap
+cp -pr build/javadoc/* %{buildroot}%{_javadocdir}/%{name}
-%postun
-%update_maven_depmap
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-tck
+cp -pr build/tck/javadoc/* %{buildroot}%{_javadocdir}/%{name}-tck
%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
+%{_javadir}/%{name}.jar
+
+%files tck
+%{_mavendepmapfragdir}/%{name}-tck
+%{_javadir}/%{name}-tck.jar
+%{_mavenpomdir}/JPP-%{name}-tck.pom
%files javadoc
%doc %{_javadocdir}/%{name}
+%doc %{_javadocdir}/%{name}-tck
%changelog
+* Mon Feb 13 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1-5.20100611svn86
+- Add tck subpackage
+- Use upstream build method
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1-4.20100611svn86
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list