[guacamole/f17] Fix license

Simone Caronni slaanesh at fedoraproject.org
Wed Jun 19 12:53:08 UTC 2013


commit 416ee80e2d9e3c192ce5b71ff2cf2f7cfadd8078
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Wed Jun 19 14:49:30 2013 +0200

    Fix license

 guacamole.spec |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/guacamole.spec b/guacamole.spec
index 8623166..d4e065a 100644
--- a/guacamole.spec
+++ b/guacamole.spec
@@ -1,9 +1,8 @@
 Name:           guacamole
 Version:        0.8.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The main Guacamole web application
-License:        AGPLv3+
-Group:          Development/Libraries
+License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://guac-dev.org/
 Source0:        http://downloads.sourceforge.net/guacamole/%{name}-%{version}.tar.gz
 # Remove javascript as according to packaging guidelines these must be present
@@ -29,6 +28,7 @@ BuildRequires:  maven-release-plugin
 BuildRequires:  maven-resources-plugin
 BuildRequires:  maven-surefire-plugin
 BuildRequires:  maven-war-plugin
+BuildRequires:  servlet3
 Requires:       guacamole-common >= 0.8.0
 Requires:       guacamole-common-js >= 0.7.1
 Requires:       guacamole-ext >= 0.8.0
@@ -39,12 +39,6 @@ Requires:       slf4j
 Requires:       tomcat
 Requires:       tomcat-native
 
-%if 0%{?fedora} || 0%{?rhel} > 6
-BuildRequires:  servlet3
-%else
-BuildRequires:  servlet25
-%endif
-
 %description
 This package contains the main HTML5 web application for the Guacamole stack
 that provides access to desktop environments using remote desktop protocols such
@@ -114,6 +108,10 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
 
 
 %changelog
+* Wed Jun 19 2013 Simone Caronni <negativo17 at gmail.com> - 0.8.1-2
+- Fix license.
+- Remove obsolete Group tag.
+
 * Fri Jun 07 2013 Simone Caronni <negativo17 at gmail.com> - 0.8.1-1
 - Update to 0.8.1.
 


More information about the scm-commits mailing list