packages: linux-libc-headers/linux-libc-headers.spec, linux-libc-headers/li...

[arekm]

Author: arekm                        Date: Wed Sep  9 08:21:30 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- install per arch atomic.h

---- Files affected:
packages/linux-libc-headers:
   linux-libc-headers.spec (1.147 -> 1.148) , linux-libc-headers-atomic.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/linux-libc-headers/linux-libc-headers.spec
diff -u packages/linux-libc-headers/linux-libc-headers.spec:1.147 packages/linux-libc-headers/linux-libc-headers.spec:1.148
--- packages/linux-libc-headers/linux-libc-headers.spec:1.147	Wed Sep  9 09:51:08 2009
+++ packages/linux-libc-headers/linux-libc-headers.spec	Wed Sep  9 10:21:25 2009
@@ -25,7 +25,6 @@
 Patch5:		%{name}-pom-set.patch
 Patch6:		linux-kernel-headers.SuSE.TIOCGDEV.patch
 Patch7:		%{name}-atm-vbr.patch
-Patch8:		%{name}-atomic.patch
 AutoReqProv:	no
 BuildRequires:	rpmbuild(macros) >= 1.360
 Requires(pre):	fileutils
@@ -69,7 +68,6 @@
 %patch5 -p1
 %patch6 -p2
 %patch7 -p1
-%patch8 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -82,6 +80,15 @@
 	ARCH=%{_target_base_arch}
 %endif
 
+# for mysql+percona
+%ifarch %{x86}
+install arch/x86/include/asm/atomic_32.h $RPM_BUILD_ROOT%{_includedir}/asm/atomic.h
+%else
+%ifarch %{x8664}
+install arch/x86/include/asm/atomic_64.h $RPM_BUILD_ROOT%{_includedir}/asm/atomic.h
+%endif
+%endif
+
 # provided by glibc-headers
 rm -rf $RPM_BUILD_ROOT%{_includedir}/scsi
 
@@ -115,6 +122,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.148  2009/09/09 08:21:25  arekm
+- install per arch atomic.h
+
 Revision 1.147  2009/09/09 07:51:08  arekm
 - up to 2.6.30.6 + add asm../atomic.h for mysql+percona usage
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/linux-libc-headers/linux-libc-headers.spec?r1=1.147&r2=1.148&f=u