From c7a99e72f940d5ef56e5b87350dce2cb069019d8 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Jun 18 2013 03:55:36 +0000 Subject: latest upstream, fix license field --- diff --git a/.gitignore b/.gitignore index 3359f33..a874f5e 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ roundcubemail-0.3.1-dep.tar.gz /roundcubemail-0.8.5-dep.tar.gz /roundcubemail-0.8.6-dep.tar.gz /roundcubemail-0.9.0-dep.tar.gz +/roundcubemail-0.9.2-dep.tar.gz diff --git a/roundcubemail.spec b/roundcubemail.spec index 66788b9..51225cd 100644 --- a/roundcubemail.spec +++ b/roundcubemail.spec @@ -1,12 +1,23 @@ %define roundcubedir %{_datadir}/roundcubemail %global _logdir /var/log Name: roundcubemail -Version: 0.9.0 +Version: 0.9.2 Release: 1%{?dist} Summary: Round Cube Webmail is a browser-based multilingual IMAP client Group: Applications/System -License: GPLv2 +# Since 0.8 beta, the main code has been GPLv3+ with exceptions and +# skins CC-BY-SA. +# Plugins are a mix of GPLv3+ and GPLv2. The Enigma plugin contains a +# copy of php-Pear-Crypt-GPG (not yet packaged for Fedora), which is +# LGPLv2+. The jqueryui plugin contains the entire jQuery UI framework +# for the use of roundcube plugins: it is licensed as MIT or GPLv2. +# The program/js/tiny_mce directory contains an entire copy of TinyMCE +# which is LGPLv2+. +# https://github.com/pear/Crypt_GPG +# http://jqueryui.com/ +# http://www.tinymce.com/ +License: GPLv3+ with exceptions and GPLv3+ and GPLv2 and LGPLv2+ and CC-BY-SA and (MIT or GPLv2) URL: http://www.roundcube.net Source0: http://downloads.sourceforge.net/roundcubemail/roundcubemail-%{version}-dep.tar.gz Source1: roundcubemail.conf @@ -134,6 +145,10 @@ exit 0 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail %changelog +* Mon Jun 17 2013 Adam Williamson - 0.9.2-1 +- latest upstream +- correct License field, add comment on complex licensing case + * Wed May 01 2013 Adam Williamson - 0.9.0-1 - latest upstream - drop MDB2 dependencies, add php-pdo dependency (upstream now using diff --git a/sources b/sources index f160d0a..469ff9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -88caf2c0bf12c875661c5e223300b405 roundcubemail-0.9.0-dep.tar.gz +92ff7b5eeb66d565333ccc57b404313f roundcubemail-0.9.2-dep.tar.gz