From 7c7d66847e7676b2b57f8b0845c85faabf94faba Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Tue, 6 Dec 2011 21:51:58 +0200 Subject: [PATCH] contrib: update GPL2 license name string in RPM SPEC files Follow OBS convention. --- contrib/opensuse-build-service/pidgin-sipe.spec | 11 +++++++---- contrib/rpm/pidgin-sipe.spec | 7 +++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/contrib/opensuse-build-service/pidgin-sipe.spec b/contrib/opensuse-build-service/pidgin-sipe.spec index d2bb4416..8bfdce16 100644 --- a/contrib/opensuse-build-service/pidgin-sipe.spec +++ b/contrib/opensuse-build-service/pidgin-sipe.spec @@ -133,7 +133,7 @@ Version: 1.12.0 Release: 1 Source: pidgin-sipe-%{version}.tar.gz Group: %{pkg_group} -License: GPLv2+ +License: GPL-2.0+ URL: http://sipe.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -236,7 +236,7 @@ This package provides the icon set for Pidgin. %package -n %{purple_plugin} Summary: Libpurple protocol plugin to connect to MS Office Communicator Group: %{pkg_group} -License: GPLv2+ +License: GPL-2.0+ Obsoletes: purple-sipe %description -n %{purple_plugin} @@ -254,7 +254,7 @@ This package provides the protocol plugin for libpurple clients. %package -n %{telepathy_plugin} Summary: Telepathy connection manager for MS Office Communicator Group: %{pkg_group} -License: GPLv2+ +License: GPL-2.0+ %description -n %{telepathy_plugin} A third-party plugin for the Pidgin multi-protocol instant messenger. @@ -273,7 +273,7 @@ instant messaging core. %package -n %{nsis_package} Summary: Windows Pidgin protocol plugin to connect to MS Office Communicator Group: %{pkg_group} -License: GPLv2+ +License: GPL-2.0+ %description -n %{nsis_package} A third-party plugin for the Pidgin multi-protocol instant messenger. @@ -420,6 +420,9 @@ rm -rf %{buildroot} %changelog +* Tue Dec 06 2011 J. D. User 1.12.0-*git* +- update GPL2 license name + * Sat Nov 12 2011 J. D. User 1.12.0-*git* - add BR gmime-devel for Fedora to have at least one verification platform diff --git a/contrib/rpm/pidgin-sipe.spec b/contrib/rpm/pidgin-sipe.spec index 14def51c..4940fb11 100644 --- a/contrib/rpm/pidgin-sipe.spec +++ b/contrib/rpm/pidgin-sipe.spec @@ -32,7 +32,7 @@ Release: 1%{?dist} Source: http://downloads.sourceforge.net/sipe/%{name}-%{version}.tar.bz2 %endif Group: %{pkg_group} -License: GPLv2+ +License: GPL-2.0+ URL: http://sipe.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -78,7 +78,7 @@ This package provides the icon set for Pidgin. %package -n %{purple_plugin} Summary: Libpurple protocol plugin to connect to MS Office Communicator Group: %{pkg_group} -License: GPLv2+ +License: GPL-2.0+ %description -n %{purple_plugin} A third-party plugin for the Pidgin multi-protocol instant messenger. @@ -134,6 +134,9 @@ rm -rf %{buildroot} %changelog +* Tue Dec 06 2011 J. D. User 1.12.0-*git* +- update GPL2 license name + * Sat Nov 12 2011 J. D. User 1.12.0-*git* - add BR gmime-devel -- 2.11.4.GIT