commit c4df46af74f7cb8cd8d1ac6346c4d200e7973954 Author: Arkadiusz MiĆkiewicz <ar...@maven.pl> Date: Mon Mar 18 10:48:06 2013 +0100
- rel 5; drop pci-db usage (obsolete) drop-pci-db.patch | 28 ++++++++++++++++++++++++++++ udisks-ac.patch | 17 +++++++++++++++++ udisks.spec | 6 +++++- 3 files changed, 50 insertions(+), 1 deletion(-) --- diff --git a/udisks.spec b/udisks.spec index 637041e..7db8b38 100644 --- a/udisks.spec +++ b/udisks.spec @@ -1,12 +1,14 @@ Summary: Disk Management Service Name: udisks Version: 1.0.4 -Release: 5 +Release: 6 License: GPL v2+ Group: Libraries Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz # Source0-md5: 86c63b2b5484f2060499a052b5b6256b Source1: %{name}.tmpfiles +Patch0: drop-pci-db.patch +Patch1: %{name}-ac.patch URL: http://www.freedesktop.org/wiki/Software/udisks BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -97,6 +99,8 @@ Konfiguracja serwisu udisks dla avahi. %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build %{__intltoolize} diff --git a/drop-pci-db.patch b/drop-pci-db.patch new file mode 100644 index 0000000..6de6f56 --- /dev/null +++ b/drop-pci-db.patch @@ -0,0 +1,28 @@ +commit c73b5ab54378ec6d7df9948c46ce87f98587af9a +Author: Tom Gundersen <t...@jklm.no> +Date: 2 days ago + + udev: remove redundant call to deprecated pci-db + + The binary is no longer shipped with systemd/udev. The functionality + is taken over by a builtin, which is ran for all devices, rendering + this rule superfluous. + + Cc: Jan de Groot <j...@archlinux.org> + Signed-off-by: Tom Gundersen <t...@jklm.no> + +diff --git a/data/80-udisks.rules b/data/80-udisks.rules +index d1c8c5d..4bf2b37 100644 +--- a/data/80-udisks.rules ++++ b/data/80-udisks.rules +@@ -1,10 +1,6 @@ + # Do not edit this file, it will be overwritten on updates + # + +-# import names for PCI storage controllers +-# +-SUBSYSTEM=="pci", ACTION=="add|change", ENV{ID_MODEL_FROM_DATABASE}=="", ATTR{class}=="0x01*", IMPORT{program}="pci-db %p" +- + # Set eSATA port type for known eSATA CardBus adapters - first we want to ensure + # the device is on a cardbus controller (upper PCI device) - then we check + # vid/pid (lower PCI device) diff --git a/udisks-ac.patch b/udisks-ac.patch new file mode 100644 index 0000000..3e54227 --- /dev/null +++ b/udisks-ac.patch @@ -0,0 +1,17 @@ +diff -urN udisks-1.0.4.org/configure.ac udisks-1.0.4/configure.ac +--- udisks-1.0.4.org/configure.ac 2011-08-26 17:08:35.000000000 +0200 ++++ udisks-1.0.4/configure.ac 2013-03-18 10:47:09.035854003 +0100 +@@ -3,12 +3,11 @@ + AC_PREREQ(2.59c) + AC_INIT(udisks, 1.0.4, http://bugs.freedesktop.org/enter_bug.cgi?product=udisks) + AM_INIT_AUTOMAKE(udisks, 1.0.4) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AM_MAINTAINER_MODE + + AC_ISC_POSIX + AC_PROG_CC +-AM_PROG_CC_STDC + AC_HEADER_STDC + AM_PROG_LIBTOOL + AC_PROG_MAKE_SET ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/udisks.git/commitdiff/c4df46af74f7cb8cd8d1ac6346c4d200e7973954 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit