Hello community, here is the log from the commit of package pcmciautils for openSUSE:Factory checked in at 2015-09-24 07:16:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcmciautils (Old) and /work/SRC/openSUSE:Factory/.pcmciautils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pcmciautils" Changes: -------- --- /work/SRC/openSUSE:Factory/pcmciautils/pcmciautils.changes 2013-04-17 23:14:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pcmciautils.new/pcmciautils.changes 2015-09-24 07:16:43.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Sep 9 11:37:14 UTC 2015 - [email protected] + +- Update to 018 + * no changelog available +- Use url for source +- Update project url +- Remove pcmciautils_fix1.diff (similar fix already included in + upstream) +- Cleanup spec file with spec-cleaner + +------------------------------------------------------------------- Old: ---- pcmciautils-017.tar.bz2 pcmciautils_fix1.diff New: ---- pcmciautils-018.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcmciautils.spec ++++++ --- /var/tmp/diff_new_pack.QhL5wJ/_old 2015-09-24 07:16:44.000000000 +0200 +++ /var/tmp/diff_new_pack.QhL5wJ/_new 2015-09-24 07:16:44.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package pcmciautils # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,36 +16,33 @@ # +%define _udevdir %(pkg-config --variable=udevdir udev) +%define _udevrulesdir %{_udevdir}/rules.d Name: pcmciautils -BuildRequires: bison -BuildRequires: flex -%if 0%{?suse_version} > 1130 -BuildRequires: sysfsutils-devel -%else -BuildRequires: sysfsutils -%endif -BuildRequires: pkgconfig -BuildRequires: pkgconfig(udev) > 187 -Url: http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html -Version: 017 +Version: 018 Release: 0 Summary: Utilities for PC-Cards License: GPL-2.0+ Group: Hardware/Other -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Obsoletes: pcmcia < 017 -Provides: pcmcia >= 017 -PreReq: permissions -Supplements: modalias(pci:v*d*sv*sd*bc06sc07i00*) -Source: pcmciautils-%{version}.tar.bz2 +Url: https://www.kernel.org/pub/linux/utils/kernel/pcmcia/ +Source0: https://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-%{version}.tar.xz +Source1: suse-files.tar.bz2 +Source2: cis-files.tar.bz2 Patch1: pcmciautils_config.opts.202500.diff -Patch2: pcmciautils_fix1.diff Patch3: pcmciautils_pie.diff 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 +BuildRequires: bison +BuildRequires: flex +BuildRequires: pkgconfig +BuildRequires: xz +BuildRequires: pkgconfig(udev) > 187 +Requires(pre): permissions +Supplements: modalias(pci:v*d*sv*sd*bc06sc07i00*) +Obsoletes: pcmcia < 017 +Provides: pcmcia >= 017 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: sysfsutils-devel + %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 @@ -54,29 +51,20 @@ and inserting cards can be done with pccardctl (it was cardctl before). There are also some tools for debugging and CIS handling. - - -Authors: --------- - Dominik Brodowski <[email protected]> - David Hinds <[email protected]> - %prep -%setup -n pcmciautils-%{version} +%setup -q -n pcmciautils-%{version} %patch1 -%setup -n pcmciautils-%{version} -T -D -a 1 -%setup -n pcmciautils-%{version} -T -D -a 2 -%patch2 -p1 +%setup -q -n pcmciautils-%{version} -T -D -a 1 +%setup -q -n pcmciautils-%{version} -T -D -a 2 %patch3 -p1 %patch4 -p1 %build -make all DEF_CFLAGS="-fPIE $RPM_OPT_FLAGS" DEF_LDFLAGS="-pie" STRIPCMD=true -# make debugtools +make %{?_smp_mflags} all DEF_CFLAGS="-fPIE %{optflags}" DEF_LDFLAGS="-pie" STRIPCMD=true %install -make install DESTDIR=%{buildroot} -install -m 644 suse-files/NOTE %{buildroot}/etc/pcmcia +make DESTDIR=%{buildroot} install %{?_smp_mflags} +install -m 644 suse-files/NOTE %{buildroot}%{_sysconfdir}/pcmcia mkdir -p %{buildroot}/lib/firmware # Only install E-CARD.cis, all other files are part of # kernel-firmware package, so no need to duplicate them. @@ -86,16 +74,16 @@ %post %set_permissions /sbin/pccardctl -rm -vf /etc/sysconfig/pcmcia +rm -vf %{_sysconfdir}/sysconfig/pcmcia %verifyscript %verify_permissions -e /sbin/pccardctl %files %defattr(-,root,root) -%dir /etc/pcmcia -%config /etc/pcmcia/config.opts -/etc/pcmcia/NOTE +%dir %{_sysconfdir}/pcmcia +%config %{_sysconfdir}/pcmcia/config.opts +%{_sysconfdir}/pcmcia/NOTE %{_udevrulesdir}/60-pcmcia.rules %verify(not mode) %attr(4750,root,trusted) /sbin/pccardctl %{_udevdir}/pcmcia-check-broken-cis ++++++ fix_udev_directory.patch ++++++ --- /var/tmp/diff_new_pack.QhL5wJ/_old 2015-09-24 07:16:44.000000000 +0200 +++ /var/tmp/diff_new_pack.QhL5wJ/_new 2015-09-24 07:16:44.000000000 +0200 @@ -1,6 +1,8 @@ ---- pcmciautils-017.orig/Makefile -+++ pcmciautils-017/Makefile -@@ -67,7 +67,7 @@ exec_prefix = ${prefix} +Index: pcmciautils-018/Makefile +=================================================================== +--- pcmciautils-018.orig/Makefile ++++ pcmciautils-018/Makefile +@@ -74,7 +74,7 @@ exec_prefix = ${prefix} etcdir = ${prefix}/etc sbindir = ${exec_prefix}/sbin mandir = ${prefix}/usr/share/man @@ -9,8 +11,10 @@ INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} ---- pcmciautils-017.orig/udev/rules-base -+++ pcmciautils-017/udev/rules-base +Index: pcmciautils-018/udev/rules-base +=================================================================== +--- pcmciautils-018.orig/udev/rules-base ++++ pcmciautils-018/udev/rules-base @@ -13,5 +13,4 @@ SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*" # PCMCIA sockets: # @@ -18,8 +22,10 @@ -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 +Index: pcmciautils-018/udev/rules-modprobe +=================================================================== +--- pcmciautils-018.orig/udev/rules-modprobe ++++ pcmciautils-018/udev/rules-modprobe @@ -1,3 +1,2 @@ # modprobe $env{MODALIAS} loads all possibly appropriate modules -SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \ ++++++ pcmciautils_config.opts.202500.diff ++++++ --- /var/tmp/diff_new_pack.QhL5wJ/_old 2015-09-24 07:16:44.000000000 +0200 +++ /var/tmp/diff_new_pack.QhL5wJ/_new 2015-09-24 07:16:44.000000000 +0200 @@ -1,5 +1,7 @@ ---- config/config.opts 2006-06-01 09:07:52.000000000 +0000 -+++ config/config.opts 2007-01-05 17:20:51.000000000 +0000 +Index: config/config.opts +=================================================================== +--- config/config.opts.orig ++++ config/config.opts @@ -18,7 +18,11 @@ include port 0x100-0x3af
