From 2387c1cd9ecffdcb2c344290de4f2e9607b7ffeed016f118b7d05289287708ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 26 Jan 2012 14:22:21 +0000 Subject: [PATCH] Use spdx.org compliant license names for all packages. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=218 --- build-source-timestamp | 2 +- samba-doc.spec | 4 +- samba.changes | 5 ++ samba.spec | 102 ++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 +- 5 files changed, 61 insertions(+), 56 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index c7f725c..f21213a 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2736 +2737 Branch : trunk diff --git a/samba-doc.spec b/samba-doc.spec index 794fdc5..825b77f 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -104,7 +104,7 @@ BuildRequires: pkgconfig Version: 3.6.2 Release: 1 Url: http://www.samba.org/ -License: GPLv3+ +License: GPL-3.0+ Summary: Samba Documentation Group: Documentation/Other PreReq: coreutils @@ -437,7 +437,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2736 +Source Timestamp: 2737 Branch : trunk %changelog diff --git a/samba.changes b/samba.changes index 9fc5ec3..fcc6ea6 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 26 14:15:38 UTC 2012 - lmuelle@suse.de + +- Use spdx.org compliant license names for all packages. + ------------------------------------------------------------------- Wed Jan 25 20:16:10 UTC 2012 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index bdbd3ca..72aa707 100644 --- a/samba.spec +++ b/samba.spec @@ -104,7 +104,7 @@ BuildRequires: pkgconfig Version: 3.6.2 Release: 1 %define ldapsmb_ver 1.34b -License: GPLv3+ +License: GPL-3.0+ Url: http://www.samba.org/ Group: Productivity/Networking/Samba Provides: samba-gplv3 = %{version} @@ -208,11 +208,11 @@ Authors: The Samba Team -Source Timestamp: 2736 +Source Timestamp: 2737 Branch : trunk %package client -License: GPLv3+ +License: GPL-3.0+ Summary: Samba Client Utilities Group: Productivity/Networking/Samba Provides: samba-gplv3-client = %{version} @@ -252,13 +252,13 @@ Authors: -------- The Samba Team -Source Timestamp: 2736 +Source Timestamp: 2737 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 %package devel -License: GPLv3+ +License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with Samba Support Group: Development/Libraries/C and C++ Provides: samba-gplv3-devel = %{version} @@ -278,14 +278,14 @@ Authors: The Samba Team -Source Timestamp: 2736 +Source Timestamp: 2737 Branch : trunk %endif %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 %package doc -License: GPLv3+ +License: GPL-3.0+ Summary: Samba Documentation Group: Documentation/Other PreReq: coreutils @@ -308,13 +308,13 @@ Authors: -------- The Samba Team -Source Timestamp: 2736 +Source Timestamp: 2737 Branch : trunk %endif %package krb-printing -License: GPLv3+ +License: GPL-3.0+ Summary: Wrapper binary for kerberized printing Group: Productivity/Networking/Samba PreReq: coreutils @@ -335,7 +335,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2736 +Source Timestamp: 2737 Branch : trunk %if %{make_utils} @@ -356,13 +356,13 @@ Authors: -------- The Samba Team -Source Timestamp: 2736 +Source Timestamp: 2737 Branch : trunk %endif %package winbind -License: GPLv3+ +License: GPL-3.0+ Summary: Winbind Daemon and Tool Group: Productivity/Networking/Samba Provides: samba-gplv3-winbind = %{version} @@ -391,18 +391,18 @@ Authors: -------- The Samba Team -Source Timestamp: 2736 +Source Timestamp: 2737 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 %package -n libsmbclient -License: GPLv3+ +License: GPL-3.0+ %else %package -n libsmbclient0 -License: GPLv3+ +License: GPL-3.0+ Provides: libsmbclient = %{version} Obsoletes: libsmbclient %endif @@ -417,14 +417,14 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2736 +Source Timestamp: 2737 Branch : trunk %else %description -n libsmbclient0 -Source Timestamp: 2736 +Source Timestamp: 2737 Branch : trunk %endif @@ -441,7 +441,7 @@ Authors: The Samba Team %package -n libsmbclient-devel -License: GPLv3+ +License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with smbclient Support Group: Development/Libraries/C and C++ %if 0%{?suse_version} > 1020 @@ -472,11 +472,11 @@ Authors: -------- The Samba Team -Source Timestamp: 2736 +Source Timestamp: 2737 Branch : trunk %package -n libnetapi0 -License: GPLv3+ +License: GPL-3.0+ Summary: Samba netapi Library Group: System/Libraries PreReq: /sbin/ldconfig @@ -490,11 +490,11 @@ Authors: -------- The Samba Team -Source Timestamp: 2736 +Source Timestamp: 2737 Branch : trunk %package -n libnetapi-devel -License: GPLv3+ +License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with netapi Support Group: Development/Libraries/C and C++ %if 0%{?suse_version} > 1020 @@ -514,18 +514,18 @@ Authors: -------- The Samba Team -Source Timestamp: 2736 +Source Timestamp: 2737 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 %package -n libsmbsharemodes -License: GPLv3+ +License: GPL-3.0+ %else %package -n libsmbsharemodes0 -License: GPLv3+ +License: GPL-3.0+ %endif Summary: Samba smbsharemodes Library Group: System/Libraries @@ -535,14 +535,14 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2736 +Source Timestamp: 2737 Branch : trunk %else %description -n libsmbsharemodes0 -Source Timestamp: 2736 +Source Timestamp: 2737 Branch : trunk %endif @@ -553,7 +553,7 @@ Authors: The Samba Team %package -n libsmbsharemodes-devel -License: GPLv3+ +License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with smbsharemodes Support Group: Development/Libraries/C and C++ %if 0%{?suse_version} > 1020 @@ -578,11 +578,11 @@ Authors: The Samba Team -Source Timestamp: 2736 +Source Timestamp: 2737 Branch : trunk %package -n libwbclient0 -License: LGPLv3+ +License: LGPL-3.0+ Summary: Samba libwbclient Library Group: System/Libraries PreReq: /sbin/ldconfig @@ -596,11 +596,11 @@ Authors: -------- The Samba Team -Source Timestamp: 2736 +Source Timestamp: 2737 Branch : trunk %package -n libwbclient-devel -License: LGPLv3+ +License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with wbclient Support Group: Development/Libraries/C and C++ %if 0%{?suse_version} > 1020 @@ -620,13 +620,13 @@ Authors: -------- The Samba Team -Source Timestamp: 2736 +Source Timestamp: 2737 Branch : trunk %package -n libtalloc2 Version: %{libtalloc_ver} Release: 5 -License: LGPLv3+ +License: LGPL-3.0+ Summary: Samba talloc Library Group: System/Libraries PreReq: /sbin/ldconfig @@ -640,13 +640,13 @@ Authors: -------- The Samba Team -Source Timestamp: 2736 +Source Timestamp: 2737 Branch : trunk %package -n libtalloc-devel Version: %{libtalloc_ver} Release: 5 -License: LGPLv3+ +License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with talloc Support Group: Development/Libraries/C and C++ %if 0%{?suse_version} > 1020 @@ -666,13 +666,13 @@ Authors: -------- The Samba Team -Source Timestamp: 2736 +Source Timestamp: 2737 Branch : trunk %package -n libtdb1 Version: %{libtdb_ver} Release: 5 -License: LGPLv3+ +License: LGPL-3.0+ Summary: Samba tdb Library Group: System/Libraries PreReq: /sbin/ldconfig @@ -686,13 +686,13 @@ Authors: -------- The Samba Team -Source Timestamp: 2736 +Source Timestamp: 2737 Branch : trunk %package -n libtdb-devel Version: %{libtdb_ver} Release: 5 -License: LGPLv3+ +License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with tdb Support Group: Development/Libraries/C and C++ #BuildRequires: pkg-config @@ -708,13 +708,13 @@ Authors: -------- The Samba Team -Source Timestamp: 2736 +Source Timestamp: 2737 Branch : trunk %package -n libtevent0 Version: %{libtevent_ver} Release: 5 -License: LGPLv3+ +License: LGPL-3.0+ Summary: Samba tevent Library Group: System/Libraries PreReq: /sbin/ldconfig @@ -728,13 +728,13 @@ Authors: -------- The Samba Team -Source Timestamp: 2736 +Source Timestamp: 2737 Branch : trunk %package -n libtevent-devel Version: %{libtevent_ver} Release: 5 -License: LGPLv3+ +License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with tevent Support Group: Development/Libraries/C and C++ %if 0%{?suse_version} > 1020 @@ -756,13 +756,13 @@ Authors: The Samba Team -Source Timestamp: 2736 +Source Timestamp: 2737 Branch : trunk %package -n libldb1 Version: %{libldb_ver} Release: 5 -License: LGPLv3+ +License: LGPL-3.0+ Summary: Samba ldb Library Group: System/Libraries BuildRequires: popt-devel @@ -778,13 +778,13 @@ Authors: The Samba Team -Source Timestamp: 2736 +Source Timestamp: 2737 Branch : trunk %package -n libldb-devel Version: %{libldb_ver} Release: 5 -License: LGPLv3+ +License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with ldb Support Group: Development/Libraries/C and C++ %if 0%{?suse_version} > 1020 @@ -805,7 +805,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2736 +Source Timestamp: 2737 Branch : trunk %if %{make_ldapsmb} @@ -813,7 +813,7 @@ Branch : trunk %package -n ldapsmb Version: 1.34b Release: 307 -License: GPLv2+ +License: GPL-2.0+ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba Requires: perl-ldap @@ -828,7 +828,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2736 +Source Timestamp: 2737 Branch : trunk %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index a3b1dea..038e2f8 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4695acb7af015c1fc7d8031b5205f8de5751f8274ae9a081d9af1c4859a447d5 -size 52467 +oid sha256:e3d6b5f65332df7597e0bd977ee93677f77dfba2078fc506fa5ab8d838185fa4 +size 52389