From c12cd34358d5e3d909b5ba0bb82b1b6fce66e2795e1762c43667f0078fea8a4f Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Mon, 13 Feb 2012 15:04:09 +0000 Subject: [PATCH] Accepting request 104540 from devel:openSUSE:Factory:patch-license patch license to follow spdx.org standard OBS-URL: https://build.opensuse.org/request/show/104540 OBS-URL: https://build.opensuse.org/package/show/security:SELinux/setools?expand=0&rev=27 --- setools.changes | 5 +++++ setools.spec | 52 ++++++++++++++++++++++++++++++++----------------- 2 files changed, 39 insertions(+), 18 deletions(-) diff --git a/setools.changes b/setools.changes index 8fd9965..07f707e 100644 --- a/setools.changes +++ b/setools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 13 10:56:00 UTC 2012 - coolo@suse.com + +- patch license to follow spdx.org standard + ------------------------------------------------------------------- Wed Nov 23 09:26:22 UTC 2011 - coolo@suse.com diff --git a/setools.spec b/setools.spec index 5aae761..271bc30 100644 --- a/setools.spec +++ b/setools.spec @@ -1,7 +1,7 @@ # # spec file for package setools # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,17 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define dataversion 3.3 Name: setools Version: 3.3.6 -Release: 9 +Release: 0 Url: http://oss.tresys.com/projects/setools/ -License: GPLv2 -Group: System/Base Summary: Policy analysis tools for SELinux +License: GPL-2.0 +Group: System/Base Source: http://oss.tresys.com/projects/setools/chrome/site/dists/%{name}-%{version}/%{name}-%{version}.tar.bz2 Source1: setools.pam Source2: apol.desktop @@ -40,12 +39,29 @@ Patch5: %{name}-seaudit-headers.patch Patch6: %{name}-setup_py-prefix.patch Patch7: %{name}-swig-2x.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf automake bison flex libtool pkgconfig -BuildRequires: gcc gcc-c++ glibc-devel libstdc++-devel -BuildRequires: libselinux-devel libsepol-devel-static -BuildRequires: gtk2-devel libglade2-devel libxml2-devel sqlite3-devel -BuildRequires: java-devel python-devel swig tcl-devel tk-devel -BuildRequires: update-alternatives update-desktop-files +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: bison +BuildRequires: flex +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: glibc-devel +BuildRequires: gtk2-devel +BuildRequires: java-devel +BuildRequires: libglade2-devel +BuildRequires: libselinux-devel +BuildRequires: libsepol-devel-static +BuildRequires: libstdc++-devel +BuildRequires: libtool +BuildRequires: libxml2-devel +BuildRequires: pkgconfig +BuildRequires: python-devel +BuildRequires: sqlite3-devel +BuildRequires: swig +BuildRequires: tcl-devel +BuildRequires: tk-devel +BuildRequires: update-alternatives +BuildRequires: update-desktop-files Requires: setools-libs = %{version}-%{release} Requires: setools-libs-tcl = %{version}-%{release} Requires: setools-gui = %{version}-%{release} @@ -60,8 +76,8 @@ SETools. %package libs -License: LGPL v2 Summary: Policy analysis support libraries for SELinux +License: LGPL-2.0 Group: System Environment/Libraries %description libs @@ -77,8 +93,8 @@ This package includes the following run-time libraries: libsefs SELinux file contexts library %package -n python-setools -License: LGPL v2 Summary: Python bindings for SELinux policy analysis +License: LGPL-2.0 Group: Development/Languages Requires: python setools-libs = %{version} @@ -95,8 +111,8 @@ This package includes Python bindings for the following libraries: libsefs SELinux file contexts library %package java -License: LGPL v2 Summary: Java bindings for SELinux policy analysis +License: LGPL-2.0 Group: Development/Languages Requires: java setools-libs = %{version} @@ -113,8 +129,8 @@ This package includes Java bindings for the following libraries: libsefs SELinux file contexts library %package tcl -License: LGPL v2 Summary: Tcl bindings for SELinux policy analysis +License: LGPL-2.0 Group: Development/Languages Requires: tcl setools-libs = %{version} @@ -131,8 +147,8 @@ This package includes Tcl bindings for the following libraries: libsefs SELinux file contexts library %package devel -License: LGPL v2 Summary: Policy analysis development files for SELinux +License: LGPL-2.0 Group: Development/Libraries Requires: libselinux-devel libsepol-devel setools-libs = %{version} @@ -151,8 +167,8 @@ libraries: %package console Summary: Policy analysis command-line tools for SELinux +License: GPL-2.0 Group: System/Base -License: GPLv2 Requires: setools-libs = %{version} %description console @@ -168,8 +184,8 @@ This package includes the following console tools: sediff semantic policy difference tool %package gui -License: GPLv2 Summary: Policy analysis graphical tools for SELinux +License: GPL-2.0 Group: System/Base Requires: tcl tk bwidget Requires: setools-libs = %{version} setools-tcl = %{version}