Просмотр исходного кода

new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9577 ec354946-7b23-47d6-9f5a-488ba84defc7
Takemikaduchi 10 лет назад
Родитель
Сommit
9e65ee0930
2 измененных файлов с 17 добавлено и 13 удалено
  1. 12 8
      e/eudev/eudev-vl.spec
  2. 5 5
      k/kmod/kmod-vl.spec

+ 12 - 8
e/eudev/eudev-vl.spec

@@ -7,8 +7,8 @@
 Summary: A userspace implementation of devfs
 Summary(ja): ユーザスペース実装のデバイスファイルシステム
 Name: eudev
-Version: 2.1.1
-Release: 2%{?_dist_release}
+Version: 3.0
+Release: 1%{?_dist_release}
 License: GPL
 Group: System Environment/Base
 URL: https://github.com/gentoo/eudev
@@ -21,6 +21,7 @@ Source5: udev.sysconfig
 
 # vine patch
 Patch1001: eudev-1.7-gudev-vine.patch
+Patch1002: eudev-3.0-blkid.patch
 
 
 ExclusiveOS: Linux
@@ -45,8 +46,8 @@ Requires: %{name}-libudev = %{version}-%{release}
 Requires: MAKEDEV >= 3.21
 Requires: util-linux-ng >= 2.16
 
-Obsoletes: udev < 213
-Provides: udev = 213
+Obsoletes: udev < 217
+Provides: udev = 217
 
 Obsoletes: dev < 3.22
 Conflicts: dev < 3.22
@@ -180,6 +181,7 @@ glib-based applications using libudev functionality.
 %prep
 %setup -q  
 %patch1001 -p1 -b .vine
+%patch1002 -p1 -b .vine
 
 %build
 NOCONFIGURE=1 ./autogen.sh
@@ -195,7 +197,6 @@ NOCONFIGURE=1 ./autogen.sh
   --with-rootlibdir=/%{_lib} \
   --with-rootlibexecdir=/lib/udev \
   --enable-introspection \
-  --enable-rule_generator \
   --enable-static
 
 make %{?_smp_mflags}
@@ -356,9 +357,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{udev_scriptdir}/collect
 %attr(0755,root,root) %{udev_scriptdir}/mtd_probe
 %attr(0755,root,root) %{udev_scriptdir}/accelerometer
-%attr(0644,root,root) %{udev_scriptdir}/rule_generator.functions
-%attr(0755,root,root) %{udev_scriptdir}/write_cd_rules
-%attr(0755,root,root) %{udev_scriptdir}/write_net_rules
 
 %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/udev-post
 %{_bindir}/udevtest
@@ -382,6 +380,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/udev/hwdb.d/20-usb-classes.hwdb
 %{_sysconfdir}/udev/hwdb.d/20-usb-vendor-model.hwdb
 %{_sysconfdir}/udev/hwdb.d/60-keyboard.hwdb
+%{_sysconfdir}/udev/hwdb.d/70-mouse.hwdb
+%{_sysconfdir}/udev/hwdb.d/70-touchpad.hwdb
 
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/udev
 
@@ -462,6 +462,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun May 24 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0-1
+- new upstream release
+- add Patch1002 (eudev-3.0-blkid.patch)
+
 * Sun Feb 01 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.1.1-2
 - fix SOURCE1 (remove udevadm trigger --type=failed)
 

+ 5 - 5
k/kmod/kmod-vl.spec

@@ -1,5 +1,5 @@
 Name:		kmod
-Version:	11
+Version:	20
 Release:        1%{?_dist_release}
 Summary:	Linux kernel module management utilities
 Summary(ja):	Linux カーネルモジュール管理ユーティリティ
@@ -72,8 +72,6 @@ pushd $RPM_BUILD_ROOT/%{_mandir}/man5
 ln -s modprobe.d.5.gz modprobe.conf.5.gz
 popd
 
-install -m755 tools/kmod-nolib $RPM_BUILD_ROOT%{_sysbindir}/
-
 mkdir -p $RPM_BUILD_ROOT/%{_lib}
 mv $RPM_BUILD_ROOT/%{_libdir}/*.so* $RPM_BUILD_ROOT/%{_lib}/
 ln -sf ../../%{_lib}/libkmod.so $RPM_BUILD_ROOT/%{_libdir}/libkmod.so
@@ -106,7 +104,6 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d
 %dir %{_sysconfdir}/modprobe.d
 %dir %{_prefix}/lib/modprobe.d
 %{_sysbindir}/kmod
-%{_sysbindir}/kmod-nolib
 %{_syssbindir}/modprobe
 %{_syssbindir}/modinfo
 %{_syssbindir}/insmod
@@ -127,7 +124,10 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d
 /%{_lib}/libkmod.so
 
 %changelog
-*Wed Nov 21 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 11-1
+* Sun May 24 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 20-1
+- update to 20
+
+* Wed Nov 21 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 11-1
 - update to 11
 - add BR: libxslt