--- a/elasticsearch.spec	Fri Apr 12 15:05:23 2013 -0700
+++ b/elasticsearch.spec	Mon Apr 15 19:33:28 2013 -0700
@@ -1,7 +1,7 @@
 # prevent brp repack jar files
 %define __os_install_post %{nil}
 
-%define _bindir  /usr/local/bin
+%define _bindir  /usr/local/bin/elasticsearch
 
 Summary:        elasticsearch is a scalable full text search engine
 Name:           elasticsearch
@@ -31,26 +31,22 @@
 
 %build
 [ "%{?dist}" == ".el6" ] && export PATH=/usr/local/apache-maven-3.0.5/bin:$PATH
-sed -i -e 's,guava</include>,guava</include>            \
-    <include>org.apache.lucene:lucene</include>         \
-    <include>log4j:log4j</include>                      \
-    <include>net.java.dev.jna:jna</include>             \
-    <include>org.xerial.snappy:snappy-java</include>    \
-    <include>com.spatial4j:spatial4j</include>          \
-    <include>com.vividsolutions:jts</include>,g' pom.xml
-sed -i -e 's,<optional>true</optional>,,g'       pom.xml
-sed -i -e 's,useTransitiveFiltering>true,useTransitiveFiltering>false,g'  src/main/assemblies/common-bin.xml
-echo '*********' pom.xml
-cat pom.xml
-echo '*********' src/main/assemblies/common-bin.xml
-cat src/main/assemblies/common-bin.xml
 mvn -Dmaven.test.skip=true clean package
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D -p -m 644 target/elasticsearch-%{version}.jar $RPM_BUILD_ROOT%{_bindir}/elasticsearch.jar
-find . -name '*.jar'
+mkdir xx
+cd xx
+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
+done
+rm -f $RPM_BUILD_ROOT%{_bindir}/lucene-core*.jar
+for f in elasticsearch jna jts log4j 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
+done
 
 
 %clean
@@ -59,7 +55,7 @@
 
 %files
 %defattr(-,root,root,-)
-%attr(0755,root,root) %{_bindir}/*
+%attr(0755,root,root) %{_bindir}