[pcmciautils] Fixup arch macros, cleanup spec, drop ancient obsoletes

Peter Robinson pbrobinson at fedoraproject.org
Tue Jun 17 12:17:34 UTC 2014


commit 7a6f13e8e1f45893d5cdf6ead8420e182109eb3d
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Jun 17 13:17:20 2014 +0100

    Fixup arch macros, cleanup spec, drop ancient obsoletes

 pcmciautils.spec |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)
---
diff --git a/pcmciautils.spec b/pcmciautils.spec
index 41f0b03..3bef9c1 100644
--- a/pcmciautils.spec
+++ b/pcmciautils.spec
@@ -2,17 +2,12 @@ Name: pcmciautils
 Summary: PCMCIA utilities and initialization programs
 License: GPLv2
 Version: 018
-Release: 6%{?dist}
+Release: 7%{?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
 Source: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-%{version}.tar.bz2
-Obsoletes: pcmcia-cs < 3.2.9
-Obsoletes: kernel-pcmcia-cs < 3.1.32
-# Do not Provide, because it would conflict
-#Provides:  pcmcia-cs = 3.2.9
-#Provides:  kernel-pcmcia-cs = 3.1.32
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm}
 BuildRequires: libsysfs-devel >= 1.3.0
 BuildRequires: byacc, flex
 
@@ -27,17 +22,13 @@ debugging PCMCIA and Cardbus sockets.
 make V=1 OPTIMIZATION="$RPM_OPT_FLAGS" STRIPCMD=: #%{?_smp_mflags}
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT/lib/udev
 cp -p src/yacc_config.c y.tab.c # for -debuginfo
 
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/pcmcia/*.opts
 %dir %{_sysconfdir}/pcmcia
 %attr(0644,root,root) /lib/udev/rules.d/*
@@ -49,6 +40,9 @@ cp -p src/yacc_config.c y.tab.c # for -debuginfo
 %{_mandir}/man*/pccardctl*
 
 %changelog
+* Tue Jun 17 2014 Peter Robinson <pbrobinson at fedoraproject.org> 018-7
+- Fixup arch macros, cleanup spec, drop ancient obsoletes
+
 * Fri Jun 06 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 018-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list