commit pcmciautils for openSUSE:Factory
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.0 +0200
+++ /work/SRC/openSUSE:Factory/.pcmciautils.new/pcmciautils.changes
2015-09-24 07:16:43.0 +0200
@@ -1,0 +2,11 @@
+Wed Sep 9 11:37:14 UTC 2015 - mplus...@suse.com
+
+- 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.0 +0200
+++ /var/tmp/diff_new_pack.QhL5wJ/_new 2015-09-24 07:16:44.0 +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
-David Hinds
-
%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
commit pcmciautils for openSUSE:Factory
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 g...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/pcmciautils/pcmciautils.changes 2012-11-06
16:17:49.0 +0100
+++ /work/SRC/openSUSE:Factory/.pcmciautils.new/pcmciautils.changes
2013-04-17 23:14:47.0 +0200
@@ -1,0 +2,7 @@
+Sun Apr 14 21:16:28 UTC 2013 - crrodrig...@opensuse.org
+
+- 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.0 +0200
+++ /var/tmp/diff_new_pack.Jppt1L/_new 2013-04-17 23:14:51.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.Jppt1L/_new 2013-04-17 23:14:52.0 +0200
@@ -1,11 +1,27 @@
Makefile 2010-01-06 16:47:45.0 +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: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit pcmciautils for openSUSE:Factory
Hello community,
here is the log from the commit of package pcmciautils for openSUSE:Factory
checked in at 2012-02-03 10:25:21
Comparing /work/SRC/openSUSE:Factory/pcmciautils (Old)
and /work/SRC/openSUSE:Factory/.pcmciautils.new (New)
Package is pcmciautils, Maintainer is g...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/pcmciautils/pcmciautils.changes 2011-10-26
15:42:05.0 +0200
+++ /work/SRC/openSUSE:Factory/.pcmciautils.new/pcmciautils.changes
2012-02-03 10:25:22.0 +0100
@@ -1,0 +2,5 @@
+Tue Jan 31 12:49:50 UTC 2012 - dlova...@suse.com
+
+- Added patch for platform independent executable build
+
+---
New:
pcmciautils_pie.diff
Other differences:
--
++ pcmciautils.spec ++
--- /var/tmp/diff_new_pack.GvZF52/_old 2012-02-03 10:25:23.0 +0100
+++ /var/tmp/diff_new_pack.GvZF52/_new 2012-02-03 10:25:23.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package pcmciautils
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -40,6 +40,7 @@
Source: pcmciautils-%{version}.tar.bz2
Patch1: pcmciautils_config.opts.202500.diff
Patch2: pcmciautils_fix1.diff
+Patch3: pcmciautils_pie.diff
Source1:suse-files.tar.bz2
Source2:cis-files.tar.bz2
@@ -64,9 +65,10 @@
%setup -n pcmciautils-%{version} -T -D -a 1
%setup -n pcmciautils-%{version} -T -D -a 2
%patch2 -p1
+%patch3 -p1
%build
-make all DEF_CFLAGS=$RPM_OPT_FLAGS STRIPCMD=true
+make all DEF_CFLAGS=-fPIE $RPM_OPT_FLAGS DEF_LDFLAGS=-pie STRIPCMD=true
# make debugtools
%install
++ pcmciautils_pie.diff ++
--- pcmciautils-017/Makefile
+++ pcmciautils-017/Makefile
@@ -126,7 +126,7 @@ WARNINGS += $(call cc-supports,-Wno-poin
WARNINGS += $(call cc-supports,-Wdeclaration-after-statement)
WARNINGS += -Wshadow
-CFLAGS += -pipe -DPCMCIAUTILS_VERSION=\$(VERSION)\
+CFLAGS += -fpie -pipe -DPCMCIAUTILS_VERSION=\$(VERSION)\
YFLAGS := -d
HEADERS = \
@@ -226,7 +226,7 @@ build/ccdv: build/ccdv.c
mv y.tab.h $*.h
$(PCCARDCTL): $(LIBC) src/$(PCCARDCTL).o src/$(PCCARDCTL).c $(OBJS) $(HEADERS)
- $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) src/$(PCCARDCTL).o $(LIB_OBJS)
$(ARCH_LIB_OBJS)
+ $(QUIET) $(LD) $(LDFLAGS) -pie -o $@ $(CRT0) src/$(PCCARDCTL).o
$(LIB_OBJS) $(ARCH_LIB_OBJS)
$(QUIET) $(STRIPCMD) $@
$(PCMCIA_CHECK_BROKEN_CIS): $(LIBC) src/$(PCMCIA_CHECK_BROKEN_CIS).o
src/read-cis.o $(OBJS) $(HEADERS)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit pcmciautils for openSUSE:Factory
Hello community,
here is the log from the commit of package pcmciautils for openSUSE:Factory
checked in at 2011-12-06 18:36:23
Comparing /work/SRC/openSUSE:Factory/pcmciautils (Old)
and /work/SRC/openSUSE:Factory/.pcmciautils.new (New)
Package is pcmciautils, Maintainer is g...@suse.com
Changes:
Other differences:
--
++ pcmciautils.spec ++
--- /var/tmp/diff_new_pack.36oR8B/_old 2011-12-06 19:03:26.0 +0100
+++ /var/tmp/diff_new_pack.36oR8B/_new 2011-12-06 19:03:26.0 +0100
@@ -29,7 +29,7 @@
Version:017
Release:115
Summary:Utilities for PC-Cards
-License:GPLv2+
+License:GPL-2.0+
Group: Hardware/Other
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Obsoletes: pcmcia 017
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit pcmciautils for openSUSE:Factory
Hello community,
here is the log from the commit of package pcmciautils for openSUSE:Factory
checked in at 2011-10-26 15:31:56
Comparing /work/SRC/openSUSE:Factory/pcmciautils (Old)
and /work/SRC/openSUSE:Factory/.pcmciautils.new (New)
Package is pcmciautils, Maintainer is g...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/pcmciautils/pcmciautils.changes 2011-09-23
12:21:48.0 +0200
+++ /work/SRC/openSUSE:Factory/.pcmciautils.new/pcmciautils.changes
2011-10-26 15:42:05.0 +0200
@@ -1,0 +2,5 @@
+Tue Oct 25 15:53:21 CEST 2011 - r...@suse.de
+
+- null termination of the pccardctl_opts added (bnc#567197)
+
+---
New:
pcmciautils_fix1.diff
Other differences:
--
++ pcmciautils.spec ++
--- /var/tmp/diff_new_pack.2GWMDR/_old 2011-10-26 15:42:12.0 +0200
+++ /var/tmp/diff_new_pack.2GWMDR/_new 2011-10-26 15:42:12.0 +0200
@@ -39,6 +39,7 @@
AutoReqProv:on
Source: pcmciautils-%{version}.tar.bz2
Patch1: pcmciautils_config.opts.202500.diff
+Patch2: pcmciautils_fix1.diff
Source1:suse-files.tar.bz2
Source2:cis-files.tar.bz2
@@ -62,6 +63,7 @@
%patch1
%setup -n pcmciautils-%{version} -T -D -a 1
%setup -n pcmciautils-%{version} -T -D -a 2
+%patch2 -p1
%build
make all DEF_CFLAGS=$RPM_OPT_FLAGS STRIPCMD=true
++ pcmciautils_fix1.diff ++
--- pcmciautils-017/src/pccardctl.c 2011/10/25 13:52:48 1.1
+++ pcmciautils-017/src/pccardctl.c 2011/10/25 13:53:06
@@ -394,6 +394,7 @@
{ .name=verbose, .has_arg=no_argument, .flag=NULL,
.val='v'},
// { .name=socket, .has_arg=required_argument, .flag=NULL,
.val='s'},
// { .name=socketdir,.has_arg=required_argument, .flag=NULL,
.val='d'},
+ { NULL, 0, NULL, 0},
};
static void lspcmcia_socket_available_resources(unsigned long socket_no, char
*which) {
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit pcmciautils for openSUSE:Factory
Hello community,
here is the log from the commit of package pcmciautils for openSUSE:Factory
checked in at Thu Aug 11 15:45:38 CEST 2011.
--- pcmciautils/pcmciautils.changes 2010-11-11 11:03:40.0 +0100
+++ /mounts/work_src_done/STABLE/pcmciautils/pcmciautils.changes
2011-08-11 11:21:24.0 +0200
@@ -1,0 +2,7 @@
+Thu Aug 11 09:19:17 UTC 2011 - a...@suse.de
+
+- Only install E-CARD.cis, all other files are part of kernel-firmware
+ package.
+- Use set_permissions.
+
+---
calling whatdependson for head-i586
Other differences:
--
++ pcmciautils.spec ++
--- /var/tmp/diff_new_pack.18faUY/_old 2011-08-11 15:45:24.0 +0200
+++ /var/tmp/diff_new_pack.18faUY/_new 2011-08-11 15:45:24.0 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package pcmciautils (Version 017)
+# spec file for package pcmciautils
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -27,7 +27,7 @@
%endif
Url:http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html
Version:017
-Release:2
+Release:115
Summary:Utilities for PC-Cards
License:GPLv2+
Group: Hardware/Other
@@ -71,13 +71,16 @@
make install DESTDIR=%{buildroot}
install -m 644 suse-files/NOTE %{buildroot}/etc/pcmcia
mkdir -p %{buildroot}/lib/firmware
-install -m 644 cis-files/* %{buildroot}/lib/firmware
+# Only install E-CARD.cis, all other files are part of
+# kernel-firmware package, so no need to duplicate them.
+install -m 644 cis-files/E-CARD.cis %{buildroot}/lib/firmware
mkdir -p %{buildroot}/%{_docdir}/pcmciautils
install -m 644 suse-files/README.SUSE %{buildroot}/%{_docdir}/pcmciautils
%post
-%run_permissions
+%set_permissions /sbin/pccardctl
rm -vf /etc/sysconfig/pcmcia
+
%verifyscript
%verify_permissions -e /sbin/pccardctl
@@ -95,7 +98,6 @@
/sbin/lspcmcia
/lib/firmware/*
/%{_docdir}/pcmciautils
-#/%{_mandir}/man[458]/*
/%{_mandir}/man8/*
%changelog
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
