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