[X2Go-Commits] [cups-x2go] 01/01: cups-x2go.spec: Pull-in packaging stuff from Jan Engelhardt's .spec files on https://build.opensuse.org/package/view_file/X11:RemoteDesktop:x2go.

git-admin at x2go.org git-admin at x2go.org
Sat Oct 11 16:51:55 CEST 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository cups-x2go.

commit 6ce7e50cc320d156cf30a69c6bb67d1eaf2c62e1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Oct 11 16:51:49 2014 +0200

    cups-x2go.spec: Pull-in packaging stuff from Jan Engelhardt's .spec files on https://build.opensuse.org/package/view_file/X11:RemoteDesktop:x2go.
---
 cups-x2go.spec   |   48 ++++++++++++++++++++++++++++++++++++------------
 debian/changelog |    3 +++
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/cups-x2go.spec b/cups-x2go.spec
index f372499..ee58849 100644
--- a/cups-x2go.spec
+++ b/cups-x2go.spec
@@ -11,6 +11,7 @@ Source0:        http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.
 BuildArch:      noarch
 Requires:       cups
 Requires:       ghostscript
+Requires:       openssh
 
 %if 0%{?el5}
 # For compatibility with EPEL5
@@ -18,6 +19,14 @@ BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 %endif
 
 %description
+X2Go is a server based computing environment with
+    - session resuming
+    - low bandwidth support
+    - session brokerage support
+    - client side mass storage mounting support
+    - audio support
+    - authentication by smartcard and USB stick
+
 CUPS backend for printing from X2Go.
 
 
@@ -29,21 +38,36 @@ CUPS backend for printing from X2Go.
 
 
 %install
-mkdir -p %{buildroot}%{_prefix}/lib/cups/backend/
-install -pm700 cups-x2go %{buildroot}%{_prefix}/lib/cups/backend/
-mkdir -p %{buildroot}%{_sysconfdir}/cups/
-cp -p cups-x2go.conf %{buildroot}%{_sysconfdir}/cups/
-mkdir -p %{buildroot}%{_datadir}/ppd/cups-x2go/
-cp -p CUPS-X2GO.ppd %{buildroot}%{_datadir}/ppd/cups-x2go/
-mkdir -p %{buildroot}%{_datadir}/x2go/versions
-cp -p VERSION.cups-x2go %{buildroot}%{_datadir}/x2go/versions/
+b="%buildroot";
+c="$b/%_libexecdir/cups/backend";
+mkdir -p "$c";
+install -pm0755 cups-x2go "$c/";
+c="$b/%_datadir/ppd/cups-x2go";
+mkdir -p "$c";
+install -pm0644 CUPS-X2GO.ppd "$c/";
+c="$b/%_sysconfdir/cups";
+mkdir -p "$c";
+install -pm0644 cups-x2go.conf "$c/";
+c="$b/%_datadir/x2go/versions";
+mkdir -p "$c";
+install -pm0644 VERSION.cups-x2go "$c/";
 
 
 %files
-%{_prefix}/lib/cups/backend/cups-x2go
-%config(noreplace) %{_sysconfdir}/cups/cups-x2go.conf
-%{_datadir}/ppd/cups-x2go/
-%{_datadir}/x2go/
+%defattr(-,root,root)
+%dir %_libexecdir/cups
+%dir %_libexecdir/cups/backend
+#
+# The cups-x2go backends wants root permissions. So give it to them.
+# http://www.cups.org/documentation.php/doc-1.4/man-backend.html says:
+# “Backends without world execute permissions are run as the root user.
+# Otherwise, the backend is run using the unprivileged user account,
+# typically "lp".”
+#
+%attr(0700,root,root) %_libexecdir/cups/backend/cups-x2go
+%_datadir/ppd
+%config(noreplace) %_sysconfdir/cups/cups-x2go.conf
+%_datadir/x2go
 
 
 %changelog
diff --git a/debian/changelog b/debian/changelog
index bd21908..ca22895 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 cups-x2go (3.0.1.1-0x2go1) UNRELEASED; urgency=low
 
   * Rename LICENSE.txt to COPYING.
+  * cups-x2go.spec:
+    + Pull-in packaging stuff from Jan Engelhardt's .spec files
+      on https://build.opensuse.org/package/view_file/X11:RemoteDesktop:x2go.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 09 May 2014 09:18:29 +0200
 

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/cups-x2go.git


More information about the x2go-commits mailing list