Browse Source

pcmciautils: update to 017

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3613 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 14 years ago
parent
commit
bb251b5e06
1 changed files with 14 additions and 12 deletions
  1. 14 12
      p/pcmciautils/pcmciautils-vl.spec

+ 14 - 12
p/pcmciautils/pcmciautils-vl.spec

@@ -1,22 +1,18 @@
 Summary: PCMCIA utilities and initialization programs
 Summary(ja): PCMCIA 用のユーティリティおよび初期化プログラム
 Name: pcmciautils
-Version: 014
+Version: 017
 Release: 1%{?_dist_release}
 Group: System Environment/Base
 License: GPL
 Url: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html
 
 Source: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-%{version}.tar.bz2
-# patch fomr fc to fix build failure
-Patch0: pcmciautils-buildfix.patch
-# replace deprecated format
-Patch10: pcmciautils-012-modalias.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-ExclusiveArch: i386 x86_64 ia64 ppc ppc64
+ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64
 BuildRequires: sysfsutils-devel >= 2.1.0
-BuildRequires: byacc
+BuildRequires: byacc, flex
 Obsoletes: pcmcia-cs
 Obsoletes: kernel-pcmcia-cs
 Requires: udev >= 097, kernel >= 2.6.16
@@ -31,11 +27,9 @@ pcmciautils パッケージは PCMCIA および Cardbus ソケットのための
 
 %prep
 %setup -q
-%patch0 -p1 -b .buildfix
-%patch10 -p1 -b .modalias
 
 %build
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} OPTIMIZATION="$RPM_OPT_FLAGS"
 
 %install
 %__rm -rf $RPM_BUILD_ROOT
@@ -47,11 +41,19 @@ pcmciautils パッケージは PCMCIA および Cardbus ソケットのための
 %files
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/pcmcia/*.opts
-%{_sysconfdir}/udev/rules.d/*
-%{_syssbindir}/*
+%dir %{_sysconfdir}/pcmcia
+%attr(0644,root,root) /lib/udev/rules.d/*
+%{_syssbindir}/pccardctl
+%attr(0755,root,root) %{_syssbindir}/lspcmcia
+%attr(0755,root,root) /lib/udev/pcmcia-*
 %{_mandir}/man*/*
 
 %changelog
+* Thu Apr 21 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 017-1
+- update to 017
+- drop unneeded patches
+- add BR: flex
+
 * Fri Aug 15 2008 Shu KONNO <owa@bg.wakwak.com> 014-1vl5
 - applied new versioning policy, spec in utf-8