- simplify build, include build id in version

Changed files:
    arcconf.spec -> 1.10

diff --git a/arcconf.spec b/arcconf.spec
index 5d498168c60201e19ca7d845f29d8f4f1d0ca914..c499269b8065483f96ee3e3a91a3875b935abaa6 100644 (file)
--- a/arcconf.spec
+++ b/arcconf.spec
@@ -1,14 +1,15 @@
+%define                build   17922
 Summary:       Adaptec uniform command line interface
 Summary(pl.UTF-8):     Ujednolicony interfajs linii poleceń Adapteca
 Name:          arcconf
-Version:       6.0
+Version:       6.0.%{build}
 Release:       1
 License:       Adaptec Downloadable Software License
 Group:         Base
 # tgz tarballs originaly came from 30MB+ Storage Manager RPM Files
-Source0:       http://www.obvious.co.nz/aacraid/arcconf/%{name}-6.0-b17922.tgz 
+Source0:       http://www.obvious.co.nz/aacraid/arcconf/%{name}-6.0-b%{build}.tgz
 # Source0-md5: 222c459447edbe7e836324056408bb0b
-Source1:       http://www.obvious.co.nz/aacraid/arcconf/%{name}-x64-6.0-b17922.tgz
+Source1:       http://www.obvious.co.nz/aacraid/arcconf/%{name}-x64-6.0-b%{build}.tgz
 # Source1-md5: 70684147e6e04cdbdad1891c6b8e6799
 URL:           http://linux.adaptec.com/
 ExclusiveArch: %{ix86} %{x8664}
@@ -39,19 +40,18 @@ Obsługiwane kontrolery:
 - Adaptec RAID 3805
 
 %prep
-%setup -q -c -a1
 %ifarch %{ix86}
-install linux/cmdline/{arcconf,README.TXT} .
+%setup -qTc -a0
 %endif
 %ifarch %{x8664}
-install linux-x64/cmdline/{arcconf,README.TXT} .
+%setup -qTc -a1
 %endif
+mv linux*/cmdline/* .
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sbindir}
-
-install arcconf $RPM_BUILD_ROOT%{_sbindir}/arcconf
+install -p arcconf $RPM_BUILD_ROOT%{_sbindir}/arcconf
 
 %clean
 rm -rf $RPM_BUILD_ROOT