[glassfish-jsp-api/f18] Fix license tag
by Mikolaj Izdebski
commit 0cd9b2c689ec0b6f09b32cb32f48754990a6b1b6
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Sep 4 18:51:55 2012 +0200
Fix license tag
- Install license files
glassfish-jsp-api.spec | 14 ++++++++++++--
sources | 2 ++
2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/glassfish-jsp-api.spec b/glassfish-jsp-api.spec
index c503711..9287e22 100644
--- a/glassfish-jsp-api.spec
+++ b/glassfish-jsp-api.spec
@@ -4,16 +4,18 @@
Name: glassfish-jsp-api
Version: 2.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Glassfish J2EE JSP API specification
Group: Development/Libraries
-License: CDDL and GPLv2 with exceptions
+License: (CDDL or GPLv2 with exceptions) and ASL 2.0
URL: http://glassfish.org
Source0: %{artifactId}-%{version}.tar.xz
# no source releases, but this will generate tarball for you from an
# SVN tag
Source1: generate_tarball.sh
+Source2: http://www.apache.org/licenses/LICENSE-2.0.txt
+Source3: http://hub.opensolaris.org/bin/download/Main/licensing/cddllicense.txt
BuildArch: noarch
@@ -47,6 +49,8 @@ BuildArch: noarch
%prep
%setup -q -n %{artifactId}-%{version}
+cp -p %{SOURCE2} LICENSE
+cp -p %{SOURCE3} cddllicense.txt
%build
@@ -70,15 +74,21 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap
%files
+%doc LICENSE cddllicense.txt
%{_javadir}/%{name}.jar
%{_mavendepmapfragdir}/%{name}
%{_mavenpomdir}/JPP-%{name}.pom
%files javadoc
+%doc LICENSE cddllicense.txt
%{_javadocdir}/%{name}
%changelog
+* Tue Sep 4 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.2.1-3
+- Fix license tag
+- Install license files
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 8cac028..4680182 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
146980bfb81e6fbd5a58d4cf30497f16 javax.servlet.jsp-api-2.2.1.tar.xz
+3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
+edd10f4fe16aeb62cf8aee5a0c7e54e1 cddllicense.txt
11 years, 8 months
[glassfish-jsp/f18] Fix license tag
by Mikolaj Izdebski
commit 14f02aadf3c912532a7467eec466e4098a8900d4
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Sep 4 18:38:55 2012 +0200
Fix license tag
- Install license files
glassfish-jsp.spec | 14 ++++++++++++--
sources | 2 ++
2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/glassfish-jsp.spec b/glassfish-jsp.spec
index 586f557..98ab790 100644
--- a/glassfish-jsp.spec
+++ b/glassfish-jsp.spec
@@ -4,16 +4,18 @@
Name: glassfish-jsp
Version: 2.2.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Glassfish J2EE JSP API implementation
Group: Development/Libraries
-License: CDDL and GPLv2 with exceptions
+License: (CDDL or GPLv2 with exceptions) and ASL 2.0
URL: http://glassfish.org
Source0: %{artifactId}-%{version}.tar.xz
# no source releases, but this will generate tarball for you from an
# SVN tag
Source1: generate_tarball.sh
+Source2: http://www.apache.org/licenses/LICENSE-2.0.txt
+Source3: http://hub.opensolaris.org/bin/download/Main/licensing/cddllicense.txt
Patch0: %{name}-build-eclipse-compilers.patch
@@ -65,6 +67,8 @@ Requires: jpackage-utils
%prep
%setup -q -n %{artifactId}-%{version}
%patch0
+cp -p %{SOURCE2} LICENSE
+cp -p %{SOURCE3} cddllicense.txt
%build
mvn-rpmbuild install javadoc:javadoc
@@ -87,15 +91,21 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap -a "javax.servlet:jsp-api"
%files
+%doc LICENSE cddllicense.txt
%{_javadir}/%{name}.jar
%{_mavendepmapfragdir}/%{name}
%{_mavenpomdir}/JPP-%{name}.pom
%files javadoc
+%doc LICENSE cddllicense.txt
%{_javadocdir}/%{name}
%changelog
+* Tue Sep 4 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.2.5-3
+- Fix license tag
+- Install license files
+
* Thu Aug 30 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 2.2.5-2
- Build Eclipse compiler adapters.
diff --git a/sources b/sources
index 2595b09..5fa1327 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
763c10540dbf74733055ce82e1e5ea70 javax.servlet.jsp-2.2.5.tar.xz
+3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
+edd10f4fe16aeb62cf8aee5a0c7e54e1 cddllicense.txt
11 years, 8 months
[glassfish-jsp] Add license files to sources
by Mikolaj Izdebski
commit eedb37ad10b5a47dc70695277d3f5a2be8c3987e
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Sep 4 18:41:41 2012 +0200
Add license files to sources
sources | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/sources b/sources
index 58b5ac4..b515cff 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
f5cb9c16d3de1d7c548d52dc2c8a8c78 javax.servlet.jsp-2.2.6.tar.xz
+3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
+edd10f4fe16aeb62cf8aee5a0c7e54e1 cddllicense.txt
11 years, 8 months
[glassfish-jsp] Fix license tag
by Mikolaj Izdebski
commit effa2f16470b10e98687b8035cf5d28054edf4e8
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Sep 4 18:38:55 2012 +0200
Fix license tag
- Install license files
glassfish-jsp.spec | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/glassfish-jsp.spec b/glassfish-jsp.spec
index 3daab0e..bbbf085 100644
--- a/glassfish-jsp.spec
+++ b/glassfish-jsp.spec
@@ -4,16 +4,18 @@
Name: glassfish-jsp
Version: 2.2.6
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Glassfish J2EE JSP API implementation
Group: Development/Libraries
-License: CDDL and GPLv2 with exceptions
+License: (CDDL or GPLv2 with exceptions) and ASL 2.0
URL: http://glassfish.org
Source0: %{artifactId}-%{version}.tar.xz
# no source releases, but this will generate tarball for you from an
# SVN tag
Source1: generate_tarball.sh
+Source2: http://www.apache.org/licenses/LICENSE-2.0.txt
+Source3: http://hub.opensolaris.org/bin/download/Main/licensing/cddllicense.txt
Patch0: %{name}-build-eclipse-compilers.patch
@@ -65,6 +67,8 @@ Requires: jpackage-utils
%prep
%setup -q -n %{artifactId}-%{version}
%patch0
+cp -p %{SOURCE2} LICENSE
+cp -p %{SOURCE3} cddllicense.txt
%build
mvn-rpmbuild install javadoc:javadoc
@@ -87,15 +91,21 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap -a "javax.servlet:jsp-api"
%files
+%doc LICENSE cddllicense.txt
%{_javadir}/%{name}.jar
%{_mavendepmapfragdir}/%{name}
%{_mavenpomdir}/JPP-%{name}.pom
%files javadoc
+%doc LICENSE cddllicense.txt
%{_javadocdir}/%{name}
%changelog
+* Tue Sep 4 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.2.6-3
+- Fix license tag
+- Install license files
+
* Thu Aug 30 2012 Krzysztof Daniel <kdaniel(a)redhat.com> 2.2.6-2
- Build Eclipse compiler adapters.
11 years, 8 months
[fusesource-pom] Install LICENSE file
by tradej@fedoraproject.org
Summary of changes:
29598d7... Install LICENSE file (*)
(*) This commit already existed in another branch; no separate mail sent
11 years, 8 months
[fusesource-pom/f18] Install LICENSE file
by tradej@fedoraproject.org
commit 29598d7e7290d8c9c0c3848f91df0d81f6935934
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Sep 4 13:59:21 2012 +0200
Install LICENSE file
- Convert patch to POM macro
fusesource-pom-1.5-pom.patch | 17 -----------------
fusesource-pom.spec | 14 ++++++++++----
sources | 1 +
3 files changed, 11 insertions(+), 21 deletions(-)
---
diff --git a/fusesource-pom.spec b/fusesource-pom.spec
index f3d9f2a..f69039e 100644
--- a/fusesource-pom.spec
+++ b/fusesource-pom.spec
@@ -1,6 +1,6 @@
Name: fusesource-pom
Version: 1.5
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Parent POM for FuseSource Maven projects
Group: Development/Libraries
License: ASL 2.0
@@ -9,7 +9,7 @@ URL: http://fusesource.com/
# mkdir -p fusesource-pom-1.5 && cd fusesource-pom-1.5 && wget -U "" http://repo1.maven.org/maven2/org/fusesource/fusesource-pom/1.5/fusesourc... && mv fusesource-pom-1.5.pom pom.xml && cd ..
# tar cjf fusesource-pom-1.5.tar.bz2 fusesource-pom-1.5
Source0: %{name}-%{version}.tar.bz2
-Patch0: %{name}-%{version}-pom.patch
+Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
BuildArch: noarch
@@ -31,7 +31,7 @@ Requires: maven-remote-resources-plugin
Requires: maven-resources-plugin
Requires: maven-source-plugin
Requires: maven-surefire-plugin
-# clirr-maven-plugin depdendency removed by patch
+# clirr-maven-plugin depdendency removed with pom macro
Requires: plexus-containers-component-metadata
Requires: modello
Requires: maven-release-plugin
@@ -45,7 +45,8 @@ This is a shared POM parent for FuseSource Maven projects
%prep
%setup -q
-%patch0 -p1
+%pom_remove_plugin :clirr-maven-plugin
+cp -p %{SOURCE1} LICENSE
%install
# POM
@@ -56,10 +57,15 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap JPP-%{name}.pom
%files
+%doc LICENSE
%{_mavenpomdir}/JPP-%{name}.pom
%{_mavendepmapfragdir}/%{name}
%changelog
+* Tue Sep 4 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.5-5
+- Install LICENSE file
+- Convert patch to POM macro
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 40f75fa..cf03184 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
61b43bcbd9d2d3c5a5484ec8454c513a fusesource-pom-1.5.tar.bz2
+3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
11 years, 8 months
[mockito/f18] Upstream is missing import-package config.
by jerboaa
commit 76190e2098834bcc41a854188dbae7ab3e7958d3
Author: Severin Gehwolf <sgehwolf(a)redhat.com>
Date: Tue Sep 4 15:24:28 2012 +0200
Upstream is missing import-package config.
This has been reported upstream:
http://code.google.com/p/mockito/issues/detail?id=373
Once it's fixed we can eliminate this again.
fix-bnd-config.patch | 13 +++++++++----
mockito.spec | 5 ++++-
2 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/fix-bnd-config.patch b/fix-bnd-config.patch
index cec2269..fe41f2f 100644
--- a/fix-bnd-config.patch
+++ b/fix-bnd-config.patch
@@ -1,5 +1,5 @@
---- conf/mockito-core.bnd.orig 2012-08-31 17:38:35.605728658 +0200
-+++ conf/mockito-core.bnd 2012-08-31 17:39:06.490980938 +0200
+--- conf/mockito-core.bnd.orig 2012-09-04 15:08:36.953346883 +0200
++++ conf/mockito-core.bnd 2012-09-04 15:09:49.221919598 +0200
@@ -1,8 +1,3 @@
--classpath= lib/run/com.springsource.org.junit-4.5.0.jar, \
- lib/run/com.springsource.org.hamcrest.core-1.1.0.jar, \
@@ -9,7 +9,7 @@
Bundle-Name= Mockito Mock Library for Java. Core bundle requires Hamcrest-core and Objenesis.
Bundle-SymbolicName= org.mockito.mockito-core
Bundle-Version= 1.9.0
-@@ -10,7 +5,7 @@
+@@ -10,15 +5,16 @@
Export-Package= !org.mockito.asm.*, \
!org.mockito.cglib.*, \
!org.mockito.internal.*, \
@@ -18,7 +18,12 @@
Import-Package= junit.*;resolution:=optional, \
org.junit.*;resolution:=optional, \
-@@ -21,4 +16,4 @@
+ org.apache.tools.ant.*;resolution:=optional, \
+ org.hamcrest;version="[1.0,2.0)", \
+ org.objenesis;version="[1.0,2.0)", \
+- org.mockito.*
++ org.mockito.*, \
++ net.sf.cglib.proxy
Private-Package: org.mockito.*
diff --git a/mockito.spec b/mockito.spec
index 503e68e..df1b13b 100644
--- a/mockito.spec
+++ b/mockito.spec
@@ -1,6 +1,6 @@
Name: mockito
Version: 1.9.0
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: A Java mocking framework
License: MIT
@@ -86,6 +86,9 @@ cp -rp target/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%doc NOTICE
%changelog
+* Tue Sep 4 2012 Severin Gehwolf <sgehwolf(a)redhat.com> 1.9.0-9
+- Fix missing Import-Package in manifest.
+
* Mon Aug 27 2012 Severin Gehwolf <sgehwolf(a)redhat.com> 1.9.0-8
- Add aqute bnd instructions for OSGi metadata
11 years, 8 months