From e811aefca56957425148ce6ac793e7fcf89757c53c59a64c6d36ac4980e07856 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Tue, 22 May 2012 09:03:14 +0000
Subject: [PATCH 1/2] Accepting request 121730 from
 home:a_jaeger:my-factory-packages

Update to Linux 3.4 headers

OBS-URL: https://build.opensuse.org/request/show/121730
OBS-URL: https://build.opensuse.org/package/show/Base:System/linux-glibc-devel?expand=0&rev=54
---
 linux-glibc-devel-3.4.tar.bz2 | 3 +++
 linux-glibc-devel.changes     | 5 +++++
 linux-glibc-devel.spec        | 4 ++--
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 linux-glibc-devel-3.4.tar.bz2

diff --git a/linux-glibc-devel-3.4.tar.bz2 b/linux-glibc-devel-3.4.tar.bz2
new file mode 100644
index 0000000..3a9b0cc
--- /dev/null
+++ b/linux-glibc-devel-3.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb29ba2db2596a11bcea0911874095f23c4b4afbd22611cf3995e65d0c750a18
+size 852649
diff --git a/linux-glibc-devel.changes b/linux-glibc-devel.changes
index 63ead22..423d7fe 100644
--- a/linux-glibc-devel.changes
+++ b/linux-glibc-devel.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May 22 07:43:50 UTC 2012 - aj@suse.de
+
+- Update to Linux 3.4 headers.
+
 -------------------------------------------------------------------
 Wed May 16 11:06:03 UTC 2012 - aj@suse.de
 
diff --git a/linux-glibc-devel.spec b/linux-glibc-devel.spec
index ceaf6a0..16bcac8 100644
--- a/linux-glibc-devel.spec
+++ b/linux-glibc-devel.spec
@@ -25,10 +25,10 @@ Group:          Development/Libraries/C and C++
 BuildArch:      noarch
 # this confusing version number has no meaning, it's the version
 # of the Linux kernel where these headers come from
-Version:        3.3.0
+Version:        3.4.0
 Release:        0
 # A "-" is not allowed in version
-%define upstream_version 3.3
+%define upstream_version 3.4
 Url:            http://www.kernel.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       kernel-headers

From 5bb9b211a2122f584f9fbea4b6ed705169b4ca7036b673562b16c0dbd32843b5 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Tue, 22 May 2012 09:14:44 +0000
Subject: [PATCH 2/2] Accepting request 121741 from
 home:a_jaeger:my-factory-packages

Update to Linux 3.4 headers

OBS-URL: https://build.opensuse.org/request/show/121741
OBS-URL: https://build.opensuse.org/package/show/Base:System/linux-glibc-devel?expand=0&rev=55
---
 getsetattr.patch              | 13 -------------
 linux-glibc-devel-3.3.tar.bz2 |  3 ---
 linux-glibc-devel.changes     |  1 +
 linux-glibc-devel.spec        |  2 --
 4 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 getsetattr.patch
 delete mode 100644 linux-glibc-devel-3.3.tar.bz2

diff --git a/getsetattr.patch b/getsetattr.patch
deleted file mode 100644
index fd35bf2..0000000
--- a/getsetattr.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: linux-glibc-devel-3.3/usr/include/asm-x86/unistd_32.h
-===================================================================
---- linux-glibc-devel-3.3.orig/usr/include/asm-x86/unistd_32.h
-+++ linux-glibc-devel-3.3/usr/include/asm-x86/unistd_32.h
-@@ -280,7 +280,7 @@
- #define __NR_mq_timedsend 279
- #define __NR_mq_timedreceive 280
- #define __NR_mq_notify 281
--#define __NR_mq_getsetaddr 282
-+#define __NR_mq_getsetattr 282
- #define __NR_kexec_load 283
- #define __NR_waitid 284
- #define __NR_add_key 286
diff --git a/linux-glibc-devel-3.3.tar.bz2 b/linux-glibc-devel-3.3.tar.bz2
deleted file mode 100644
index 84c7288..0000000
--- a/linux-glibc-devel-3.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:344067d9ea2a10b8e4f014d506010a21e7f4d52885a462a25575dbd4565c2b5c
-size 810407
diff --git a/linux-glibc-devel.changes b/linux-glibc-devel.changes
index 423d7fe..42ae4a8 100644
--- a/linux-glibc-devel.changes
+++ b/linux-glibc-devel.changes
@@ -2,6 +2,7 @@
 Tue May 22 07:43:50 UTC 2012 - aj@suse.de
 
 - Update to Linux 3.4 headers.
+  * Remove merged patch getsetattr.patch.
 
 -------------------------------------------------------------------
 Wed May 16 11:06:03 UTC 2012 - aj@suse.de
diff --git a/linux-glibc-devel.spec b/linux-glibc-devel.spec
index 16bcac8..5fbd2f1 100644
--- a/linux-glibc-devel.spec
+++ b/linux-glibc-devel.spec
@@ -38,7 +38,6 @@ PreReq:         coreutils
 Source:         %{name}-%{upstream_version}.tar.bz2
 Source1:        install_all.sh
 Patch1:         linux-glibc-devel.SuSE.SO_BSDCOMPAT.patch
-Patch2:         getsetattr.patch
 
 %description
 This package provides Linux kernel headers, the kernel API description
@@ -52,7 +51,6 @@ packages, instead.
 %prep
 %setup -q -n linux-glibc-devel-%{upstream_version}
 %patch1
-%patch2 -p1
 
 %build
 cat > version.h <<-BOGUS