rpms/pcmciautils/devel .cvsignore, 1.7, 1.8 pcmciautils.spec, 1.34, 1.35 sources, 1.7, 1.8

[Harald Hoyer]

Author: harald

Update of /cvs/pkgs/rpms/pcmciautils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6263

Modified Files:
	.cvsignore pcmciautils.spec sources 
Log Message:
* Mon Feb 15 2010 Harald Hoyer <harald at redhat.com> 017-1
- version 017
- fix build on rawhide (bug #565133)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pcmciautils/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	6 Mar 2009 08:29:26 -0000	1.7
+++ .cvsignore	15 Feb 2010 12:14:29 -0000	1.8
@@ -1 +1 @@
-pcmciautils-015.tar.bz2
+pcmciautils-017.tar.bz2


Index: pcmciautils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcmciautils/devel/pcmciautils.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- pcmciautils.spec	6 Aug 2009 10:36:18 -0000	1.34
+++ pcmciautils.spec	15 Feb 2010 12:14:29 -0000	1.35
@@ -1,8 +1,8 @@
 Name: pcmciautils
 Summary: PCMCIA utilities and initialization programs
 License: GPLv2
-Version: 015
-Release: 4%{?dist}
+Version: 017
+Release: 1%{?dist}
 Group: System Environment/Base
 ExclusiveArch: i386 i586 i686 x86_64 ia64 ppc ppc64 %{?arm}
 URL: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html
@@ -16,7 +16,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildRequires: libsysfs-devel >= 1.3.0
 Requires: udev >= 062, kernel >= 2.6.12-1.1411_FC5
 BuildRequires: byacc, flex
-Patch1: pcmciautils-fedora.patch
 
 %description
 The pcmciautils package contains utilities for initializing and
@@ -24,19 +23,16 @@ debugging PCMCIA and Cardbus sockets.
 
 %prep
 %setup -q
-# Fix build peculiarities
-%patch1 -p1
 
 %build
-make %{?_smp_mflags}
+#make %{?_smp_mflags}
+make
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT/lib/udev
-mv $RPM_BUILD_ROOT/sbin/pcmcia-check-broken-cis $RPM_BUILD_ROOT/lib/udev
-mv $RPM_BUILD_ROOT/sbin/pcmcia-socket-startup $RPM_BUILD_ROOT/lib/udev
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -45,7 +41,7 @@ mv $RPM_BUILD_ROOT/sbin/pcmcia-socket-st
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/pcmcia/*.opts
 %dir %{_sysconfdir}/pcmcia
-%config(noreplace) %attr(0644,root,root) /etc/udev/rules.d/*
+%attr(0644,root,root) /lib/udev/rules.d/*
 /sbin/pccardctl
 %attr(0755,root,root) /sbin/lspcmcia
 %attr(0755,root,root) /lib/udev/pcmcia-check-broken-cis
@@ -54,6 +50,10 @@ mv $RPM_BUILD_ROOT/sbin/pcmcia-socket-st
 %{_mandir}/man*/pccardctl*
 
 %changelog
+* Mon Feb 15 2010 Harald Hoyer <harald at redhat.com> 017-1
+- version 017
+- fix build on rawhide (bug #565133)
+
 * Thu Aug 06 2009 Harald Hoyer <harald at redhat.com> 015-4
 - add i686 buildarch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pcmciautils/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	6 Mar 2009 08:29:26 -0000	1.7
+++ sources	15 Feb 2010 12:14:29 -0000	1.8
@@ -1 +1 @@
-9e12435c8b6cf7bf59894e90e480b4aa  pcmciautils-015.tar.bz2
+5245af28eeba57ec0606a874d44d10f7  pcmciautils-017.tar.bz2