upgpkg: direwolf-git 1.5.beta4.r112.ge54b851-2

Fix CMAKE_INSTALL_PREFIX and DESTDIR usage

3 files changed, 5 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 27b84d19ec60..74acf3755702 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = direwolf-git
 	pkgdesc = Software modem/TNC and APRS encoder/decoder
 	pkgver = 1.5.beta4.r112.ge54b851
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/wb2osz/direwolf
 	arch = i686
 	arch = x86_64
@@ -16,17 +16,14 @@ pkgbase = direwolf-git
 	provides = direwolf
 	conflicts = direwolf
 	source = git+https://github.com/wb2osz/direwolf.git#branch=dev
-	source = 0001-Add-build-option-for-udev-path.patch
 	source = 0002-Fix-gpsd-version-error.patch
 	source = direwolf.service
 	source = direwolf-kiss.service
 	sha1sums = SKIP
-	sha1sums = 445003106d7a87658dfc064bf147171fb139c485
 	sha1sums = be4921815da1b631c6b22d362dd03a184cf5ce8a
 	sha1sums = 66366c7a4e8d3768013f9036f2681a86d4b8ad88
 	sha1sums = eea3a3fb334645cd8a1e2604dc6c6b024148722a
 	sha256sums = SKIP
-	sha256sums = be7148c5ccd937f60308d6d5f26e89d55a6bb14b39eae7bbba8f6b5666967f25
 	sha256sums = 402378a290a0e1ed29a0bbde3b921a16e4a85913eed25b215fe62bf6dedbc0d0
 	sha256sums = a1efe2bb96470bc52faa747708b195a685dc454f3d9c91f6bf4d39ab94d3608a
 	sha256sums = 2a2e4acc769a20afebdfdcd21640fd17b0c4217ceb7ecb3378f9ee5c45fadc68
diff --git a/0001-Add-build-option-for-udev-path.patch b/0001-Add-build-option-for-udev-path.patch
deleted file mode 100644
index 1fb919fb4b11..000000000000
--- a/0001-Add-build-option-for-udev-path.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9a1cb8e..63c971d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -229,6 +229,9 @@ else()
-     set(INSTALL_MAN_DIR "share/man/man1")
-   endif()
-   set(INSTALL_DATA_DIR "share/${PROJECT_NAME}")
-+  if (NOT DEFINED UDEV_RULES_DIR OR "${UDEV_RULES_DIR}" STREQUAL "")
-+    set(UDEV_RULES_DIR "/etc/udev/rules.d")
-+  endif()
- endif(WIN32 OR CYGWIN)
- 
- # requirements
-diff --git a/conf/CMakeLists.txt b/conf/CMakeLists.txt
-index d4a229d..a84497f 100644
---- a/conf/CMakeLists.txt
-+++ b/conf/CMakeLists.txt
-@@ -26,7 +26,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/direwolf.conf" "${file_content}")
- 
- # install udev rules for CM108
- if(LINUX)
--  install(FILES "${CUSTOM_CONF_DIR}/99-direwolf-cmedia.rules" DESTINATION /etc/udev/rules.d/)
-+  install(FILES "${CUSTOM_CONF_DIR}/99-direwolf-cmedia.rules" DESTINATION ${UDEV_RULES_DIR})
- endif()
- 
- install(FILES "${CMAKE_BINARY_DIR}/direwolf.conf" DESTINATION ${INSTALL_CONF_DIR})
diff --git a/PKGBUILD b/PKGBUILD
index e002961b46b5..770beb99b1a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 pkgname=direwolf-git
 _pkgname=direwolf
 pkgver=1.5.beta4.r112.ge54b851
-pkgrel=1
+pkgrel=2
 pkgdesc="Software modem/TNC and APRS encoder/decoder"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url="https://github.com/wb2osz/direwolf"
@@ -12,17 +12,14 @@ makedepends=('git' 'cmake')
 provides=('direwolf')
 conflicts=('direwolf')
 source=('git+https://github.com/wb2osz/direwolf.git#branch=dev'
-        '0001-Add-build-option-for-udev-path.patch'
         '0002-Fix-gpsd-version-error.patch'
         'direwolf.service'
         'direwolf-kiss.service')
 sha1sums=('SKIP'
-          '445003106d7a87658dfc064bf147171fb139c485'
           'be4921815da1b631c6b22d362dd03a184cf5ce8a'
           '66366c7a4e8d3768013f9036f2681a86d4b8ad88'
           'eea3a3fb334645cd8a1e2604dc6c6b024148722a')
 sha256sums=('SKIP'
-            'be7148c5ccd937f60308d6d5f26e89d55a6bb14b39eae7bbba8f6b5666967f25'
             '402378a290a0e1ed29a0bbde3b921a16e4a85913eed25b215fe62bf6dedbc0d0'
             'a1efe2bb96470bc52faa747708b195a685dc454f3d9c91f6bf4d39ab94d3608a'
             '2a2e4acc769a20afebdfdcd21640fd17b0c4217ceb7ecb3378f9ee5c45fadc68')
@@ -34,28 +31,22 @@ pkgver() {
 
 prepare() {
     cd "$_pkgname"
-    git apply ../0001-Add-build-option-for-udev-path.patch
     git apply ../0002-Fix-gpsd-version-error.patch
 }
 
 build() {
     cd "$_pkgname"
-    mkdir build
+    mkdir -p build
     cd build
-    cmake -DCMAKE_INSTALL_PREFIX="$pkgdir/usr" \
+    cmake -DCMAKE_INSTALL_PREFIX="/usr" \
           -DCMAKE_BUILD_TYPE=Release \
-          -DUDEV_RULES_DIR="$pkgdir/etc/udev/rules.d" \
           ..
     make
 }
 
 package() {
     cd "$_pkgname/build"
-    make install
-    #mkdir -p "$pkgdir/usr/bin"
-    #mkdir -p "$pkgdir/usr/share/doc/$_pkgname"
-    #mkdir -p "$pkgdir/var/log/direwolf"
-
+    make DESTDIR="$pkgdir" install
 
     mkdir -p "$pkgdir/etc/direwolf"
     install -D -m 644 direwolf.conf "$pkgdir/etc/direwolf/direwolf.conf"