From 5124f336e90662a0cd8be00daf1b94852b471af91b29d093bb0e4473a7158666 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 21 Nov 2011 13:24:17 +0000 Subject: [PATCH 1/3] prepare_spec OBS-URL: https://build.opensuse.org/package/show/server:irc/irssi?expand=0&rev=37 --- irssi.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/irssi.spec b/irssi.spec index 87414f7..53630f3 100644 --- a/irssi.spec +++ b/irssi.spec @@ -1,5 +1,5 @@ # -# spec file for package irssi (Version 0.8.15) +# spec file for package irssi # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ Version: 0.8.15 Release: 1 %define pkg_name irssi # -License: GPLv2+ +License: GPL v2 or later Group: Productivity/Networking/IRC # BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -69,7 +69,7 @@ Authors: Timo Sirainen %package devel -License: GPLv2+ +License: GPL v2 or later Group: Development/Languages/C and C++ Requires: %{pkg_name} = %{version} # From 4a80897ad52bef4b1aa6f032d994715962e3e4fa781a7e3cc0591555af83f04d Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 21 Nov 2011 13:24:23 +0000 Subject: [PATCH 2/3] sync with O:F OBS-URL: https://build.opensuse.org/package/show/server:irc/irssi?expand=0&rev=38 --- irssi.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/irssi.spec b/irssi.spec index 53630f3..3fddbbb 100644 --- a/irssi.spec +++ b/irssi.spec @@ -23,7 +23,7 @@ Version: 0.8.15 Release: 1 %define pkg_name irssi # -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Networking/IRC # BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -69,7 +69,7 @@ Authors: Timo Sirainen %package devel -License: GPL v2 or later +License: GPLv2+ Group: Development/Languages/C and C++ Requires: %{pkg_name} = %{version} # From 175ceaa3da8b4d23832703e77a17f7a90f0af3755f6d2fc1a36a9cb98b61e5fb Mon Sep 17 00:00:00 2001 From: Factory Maintainer Date: Tue, 6 Mar 2012 08:29:32 +0000 Subject: [PATCH 3/3] Accepting request 104364 from devel:openSUSE:Factory:patch-license patch license to follow spdx.org standard OBS-URL: https://build.opensuse.org/request/show/104364 OBS-URL: https://build.opensuse.org/package/show/server:irc/irssi?expand=0&rev=39 --- irssi.changes | 5 +++++ irssi.spec | 18 +++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/irssi.changes b/irssi.changes index c3b5d05..a9898d1 100644 --- a/irssi.changes +++ b/irssi.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 13 10:47:57 UTC 2012 - coolo@suse.com + +- patch license to follow spdx.org standard + ------------------------------------------------------------------- Tue Jan 11 08:23:57 UTC 2011 - aj@suse.de diff --git a/irssi.spec b/irssi.spec index 3fddbbb..55157a4 100644 --- a/irssi.spec +++ b/irssi.spec @@ -1,7 +1,7 @@ # # spec file for package irssi # -# 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,19 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: irssi Version: 0.8.15 -Release: 1 +Release: 0 %define pkg_name irssi # -License: GPLv2+ -Group: Productivity/Networking/IRC # BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: glib2-devel ncurses-devel openssl-devel pkgconfig +BuildRequires: glib2-devel +BuildRequires: ncurses-devel +BuildRequires: openssl-devel +BuildRequires: pkgconfig %if 0%{?suse_version} BuildRequires: update-desktop-files %endif @@ -45,6 +44,8 @@ Source99: irssi-rpmlintrc Patch: irssi-0.8.15_ssl_proxy.patch # Summary: Modular, Secure, and Well Designed IRC Client +License: GPL-2.0+ +Group: Productivity/Networking/IRC %if 0%{?suse_version} > 1130 %{perl_requires} %else @@ -69,11 +70,10 @@ Authors: Timo Sirainen %package devel -License: GPLv2+ -Group: Development/Languages/C and C++ Requires: %{pkg_name} = %{version} # Summary: Development package for irssi +Group: Development/Languages/C and C++ %description devel This package contains the development files for irssi. It allows to