From a53f260b23eeeffa33aba3da10b6f5ed47c7a250ae2e6ec59723cd87b96c1251 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 18 Jan 2012 09:31:00 +0000 Subject: [PATCH] Accepting request 100532 from home:a_jaeger:my-factory-packages Update license OBS-URL: https://build.opensuse.org/request/show/100532 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=156 --- glibc.changes | 5 +++++ glibc.spec | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/glibc.changes b/glibc.changes index 2fb5c90..93c823f 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 18 09:29:24 UTC 2012 - aj@suse.de + +- Update license strings in spec file. + ------------------------------------------------------------------- Mon Jan 16 13:19:43 UTC 2012 - aj@suse.de diff --git a/glibc.spec b/glibc.spec index d89533b..3bb206f 100644 --- a/glibc.spec +++ b/glibc.spec @@ -20,7 +20,7 @@ Name: glibc Summary: Standard Shared Libraries (from the GNU C Library) -License: GPL-2.0+ +License: LGPL-2.1+ and SUSE-LGPL-2.1+-with-GCC-exception and GPL-2.0+ Group: System/Libraries BuildRequires: gcc-c++ BuildRequires: libselinux-devel @@ -208,7 +208,7 @@ without these libraries. %package info Summary: Info Files for the GNU C Library -License: GPL-2.0+ +License: GFDL-1.1 Group: Documentation/Other Requires(post): %{install_info_prereq} Requires(postun): %{install_info_prereq} @@ -221,7 +221,7 @@ complete and is partially out of date. %package html Summary: HTML Documentation for the GNU C Library -License: GPL-2.0+ ; LGPL-2.1+ +License: GFDL-1.1 Group: Documentation/HTML BuildArch: noarch @@ -232,7 +232,7 @@ partially out of date. %package i18ndata Summary: Database Sources for 'locale' -License: LGPL-2.1+ +License: GPL-2.0+ and MIT Group: System/Libraries BuildArch: noarch @@ -244,7 +244,7 @@ created. %package locale Summary: Locale Data for Localized Programs -License: GPL-2.0+ ; LGPL-2.1+ +License: GPL-2.0+ and MIT and LGPL-2.1+ Group: System/Libraries Requires(post): /bin/cat Requires: glibc = %{version} @@ -261,7 +261,7 @@ Locale data for the internationalisation features of the GNU C library. %package -n nscd Summary: Name Service Caching Daemon -License: LGPL-2.1+ +License: GPL-2.0+ Group: System/Daemons Provides: aaa_base:/etc/init.d/nscd Provides: glibc:/usr/sbin/nscd @@ -276,7 +276,7 @@ performance with NIS, NIS+, and LDAP. %package profile Summary: Libc Profiling and Debugging Versions -License: LGPL-2.1+ +License: LGPL-2.1+ and SUSE-LGPL-2.1+-with-GCC-exception and GPL-2.0+ Group: Development/Libraries/C and C++ Requires: glibc = %{version} # bug437293 @@ -293,7 +293,7 @@ necessary for profiling and debugging. %package devel Summary: Include Files and Libraries Mandatory for Development -License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ +License: BSD-3-Clause and LGPL-2.1+ and SUSE-LGPL-2.1+-with-GCC-exception and GPL-2.0+ Group: Development/Libraries/C and C++ Obsoletes: epoll = 1.0 Provides: epoll < 1.0 @@ -313,7 +313,7 @@ library. %package devel-static Summary: C library static libraries for -static linking -License: GPL-2.0+ +License: BSD-3-Clause and LGPL-2.1+ and SUSE-LGPL-2.1+-with-GCC-exception and GPL-2.0+ Group: Development/Libraries/C and C++ Requires: %{name}-devel = %{version} # Provide Fedora name for package to make packaging easier @@ -326,7 +326,7 @@ which is highly discouraged. %package utils Summary: Development utilities from GNU C library -License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ +License: LGPL-2.1+ Group: Development/Languages/C and C++ Requires: glibc = %{version} @@ -341,7 +341,7 @@ If you are unsure if you need this, don't install this package. # package so that glibc does not require libselinux. %package extra Summary: Extra binaries from GNU C Library -License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ +License: LGPL-2.1+ Group: Development/Languages/C and C++ Requires: glibc = %{version} @@ -355,7 +355,7 @@ makedb: A program to create a database for nss %package obsolete Summary: Obsolete Shared Libraries from the GNU C Library -License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ +License: LGPL-2.0+ Group: System/Libraries Requires: glibc = %{version}