commit 331628cd3ae062ae9ad28864eba4f85388c3d9cf Author: Michal Srb msrb@redhat.com Date: Mon Apr 7 06:52:46 2014 +0200
Remove forgotten BSD license references
jenkins.spec | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) --- diff --git a/jenkins.spec b/jenkins.spec index 2479534..9bbc1b8 100644 --- a/jenkins.spec +++ b/jenkins.spec @@ -5,7 +5,7 @@
Name: jenkins Version: 1.557 -Release: 9%{?dist} +Release: 10%{?dist} Summary: An extendable open source continuous integration server
# The project's primary license is MIT @@ -21,8 +21,6 @@ Source0: https://github.com/jenkinsci/jenkins/archive/%%7Bname%7D-%%7Bversion%7D. Source1: http://www.apache.org/licenses/LICENSE-2.0.txt # taken from https://netbeans.org/cddl-gplv2.html Source2: CDDL-LICENSE -# taken from core/src/main/java/hudson/markup/EbayPolicy.java -Source3: BSD-LICENSE Source4: jenkins-sysconfig Source5: context.xml
@@ -380,7 +378,6 @@ find . -name "*.class" -delete
cp %{SOURCE1} LICENSE-ASL-2.0.txt cp %{SOURCE2} LICENSE-CDDL.txt -cp %{SOURCE3} LICENSE-BSD.txt
# packaging layout %mvn_package :jenkins-core core @@ -543,7 +540,7 @@ cp -p %{SOURCE5} %{buildroot}/%{homedir}/webapp/META-INF/context.xml
%files core -f .mfiles-core %dir %{_javadir}/%{name} -%doc LICENSE.txt LICENSE-ASL-2.0.txt LICENSE-CDDL.txt LICENSE-BSD.txt +%doc LICENSE.txt LICENSE-ASL-2.0.txt LICENSE-CDDL.txt
%files plugins-pom -f .mfiles-plugins-pom
@@ -564,6 +561,9 @@ cp -p %{SOURCE5} %{buildroot}/%{homedir}/webapp/META-INF/context.xml %doc LICENSE.txt
%changelog +* Mon Apr 07 2014 Michal Srb msrb@redhat.com - 1.557-10 +- Remove forgotten BSD license references + * Fri Apr 04 2014 Michal Srb msrb@redhat.com - 1.557-9 - Update license tag to reflect changes in 1.557