|
@@ -7,8 +7,8 @@
|
|
Summary: A userspace implementation of devfs
|
|
Summary: A userspace implementation of devfs
|
|
Summary(ja): ユーザスペース実装のデバイスファイルシステム
|
|
Summary(ja): ユーザスペース実装のデバイスファイルシステム
|
|
Name: eudev
|
|
Name: eudev
|
|
-Version: 3.1.2
|
|
+Version: 3.1.5
|
|
-Release: 2%{?_dist_release}
|
|
+Release: 1%{?_dist_release}
|
|
License: GPL
|
|
License: GPL
|
|
Group: System Environment/Base
|
|
Group: System Environment/Base
|
|
URL: https://github.com/gentoo/eudev
|
|
URL: https://github.com/gentoo/eudev
|
|
@@ -19,8 +19,8 @@ Source3: udev-post.init
|
|
Source4: fw_unit_symlinks.sh
|
|
Source4: fw_unit_symlinks.sh
|
|
Source5: udev.sysconfig
|
|
Source5: udev.sysconfig
|
|
|
|
|
|
|
|
+Patch0: eudev-3.1.5-git20160322.patch
|
|
# vine patch
|
|
# vine patch
|
|
-Patch1001: eudev-1.7-gudev-vine.patch
|
|
|
|
Patch1002: eudev-3.0-blkid.patch
|
|
Patch1002: eudev-3.0-blkid.patch
|
|
Patch1003: eudev-3.1.1-rules-vine.patch
|
|
Patch1003: eudev-3.1.1-rules-vine.patch
|
|
|
|
|
|
@@ -32,14 +32,14 @@ BuildRequires: sed, flex
|
|
BuildRequires: pam-devel, glib2-devel, bison
|
|
BuildRequires: pam-devel, glib2-devel, bison
|
|
BuildRequires: findutils
|
|
BuildRequires: findutils
|
|
BuildRequires: hwdata
|
|
BuildRequires: hwdata
|
|
-BuildRequires: gobject-introspection-devel >= 0.6.2
|
|
+BuildRequires: gobject-introspection-devel >= 1.31.1
|
|
BuildRequires: gtk-doc
|
|
BuildRequires: gtk-doc
|
|
BuildRequires: usbutils >= 0.82
|
|
BuildRequires: usbutils >= 0.82
|
|
BuildRequires: gperf
|
|
BuildRequires: gperf
|
|
BuildRequires: libacl-devel
|
|
BuildRequires: libacl-devel
|
|
BuildRequires: libusb-devel
|
|
BuildRequires: libusb-devel
|
|
BuildRequires: kmod-devel
|
|
BuildRequires: kmod-devel
|
|
-BuildRequires: libblkid-devel
|
|
+BuildRequires: libblkid-devel >= 2.20
|
|
|
|
|
|
Requires(pre): /bin/sh fileutils
|
|
Requires(pre): /bin/sh fileutils
|
|
Requires(pre): MAKEDEV >= 3.21
|
|
Requires(pre): MAKEDEV >= 3.21
|
|
@@ -101,36 +101,6 @@ Provides: libudev-static = 213
|
|
This package contains the static library libudev, which provides
|
|
This package contains the static library libudev, which provides
|
|
access to udev device information.
|
|
access to udev device information.
|
|
|
|
|
|
-%package libgudev1
|
|
|
|
-Summary: Libraries for adding libudev support to applications that use glib
|
|
|
|
-Summary(ja): Glib を使用するアプリケーションに libudev サポートを追加するためのライブラリ
|
|
|
|
-Group: System Environment/Libraries
|
|
|
|
-Requires: %{name}-libudev = %{version}-%{release}
|
|
|
|
-# remove the following lines for libgudev so major 1
|
|
|
|
-Obsoletes: libgudev <= 20090517
|
|
|
|
-Provides: libgudev = 20090518
|
|
|
|
-Obsoletes: libgudev1 < 213
|
|
|
|
-Provides: libgudev1 = 213
|
|
|
|
-
|
|
|
|
-%description libgudev1
|
|
|
|
-This package contains the libraries that make it easier to use libudev
|
|
|
|
-functionality from applications that use glib.
|
|
|
|
-
|
|
|
|
-%package libgudev1-devel
|
|
|
|
-Summary: Header files for adding libudev support to applications that use glib
|
|
|
|
-Summary(ja): Glib を使用するアプリケーションに libudev サポートを追加するための開発用ファイル
|
|
|
|
-Group: Development/Libraries
|
|
|
|
-Requires: %{name}-libgudev1 = %{version}-%{release}
|
|
|
|
-Requires: %{name}-libudev-devel = %{version}-%{release}
|
|
|
|
-Obsoletes: libgudev-devel <= 20090517
|
|
|
|
-Provides: libgudev-devel = 20090518
|
|
|
|
-Obsoletes: libgudev1-devel < 213
|
|
|
|
-Provides: libgudev1-devel = 213
|
|
|
|
-
|
|
|
|
-%description libgudev1-devel
|
|
|
|
-This package contains the header and pkg-config files for developing
|
|
|
|
-glib-based applications using libudev functionality.
|
|
|
|
-
|
|
|
|
# compat32
|
|
# compat32
|
|
%package -n compat32-%{name}-libudev
|
|
%package -n compat32-%{name}-libudev
|
|
Summary: Dynamic library to access udev device information
|
|
Summary: Dynamic library to access udev device information
|
|
@@ -154,34 +124,10 @@ Provides: compat32-libudev-devel = 213
|
|
This package contains the development files for the library libudev, a
|
|
This package contains the development files for the library libudev, a
|
|
dynamic library, which provides access to udev device information.
|
|
dynamic library, which provides access to udev device information.
|
|
|
|
|
|
-%package -n compat32-%{name}-libgudev1
|
|
|
|
-Summary: Libraries for adding libudev support to applications that use glib
|
|
|
|
-Summary(ja): Glib を使用するアプリケーションに libudev サポートを追加するためのライブラリ
|
|
|
|
-Group: System Environment/Libraries
|
|
|
|
-Requires: compat32-%{name}-libudev = %{version}-%{release}
|
|
|
|
-Obsoletes: compat32-libgudev1 < 213
|
|
|
|
-Provides: compat32-libgudev1 = 213
|
|
|
|
-
|
|
|
|
-%description -n compat32-%{name}-libgudev1
|
|
|
|
-This package contains the libraries that make it easier to use libudev
|
|
|
|
-
|
|
|
|
-%package -n compat32-%{name}-libgudev1-devel
|
|
|
|
-Summary: Header files for adding libudev support to applications that use glib
|
|
|
|
-Summary(ja): Glib を使用するアプリケーションに libudev サポートを追加するための開発用ファイル
|
|
|
|
-Group: Development/Libraries
|
|
|
|
-Requires: compat32-%{name}-libudev-devel
|
|
|
|
-Requires: compat32-%{name}-libgudev1 = %{version}-%{release}
|
|
|
|
-Obsoletes: compat32-libgudev1-devel < 213
|
|
|
|
-Provides: compat32-libgudev1-devel = 213
|
|
|
|
-
|
|
|
|
-%description -n compat32-%{name}-libgudev1-devel
|
|
|
|
-This package contains the header and pkg-config files for developing
|
|
|
|
-glib-based applications using libudev functionality.
|
|
|
|
-
|
|
|
|
|
|
|
|
%prep
|
|
%prep
|
|
%setup -q
|
|
%setup -q
|
|
-%patch1001 -p1 -b .vine
|
|
+%patch0 -p1 -b .old
|
|
%patch1002 -p1 -b .vine
|
|
%patch1002 -p1 -b .vine
|
|
%patch1003 -p1 -b .vine
|
|
%patch1003 -p1 -b .vine
|
|
|
|
|
|
@@ -214,8 +160,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
|
|
rm -fr $RPM_BUILD_ROOT%{_docdir}/udev
|
|
rm -fr $RPM_BUILD_ROOT%{_docdir}/udev
|
|
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
|
|
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
|
|
|
|
|
|
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libgudev*.a
|
|
|
|
-
|
|
|
|
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.rules
|
|
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.rules
|
|
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/udev
|
|
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/udev
|
|
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/hotplug.d/default/10-udev.hotplug
|
|
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/hotplug.d/default/10-udev.hotplug
|
|
@@ -329,15 +273,9 @@ exit 0
|
|
%post libudev -p /sbin/ldconfig
|
|
%post libudev -p /sbin/ldconfig
|
|
%postun libudev -p /sbin/ldconfig
|
|
%postun libudev -p /sbin/ldconfig
|
|
|
|
|
|
-%post libgudev1 -p /sbin/ldconfig
|
|
|
|
-%postun libgudev1 -p /sbin/ldconfig
|
|
|
|
-
|
|
|
|
%if %{build_compat32}
|
|
%if %{build_compat32}
|
|
%post -n compat32-%{name}-libudev -p /sbin/ldconfig
|
|
%post -n compat32-%{name}-libudev -p /sbin/ldconfig
|
|
%postun -n compat32-%{name}-libudev -p /sbin/ldconfig
|
|
%postun -n compat32-%{name}-libudev -p /sbin/ldconfig
|
|
-
|
|
|
|
-%post -n compat32-%{name}-libgudev1 -p /sbin/ldconfig
|
|
|
|
-%postun -n compat32-%{name}-libgudev1 -p /sbin/ldconfig
|
|
|
|
%endif
|
|
%endif
|
|
|
|
|
|
|
|
|
|
@@ -359,7 +297,6 @@ rm -rf $RPM_BUILD_ROOT
|
|
%attr(0755,root,root) %{udev_scriptdir}/fw_unit_symlinks.sh
|
|
%attr(0755,root,root) %{udev_scriptdir}/fw_unit_symlinks.sh
|
|
%attr(0755,root,root) %{udev_scriptdir}/collect
|
|
%attr(0755,root,root) %{udev_scriptdir}/collect
|
|
%attr(0755,root,root) %{udev_scriptdir}/mtd_probe
|
|
%attr(0755,root,root) %{udev_scriptdir}/mtd_probe
|
|
-%attr(0755,root,root) %{udev_scriptdir}/accelerometer
|
|
|
|
|
|
|
|
%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/udev-post
|
|
%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/udev-post
|
|
%{_bindir}/udevtest
|
|
%{_bindir}/udevtest
|
|
@@ -376,6 +313,7 @@ rm -rf $RPM_BUILD_ROOT
|
|
%{_sysconfdir}/udev/hwdb.d/20-OUI.hwdb
|
|
%{_sysconfdir}/udev/hwdb.d/20-OUI.hwdb
|
|
%{_sysconfdir}/udev/hwdb.d/20-acpi-vendor.hwdb
|
|
%{_sysconfdir}/udev/hwdb.d/20-acpi-vendor.hwdb
|
|
%{_sysconfdir}/udev/hwdb.d/20-bluetooth-vendor-product.hwdb
|
|
%{_sysconfdir}/udev/hwdb.d/20-bluetooth-vendor-product.hwdb
|
|
|
|
+%{_sysconfdir}/udev/hwdb.d/20-net-ifname.hwdb
|
|
%{_sysconfdir}/udev/hwdb.d/20-pci-classes.hwdb
|
|
%{_sysconfdir}/udev/hwdb.d/20-pci-classes.hwdb
|
|
%{_sysconfdir}/udev/hwdb.d/20-pci-vendor-model.hwdb
|
|
%{_sysconfdir}/udev/hwdb.d/20-pci-vendor-model.hwdb
|
|
%{_sysconfdir}/udev/hwdb.d/20-sdio-classes.hwdb
|
|
%{_sysconfdir}/udev/hwdb.d/20-sdio-classes.hwdb
|
|
@@ -385,7 +323,7 @@ rm -rf $RPM_BUILD_ROOT
|
|
%{_sysconfdir}/udev/hwdb.d/60-evdev.hwdb
|
|
%{_sysconfdir}/udev/hwdb.d/60-evdev.hwdb
|
|
%{_sysconfdir}/udev/hwdb.d/60-keyboard.hwdb
|
|
%{_sysconfdir}/udev/hwdb.d/60-keyboard.hwdb
|
|
%{_sysconfdir}/udev/hwdb.d/70-mouse.hwdb
|
|
%{_sysconfdir}/udev/hwdb.d/70-mouse.hwdb
|
|
-%{_sysconfdir}/udev/hwdb.d/70-touchpad.hwdb
|
|
+%{_sysconfdir}/udev/hwdb.d/70-pointingstick.hwdb
|
|
|
|
|
|
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/udev
|
|
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/udev
|
|
|
|
|
|
@@ -430,21 +368,6 @@ rm -rf $RPM_BUILD_ROOT
|
|
%defattr(-,root,root,-)
|
|
%defattr(-,root,root,-)
|
|
%{_libdir}/libudev.a
|
|
%{_libdir}/libudev.a
|
|
|
|
|
|
-%files libgudev1
|
|
|
|
-%defattr(-,root,root,-)
|
|
|
|
-%doc COPYING
|
|
|
|
-/%{_lib}/libgudev-1.0.so.*
|
|
|
|
-%{_libdir}/girepository-1.0/GUdev-1.0.typelib
|
|
|
|
-
|
|
|
|
-%files libgudev1-devel
|
|
|
|
-%defattr(-,root,root,-)
|
|
|
|
-%doc COPYING
|
|
|
|
-%{_libdir}/libgudev-1.0.so
|
|
|
|
-%{_includedir}/gudev-1.0/gudev/*.h
|
|
|
|
-%{_datadir}/gir-1.0/GUdev-1.0.gir
|
|
|
|
-%{_libdir}/pkgconfig/gudev-1.0*
|
|
|
|
-
|
|
|
|
-
|
|
|
|
%if %{build_compat32}
|
|
%if %{build_compat32}
|
|
%files -n compat32-%{name}-libudev
|
|
%files -n compat32-%{name}-libudev
|
|
%defattr(-,root,root,-)
|
|
%defattr(-,root,root,-)
|
|
@@ -453,19 +376,16 @@ rm -rf $RPM_BUILD_ROOT
|
|
%files -n compat32-%{name}-libudev-devel
|
|
%files -n compat32-%{name}-libudev-devel
|
|
%defattr(-,root,root,-)
|
|
%defattr(-,root,root,-)
|
|
%{_libdir}/libudev.so
|
|
%{_libdir}/libudev.so
|
|
-
|
|
|
|
-%files -n compat32-%{name}-libgudev1
|
|
|
|
-%defattr(-,root,root,-)
|
|
|
|
-/%{_lib}/libgudev-1.0.so.*
|
|
|
|
-
|
|
|
|
-%files -n compat32-%{name}-libgudev1-devel
|
|
|
|
-%defattr(-,root,root,-)
|
|
|
|
-%doc COPYING
|
|
|
|
-%{_libdir}/libgudev-1.0.so
|
|
|
|
%endif
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Sun Apr 24 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.5-1
|
|
|
|
+- new upstream release
|
|
|
|
+- add Patch0 (eudev-3.1.5-git20160322.patch)
|
|
|
|
+- remove Patch1001 (eudev-1.7-gudev-vine.patch)
|
|
|
|
+- remove libgudev1,libgudev1-devel subpackages
|
|
|
|
+
|
|
* Thu Nov 12 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.2-2
|
|
* Thu Nov 12 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.2-2
|
|
- fix spec file
|
|
- fix spec file
|
|
|
|
|