Fix geoip, Remove cmake patch

4 files changed, 6 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e31e31652bca..f9b1f6e6867e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sun Feb 21 10:07:06 UTC 2016
+# Thu Apr 14 21:03:21 UTC 2016
 pkgbase = heka-git
 	pkgdesc = Data collection and processing made easy
 	pkgver = r1
@@ -17,13 +17,11 @@ pkgbase = heka-git
 	makedepends = mercurial
 	makedepends = patch
 	depends = geoip
-	optdepends = geoip-citydata: GeoIpDecoder
+	optdepends = geoip-database-extra: GeoIpDecoder
 	provides = heka
 	conflicts = heka
-	source = heka::git+https://github.com/mozilla-services/heka.git#tag=vr1
+	source = heka::git+https://github.com/nfnty/heka.git
 	source = heka.service
-	source = cmake.patch
-	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 5ed6c4464959..6cc5e5c8e9f3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,19 +17,17 @@ makedepends=(
     'mercurial'
     'patch'
 )
-optdepends=('geoip-citydata: GeoIpDecoder')
+optdepends=('geoip-database-extra: GeoIpDecoder')
 provides=("${pkgname[0]%-git}")
 conflicts=("${pkgname[0]%-git}")
 
 source=(
-    "${srcname}::git+https://github.com/mozilla-services/${srcname}.git#tag=v${pkgver}"
+    "${srcname}::git+https://github.com/mozilla-services/${srcname}.git"
     'heka.service'
-    'cmake.patch'
 )
 sha512sums=(
     'SKIP'
     'SKIP'
-    'SKIP'
 )
 
 install='install.sh'
@@ -43,12 +41,6 @@ pkgver() {
         "$( git rev-parse --short 'HEAD' )"
 }
 
-prepare() {
-    cd "${srcdir}/${srcname}"
-
-    git apply "${srcdir}/cmake.patch"
-}
-
 build() {
     path_build="${srcdir}/build"
     mkdir --parents "${path_build}"
diff --git a/cmake.patch b/cmake.patch
deleted file mode 100644
index d82b5870650b..000000000000
--- a/cmake.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7f42228..0324223 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -19,7 +19,6 @@ find_package(Go 1.4 REQUIRED)
- find_package(Git REQUIRED)
- find_package(Protobuf 2.3 QUIET)
- set(CPACK_PACKAGE_FILE_NAME ${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}_${CPACK_PACKAGE_VERSION_PATCH}-${GO_PLATFORM}-${GO_ARCH})
--set(CMAKE_INSTALL_PREFIX ${CMAKE_PROJECT_NAME})
- set(PROJECT_PATH "${CMAKE_BINARY_DIR}/heka")
- set(HEKA_PATH "${PROJECT_PATH}/src/github.com/mozilla-services/heka")
- set(LUA_INCLUDE_PATH "${PROJECT_PATH}/include")
-@@ -289,9 +288,9 @@ endif()
- if (INCLUDE_MOZSVC)
-     add_test(mozsvc ${GO_EXECUTABLE} test ${BENCHMARK_FLAG} ${COVERAGE_FLAG} github.com/mozilla-services/heka-mozsvc-plugins)
- endif()
--install(FILES "${HEKA_PATH}/cmd/heka-sbmgr/sbmgr.toml" "${HEKA_PATH}/cmd/heka-sbmgr/hekad.toml.sbmgr" DESTINATION bin)
-+install(FILES "${HEKA_PATH}/cmd/heka-sbmgr/sbmgr.toml" "${HEKA_PATH}/cmd/heka-sbmgr/hekad.toml.sbmgr" DESTINATION "share/${CMAKE_PROJECT_NAME}/examples")
- if(INCLUDE_SANDBOX)
--install(FILES "${HEKA_PATH}/sandbox/lua/testsupport/hekabench_cbuf_counter.lua" DESTINATION bin)
-+install(FILES "${HEKA_PATH}/sandbox/lua/testsupport/hekabench_cbuf_counter.lua" DESTINATION "share/${CMAKE_PROJECT_NAME}/examples")
- endif()
- install(FILES "${CMAKE_SOURCE_DIR}/LICENSE.txt" DESTINATION "share/${CMAKE_PROJECT_NAME}")
- install(DIRECTORY "${CMAKE_SOURCE_DIR}/dasher" DESTINATION "share/${CMAKE_PROJECT_NAME}")
diff --git a/heka.service b/heka.service
index 101922f2face..f6bda4bec106 100644
--- a/heka.service
+++ b/heka.service
@@ -10,7 +10,7 @@ Restart=on-failure
 
 ExecStart=/usr/bin/hekad -config=/etc/heka/conf.d/
 
-ExecReload=/usr/bin/kill --signal HUP ${MAINPID}
+ExecReload=/usr/bin/kill --signal HUP "${MAINPID}"
 
 [Install]
 WantedBy=multi-user.target