[jenkins-version-number/f19] Fix licensing
Michal Srb
msrb at fedoraproject.org
Thu May 16 07:36:06 UTC 2013
commit db11d1897115bb0ee01427f7de9d7a05fd721be0
Author: Michal Srb <msrb at redhat.com>
Date: Thu May 16 09:35:32 2013 +0200
Fix licensing
- Fix directory ownership
.gitignore | 1 +
jenkins-version-number.spec | 13 ++++++++++---
sources | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 96e992d..8a440a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/version-number-1.1.tar.gz
/LICENSE-2.0.txt
/LICENSE.txt
+/LICENSE-MIT
diff --git a/jenkins-version-number.spec b/jenkins-version-number.spec
index e443a56..76526a8 100644
--- a/jenkins-version-number.spec
+++ b/jenkins-version-number.spec
@@ -2,7 +2,7 @@
Name: jenkins-version-number
Version: 1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Version number manipulation library for Java
# Main class has been rewritten by Apache guys, rest of the project is under MIT
@@ -12,7 +12,9 @@ License: ASL 2.0 and MIT
URL: https://github.com/jenkinsci/lib-version-number
Source0: https://github.com/jenkinsci/lib-%{short_name}/archive/%{short_name}-%{version}.tar.gz
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
-Source2: https://raw.github.com/jenkinsci/jenkins/jenkins-1.510/LICENSE.txt
+# License text copied from http://jenkins-ci.org/mit-license (link specified in pom file)
+Source2: LICENSE-MIT
+
BuildRequires: maven-local
BuildRequires: mvn(junit:junit)
@@ -38,7 +40,7 @@ This package contains the API documentation for %{name}.
%pom_xpath_inject "pom:project" "<groupId>org.jenkins-ci</groupId>"
cp %{SOURCE1} LICENSE-ASL
-cp %{SOURCE2} LICENSE-MIT
+cp %{SOURCE2} .
%build
%mvn_build -- -Dproject.build.sourceEncoding=ISO-8859-1
@@ -47,11 +49,16 @@ cp %{SOURCE2} LICENSE-MIT
%mvn_install
%files -f .mfiles
+%dir %{_javadir}/%{name}
%doc LICENSE-ASL LICENSE-MIT
%files javadoc -f .mfiles-javadoc
%doc LICENSE-ASL LICENSE-MIT
%changelog
+* Thu May 16 2013 Michal Srb <msrb at redhat.com> - 1.1-2
+- Fix licensing
+- Fix directory ownership
+
* Mon May 13 2013 Michal Srb <msrb at redhat.com> - 1.1-1
- Initial package
diff --git a/sources b/sources
index b44d03f..fe23f2c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
6e6cd0c1fd6826414a432ffeddcb0836 version-number-1.1.tar.gz
3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
-9cc0a29e6ed42f3362df214b05448545 LICENSE.txt
+ebb9535dcdd967d9bd5a580e704113fd LICENSE-MIT
More information about the scm-commits
mailing list