[glassfish-hk2] introduce license macro
by gil
commit b0732bd5d453a2240b020a492cf18ed259125a48
Author: gil <puntogil(a)libero.it>
Date: Tue Feb 3 10:41:38 2015 +0100
introduce license macro
glassfish-hk2.spec | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 deletions(-)
---
diff --git a/glassfish-hk2.spec b/glassfish-hk2.spec
index eececd9..ca0f2de 100644
--- a/glassfish-hk2.spec
+++ b/glassfish-hk2.spec
@@ -1,6 +1,6 @@
Name: glassfish-hk2
Version: 2.1.93
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Hundred Kilobytes Kernel
License: CDDL or GPLv2 with exceptions
URL: http://hk2.java.net/
@@ -16,7 +16,6 @@ Source1: glassfish-LICENSE.txt
Patch0: glassfish-hk2-2.1.92-hk2-utils-osgi_bundle.patch
BuildRequires: glassfish-master-pom
-BuildRequires: java-devel
BuildRequires: jvnet-parent
BuildRequires: args4j
@@ -60,8 +59,6 @@ BuildRequires: maven-plugin-bundle
BuildRequires: maven-plugin-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-source-plugin
-#BuildRequires: maven-surefire-plugin
-#BuildRequires: maven-surefire-provider-junit4
BuildArch: noarch
@@ -276,7 +273,6 @@ rm -rf hk2-inhabitant-generator/src/test/java/org/jvnet/hk2/generator/tests/
cp -p %{SOURCE1} LICENSE.txt
sed -i 's/\r//' LICENSE.txt
-%build
%mvn_package ":hk2-api" api
%mvn_package ":hk2-bom" %{name}
%mvn_package ":hk2-build" %{name}
@@ -310,6 +306,8 @@ sed -i 's/\r//' LICENSE.txt
%mvn_package ":consolidatedbundle-maven-plugin" maven-plugins
%mvn_package ":osgiversion-maven-plugin" maven-plugins
+%build
+
# some tests fails for various cause
%mvn_build -- -Dmaven.test.failure.ignore=true
@@ -323,62 +321,65 @@ install -m 644 hk2-config/target/hk2-config-%{version}-tests.jar \
%files -f .mfiles-%{name}
%dir %{_javadir}/%{name}
-%doc LICENSE.txt
+%license LICENSE.txt
%files api -f .mfiles-api
-%doc LICENSE.txt
+%license LICENSE.txt
%files apt -f .mfiles-apt
-%doc LICENSE.txt
+%license LICENSE.txt
%files class-model -f .mfiles-class-model
-%doc LICENSE.txt
+%license LICENSE.txt
%if 0
%files config -f .mfiles-config
-%doc LICENSE.txt
+%license LICENSE.txt
%endif
%files core -f .mfiles-core
-%doc LICENSE.txt
+%license LICENSE.txt
%files dependency-verifier -f .mfiles-dependency-verifier
-%doc LICENSE.txt
+%license LICENSE.txt
%files dependency-visualizer -f .mfiles-dependency-visualizer
-%doc LICENSE.txt
+%license LICENSE.txt
%files guice-bridge -f .mfiles-guice-bridge
-%doc LICENSE.txt
+%license LICENSE.txt
%files inhabitant-generator -f .mfiles-inhabitant-generator
-%doc LICENSE.txt
+%license LICENSE.txt
%files locator -f .mfiles-locator
-%doc LICENSE.txt
+%license LICENSE.txt
%files maven -f .mfiles-maven
-%doc LICENSE.txt
+%license LICENSE.txt
%files maven-plugins -f .mfiles-maven-plugins
-%doc LICENSE.txt
+%license LICENSE.txt
%files osgi -f .mfiles-osgi
-%doc LICENSE.txt
+%license LICENSE.txt
%files runlevel -f .mfiles-runlevel
-%doc LICENSE.txt
+%license LICENSE.txt
%files testing -f .mfiles-testing
-%doc LICENSE.txt
+%license LICENSE.txt
%files utils -f .mfiles-utils
-%doc LICENSE.txt
+%license LICENSE.txt
%files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt
+%license LICENSE.txt
%changelog
+* Tue Feb 03 2015 gil cattaneo <puntogil(a)libero.it> 2.1.93-8
+- introduce license macro
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.1.93-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 3 months
[glassfish-ha-api] introduce license macro
by gil
commit fb09da77bc9436fa527766e3fce4df2ebfcb0443
Author: gil <puntogil(a)libero.it>
Date: Tue Feb 3 10:32:28 2015 +0100
introduce license macro
glassfish-ha-api.spec | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/glassfish-ha-api.spec b/glassfish-ha-api.spec
index e45c426..5c96d65 100644
--- a/glassfish-ha-api.spec
+++ b/glassfish-ha-api.spec
@@ -1,6 +1,6 @@
Name: glassfish-ha-api
Version: 3.1.9
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: High Availability APIs and SPI
License: CDDL or GPLv2 with exceptions
URL: http://glassfish.java.net/
@@ -11,11 +11,8 @@ Source0: %{name}-%{version}-src-svn.tar.gz
# glassfish-ha-api package don't include the license file
Source1: glassfish-LICENSE.txt
-BuildRequires: java-devel
BuildRequires: jvnet-parent
-
BuildRequires: glassfish-hk2-api
-
# test dep
BuildRequires: junit
@@ -66,21 +63,25 @@ sed -i "s|<artifactId>hk2</artifactId>|<artifactId>hk2-api</artifactId>|" pom.xm
cp -p %{SOURCE1} LICENSE.txt
sed -i 's/\r//' LICENSE.txt
+%mvn_file :ha-api %{name}
+
%build
-%mvn_file :ha-api %{name}
%mvn_build
%install
%mvn_install
%files -f .mfiles
-%doc LICENSE.txt
+%license LICENSE.txt
%files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt
+%license LICENSE.txt
%changelog
+* Tue Feb 03 2015 gil cattaneo <puntogil(a)libero.it> 3.1.9-5
+- introduce license macro
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.1.9-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
@@ -92,4 +93,4 @@ sed -i 's/\r//' LICENSE.txt
- minor changes to adapt to current guideline
* Tue Oct 02 2012 gil cattaneo <puntogil(a)libero.it> 3.1.9-1
-- initial rpm
\ No newline at end of file
+- initial rpm
9 years, 3 months
[glassfish-gmbal] introduce license macro
by gil
commit 6d0ae83d8953e839903f08d4a24d8432c8b79bdd
Author: gil <puntogil(a)libero.it>
Date: Tue Feb 3 10:28:48 2015 +0100
introduce license macro
glassfish-gmbal.spec | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/glassfish-gmbal.spec b/glassfish-gmbal.spec
index 917110c..ef19272 100644
--- a/glassfish-gmbal.spec
+++ b/glassfish-gmbal.spec
@@ -77,11 +77,11 @@ mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name}
%files -f .mfiles
-%doc legal/LICENSE.TXT
+%license legal/LICENSE.TXT
%files javadoc
%{_javadocdir}/%{name}
-%doc legal/LICENSE.TXT
+%license legal/LICENSE.TXT
%changelog
* Tue Feb 03 2015 gil cattaneo <puntogil(a)libero.it> 3.2.0-0.6.b003
9 years, 3 months
[glassfish-gmbal] introduce license macro
by gil
commit 046a8305cefd0e4814c708d3dd7656694559aabe
Author: gil <puntogil(a)libero.it>
Date: Tue Feb 3 10:28:14 2015 +0100
introduce license macro
glassfish-gmbal.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/glassfish-gmbal.spec b/glassfish-gmbal.spec
index 48d1285..917110c 100644
--- a/glassfish-gmbal.spec
+++ b/glassfish-gmbal.spec
@@ -2,7 +2,7 @@
%global namedversion %{version}%{?namedreltag}
Name: glassfish-gmbal
Version: 3.2.0
-Release: 0.5.b003%{?dist}
+Release: 0.6.b003%{?dist}
Summary: GlassFish MBean Annotation Library
License: CDDL or GPLv2 with exceptions
URL: http://java.net/projects/gmbal/pages/Home
@@ -84,6 +84,9 @@ cp -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name}
%doc legal/LICENSE.TXT
%changelog
+* Tue Feb 03 2015 gil cattaneo <puntogil(a)libero.it> 3.2.0-0.6.b003
+- introduce license macro
+
* Fri Jun 06 2014 gil cattaneo <puntogil(a)libero.it> 3.2.0-0.5.b003
- Use .mfiles generated during build
9 years, 3 months
[glassfish-annotation-api] introduce license macro
by gil
commit 782af08da4619b39bf656f1fe6d90e513cd5c9f0
Author: gil <puntogil(a)libero.it>
Date: Tue Feb 3 10:25:26 2015 +0100
introduce license macro
glassfish-annotation-api.spec | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/glassfish-annotation-api.spec b/glassfish-annotation-api.spec
index 9d9ff34..1ac89ee 100644
--- a/glassfish-annotation-api.spec
+++ b/glassfish-annotation-api.spec
@@ -3,7 +3,7 @@
%global oname javax.annotation-api
Name: glassfish-annotation-api
Version: 1.2
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Common Annotations API Specification (JSR 250)
License: CDDL or GPLv2 with exceptions
# http://jcp.org/en/jsr/detail?id=250
@@ -12,7 +12,6 @@ URL: http://glassfish.java.net/
# tar czf glassfish-annotation-api-1.2-src-svn.tar.gz glassfish-annotation-api-1.2
Source0: %{name}-%{namedversion}-src-svn.tar.gz
-BuildRequires: java-devel
BuildRequires: jvnet-parent
BuildRequires: glassfish-legal
@@ -37,10 +36,10 @@ This package contains javadoc for %{name}.
%setup -q -n %{name}-%{namedversion}
%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
+%mvn_file :%{oname} %{name}
%build
-%mvn_file :%{oname} %{name}
%mvn_build
sed -i 's/\r//' target/classes/META-INF/LICENSE.txt
@@ -50,12 +49,15 @@ cp -p target/classes/META-INF/LICENSE.txt .
%mvn_install
%files -f .mfiles
-%doc LICENSE.txt
+%license LICENSE.txt
%files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt
+%license LICENSE.txt
%changelog
+* Tue Feb 03 2015 gil cattaneo <puntogil(a)libero.it> 1.2-8
+- introduce license macro
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 3 months
[geronimo-jcdi-1.0-api] introduce license macro
by gil
commit bb0ad7eba263eb8c09ca350c9898b289dc44164d
Author: gil <puntogil(a)libero.it>
Date: Tue Feb 3 10:18:47 2015 +0100
introduce license macro
geronimo-jcdi-1.0-api.spec | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/geronimo-jcdi-1.0-api.spec b/geronimo-jcdi-1.0-api.spec
index 0edd1c4..35f93ea 100644
--- a/geronimo-jcdi-1.0-api.spec
+++ b/geronimo-jcdi-1.0-api.spec
@@ -2,14 +2,13 @@
%global spec_name geronimo-jcdi_%{spec_ver}_spec
Name: geronimo-jcdi-1.0-api
Version: 1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Apache Geronimo Java Contexts and Dependency Injection (JSR-299) Spec API
License: ASL 2.0
URL: http://geronimo.apache.org/
Source0: http://repo2.maven.org/maven2/org/apache/geronimo/specs/%{spec_name}/%{ve...
-BuildRequires: java-devel
-BuildRequires: mvn(org.apache.geronimo.specs:specs)
+BuildRequires: mvn(org.apache.geronimo.specs:specs:pom:)
BuildRequires: mvn(javax.inject:javax.inject)
BuildRequires: mvn(org.apache.geronimo.specs:geronimo-annotation_1.1_spec)
BuildRequires: mvn(org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec)
@@ -56,21 +55,25 @@ for s in src/main/java/javax/enterprise/inject/spi/BeanManager.java \
native2ascii -encoding UTF8 ${s} ${s}
done
+%mvn_file : %{name}
+
%build
-%mvn_file : %{name}
%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
%install
%mvn_install
%files -f .mfiles
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
%files javadoc -f .mfiles-javadoc
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
%changelog
+* Tue Feb 03 2015 gil cattaneo <puntogil(a)libero.it> 1.0-4
+- introduce license macro
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
@@ -78,4 +81,4 @@ done
- Use Requires: java-headless rebuild (#1067528)
* Tue Jul 23 2013 gil cattaneo <puntogil(a)libero.it> 1.0-1
-- initial rpm
\ No newline at end of file
+- initial rpm
9 years, 3 months
[gemini-blueprint] introduce license macro
by gil
commit 26117c6dbae69688f0d1efa8631b8867f65739e6
Author: gil <puntogil(a)libero.it>
Date: Tue Feb 3 09:49:41 2015 +0100
introduce license macro
gemini-blueprint.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gemini-blueprint.spec b/gemini-blueprint.spec
index 4264220..7e8f680 100644
--- a/gemini-blueprint.spec
+++ b/gemini-blueprint.spec
@@ -180,7 +180,7 @@ rm -r core/src/test/java/org/eclipse/gemini/blueprint/blueprint/ReflectionTest.j
%license epl-v10.html license-apache.txt notice.html
%files javadoc -f .mfiles-javadoc
-%license %doc epl-v10.html license-apache.txt notice.html
+%license epl-v10.html license-apache.txt notice.html
%changelog
* Tue Feb 03 2015 gil cattaneo <puntogil(a)libero.it> 1.0.2-8
9 years, 3 months
[gentlyweb-utils] introduce license macro
by gil
commit c0afb580870b7af2db4f9201fd5b72fef98d06c7
Author: gil <puntogil(a)libero.it>
Date: Tue Feb 3 09:40:10 2015 +0100
introduce license macro
gentlyweb-utils.spec | 35 ++++++++++++-----------------------
1 files changed, 12 insertions(+), 23 deletions(-)
---
diff --git a/gentlyweb-utils.spec b/gentlyweb-utils.spec
index 89c6119..50a8207 100644
--- a/gentlyweb-utils.spec
+++ b/gentlyweb-utils.spec
@@ -3,11 +3,10 @@ Name: gentlyweb-utils
# http://ftp.de.debian.org/debian/pool/main/g/gentlyweb-utils/gentlyweb-uti...
# the version is changed only in the activemq package see activemq-5.6.0/pom.xml
Version: 1.5
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Java utility library used by JoSQL for I/O
License: ASL 2.0
Url: http://josql.sourceforge.net/
-#Sour ce0: http://gentlyweb-utils.sourcearchive.com/downloads/1.5-1/gentlyweb-utils_...
Source0: http://sourceforge.net/projects/josql/files/josql/stable-2.2/gentlyWEB-sr...
Source1: http://repo.fusesource.com/nexus/content/groups/public/net/sf/josql/%{nam...
# use system libraries
@@ -16,14 +15,10 @@ Source1: http://repo.fusesource.com/nexus/content/groups/public/net/sf/jos
# add javadoc task
Patch0: %{name}-%{version}-build.patch
-
-BuildRequires: java-devel
-BuildRequires: jpackage-utils
-
BuildRequires: ant
+BuildRequires: javapackages-local
BuildRequires: jdom
-Requires: jpackage-utils
BuildArch: noarch
%description
@@ -39,33 +34,27 @@ This package contains javadoc for %{name}.
%setup -q -n gentlyWEB-src-utils-1.1
%patch0 -p0
+%mvn_file : %{name} gentlyWEB-utils
+
%build
%ant -f build-utils.xml createUtilsJar javadoc
%install
-mkdir -p %{buildroot}%{_javadir}
-install -m 644 gentlyWEB-utils-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}.jar
-ln -sf %{name}.jar %{buildroot}%{_javadir}/gentlyWEB-utils.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 %SOURCE1 %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%mvn_artifact %{SOURCE1} gentlyWEB-utils-%{version}.jar
+%mvn_install -J apidocs
%files -f .mfiles
-%{_javadir}/gentlyWEB-utils.jar
-%doc LICENSE-2.0.txt
+%license LICENSE-2.0.txt
-%files javadoc
-%{_javadocdir}/%{name}
-%doc LICENSE-2.0.txt
+%files javadoc -f .mfiles-javadoc
+%license LICENSE-2.0.txt
%changelog
+* Tue Feb 03 2015 gil cattaneo <puntogil(a)libero.it> 1.5-7
+- introduce license macro
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.5-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 3 months
[gemini-blueprint] introduce license macro
by gil
commit 46e287905a1cb3c8a3d5b001bbf1b6e2beb94c64
Author: gil <puntogil(a)libero.it>
Date: Tue Feb 3 09:32:25 2015 +0100
introduce license macro
gemini-blueprint.spec | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/gemini-blueprint.spec b/gemini-blueprint.spec
index 10c0e50..4264220 100644
--- a/gemini-blueprint.spec
+++ b/gemini-blueprint.spec
@@ -3,7 +3,7 @@
%global dotname gemini.blueprint
Name: gemini-blueprint
Version: 1.0.2
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Reference Implementation of the OSGi Blueprint Service
# BSD file - test-support/src/main/java/org/eclipse/gemini/blueprint/test/internal/util/DependencyVisitor.java,
License: ASL 2.0 and BSD and EPL
@@ -12,13 +12,11 @@ URL: http://www.eclipse.org/gemini/
Source0: https://github.com/eclipse/gemini.blueprint/archive/%{namedversion}.tar.gz
# add maven-{bundle,jar}-plugin configuration
Patch0: %{name}-%{namedversion}-add-osgi-manifests.patch
-BuildRequires: java-devel
BuildRequires: aopalliance
BuildRequires: felix-osgi-compendium
BuildRequires: felix-osgi-core
BuildRequires: log4j12
-BuildRequires: slf4j
BuildRequires: springframework
BuildRequires: springframework-aop
BuildRequires: springframework-beans
@@ -30,7 +28,6 @@ BuildRequires: mvn(org.slf4j:slf4j-log4j12)
BuildRequires: maven-local
BuildRequires: maven-plugin-bundle
-BuildRequires: maven-surefire-provider-junit
# test deps
BuildRequires: easymock3
@@ -179,12 +176,16 @@ rm -r core/src/test/java/org/eclipse/gemini/blueprint/blueprint/ReflectionTest.j
%files -f .mfiles
%dir %{_javadir}/%{name}
-%doc about.html changelog.txt epl-v10.html license-apache.txt notice.html readme-building.txt readme.txt
+%doc about.html changelog.txt readme-building.txt readme.txt
+%license epl-v10.html license-apache.txt notice.html
%files javadoc -f .mfiles-javadoc
-%doc epl-v10.html license-apache.txt notice.html
+%license %doc epl-v10.html license-apache.txt notice.html
%changelog
+* Tue Feb 03 2015 gil cattaneo <puntogil(a)libero.it> 1.0.2-8
+- introduce license macro
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 3 months