[mustache-java] introduce license macro
gil
gil at fedoraproject.org
Tue Feb 10 18:25:16 UTC 2015
commit 9916c12895fc8feabdf399ea2d1de5b2640c0456
Author: gil <puntogil at libero.it>
Date: Tue Feb 10 19:25:03 2015 +0100
introduce license macro
mustache-java.spec | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
---
diff --git a/mustache-java.spec b/mustache-java.spec
index f14c8a5..f4a10cd 100644
--- a/mustache-java.spec
+++ b/mustache-java.spec
@@ -1,7 +1,7 @@
%global oname mustache.java
Name: mustache-java
Version: 0.8.16
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Implementation of mustache.js for Java
License: ASL 2.0
URL: https://github.com/spullara/mustache.java/
@@ -16,11 +16,7 @@ BuildRequires: mvn(org.apache.maven:maven-plugin-api)
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-api)
-%if %{?fedora} > 19
BuildRequires: mvn(org.jruby:jruby)
-%else
-BuildRequires: mvn(org.jruby:shared)
-%endif
BuildRequires: mvn(org.ow2.asm:asm-commons)
BuildRequires: mvn(org.ow2.asm:asm-util)
@@ -79,13 +75,6 @@ find . -name "*.jar" -print -delete
</archive>
</configuration>"
-# TODO Fix jruby aId
-%if %{?fedora} <= 19
-%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'org.jruby']/pom:artifactId" shared compiler
-%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'org.jruby']/pom:artifactId" shared codegen
-%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'org.jruby']/pom:artifactId" shared indy
-%endif
-
# These tests fails for various reasons
rm -r compiler/src/test/java/com/github/mustachejava/SpecTest.java \
compiler/src/test/java/com/github/mustachejava/simple/SimpleSpecTest.java \
@@ -99,9 +88,10 @@ rm -r compiler/src/test/java/com/github/mustachejava/SpecTest.java \
rm -r compiler/src/test/java/com/github/mustachejava/JRubyTest.java \
compiler/src/test/java/com/github/mustachejavabenchmarks/JRubyBenchmarkTest.java
+%mvn_package com.github.spullara.mustache.java:mustache-maven-plugin maven-plugin
+
%build
-%mvn_package com.github.spullara.mustache.java:mustache-maven-plugin maven-plugin
%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
%install
@@ -112,15 +102,19 @@ install -pm 644 compiler/target/compiler-%{version}-tests.jar %{buildroot}%{_jav
%files -f .mfiles
%dir %{_javadir}/%{name}
%{_javadir}/%{name}/compiler-tests.jar
-%doc LICENSE README.md
+%doc README.md
+%license LICENSE
%files maven-plugin -f .mfiles-maven-plugin
-%doc LICENSE
+%license LICENSE
%files javadoc -f .mfiles-javadoc
-%doc LICENSE
+%license LICENSE
%changelog
+* Tue Feb 10 2015 gil cattaneo <puntogil at libero.it> 0.8.16-2
+- introduce license macro
+
* Thu Sep 04 2014 gil cattaneo <puntogil at libero.it> 0.8.16-1
- update to 0.8.16
More information about the scm-commits
mailing list