# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1367949272 25200
# Node ID 01ebc38d772e22156b26ae437ecb5c8a9b681812
# Parent  76544ad0561d1065825942197229cc8ee7332a5a
switch kibana to ruby gem rather than jruby

diff -r 76544ad0561d -r 01ebc38d772e Makefile
--- a/Makefile	Mon May 06 23:31:24 2013 -0700
+++ b/Makefile	Tue May 07 10:54:32 2013 -0700
@@ -15,7 +15,6 @@
 lcc=df8ae2344433e5072a8dfe77082acfd1c9b6ed62
 lcs=df8ae234
 lv=0.2.0
-#l=Kibana-$(lv).tar.gz
 l=Kibana-$(lv)-$(lcs).tar.gz
 
 download:
@@ -25,7 +24,6 @@
 	[ -f $(i) ] || curl https://nodeload.github.com/NickPadilla/GraphTastic/tar.gz/$(icc) >$(i)
 	[ -f $(j) ] || curl http://repository.codehaus.org/org/jruby/jruby-complete/$(jv)/$(j) >$(j)
 	[ -f $(k) ] || curl http://logstash.objects.dreamhost.com/maxmind/$(k) >$(k)
-	#[ -f $(l) ] || curl https://codeload.github.com/rashidkpc/Kibana/tar.gz/v$(lv) >$(l)
 	[ -f $(l) ] || curl https://nodeload.github.com/rashidkpc/Kibana/tar.gz/$(lcc) >$(l)
 
 srpm: download
@@ -36,21 +34,18 @@
 	done
 	# build the source rpms
 	rpmbuild --define "dist $(dist)" --define "_sourcedir $(shell pwd)" --define "_srcrpmdir $(shell pwd)" --define "_rpmdir $(shell pwd)" -bs Kibana.spec
-	#rpmbuild --define "dist $(dist)" --define "_sourcedir $(shell pwd)" --define "_srcrpmdir $(shell pwd)" --define "_rpmdir $(shell pwd)" -bs jruby.spec
-	#rpmbuild --define "dist $(dist)" --define "_sourcedir $(shell pwd)" --define "_srcrpmdir $(shell pwd)" --define "_rpmdir $(shell pwd)" -bs GraphTastic-client.spec
-	#rpmbuild --define "dist $(dist)" --define "_sourcedir $(shell pwd)" --define "_srcrpmdir $(shell pwd)" --define "_rpmdir $(shell pwd)" -bs elasticsearch.spec
-	#rpmbuild --define "dist $(dist)" --define "_sourcedir $(shell pwd)" --define "_srcrpmdir $(shell pwd)" --define "_rpmdir $(shell pwd)" -bs logstash.spec
+	rpmbuild --define "dist $(dist)" --define "_sourcedir $(shell pwd)" --define "_srcrpmdir $(shell pwd)" --define "_rpmdir $(shell pwd)" -bs jruby.spec
+	rpmbuild --define "dist $(dist)" --define "_sourcedir $(shell pwd)" --define "_srcrpmdir $(shell pwd)" --define "_rpmdir $(shell pwd)" -bs GraphTastic-client.spec
+	rpmbuild --define "dist $(dist)" --define "_sourcedir $(shell pwd)" --define "_srcrpmdir $(shell pwd)" --define "_rpmdir $(shell pwd)" -bs elasticsearch.spec
+	rpmbuild --define "dist $(dist)" --define "_sourcedir $(shell pwd)" --define "_srcrpmdir $(shell pwd)" --define "_rpmdir $(shell pwd)" -bs logstash.spec
 
 rpm:
 	# kill off maven repository cache
 	rm -rf ~/.m2
 	# build binary rpms
 	rpmbuild --define "dist $(dist)" --define "_rpmdir $(shell pwd)" --rebuild Kibana-$(lv)-1$(dist).src.rpm
-	#rpmbuild --define "dist $(dist)" --define "_rpmdir $(shell pwd)" --rebuild jruby-$(jv)-0$(dist).src.rpm
-	#rpmbuild --define "dist $(dist)" --define "_rpmdir $(shell pwd)" --rebuild GraphTastic-client-0.0.0-0$(dist).src.rpm
-	#rpmbuild --define "dist $(dist)" --define "_rpmdir $(shell pwd)" --rebuild elasticsearch-$(hv)-0$(dist).src.rpm
-	#rpmbuild --define "dist $(dist)" --define "_rpmdir $(shell pwd)" --rebuild logstash-$(gv)-0$(dist).src.rpm
-
-package-web:
-	tar cfz logstash.fedora.tar.gz *.src.rpm $$(hg status -c | cut -c3-)
-
+	rpmbuild --define "dist $(dist)" --define "_rpmdir $(shell pwd)" --rebuild jruby-$(jv)-0$(dist).src.rpm
+	rpmbuild --define "dist $(dist)" --define "_rpmdir $(shell pwd)" --rebuild GraphTastic-client-0.0.0-0$(dist).src.rpm
+	rpmbuild --define "dist $(dist)" --define "_rpmdir $(shell pwd)" --rebuild elasticsearch-$(hv)-0$(dist).src.rpm
+	rpmbuild --define "dist $(dist)" --define "_rpmdir $(shell pwd)" --rebuild logstash-$(gv)-0$(dist).src.rpm
+	rpmbuild --define "dist $(dist)" --define "_rpmdir $(shell pwd)" --rebuild rubygem-tzinfo*src.rpm
diff -r 76544ad0561d -r 01ebc38d772e logstash.spec
--- a/logstash.spec	Mon May 06 23:31:24 2013 -0700
+++ b/logstash.spec	Tue May 07 10:54:32 2013 -0700
@@ -10,8 +10,7 @@
 License:        Apache 2.0
 URL:            http://logstash.net/
 BuildArch:      noarch
-#Source0:        https://logstash.objects.dreamhost.com/release/%{name}-%{version}-monolithic.jar
-#Source0:         curl https://nodeload.github.com/logstash/logstash/tar.gz/v%{version} >logstash-%{version}.tar.gz
+#Source0:         curl https://nodeload.github.com/logstash/logstash/tar.gz/v%{version} >%{name}-%{version}.tar.gz
 Source0:        %{name}-%{version}.tar.gz
 Source1:        https://logstash.jira.com/secure/attachment/12610/logstash_index_cleaner.py
 Source2:        http://logstash.objects.dreamhost.com/maxmind/GeoLite-City-2013-01-18.dat.gz