https://bugzilla.redhat.com/show_bug.cgi?id=1302144 --- Comment #10 from Marcus Karlsson <mk@xxxxxxxxxx> --- Thanks for the review, and sorry for the delay on my end. I have updated the spec file as follows: I have received a license clarification from upstream developer André Dietisheim who confirmed that the license of DeploymentConfig.java as included in the tarball is EPL. I have included the email that I received complete with all headers as a source file and marked as %license in the package. The license header had already been added to the file in the upstream repository. It turns out the comment in the spec regarding the tests were not entirely correct. They fail to run but it's not because of JUnit, it's because of a missing dependency on an assert from fest-assert which has not been packaged. I have included a patch which rewrites the test cases that uses the assertion so that they instead use equivalent JUnit assertions. I have also added a second patch that fixes three failing test cases, which to my understanding is because of an inconsistency between the test cases and the sample data which they operate on. The failing tests had also already been fixed in the upstream repository. Also, the group field has been removed. Updated SPEC URL: https://www.acc.umu.se/~mk/fedora/openshift-restclient-java/openshift-restclient-java.spec Updated SRPM URL: https://www.acc.umu.se/~mk/fedora/openshift-restclient-java/openshift-restclient-java-3.0.1-1.fc25.src.rpm Updated Koji URL: http://koji.fedoraproject.org/koji/taskinfo?taskID=13206620 Here is a diff of the spec file from the last version: --- openshift-restclient-java.spec.orig 2016-03-02 23:39:44.225597729 +0100 +++ openshift-restclient-java.spec 2016-03-02 23:55:08.077415306 +0100 @@ -5,26 +5,35 @@ Release: 1%{?dist} Summary: OpenShift Java REST Client -Group: Development/Libraries License: EPL URL: https://github.com/openshift/openshift-restclient-java Source0: https://github.com/openshift/%{name}/archive/%{name}-%{version}.%{rls_tag}.tar.gz + +# Clarification of license of src/main/java/com/openshift/internal/restclient/model/DeploymentConfig.java +Source1: license-clarification.txt + BuildArch: noarch -BuildRequires: maven-local -BuildRequires: mvn(com.jcraft:jsch) -BuildRequires: mvn(commons-codec:commons-codec) -BuildRequires: mvn(commons-io:commons-io) -BuildRequires: mvn(commons-lang:commons-lang) -BuildRequires: mvn(junit:junit) -BuildRequires: mvn(log4j:log4j) -BuildRequires: mvn(org.apache.commons:commons-compress) -BuildRequires: mvn(org.apache.httpcomponents:httpclient) -BuildRequires: mvn(org.apache.httpcomponents:httpcore) -BuildRequires: mvn(org.jboss:jboss-dmr) -BuildRequires: mvn(org.mockito:mockito-core) -BuildRequires: mvn(org.slf4j:slf4j-api) -BuildRequires: mvn(org.slf4j:slf4j-log4j12) +# Remove dependency on fest-assert since it's not packaged. +Patch0: %{name}-test-fest-assert.patch + +# Fix failing tests in ImageStreamingTest. They are already fixed in upstream git. +Patch1: %{name}-test-imagestreamtest.patch + +BuildRequires: maven-local +BuildRequires: mvn(com.jcraft:jsch) +BuildRequires: mvn(commons-codec:commons-codec) +BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(commons-lang:commons-lang) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(log4j:log4j) +BuildRequires: mvn(org.apache.commons:commons-compress) +BuildRequires: mvn(org.apache.httpcomponents:httpclient) +BuildRequires: mvn(org.apache.httpcomponents:httpcore) +BuildRequires: mvn(org.jboss:jboss-dmr) +BuildRequires: mvn(org.mockito:mockito-core) +BuildRequires: mvn(org.slf4j:slf4j-api) +BuildRequires: mvn(org.slf4j:slf4j-log4j12) %description This is the Java REST client for the version 3 architecture of OpenShift based @@ -41,25 +50,27 @@ %prep %setup -qn %{name}-%{name}-%{version}.%{rls_tag} +cp %{SOURCE1} . chmod -x license README.md +%patch0 -p1 +%patch1 -p1 + %pom_remove_dep org.easytesting:fest-assert %build -# Tests skipped because of wrong junit version -# (Fedora is 4.10, this expects 4.8) -%mvn_build --skip-tests +%mvn_build %install %mvn_install %files -f .mfiles %dir %{_javadir}/%{name} -%license epl-v10.html license +%license epl-v10.html license license-clarification.txt %doc README.md DESIGN.md %files javadoc -f .mfiles-javadoc -%license epl-v10.html license +%license epl-v10.html license license-clarification.txt %changelog * Sun Jan 10 2016 Marcus Karlsson <mk@xxxxxxxxxx> - 3.0.1-1 -- You are receiving this mail because: You are on the CC list for the bug. You are always notified about changes to this product and component _______________________________________________ package-review mailing list package-review@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/package-review