From c508a8f2c99b7d5ca1012d76597e31203b49fdd734ad457f60592f288613332b Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 20 Jun 2011 12:47:04 +0000 Subject: [PATCH 1/2] Accepting request 74197 from home:msmeissn:branches:Base:System move summary,license and group out of the not-ppc if OBS-URL: https://build.opensuse.org/request/show/74197 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=67 --- glibc.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/glibc.spec b/glibc.spec index db16f58..b7f241d 100644 --- a/glibc.spec +++ b/glibc.spec @@ -18,6 +18,9 @@ Name: glibc +License: GPLv2+ +Summary: Standard Shared Libraries (from the GNU C Library) +Group: System/Libraries BuildRequires: gcc-c++ BuildRequires: libselinux-devel BuildRequires: libstdc++-devel @@ -42,9 +45,6 @@ BuildRequires: libstdc++-devel %define powerpc_optimize_cpu_power7 0 %define powerpc_optimize_cpu_cell 0 %else -License: GPLv2+ -Summary: Standard Shared Libraries (from the GNU C Library) -Group: System/Libraries %define optimize_power 0 %define powerpc_optimize_base 0 %define powerpc_optimize_cpu_power4 0 From e2e592656e2e0012949d8b94d25fcc9d26da437fc1eacb4de822be237b365276 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 20 Jun 2011 12:48:58 +0000 Subject: [PATCH 2/2] Accepting request 74201 from home:a_jaeger:branches:openSUSE:Factory Minor cleanups. OBS-URL: https://build.opensuse.org/request/show/74201 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=68 --- glibc.changes | 10 +++++++++- glibc.rpmlintrc | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/glibc.changes b/glibc.changes index 1dd1303..b9be988 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,9 +1,17 @@ +------------------------------------------------------------------- +Mon Jun 20 12:47:46 UTC 2011 - aj@suse.de + +- Enhance rpmlintrc. +- move summary,license and group out of the not-ppc if (by Marcus + Meissner). + ------------------------------------------------------------------- Mon Jun 20 11:02:01 UTC 2011 - aj@suse.de - Remove PreReq on permissions to avoid a cycle that gives leads to an uninstallable system (bnc#700925). -- Fix on x86 - fixes scpm compilation. +- Fix on x86 - fixes scpm compilation + (bnc#700784). ------------------------------------------------------------------- Fri Jun 17 09:50:19 UTC 2011 - aj@suse.de diff --git a/glibc.rpmlintrc b/glibc.rpmlintrc index a71322b..c3289a4 100644 --- a/glibc.rpmlintrc +++ b/glibc.rpmlintrc @@ -10,3 +10,5 @@ addFilter(".*files-duplicate /usr/lib64/libbsd-compat.a /usr/lib.*/libg.a") addFilter(".*shared-lib-without-dependency-information /lib.*/ld-2.*.so") # Handled via glibc_post_upgrade: addFilter(".*permissions-missing-postin missing %set_permissions /usr/.*pt_chown in %post") +# Do not require permissions, this will lead to a cycle (bnc#700925): +addFilter("glibc\..*: permissions-missing-requires")