use tar archive, version archives

merged with old changes
2012-05-20 18:12:33.000000000 +0300

diff --git a/mcelog.spec b/mcelog.spec
index 038815673c0942f6665ffad4155436238802e164..22d090ebd5af2d362df89df82e05aa767e29b742 100644 (file)
--- a/mcelog.spec
+++ b/mcelog.spec
@@ -1,16 +1,17 @@
 # TODO
 # - sync pl
-%define                snap    20130601
+%define                subver  20130601
 %define                rel     1
 Summary:       x86-64/x86 Machine Check Exceptions collector and decoder
 Summary(pl.UTF-8):     Narzędzie do zbierania i dekodowania wyjątków MCE na platformie x86-64/x86
 Name:          mcelog
 Version:       1.0
-Release:       1.%{snap}.%{rel}
+Release:       1.%{subver}.%{rel}
 License:       GPL v2
 Group:         Applications/System
-Source0:       https://github.com/andikleen/mcelog/archive/master.zip
-# Source0-md5: 81f744e778cd170f68d03764633c4a31
+#Source0:      http://www.kernel.org/pub/linux/utils/cpu/mce/%{name}-%{version}%{subver}.tar.gz
+Source0:       https://github.com/andikleen/mcelog/tarball/master/%{name}-%{version}-%{subver}.tgz
+# Source0-md5: c48d3d3296ad0d5cbdf661e44375ea64
 Source1:       %{name}.logrotate
 Source2:       %{name}.cron
 Source3:       %{name}.init
@@ -19,7 +20,6 @@ Patch1:               %{name}-FHS.patch
 Patch2:                bashism.patch
 URL:           https://github.com/andikleen/mcelog.git
 BuildRequires: rpmbuild(macros) >= 1.228
-BuildRequires: unzip
 Requires(post,preun):  /sbin/chkconfig
 Requires:      rc-scripts
 Suggests:      crondaemon
@@ -60,14 +60,15 @@ który może być czytany z przestrzeni użytkownika poprzez urządzenie
 tych zdarzeń; loguje ono zdekodowane zdarzenia MCE do /var/log/mcelog.
 
 %prep
-%setup -q -n %{name}-master
+%setup -qc
+mv andikleen-mcelog-*/* .
 %patch1 -p1
 %patch2 -p1
 
 %build
 %{__make} \
        CC="%{__cc}" \
-       CFLAGS="%{rpmcflags}"
+       CFLAGS="%{rpmcflags} -fpie -pie"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -77,10 +78,10 @@ install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig,{cron,logrotate}.d},/var/
        prefix=$RPM_BUILD_ROOT%{_prefix} \
        etcprefix=$RPM_BUILD_ROOT
 
-cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.d/%{name}
-cp -a %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.d/%{name}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 
 :> $RPM_BUILD_ROOT%{statdir}/memory-errors