[guacamole/f18] Update spec file to master

[Simone Caronni]

commit cd4f75dcc768f12bb3d7a1ed24b908f64462ceb3
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Wed Jun 19 15:04:15 2013 +0200

    Update spec file to master

 guacamole.spec |   38 +++++++++++++-------------------------
 1 files changed, 13 insertions(+), 25 deletions(-)
---
diff --git a/guacamole.spec b/guacamole.spec
index 01a0a92..c0ade6d 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
@@ -15,35 +14,20 @@ BuildArch:      noarch
 
 BuildRequires:  guacamole-common >= 0.8.0
 BuildRequires:  guacamole-ext >= 0.8.0
-BuildRequires:  java-devel
-BuildRequires:  jpackage-utils
+BuildRequires:  maven-local
 BuildRequires:  maven-clean-plugin
-BuildRequires:  maven-compiler-plugin
 BuildRequires:  maven-dependency-plugin
-BuildRequires:  maven-install-plugin
-BuildRequires:  maven-jar-plugin
-BuildRequires:  maven-javadoc-plugin
-BuildRequires:  maven-local
-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
 Requires:       java
-Requires:       jpackage-utils
 Requires:       log4j
 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
@@ -59,7 +43,6 @@ The centralized server is provided by the "guacd" package and its associated
 %package javadoc
 Summary:          API documentation for %{name}
 Group:            Documentation
-Requires:         jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -70,7 +53,7 @@ This package contains the API documentation for %{name}.
 %patch1 -p1
 
 %build
-#https://fedoraproject.org/wiki/User:Akurtakov/JavaPackagingDraftUpdate#Patching_Maven_pom.xml_files
+# https://fedoraproject.org/wiki/Packaging:Java#Patching_Maven_pom.xml_files
 %pom_remove_dep net.sourceforge.guacamole:guacamole-common-js
 
 mvn-rpmbuild package javadoc:aggregate
@@ -84,8 +67,8 @@ cp -frp target/%{name}-%{version}/* %{buildroot}%{_sharedstatedir}/tomcat/webapp
 
 # Use Fedora packaged jar files & java scripts
 rm -f %{buildroot}%{_sharedstatedir}/tomcat/webapps/%{name}/WEB-INF/lib/*.jar
-ln -sf %{_javadir}/%{name}/guacamole-ext.jar %{buildroot}%{_sharedstatedir}/tomcat/webapps/%{name}/WEB-INF/lib/
-ln -sf %{_javadir}/%{name}/guacamole-common.jar %{buildroot}%{_sharedstatedir}/tomcat/webapps/%{name}/WEB-INF/lib/
+ln -sf %{_javadir}/guacamole-ext/guacamole-ext.jar %{buildroot}%{_sharedstatedir}/tomcat/webapps/%{name}/WEB-INF/lib/
+ln -sf %{_javadir}/guacamole-common/guacamole-common.jar %{buildroot}%{_sharedstatedir}/tomcat/webapps/%{name}/WEB-INF/lib/
 ln -sf %{_javadir}/slf4j/api.jar %{buildroot}%{_sharedstatedir}/tomcat/webapps/%{name}/WEB-INF/lib/
 ln -sf %{_javadir}/slf4j/jcl-over-slf4j.jar %{buildroot}%{_sharedstatedir}/tomcat/webapps/%{name}/WEB-INF/lib/
 ln -sf %{_datadir}/guacamole-common-js %{buildroot}%{_sharedstatedir}/tomcat/webapps/%{name}/
@@ -111,11 +94,16 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
 %doc COPYING
 %{_javadocdir}/%{name}
 
-
 %changelog
+* Wed Jun 19 2013 Simone Caronni <negativo17 at gmail.com> - 0.8.1-2
+- Fix license.
+
 * Fri Jun 07 2013 Simone Caronni <negativo17 at gmail.com> - 0.8.1-1
 - Update to 0.8.1.
 
+* Tue Mar 26 2013 Simone Caronni <negativo17 at gmail.com> - 0.8.0-3
+- Updated spec file for Java guidelines.
+
 * Mon Mar 25 2013 Simone Caronni <negativo17 at gmail.com> - 0.8.0-2
 - Source rebuilt upstream due to bug: http://guac-dev.org/trac/ticket/298