--- a/elasticsearch.spec	Wed Apr 17 19:38:59 2013 -0700
+++ b/elasticsearch.spec	Fri Apr 19 15:03:01 2013 -0700
@@ -1,25 +1,23 @@
 # prevent brp repack jar files
 %define __os_install_post %{nil}
 
-%define _bindir  /usr/local/bin/elasticsearch
 
 Summary:        elasticsearch is a scalable full text search engine
 Name:           elasticsearch
-Version:        0.20.5
+Version:        0.20.6
 Release:        0%{?dist}
 Group:          System Environment/Daemons
 License:        Apache 2.0
 URL:            http://www.elasticsearch.org/
 BuildArch:      noarch
-#Source0:         curl https://nodeload.github.com/elasticsearch/elasticsearch/tar.gz/v%{version} >elasticsearch-%{version}.tar.gz
-Source0:        %{name}-%{version}.tar.gz
+Source0:        https://nodeload.github.com/%{name}/%{name}/tar.gz/v%{version}/%{name}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires:  java-1.7.0-openjdk-devel
+BuildRequires:  java-devel
 
 %if "%{?dist}" != ".el6"
 # el6 does not have maven yet, so we assume it is manually installed
 # in /usr/local/apache-maven-3.0.5
-BuildRequires:  maven
+BuildRequires:  maven-local
 %endif
 
 %description
@@ -41,10 +39,12 @@
 tar xfz ../target/releases/%{name}-%{version}.tar.gz
 for f in %{name}-%{version}/lib/*.jar; do
     b=$(basename $f)
-    install -D -p -m 644 $f $RPM_BUILD_ROOT%{_bindir}/$b
+    install -D -p -m 644 $f $RPM_BUILD_ROOT%{_javadir}/%{name}/$b
 done
+cd $RPM_BUILD_ROOT%{_javadir}/%{name}
 for f in elasticsearch jna jts log4j lucene-core lucene-analyzers lucene-highlighter lucene-memory lucene-queries snappy-java spatial4j; do
-    mv $RPM_BUILD_ROOT%{_bindir}/$f*.jar $RPM_BUILD_ROOT%{_bindir}/$f.jar
+    v=$(echo $f*.jar)
+    ln --symbolic $v $f.jar
 done
 
 
@@ -54,7 +54,7 @@
 
 %files
 %defattr(-,root,root,-)
-%attr(0755,root,root) %{_bindir}
+%attr(0755,root,root) %{_javadir}/%{name}