[x2goclient] - Update to 4.0.1.2 - Update summary and description from upstream - Split out browser plugin into x

Orion Poplawski orion at fedoraproject.org
Tue Dec 17 22:59:47 UTC 2013 

commit 980212f53f14a1efbd59584c46b35cb8f2b9fe65
Author: Orion Poplawski <orion at nwra.com>
Date:   Tue Dec 17 15:59:57 2013 -0700

    - Update to 4.0.1.2
    - Update summary and description from upstream
    - Split out browser plugin into x2goplugin package
    - Add x2goplugin-provider package for apache config

 .gitignore                |    1 +
 sources                   |    2 +-
 x2goclient-provider.patch |   20 +++++++++
 x2goclient.spec           |   97 +++++++++++++++++++++++++++++++++++++++++----
 4 files changed, 111 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4b4d411..ac01fa3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /x2goclient-4.0.1.0.tar.gz
 /x2goclient-4.0.1.1.tar.gz
+/x2goclient-4.0.1.2.tar.gz
diff --git a/sources b/sources
index 1c914e8..488e2d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-13b6729acfd5c6a00441430ef6ab69d6  x2goclient-4.0.1.1.tar.gz
+500c94ce4c8a63ecabde347d526f1356  x2goclient-4.0.1.2.tar.gz
diff --git a/x2goclient-provider.patch b/x2goclient-provider.patch
new file mode 100644
index 0000000..18f18d9
--- /dev/null
+++ b/x2goclient-provider.patch
@@ -0,0 +1,20 @@
+diff --git a/provider/etc/x2goplugin-apache.conf b/provider/etc/x2goplugin-apache.conf
+index 76e827e..b5bcb82 100644
+--- a/provider/etc/x2goplugin-apache.conf
++++ b/provider/etc/x2goplugin-apache.conf
+@@ -1 +1,15 @@
+ Alias /x2goplugin.html /usr/share/x2go/plugin/x2goplugin.html
++
++<Directory /usr/share/x2go/plugin>
++    <IfModule mod_authz_core.c>
++        # Apache 2.4
++        Require local
++    </IfModule>
++    <IfModule !mod_authz_core.c>
++         # Apache 2.2
++         Order Deny,Allow
++         Deny from all
++         Allow from 127.0.0.1
++         Allow from ::1
++    </IfModule>
++</Directory>
diff --git a/x2goclient.spec b/x2goclient.spec
index 19c44e4..e7e6917 100644
--- a/x2goclient.spec
+++ b/x2goclient.spec
@@ -1,12 +1,14 @@
 Name:           x2goclient
-Version:        4.0.1.1
+Version:        4.0.1.2
 Release:        1%{?dist}
-Summary:        Graphical client for use with the X2Go network based computing environment
+Summary:        X2Go Client application (Qt4)
 
 Group:          Applications/Communications
 License:        GPLv2+
 URL:            http://www.x2go.org
 Source0:        http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz
+# Add apache authorization configuration to config file
+Patch0:         x2goclient-provider.patch
 
 BuildRequires:  cups-devel
 BuildRequires:  desktop-file-utils
@@ -21,18 +23,74 @@ BuildRequires:  openldap-devel
 BuildRequires:  qt-devel
 BuildRequires:  qtbrowserplugin-static
 Requires:       hicolor-icon-theme
-Requires:       mozilla-filesystem
 Requires:       nxproxy
+# For GSSAPI authenticated connections
+Requires:       openssh-clients
+# For local folder sharing and printing
+Requires:       openssh-server
 
 %description
-This client will be able to connect to X2Go server(s) and start, stop, resume 
-and terminate (running) desktop sessions. X2Go Client stores different server 
-connections and may automatically request authentication data from LDAP 
-directories. 
+X2Go is a server based computing environment with
+    - session resuming
+    - low bandwidth support
+    - session brokerage support
+    - client-side mass storage mounting support
+    - client-side printing support
+    - audio support
+    - authentication by smartcard and USB stick
+
+X2Go Client is a graphical client (Qt4) for the X2Go system.
+You can use it to connect to running sessions and start new sessions.
+
+
+%package -n x2goplugin
+Summary:        X2Go Client (Qt4) as browser plugin
+Group:          Applications/Communications
+Requires:       mozilla-filesystem
+Requires:       nxproxy
+# For GSSAPI authenticated connections
+Requires:       openssh-clients
+# For local folder sharing and printing
+Requires:       openssh-server
+
+%description -n x2goplugin
+X2Go is a server based computing environment with
+    - session resuming
+    - low bandwidth support
+    - session brokerage support
+    - client-side mass storage mounting support
+    - client-side printing support
+    - audio support
+    - authentication by smartcard and USB stick
+
+X2Go Client is a graphical client (qt4) for the X2Go system.
+You can use it to connect to running sessions and start new sessions.
+
+This package provides X2Go Client as QtBrowser-based Mozilla plugin.
+
+
+%package -n x2goplugin-provider
+Summary:        Provide X2Go Plugin via Apache webserver
+Group:          Applications/Communications
+Requires:       httpd
+
+%description -n x2goplugin-provider
+X2Go is a server based computing environment with
+    - session resuming
+    - low bandwidth support
+    - session brokerage support
+    - client-side mass storage mounting support
+    - client-side printing support
+    - audio support
+    - authentication by smartcard and USB stick
+
+This package provides an example configuration for providing
+the X2Go Plugin via an Apache webserver.
 
 
 %prep
 %setup -q
+%patch0 -p1 -b .provider
 # Fix up install issues
 sed -i -e 's/-o root -g root//' Makefile
 sed -i -e '/^MOZPLUGDIR=/s/lib/%{_lib}/' Makefile
@@ -47,10 +105,14 @@ rm -r qtbrowserplugin*
 export PATH=%{_qt4_bindir}:$PATH
 make %{?_smp_mflags}
 
+
 %install
 make install DESTDIR=%{buildroot} PREFIX=%{_prefix}
 desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 
+mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
+ln -s ../../x2go/x2goplugin-apache.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/x2goplugin-provider.conf
+
 
 %post
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -74,11 +136,30 @@ fi
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 %{_datadir}/icons/hicolor/64x64/apps/%{name}.png
 %{_datadir}/%{name}/
-%{_libdir}/mozilla/plugins/libx2goplugin.so
 %{_mandir}/man1/%{name}.1.gz
 
+%files -n x2goplugin
+%doc AUTHORS COPYING LICENSE 
+%{_libdir}/mozilla/plugins/libx2goplugin.so
+
+%files -n x2goplugin-provider
+%doc AUTHORS COPYING LICENSE 
+# Link
+%{_sysconfdir}/httpd/conf.d/x2goplugin-provider.conf
+%dir %{_sysconfdir}/x2go
+%dir %{_sysconfdir}/x2go/plugin-provider
+%config(noreplace) %{_sysconfdir}/x2go/plugin-provider/x2goplugin.html
+%config(noreplace) %{_sysconfdir}/x2go/x2goplugin-apache.conf
+%{_datadir}/x2go/
+
 
 %changelog
+* Tue Dec 17 2013 Orion Poplawski <orion at cora.nwra.com> - 4.0.1.2-1
+- Update to 4.0.1.2
+- Update summary and description from upstream
+- Split out browser plugin into x2goplugin package
+- Add x2goplugin-provider package for apache config
+
 * Wed Sep 11 2013 Orion Poplawski <orion at cora.nwra.com> - 4.0.1.1-1
 - Update to 4.0.1.1
 - Drop patches applied upstream

More information about the scm-commits mailing list