From bfdcf9ee0be71c75d1a01900fbdfb5ac395a40b1 Mon Sep 17 00:00:00 2001
From: Jochen Schmitt <Jochen@herr-schmitt.de>
Date: Thu, 24 Jul 2014 18:24:51 +0200
Subject: [PATCH] Migrating to the new JAVA packaging guidelines

---
 clojure.spec | 33 +++++++++------------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/clojure.spec b/clojure.spec
index a13f7bb..b01740c 100644
--- a/clojure.spec
+++ b/clojure.spec
@@ -7,7 +7,7 @@
 Name:           clojure
 Epoch:          1
 Version:        1.6.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A dynamic programming language that targets the Java Virtual Machine
 
 Group:          Development/Languages
@@ -19,13 +19,11 @@ Source1:        clojure.sh
 
 BuildArch:      noarch
 
-BuildRequires:  maven-local
+BuildRequires:  javapackages-tools
 BuildRequires:  ant >= 1.6
-BuildRequires:  jpackage-utils >= 1.5
 BuildRequires:  objectweb-asm
 BuildRequires:  java-devel >= 1:1.6.0
 
-Requires:       jpackage-utils
 %if 0%{?fedora} > 20
 Requires:       java-headless >= 1:1.6
 %else
@@ -52,6 +50,8 @@ can avoid reflection.
 %build
 ant -Dmaven.test.skip=1
 
+%mvn_artifact pom.xml %{name}.jar
+
 %install
 # jar - link to prefix'd jar so that java stuff knows where to look
 install -d -m 755 %{buildroot}%{_javadir}
@@ -63,33 +63,18 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 install -d -m 755 %{buildroot}%{_bindir}
 install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}
 
-%if 0%{?add_maven_depmap:1}
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-%else
-# some systems like RHEL do not have add_maven_depmap defined
-# - probably don't need JPP/%{name} -- do we?
-%add_to_maven_depmap %{groupId} %{artifactId} %{version} JPP %{name}
-%endif
+%mvn_install
 
-%clean
-rm -rf %{buildroot}
-
-%if 0%{?rhel}
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-%endif
-
-%files
+%files -f .mfiles
 %doc epl-v10.html changes.md readme.txt 
 %{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
 %{_javadir}/%{name}.jar
 %{_bindir}/%{name}
 
 %changelog
+* Thu Jul 24 2014 Jochen Schmitt <Jochen herr-schmitt de> - 1:1.6.0-3
+- Migrating to the new JAVA packaging guidelines
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.6.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild