From 668387b8d6c724c29f7173a680b8300b5e0cc4906107b2f4796d867605cca98d Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Wed, 28 Nov 2012 16:19:40 +0000 Subject: [PATCH 1/2] - Reenable multi-arch on ppc ppc64 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=237 --- glibc.changes | 5 +++++ glibc.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/glibc.changes b/glibc.changes index bc0416d..8f15408 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 28 09:31:11 UTC 2012 - schwab@suse.de + +- Reenable multi-arch on ppc ppc64 + ------------------------------------------------------------------- Tue Nov 27 21:34:15 UTC 2012 - aj@suse.de diff --git a/glibc.spec b/glibc.spec index d63cf87..c1cb42b 100644 --- a/glibc.spec +++ b/glibc.spec @@ -626,7 +626,7 @@ configure_and_build_glibc() { --enable-stackguard-randomization \ %endif --build=%{target} --host=%{target} \ -%ifarch %{ix86} x86_64 sparc sparc64 s390 s390x +%ifarch ppc ppc64 %{ix86} x86_64 sparc sparc64 s390 s390x --enable-multi-arch \ %endif %ifarch mipsel From 83fc2fcdc0388b81bf7d7baf67c0d16b8090832b981cf2d8848093961bf139ac Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 28 Nov 2012 20:52:39 +0000 Subject: [PATCH 2/2] Accepting request 143490 from home:a_jaeger:my-factory-packages Update to git head, fix nscd systemd file. OBS-URL: https://build.opensuse.org/request/show/143490 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=238 --- glibc-2.16.90-de2fd463b1c0.tar.xz | 3 --- glibc-2.16.90-e3c6aa3a5848.tar.xz | 3 +++ glibc.changes | 8 ++++++++ glibc.spec | 8 ++++---- 4 files changed, 15 insertions(+), 7 deletions(-) delete mode 100644 glibc-2.16.90-de2fd463b1c0.tar.xz create mode 100644 glibc-2.16.90-e3c6aa3a5848.tar.xz diff --git a/glibc-2.16.90-de2fd463b1c0.tar.xz b/glibc-2.16.90-de2fd463b1c0.tar.xz deleted file mode 100644 index 9fb7295..0000000 --- a/glibc-2.16.90-de2fd463b1c0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:954cdcd1a7c963357086f2caa109ac6ad7bea15e03f1ae930bd7b541d778166b -size 11128040 diff --git a/glibc-2.16.90-e3c6aa3a5848.tar.xz b/glibc-2.16.90-e3c6aa3a5848.tar.xz new file mode 100644 index 0000000..447ac69 --- /dev/null +++ b/glibc-2.16.90-e3c6aa3a5848.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0bd758d05a8abeb05258a9f5c253969c201ad76e6f6c6bebdc4e8883a3cf2443 +size 11142916 diff --git a/glibc.changes b/glibc.changes index 8f15408..e825d12 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Nov 28 15:48:32 UTC 2012 - aj@suse.de + +- Update to e3c6aa3a5848: + * Fix powerpc64 make abi check failure + * bugfixes +- Install nscd.socket to new /usr location + ------------------------------------------------------------------- Wed Nov 28 09:31:11 UTC 2012 - schwab@suse.de diff --git a/glibc.spec b/glibc.spec index c1cb42b..d39c49a 100644 --- a/glibc.spec +++ b/glibc.spec @@ -123,7 +123,7 @@ Provides: ld-linux.so.3(GLIBC_2.4) Version: 2.16.90 Release: 0 %define glibc_major_version 2.16.90 -%define git_id de2fd463b1c0 +%define git_id e3c6aa3a5848 Url: http://www.gnu.org/software/libc/libc.html BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: glibc-%{version}-%{git_id}.tar.xz @@ -945,8 +945,8 @@ done mkdir -p %{buildroot}/usr/lib/tmpfiles.d/ install -m 644 %{SOURCE20} %{buildroot}/usr/lib/tmpfiles.d/ -mkdir -p %{buildroot}/lib/systemd/system -install -m 644 %{SOURCE21} %{buildroot}/lib/systemd/system +mkdir -p %{buildroot}/usr/lib/systemd/system +install -m 644 %{SOURCE21} %{buildroot}/usr/lib/systemd/system %ifarch armv7l armv7hl # Provide compatibility link @@ -1242,7 +1242,7 @@ exit 0 %config(noreplace) /etc/nscd.conf %{_sbindir}/nscd %{_sbindir}/rcnscd -/lib/systemd/system/nscd.service +/usr/lib/systemd/system/nscd.service %dir /usr/lib/tmpfiles.d /usr/lib/tmpfiles.d/nscd.conf %dir %attr(0755,root,root) %ghost /var/run/nscd