summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey D2017-05-20 08:45:46 +0300
committerAlexey D2017-05-20 08:45:46 +0300
commit788e494fe39f3448ba874b3e8c5e57aeb370366a (patch)
tree379ca1fa0a7fb018770d4590b4564ea2ad704d5f
parent04e298a1cc789e0048f20bfeb23674eaa7283604 (diff)
downloadaur-788e494fe39f3448ba874b3e8c5e57aeb370366a.tar.gz
version 2.6.5-1
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD13
-rw-r--r--dbus_service_fix.patch12
3 files changed, 8 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f7f49584a86..b5181ceb130 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sun Apr 23 13:50:15 UTC 2017
+# Sat May 20 05:45:14 UTC 2017
pkgbase = udisks2-nosystemd
pkgdesc = Disk Management Service, version 2
- pkgver = 2.6.4
+ pkgver = 2.6.5
pkgrel = 1
url = http://www.freedesktop.org/wiki/Software/udisks
arch = i686
@@ -23,16 +23,14 @@ pkgbase = udisks2-nosystemd
optdepends = gptfdisk: GUID partition table support
optdepends = ntfs-3g: NTFS filesystem management support
optdepends = dosfstools: VFAT filesystem management support
- provides = udisks2=2.6.4
+ provides = udisks2=2.6.5
conflicts = udisks2
conflicts = udisks2-eudev
replaces = udisks2
replaces = udisks2-eudev
options = !libtool
- source = https://github.com/storaged-project/udisks/archive/udisks-2.6.4.tar.gz
- source = dbus_service_fix.patch
- sha256sums = 7c7889dbd8f910b8a8094841168c04d48e0bdaf946b22aa5f0742a460473c191
- sha256sums = 1721df69e97ad8fd0567448ef4752a35288b68f25111316054aec6fb4e749f86
+ source = https://github.com/storaged-project/udisks/archive/udisks-2.6.5.tar.gz
+ sha256sums = 817e2de4efab458a98b24b15066933692e6ee3777430211b4e7aeddd0b9045f2
pkgname = udisks2-nosystemd
diff --git a/PKGBUILD b/PKGBUILD
index 5d3e8420ebd..b91d182b41c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Ionut Biru <ibiru@archlinux.org>
pkgname=udisks2-nosystemd
-pkgver=2.6.4
+pkgver=2.6.5
pkgrel=1
pkgdesc="Disk Management Service, version 2"
arch=('i686' 'x86_64')
@@ -20,15 +20,8 @@ provides=("udisks2=${pkgver}")
conflicts=('udisks2' 'udisks2-eudev')
replaces=('udisks2' 'udisks2-eudev')
options=(!libtool)
-source=(https://github.com/storaged-project/udisks/archive/udisks-$pkgver.tar.gz
- dbus_service_fix.patch)
-sha256sums=('7c7889dbd8f910b8a8094841168c04d48e0bdaf946b22aa5f0742a460473c191'
- '1721df69e97ad8fd0567448ef4752a35288b68f25111316054aec6fb4e749f86')
-
-prepare() {
- cd "udisks-udisks-$pkgver"
- patch -p1 -i ../dbus_service_fix.patch
-}
+source=(https://github.com/storaged-project/udisks/archive/udisks-$pkgver.tar.gz)
+sha256sums=('817e2de4efab458a98b24b15066933692e6ee3777430211b4e7aeddd0b9045f2')
build() {
cd "udisks-udisks-$pkgver"
diff --git a/dbus_service_fix.patch b/dbus_service_fix.patch
deleted file mode 100644
index f55b1c9ac70..00000000000
--- a/dbus_service_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/data/Makefile.am b/data/Makefile.am
---- a/data/Makefile.am 2017-03-14 15:53:25.000000000 +0300
-+++ b/data/Makefile.am 2017-04-23 16:36:55.033679497 +0300
-@@ -6,7 +6,7 @@
- dbusservice_DATA = $(dbusservice_in_files:.service.in=.service)
-
- $(dbusservice_DATA): $(dbusservice_in_files) Makefile
-- @sed -e "s|\@udisksprivdir\@|$(libexecdir)/udisks2|" $< > $@
-+ @sed -e "s|\@udisksdprivdir\@|$(libexecdir)/udisks2|" $< > $@
-
- dbusconfdir = $(sysconfdir)/dbus-1/system.d
- dbusconf_in_files = org.freedesktop.UDisks2.conf.in