[guacamole-client/f18] First import
Simone Caronni
slaanesh at fedoraproject.org
Mon Jul 22 10:18:37 UTC 2013
commit 6731ffdcef0c11f199c1422ce8e08474c42031a1
Author: Simone Caronni <negativo17 at gmail.com>
Date: Mon Jul 22 12:17:36 2013 +0200
First import
.gitignore | 1 +
guacamole-client-0.8.2-allow-linking.patch | 7 ++
guacamole-client-0.8.2-js-assembly.patch | 38 +++++++++
guacamole-client.spec | 123 ++++++++++++++++++++++++++++
sources | 1 +
5 files changed, 170 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..aa92d93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/guacamole-client-0.8.2.tar.gz
diff --git a/guacamole-client-0.8.2-allow-linking.patch b/guacamole-client-0.8.2-allow-linking.patch
new file mode 100644
index 0000000..7688e27
--- /dev/null
+++ b/guacamole-client-0.8.2-allow-linking.patch
@@ -0,0 +1,7 @@
+diff -Naur guacamole-client-0.8.2.old/guacamole/src/main/webapp/META-INF/context.xml guacamole-client-0.8.2/guacamole/src/main/webapp/META-INF/context.xml
+--- guacamole-client-0.8.2.old/guacamole/src/main/webapp/META-INF/context.xml 2013-07-17 15:52:47.954777359 +0200
++++ guacamole-client-0.8.2/guacamole/src/main/webapp/META-INF/context.xml 2013-07-17 22:02:46.369526382 +0200
+@@ -1,2 +1,2 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<Context antiJARLocking="true" path=""/>
++<Context antiJARLocking="true" path="" allowLinking="true"/>
diff --git a/guacamole-client-0.8.2-js-assembly.patch b/guacamole-client-0.8.2-js-assembly.patch
new file mode 100644
index 0000000..3c6b710
--- /dev/null
+++ b/guacamole-client-0.8.2-js-assembly.patch
@@ -0,0 +1,38 @@
+From ac8222430c54245f78cffa5bd9b031811380481c Mon Sep 17 00:00:00 2001
+From: Michael Jumper <mike.jumper at guac-dev.org>
+Date: Wed, 17 Jul 2013 15:10:53 -0700
+Subject: [PATCH] Use assembly plugin 2.4, add missing ID.
+
+---
+ guacamole-common-js/pom.xml | 2 ++
+ guacamole-common-js/static.xml | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/guacamole-common-js/pom.xml b/guacamole-common-js/pom.xml
+index 2913103..5d3dd1d 100644
+--- a/guacamole-common-js/pom.xml
++++ b/guacamole-common-js/pom.xml
+@@ -18,7 +18,9 @@
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
++ <version>2.4</version>
+ <configuration>
++ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>static.xml</descriptor>
+ </descriptors>
+diff --git a/guacamole-common-js/static.xml b/guacamole-common-js/static.xml
+index f9b6bdf..d3903dc 100644
+--- a/guacamole-common-js/static.xml
++++ b/guacamole-common-js/static.xml
+@@ -1,5 +1,6 @@
+ <assembly>
+ <baseDirectory>guacamole-common-js</baseDirectory>
++ <id>guacamole-common-js</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+--
+1.7.10.4
+
diff --git a/guacamole-client.spec b/guacamole-client.spec
new file mode 100644
index 0000000..436600e
--- /dev/null
+++ b/guacamole-client.spec
@@ -0,0 +1,123 @@
+Name: guacamole-client
+Version: 0.8.2
+Release: 2%{?dist}
+Summary: Server-side Java components that form the Guacamole application
+
+License: MPLv1.1 or GPL+ or AGPLv3+
+URL: http://guac-dev.org/
+Source0: http://guac-dev.org/pub/dist/source/%{name}-%{version}.tar.gz
+
+Patch0: %{name}-0.8.2-allow-linking.patch
+Patch1: %{name}-0.8.2-js-assembly.patch
+BuildArch: noarch
+
+BuildRequires: java-devel
+BuildRequires: maven-clean-plugin
+BuildRequires: maven-dependency-plugin
+BuildRequires: maven-local
+BuildRequires: maven-release-plugin
+BuildRequires: maven-war-plugin
+BuildRequires: servlet3
+
+%description
+Guacamole is an HTML5 remote desktop gateway.
+
+Guacamole provides access to desktop environments using remote desktop protocols
+like VNC and RDP. A centralized server acts as a tunnel and proxy, allowing
+access to multiple desktops through a web browser.
+
+No browser plugins are needed, and no client software needs to be installed. The
+client requires nothing more than a web browser supporting HTML5 and AJAX.
+
+The centralized server is provided by the "guacamole-server" package.
+
+%package -n guacamole
+Summary: The main Guacamole web application
+Requires: apache-commons-logging
+Requires: java
+Requires: jpackage-utils
+Requires: slf4j >= 1.6.1
+Requires: tomcat
+Requires: tomcat-native
+Obsoletes: guacamole-common < 0.8.2
+Obsoletes: guacamole-common-js < 0.8.2
+Obsoletes: guacamole-ext < 0.8.2
+Provides: guacamole-common = %{version}-%{release}
+Provides: guacamole-common-js = %{version}-%{release}
+Provides: guacamole-ext = %{version}-%{release}
+
+%description -n guacamole
+This package contains the main HTML5 web application for the Guacamole stack
+that provides access to desktop environments using remote desktop protocols such
+as VNC or RDP.
+
+A centralized server acts as a tunnel and proxy, allowing access to multiple
+desktops through a web browser. No plugins are needed: the client requires
+nothing more than a web browser supporting HTML5 and AJAX.
+
+The centralized server is provided by the "guacd" package and its associated
+"libguac-client-*" packages.
+
+%package -n guacamole-javadoc
+Summary: API documentation for %{name}
+
+%description -n guacamole-javadoc
+This package contains the API documentation for %{name}.
+
+%prep
+%setup -q -n %{name}-%{version}
+%patch0 -p1
+%patch1 -p1
+
+%build
+mvn-rpmbuild package javadoc:aggregate
+
+%install
+# Put data files into tomcat's webapps directory
+mkdir -p %{buildroot}%{_datadir}/tomcat/webapps/guacamole/
+cp -frp guacamole/target/guacamole-%{version}/* %{buildroot}%{_datadir}/tomcat/webapps/guacamole/
+
+# Use Fedora packaged jar files
+find %{buildroot}%{_datadir}/tomcat/webapps/guacamole/WEB-INF/lib/*jar ! -name "*guacamole*jar" -delete
+for jar in commons-logging.jar slf4j/slf4j-api.jar slf4j/slf4j-jcl.jar; do
+ ln -sf %{_javadir}/$jar %{buildroot}%{_datadir}/tomcat/webapps/guacamole/WEB-INF/lib/
+done
+
+# Configuration file
+mkdir -p %{buildroot}%{_sysconfdir}/guacamole
+cp -p guacamole/doc/example/* %{buildroot}%{_sysconfdir}/guacamole
+sed -i -e 's@/path/to@%{_sysconfdir}/guacamole at g' %{buildroot}%{_sysconfdir}/guacamole/guacamole.properties
+ln -sf %{_sysconfdir}/guacamole/guacamole.properties %{buildroot}%{_datadir}/tomcat/webapps/guacamole/WEB-INF/classes/
+
+# Docs
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
+
+%pretrans -n guacamole
+# Workaround for rpm bug; replacing directory with symlink fails.
+# Open since 2008!
+# https://bugzilla.redhat.com/show_bug.cgi?id=975909
+# https://bugzilla.redhat.com/show_bug.cgi?id=447156
+if [ $1 = 0 ]; then
+ [ -h %{_datadir}/tomcat/webapps/guacamole/guacamole-common-js ] && \
+ rm -f %{_datadir}/tomcat/webapps/guacamole/guacamole-common-js
+ exit 0
+fi
+
+%files -n guacamole
+%doc guacamole/COPYING guacamole-ext/LICENSE guacamole/README
+%{_datadir}/tomcat/webapps/guacamole
+%dir %{_sysconfdir}/guacamole
+%config(noreplace) %{_sysconfdir}/guacamole/user-mapping.xml
+%config(noreplace) %{_sysconfdir}/guacamole/guacamole.properties
+
+%files -n guacamole-javadoc
+%doc guacamole/COPYING guacamole-ext/LICENSE
+%{_javadocdir}/%{name}
+
+%changelog
+* Mon Jul 22 2013 Simone Caronni <negativo17 at gmail.com> - 0.8.2-2
+- Review fixes.
+
+* Tue Jul 16 2013 Simone Caronni <negativo17 at gmail.com> - 0.8.2-1
+- First build.
diff --git a/sources b/sources
index e69de29..2626a56 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+a9220ee155b39718dc307451d2b540c9 guacamole-client-0.8.2.tar.gz
More information about the scm-commits
mailing list