diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 7 | ||||
| -rw-r--r-- | airsane-systemd-dir.patch | 23 |
3 files changed, 8 insertions, 28 deletions
@@ -1,6 +1,6 @@ pkgbase = airsane-git pkgdesc = Publish SANE scanners to MacOS and Android via Apple AirScan - pkgver = 0.3.4.r2.g0736ea3 + pkgver = 0.3.5.r0.gfef10a4 pkgrel = 1 url = https://github.com/SimulPiscator/AirSane arch = i686 @@ -17,9 +17,7 @@ pkgbase = airsane-git conflicts = airsane source = airsane::git+https://github.com/SimulPiscator/AirSane.git source = airsane-systemd-dir.patch - md5sums = SKIP - md5sums = 7c14c073eb6fae88baad06c195eb6907 sha256sums = SKIP - sha256sums = 10f53fb504224e5a814023342933a6143cde6af0f9479ab8ae4b5a84b929a5ea + sha256sums = 0d92b2984b4c2362027aea195e6c2d2bda5961ce568e1b3472e3678525e3dcc2 pkgname = airsane-git @@ -1,6 +1,6 @@ # Maintainer: Eric Anderson <ejona86@gmail.com> pkgname=airsane-git -pkgver=0.3.4.r2.g0736ea3 +pkgver=0.3.5.r0.gfef10a4 pkgrel=1 pkgdesc="Publish SANE scanners to MacOS and Android via Apple AirScan" arch=('i686' 'x86_64') @@ -13,10 +13,8 @@ conflicts=("${pkgname%-git}") backup=() source=("${pkgname%-git}::git+https://github.com/SimulPiscator/AirSane.git" "airsane-systemd-dir.patch") -md5sums=('SKIP' - '7c14c073eb6fae88baad06c195eb6907') sha256sums=('SKIP' - '10f53fb504224e5a814023342933a6143cde6af0f9479ab8ae4b5a84b929a5ea') + '0d92b2984b4c2362027aea195e6c2d2bda5961ce568e1b3472e3678525e3dcc2') pkgver() { cd "$srcdir/${pkgname%-git}" @@ -26,7 +24,6 @@ pkgver() { prepare() { cd "$srcdir/${pkgname%-git}" patch -p1 -i "$srcdir/airsane-systemd-dir.patch" - sed -i 's#/usr/local/#/usr/#g' systemd/airsaned.service } build() { diff --git a/airsane-systemd-dir.patch b/airsane-systemd-dir.patch index d06cc60d1081..ace554f883a2 100644 --- a/airsane-systemd-dir.patch +++ b/airsane-systemd-dir.patch @@ -1,28 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5a8662d..c9f81b1 100644 +index d745832..924ac65 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -153,7 +153,7 @@ install(TARGETS ${PROJECT_NAME} - RUNTIME DESTINATION bin +@@ -168,7 +168,7 @@ install(TARGETS ${PROJECT_NAME} ) - install(FILES systemd/airsaned.service + configure_file(systemd/airsaned.service.in ${CMAKE_BINARY_DIR}/airsaned.service @ONLY) + install(FILES ${CMAKE_BINARY_DIR}/airsaned.service - DESTINATION /lib/systemd/system + DESTINATION /usr/lib/systemd/system ) install(FILES systemd/airsaned.default DESTINATION /etc/default -diff --git a/systemd/airsaned.service b/systemd/airsaned.service -index 0f95309..ed155f2 100644 ---- a/systemd/airsaned.service -+++ b/systemd/airsaned.service -@@ -7,8 +7,8 @@ EnvironmentFile=-/etc/default/airsane - ExecStart=/usr/local/bin/airsaned --interface=${INTERFACE} --listen-port=${LISTEN_PORT} --access-log=${ACCESS_LOG} --hotplug=${HOTPLUG} --mdns-announce=${MDNS_ANNOUNCE} --announce-secure=${ANNOUNCE_SECURE} --unix-socket=${UNIX_SOCKET} --web-interface=${WEB_INTERFACE} --random-paths=${RANDOM_PATHS} --compatible-path=${COMPATIBLE_PATH} --local-scanners-only=${LOCAL_SCANNERS_ONLY} --disclose-version=${DISCLOSE_VERSION} --reset-option=${RESET_OPTION} --options-file=${OPTIONS_FILE} --ignore-list=${IGNORE_LIST} - ExecReload=/bin/kill -HUP $MAINPID - ExecStartPre=/bin/sleep 15 --User=saned --Group=saned -+DynamicUser=true -+Group=scanner - Type=simple - - [Install] |