[apache-commons-jexl] Build JEXL 1.x compat artifact

Michal Srb msrb at fedoraproject.org
Thu Jan 2 09:11:33 UTC 2014


commit a3e1001c32a084a9f996fb2505e39f521d7ef4d6
Author: Michal Srb <msrb at redhat.com>
Date:   Thu Jan 2 09:59:57 2014 +0100

    Build JEXL 1.x compat artifact
    
    - Fix directory ownership

 apache-commons-jexl.spec |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/apache-commons-jexl.spec b/apache-commons-jexl.spec
index 58d69a7..9be32a2 100644
--- a/apache-commons-jexl.spec
+++ b/apache-commons-jexl.spec
@@ -1,8 +1,9 @@
 %global jarname commons-jexl
+%global compatver 2.1.0
 
 Name:           apache-%{jarname}
 Version:        2.1.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Java Expression Language (JEXL)
 
 Group:          Development/Libraries
@@ -53,24 +54,36 @@ find \( -name '*.jar' -o -name '*.class' \) -delete
 # Fix line endings
 find -name '*.txt' -exec sed -i 's/\r//' '{}' +
 
+# Drop "-SNAPSHOT" from version
+%pom_xpath_set "pom:project/pom:version" %{compatver} jexl2-compat
 
 %build
 %mvn_build
 
+pushd jexl2-compat
+  %mvn_build
+popd
 
 %install
+%mvn_artifact jexl2-compat/pom.xml \
+              jexl2-compat/target/%{jarname}-compat-%{compatver}.jar
+
 %mvn_install
 
 
 %files -f .mfiles
 %doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
+%{_javadir}/%{name}
 
 %files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt NOTICE.txt
-%{_javadocdir}/%{name}
 
 
 %changelog
+* Thu Jan 02 2014 Michal Srb <msrb at redhat.com> - 2.1.1-9
+- Build JEXL 1.x compat artifact
+- Fix directory ownership
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list