fix BTS:2917,2923

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9578 ec354946-7b23-47d6-9f5a-488ba84defc7

e/eudev/eudev-vl.spec

@@ -8,7 +8,7 @@ Summary: A userspace implementation of devfs
 Summary(ja): ユーザスペース実装のデバイスファイルシステム
 Name: eudev
 Version: 3.0
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: GPL
 Group: System Environment/Base
 URL: https://github.com/gentoo/eudev
@@ -22,6 +22,7 @@ Source5: udev.sysconfig
 # vine patch
 Patch1001: eudev-1.7-gudev-vine.patch
 Patch1002: eudev-3.0-blkid.patch
+Patch1003: eudev-3.0-rules-vine.patch
 
 
 ExclusiveOS: Linux
@@ -182,6 +183,7 @@ glib-based applications using libudev functionality.
 %setup -q  
 %patch1001 -p1 -b .vine
 %patch1002 -p1 -b .vine
+%patch1003 -p1 -b .vine
 
 %build
 NOCONFIGURE=1 ./autogen.sh
@@ -462,6 +464,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun May 24 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0-2
+- add Patch1003 (eudev-3.0-rules-vine.patch)
+
 * Sun May 24 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0-1
 - new upstream release
 - add Patch1002 (eudev-3.0-blkid.patch)

u/udisks2/udisks2-vl.spec

@@ -13,7 +13,7 @@
 Summary: Storage Management Service
 Name: udisks2
 Version: 2.1.5
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/wiki/Software/udisks
@@ -104,6 +104,7 @@ This package contains documentation for udisks2.
 
 %build
 %configure \
+	--sbindir=%{_syssbindir} \
 	--enable-gtk-doc
 make
 
@@ -115,11 +116,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
-# for now, include a compat symlink for the command-line tool
-# and man page
-ln -s udisks $RPM_BUILD_ROOT%{_bindir}/devkit-disks
-ln -s udisks.1 $RPM_BUILD_ROOT%{_datadir}/man/man1/devkit-disks.1
-
 mkdir $RPM_BUILD_ROOT/run
 
 %find_lang %{name}
@@ -136,9 +132,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc README AUTHORS NEWS COPYING HACKING
 %{_sysconfdir}/dbus-1/system.d/org.freedesktop.UDisks2.conf
 /lib/udev/rules.d/80-udisks2.rules
-%{_bindir}/devkit-disks
 %{_bindir}/udisksctl
-%{_sbindir}/umount.udisks2
+%{_syssbindir}/umount.udisks2
 %dir %{_prefix}/lib/udisks2
 %{_prefix}/lib/udisks2/udisksd
 %{_libdir}/libudisks2.so.*
@@ -164,6 +159,10 @@ rm -rf $RPM_BUILD_ROOT
 
 #
 %changelog
+* Sun May 24 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.1.5-2
+- remove unused files
+- change path of umount.udisks2
+
 * Sun Apr 12 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.1.5-1
 - new upstream release