Hello community, here is the log from the commit of package pcmciautils for openSUSE:Factory checked in at 2013-04-17 23:14:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcmciautils (Old) and /work/SRC/openSUSE:Factory/.pcmciautils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pcmciautils", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/pcmciautils/pcmciautils.changes 2012-11-06 16:17:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pcmciautils.new/pcmciautils.changes 2013-04-17 23:14:47.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Apr 14 21:16:28 UTC 2013 - [email protected] + +- Use pkgconfig to determine the correct path of udev stuff +- Update the bundled udev rules to use the BUILTIN modprobe + routines instead of invoking the modprobe binary. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcmciautils.spec ++++++ --- /var/tmp/diff_new_pack.Jppt1L/_old 2013-04-17 23:14:51.000000000 +0200 +++ /var/tmp/diff_new_pack.Jppt1L/_new 2013-04-17 23:14:51.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package pcmciautils # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,8 @@ %else BuildRequires: sysfsutils %endif +BuildRequires: pkgconfig +BuildRequires: pkgconfig(udev) > 187 Url: http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html Version: 017 Release: 0 @@ -42,7 +44,8 @@ Patch4: fix_udev_directory.patch Source1: suse-files.tar.bz2 Source2: cis-files.tar.bz2 - +%define _udevdir %(pkg-config --variable=udevdir udev) +%define _udevrulesdir %{_udevdir}/rules.d %description This package enables the usage of PC-Cards with Linux. It provides hotplug scripts, and tools that set up sockets and cards. Since kernel @@ -65,7 +68,7 @@ %setup -n pcmciautils-%{version} -T -D -a 2 %patch2 -p1 %patch3 -p1 -%patch4 +%patch4 -p1 %build make all DEF_CFLAGS="-fPIE $RPM_OPT_FLAGS" DEF_LDFLAGS="-pie" STRIPCMD=true @@ -93,12 +96,10 @@ %dir /etc/pcmcia %config /etc/pcmcia/config.opts /etc/pcmcia/NOTE -/usr/lib/udev/rules.d/60-pcmcia.rules +%{_udevrulesdir}/60-pcmcia.rules %verify(not mode) %attr(4750,root,trusted) /sbin/pccardctl -%dir /usr/lib/udev -%dir /usr/lib/udev/rules.d -/usr/lib/udev/pcmcia-check-broken-cis -/usr/lib/udev/pcmcia-socket-startup +%{_udevdir}/pcmcia-check-broken-cis +%{_udevdir}/pcmcia-socket-startup /sbin/lspcmcia /lib/firmware/* /%{_docdir}/pcmciautils ++++++ fix_udev_directory.patch ++++++ --- /var/tmp/diff_new_pack.Jppt1L/_old 2013-04-17 23:14:52.000000000 +0200 +++ /var/tmp/diff_new_pack.Jppt1L/_new 2013-04-17 23:14:52.000000000 +0200 @@ -1,11 +1,27 @@ ---- Makefile 2010-01-06 16:47:45.000000000 +0100 -+++ Makefile 2012-11-05 21:28:17.080705810 +0100 -@@ -67,7 +67,7 @@ +--- pcmciautils-017.orig/Makefile ++++ pcmciautils-017/Makefile +@@ -67,7 +67,7 @@ exec_prefix = ${prefix} etcdir = ${prefix}/etc sbindir = ${exec_prefix}/sbin mandir = ${prefix}/usr/share/man -udevdir = ${prefix}/lib/udev -+udevdir = ${prefix}/usr/lib/udev ++udevdir = $(shell pkg-config --variable=udevdir udev) INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} +--- pcmciautils-017.orig/udev/rules-base ++++ pcmciautils-017/udev/rules-base +@@ -13,5 +13,4 @@ SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*" + # PCMCIA sockets: + # + # modprobe the pcmcia bus module so that 16-bit PCMCIA devices work +-SUBSYSTEM=="pcmcia_socket", \ +- RUN+="/sbin/modprobe -b pcmcia" ++SUBSYSTEM=="pcmcia_socket", RUN{builtin}="kmod load pcmcia" +--- pcmciautils-017.orig/udev/rules-modprobe ++++ pcmciautils-017/udev/rules-modprobe +@@ -1,3 +1,2 @@ + # modprobe $env{MODALIAS} loads all possibly appropriate modules +-SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \ +- RUN+="/sbin/modprobe $env{MODALIAS}" ++SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", RUN{builtin}="kmod load $env{MODALIAS}" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
