commit 374e5160ad07d83fd98693b252dc966197715ea0 Author: gil puntogil@libero.it Date: Sun Feb 1 15:53:39 2015 +0100
introduce license macro
ehcache-core.spec | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) --- diff --git a/ehcache-core.spec b/ehcache-core.spec index 6efa984..80e8624 100644 --- a/ehcache-core.spec +++ b/ehcache-core.spec @@ -1,6 +1,6 @@ Name: ehcache-core Version: 2.6.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Easy Hibernate Cache License: ASL 2.0 URL: http://ehcache.org/ @@ -14,8 +14,6 @@ Source0: %{name}-%{version}-clean-src-svn.tar.gz Patch0: %{name}-2.6.7-java8.patch
BuildRequires: ehcache-parent -BuildRequires: java-devel - BuildRequires: geronimo-jta BuildRequires: hibernate3 >= 3.6.10-7 BuildRequires: ehcache-sizeof-agent @@ -89,10 +87,11 @@ This package contains javadoc for %{name}. # disable embedded ehcache-sizeof-agent.jar copy %pom_remove_plugin :maven-dependency-plugin
-%build - %mvn_file :%{name} %{name} %mvn_alias :%{name} net.sf.ehcache:ehcache + +%build + # tests skipped. cause: missing dependencies %mvn_build -f -- -Dmaven.local.depmap.file="%{_mavendepmapfragdir}/tomcat-tomcat-servlet-api"
@@ -100,12 +99,15 @@ This package contains javadoc for %{name}. %mvn_install
%files -f .mfiles -%doc src/assemble/EHCACHE-CORE-LICENSE.txt +%license src/assemble/EHCACHE-CORE-LICENSE.txt
%files javadoc -f .mfiles-javadoc -%doc src/assemble/EHCACHE-CORE-LICENSE.txt +%license src/assemble/EHCACHE-CORE-LICENSE.txt
%changelog +* Sun Feb 01 2015 gil cattaneo puntogil@libero.it 2.6.7-6 +- introduce license macro + * Sat Jun 07 2014 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 2.6.7-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
java-sig-commits@lists.fedoraproject.org