[clojure/f16: 11/12] Update to better follow packaging guidelines

[Michel Alexandre Salim]

commit b255c79724fe12d39708449bf5b827f28ea70200
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Thu Jun 7 16:50:52 2012 +0700

    Update to better follow packaging guidelines

 .gitignore   |    7 +------
 clojure.spec |   58 ++++++++++++++++++++++++++++++++++++----------------------
 sources      |    2 +-
 3 files changed, 38 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 90919ef..68cd157 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1 @@
-clojure-1.1.0.zip
-/clojure-1.2.0.zip
-/clojure-1.2.1.zip
-/clojure-1.3.0-RC0.zip
-/clojure-1.3.0.zip
-/clojure-1.4.0.zip
+/clojure-clojure-clojure-1.4.0-0-g0ba3ff1.tar.gz
diff --git a/clojure.spec b/clojure.spec
index df2a3bf..f3dcbe2 100644
--- a/clojure.spec
+++ b/clojure.spec
@@ -1,16 +1,24 @@
+%global project     clojure
+%global groupId     org.clojure
+%global artifactId  clojure
+%global archivename %{project}-%{artifactId}
+%global commit_hash 0ba3ff1
+
 Name:           clojure
 Epoch:		1
 Version:     	1.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A dynamic programming language that targets the Java Virtual Machine
 
 Group:          Development/Languages
 License:        EPL
 URL:            http://clojure.org/
-Source0:        http://repo1.maven.org/maven2/org/clojure/clojure/%{version}/clojure-%{version}.zip
+# wget --content-disposition \
+#   https://github.com/clojure/clojure/tarball/clojure-%{version}
+Source0:        %{project}-%{archivename}-%{version}-0-g%{commit_hash}.tar.gz
+
 Source1:        clojure.sh
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 BuildRequires:  ant >= 1.6
@@ -34,53 +42,59 @@ optional type hints and type inference, to ensure that calls to Java
 can avoid reflection.
 
 %prep
-%setup -q
-rm -f *.jar
+%setup -q -n %{archivename}-8306949
 
 %build
 ant
 
 %install
-rm -rf %{buildroot}
-
+# EDIT this section does not seem to make any sense, it's all source files!
 # prefix install
-install -p -d -m 755 %{buildroot}%{_datadir}/%{name}
-cp -ar src/clj/clojure/*  %{buildroot}%{_datadir}/%{name}/
-rm -f %{buildroot}%{_datadir}/%{name}/xml/\#*
+#install -d -m 755 %{buildroot}%{_datadir}/%{name}
+#cp -ar src/clj/clojure/*  %{buildroot}%{_datadir}/%{name}/
+#rm -f %{buildroot}%{_datadir}/%{name}/xml/\#*
 
 # jar - link to prefix'd jar so that java stuff knows where to look
 install -d -m 755 %{buildroot}%{_javadir}
-cp clojure.jar %{buildroot}%{_javadir}/%{name}.jar
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -pm 644 %{name}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
 # startup script
 install -d -m 755 %{buildroot}%{_bindir}
-cp %{SOURCE1} %{buildroot}%{_bindir}/clojure
+install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}
 
-install -d %{buildroot}%{_datadir}/maven2/poms
-%add_to_maven_depmap clojure clojur-lang %{version} JPP/%{name} clojure-lang
-install -m 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-clojure-lang.pom
+%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
 
 %clean
 rm -rf %{buildroot}
 
+%if 0%{?rhel}
 %post
 %update_maven_depmap
 
 %postun
 %update_maven_depmap
+%endif
 
 %files
-%defattr(-,root,root,-)
-%doc readme.txt epl-v10.html
-
-%attr(0755,root,root) %{_bindir}/clojure
+%doc epl-v10.html changes.md readme.txt 
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
 %{_javadir}/%{name}.jar
-%{_datadir}/%{name}
 %{_bindir}/clojure
-%{_datadir}/maven2/poms
-%{_mavendepmapfragdir}/*
+#{_datadir}/%{name}
 
 %changelog
+* Wed Jun  6 2012 Michel Salim <salimma at fedoraproject.org> - 1:1.4.0-2
+- Update to better follow packaging guidelines
+
 * Tue Apr 17 2012 Jochen Schmitt <Jochen herr-schmitt de> 1:1.4.0-1
 - New upstream release
 
diff --git a/sources b/sources
index 33d3dee..df55aa0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-db17baaea5bc90687c6293260499cca8  clojure-1.4.0.zip
+3a8430bc1005613dead40ff3a6dbd723  clojure-clojure-clojure-1.4.0-0-g0ba3ff1.tar.gz