[maven-scm] Install LICENSE file
by Mikolaj Izdebski
Summary of changes:
c51c7a9... Install LICENSE file (*)
(*) This commit already existed in another branch; no separate mail sent
11 years, 7 months
[maven-scm/f18] Install LICENSE file
by Mikolaj Izdebski
commit c51c7a971f433371e6675b96f14f07276a6e3566
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Nov 15 17:56:26 2012 +0100
Install LICENSE file
maven-scm.spec | 11 ++++++++++-
sources | 1 +
2 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/maven-scm.spec b/maven-scm.spec
index 560f048..6a7ccf1 100644
--- a/maven-scm.spec
+++ b/maven-scm.spec
@@ -30,7 +30,7 @@
Name: maven-scm
Version: 1.7
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Common API for doing SCM operations
License: ASL 2.0
Group: Development/Libraries
@@ -38,6 +38,7 @@ URL: http://maven.apache.org/scm
Source0: http://repo1.maven.org/maven2/org/apache/maven/scm/%{name}/%{version}/%{n...
Source1: %{name}-jpp-depmap.xml
+Source2: http://www.apache.org/licenses/LICENSE-2.0.txt
# fix modello configuration in vss provider pom and the cast as above
Patch0: 005_maven-scm_fix-vss-provider-pom.patch
@@ -107,6 +108,8 @@ Javadoc for %{name}.
%patch1 -p1
%patch5 -p1
+cp -p %{SOURCE2} LICENSE
+
%pom_remove_plugin org.codehaus.mojo:animal-sniffer-maven-plugin
%pom_remove_plugin org.codehaus.mojo:animal-sniffer-maven-plugin maven-scm-plugin
@@ -164,6 +167,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files
+%doc LICENSE
%dir %{_javadir}/%{name}
%{_javadir}/%{name}/api*
%{_javadir}/%{name}/client*
@@ -174,14 +178,19 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{_mavendepmapfragdir}/*
%files test
+%doc LICENSE
%{_javadir}/%{name}/provider-cvstest*
%{_javadir}/%{name}/provider-svntest*
%{_javadir}/%{name}/test*
%files javadoc
+%doc LICENSE
%{_javadocdir}/*
%changelog
+* Thu Nov 15 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.7-4
+- Install LICENSE file
+
* Tue Aug 21 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.7-3
- Remove unneeded mockito build dependency
- Use new pom_ macros instead of patches
diff --git a/sources b/sources
index f484cb2..2aaddb2 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
7c1b497bc8cebe99b8d238d4067c6183 maven-scm-1.7-source-release.zip
+3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
11 years, 7 months
[maven/f18] Install NOTICE file with javadoc package
by Mikolaj Izdebski
commit fe27247dd9af6034953f8afa422ee92c6189b191
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Nov 15 17:01:29 2012 +0100
Install NOTICE file with javadoc package
maven.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/maven.spec b/maven.spec
index 1cd4dae..3789129 100644
--- a/maven.spec
+++ b/maven.spec
@@ -2,7 +2,7 @@
Name: maven
Version: 3.0.4
-Release: 21%{?dist}
+Release: 21.1%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -380,11 +380,14 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP
%{_mandir}/man1/mvn.1.gz
%files javadoc
-%doc LICENSE.txt
+%doc LICENSE.txt NOTICE.txt
%{_javadocdir}/%{name}
%changelog
+* Thu Nov 15 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-21.1
+- Install NOTICE file with javadoc package
+
* Thu Nov 08 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.0.4-21
- Add support for custom jar/pom/fragment directories
11 years, 7 months
[maven] Install NOTICE file with javadoc package
by Mikolaj Izdebski
commit c4935d7c53bee0928987e3cd9305d1a29c88f58c
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Nov 15 16:52:16 2012 +0100
Install NOTICE file with javadoc package
maven.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/maven.spec b/maven.spec
index 770c1d1..3375f38 100644
--- a/maven.spec
+++ b/maven.spec
@@ -2,7 +2,7 @@
Name: maven
Version: 3.0.4
-Release: 23%{?dist}
+Release: 24%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -419,11 +419,14 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP
%{_mandir}/man1/mvn.1.gz
%files javadoc
-%doc LICENSE.txt
+%doc LICENSE.txt NOTICE.txt
%{_javadocdir}/%{name}
%changelog
+* Thu Nov 15 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-24
+- Install NOTICE file with javadoc package
+
* Tue Nov 13 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-23
- Temporarly require Plexus POMs as a workaround
11 years, 7 months
[plexus-bsh-factory] fix incomplete license.txt
by Tom Callaway
commit 9bb6e0b55cf699be0faf9a4a98ab59e7f5e0cc1f
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Nov 15 10:17:57 2012 -0500
fix incomplete license.txt
plexus-bsh-factory-license.txt | 24 ++++++++++++++++++++++++
plexus-bsh-factory.spec | 5 ++++-
2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/plexus-bsh-factory-license.txt b/plexus-bsh-factory-license.txt
index df26fc8..9c833b0 100644
--- a/plexus-bsh-factory-license.txt
+++ b/plexus-bsh-factory-license.txt
@@ -1,2 +1,26 @@
From jason(a)maven.org Wed Jul 9 21:16:12 2008
Return-Path: <dev-return-4811-tcallawa=redhat.com(a)plexus.codehaus.org>
+To: dev(a)plexus.codehaus.org
+
+No one uses it anyway, so you can safely remove it. But the license is MIT if not stated, though it's all switching to ASL.
+
+*****
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plexus-bsh-factory.spec b/plexus-bsh-factory.spec
index b06f6fb..a4bb92c 100644
--- a/plexus-bsh-factory.spec
+++ b/plexus-bsh-factory.spec
@@ -36,7 +36,7 @@
Name: %{parent}-%{subname}
Version: 1.0
-Release: 0.7.a7s.1.12%{?dist}
+Release: 0.7.a7s.1.13%{?dist}
Epoch: 0
Summary: Plexus Bsh component factory
License: MIT
@@ -178,6 +178,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Nov 15 2012 Tom Callaway <spot(a)fedoraproject.org> - 0:1.0-0.7.a7s.1.13
+- fix incomplete license.txt
+
* Tue Aug 21 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:1.0-0.7.a7s.1.12
- Don't own _mavenfragdir
11 years, 7 months
[maven-surefire] Add CPL license
by Mikolaj Izdebski
Summary of changes:
da3a3b0... Add CPL license (*)
(*) This commit already existed in another branch; no separate mail sent
11 years, 7 months
[maven-surefire/f18] Add CPL license
by Mikolaj Izdebski
commit da3a3b06cc0385902a59a9e94287d7974dae9fa5
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Nov 15 15:03:29 2012 +0100
Add CPL license
maven-surefire.spec | 13 +++++++++----
sources | 1 +
2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/maven-surefire.spec b/maven-surefire.spec
index 0a30df2..ddff12f 100644
--- a/maven-surefire.spec
+++ b/maven-surefire.spec
@@ -2,15 +2,16 @@
Name: maven-surefire
Version: 2.12.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 0
Summary: Test framework project
-License: ASL 2.0
+License: ASL 2.0 and CPL
Group: Development/Libraries
URL: http://maven.apache.org/surefire/
Source0: http://repo2.maven.org/maven2/org/apache/maven/surefire/surefire/%{versio...
Source1: %{name}-jpp-depmap.xml
+Source2: http://junit.sourceforge.net/cpl-v10.html
# provide compatibility for maven3
Patch0: 0003-Fix-maven3-compatibility.patch
@@ -156,6 +157,7 @@ Javadoc for %{name}.
%prep
%setup -q -n surefire-%{version}
+cp -p %{SOURCE2} .
%patch0 -p1 -b .sav
@@ -309,7 +311,7 @@ ln -s %{_javadir}/maven-surefire/report-maven-plugin.jar \
%files
-%doc LICENSE NOTICE
+%doc LICENSE NOTICE cpl-v10.html
%dir %{_javadir}/maven-surefire
%{_javadir}/maven-surefire/api.jar
%{_javadir}/maven-surefire/booter.jar
@@ -369,10 +371,13 @@ ln -s %{_javadir}/maven-surefire/report-maven-plugin.jar \
%{_javadir}/maven-failsafe-plugin.jar
%files javadoc
-%doc LICENSE NOTICE
+%doc LICENSE NOTICE cpl-v10.html
%doc %{_javadocdir}/*
%changelog
+* Thu Nov 15 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:2.12.4-3
+- Add CPL license
+
* Mon Oct 22 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:2.12.4-2
- Add maven depmap for org.beanshell:bsh
diff --git a/sources b/sources
index c7d2c5d..a4832a3 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
c3f8e9b9a171403d882e4f6c9a789414 surefire-2.12.4-source-release.zip
+67a4b75d42edcbd82d2878eba913691b cpl-v10.html
11 years, 7 months
