[X2Go-Commits] [cups-x2go] 01/01: Revert previous changes. Own %{_datadir}/ppd/ for all SUSE releases for the time being. Fixes ${_datadir} -> %{_datadir} in changelog.

git-admin at x2go.org git-admin at x2go.org
Wed Feb 11 14:45:42 CET 2015


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

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

commit cdc15a33fb180b70a47c147e69fd69026d61412e
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Feb 11 14:45:29 2015 +0100

    Revert previous changes. Own %{_datadir}/ppd/ for all SUSE releases for the time being. Fixes ${_datadir} -> %{_datadir} in changelog.
---
 cups-x2go.spec   |   30 +++++++++++++++++-------------
 debian/changelog |   10 ++++++----
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/cups-x2go.spec b/cups-x2go.spec
index fae9fee..1a12e85 100644
--- a/cups-x2go.spec
+++ b/cups-x2go.spec
@@ -8,12 +8,14 @@ License:        GPLv2+
 URL:            http://www.x2go.org/
 Source0:        http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz
 
-# /usr/share/ppd/ is provided by ,,cups-filters'' for openSUSE 13.2 and higher and SLES 12 and higher.
-# Older releases provide /usr/share/ppd/ via ,,cups''.
-%if 0%{?suse_version} && 0%{?suse_version} >= 1315
-Requires:       cups-filters
-BuildRequires:  cups-filters
-%else
+# %%{_datadir}/ppd/ is provided by ,,cups-filters'' for OpenSUSE 13.2+ and SLES 12+.
+# Older releases provide %%{_datadir}/ppd/ not at all.
+# However, cups-filters conflicts with cups < 1.6, which is currently shipped for
+# OpenSUSE 13.2 and SLES 12. Do not use this (yet.)
+#%if 0%{?suse_version} && 0%{?suse_version} >= 1315
+#Requires:       cups-filters
+#BuildRequires:  cups-filters
+#%else
 # Also needed at build-time as the package owning the common directories on SUSE.
 %if 0%{?fedora}
 Requires:       cups
@@ -22,14 +24,9 @@ BuildRequires:  cups-filesystem
 %else
 Requires:       cups
 BuildRequires:  cups
-
-# Additionally require cups-backends on older SUSE versions for /usr/share/ppd/.
-%if 0%{?suse_version}
-Requires:       cups-backends
-BuildRequires:  cups-backends
-%endif
-%endif
 %endif
+#%endif
+#%endif
 
 Requires:       ghostscript
 %if 0%{?fedora} || 0%{?el5} || 0%{?el6} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?rhel}
@@ -92,6 +89,13 @@ install -pm0644 VERSION.cups-x2go "$c/";
 #
 %attr(0700,root,root) %{_prefix}/lib/cups/backend/cups-x2go
 %config(noreplace) %{_sysconfdir}/cups/cups-x2go.conf
+
+# Nothing provides %%{_datadir}/ppd/ on OpenSUSE < 13.2/SLES < 12.
+# The package (cups-filters) that provides %%{_datadir}/ppd/ conflicts with
+# cups on newer releases.
+%if 0%{?suse_version} && 0%{?suse_version} <= 1320
+${_datadir}/ppd/
+%endif
 %{_datadir}/ppd/cups-x2go/
 %{_datadir}/x2go/
 
diff --git a/debian/changelog b/debian/changelog
index 4054ad1..65a753c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,14 +9,16 @@ cups-x2go (3.0.1.2-0x2go1) UNRELEASED; urgency=low
     + Wrap macros in curly braces where appropriate.
     + Do not own alien directories.
     + Add docs.
-    + Re-add ${_datadir}/ppd/cups-x2go as owned directory.
+    + Re-add %{_datadir}/ppd/cups-x2go as owned directory.
     + Use slashes to correctly mark directories.
-    + Fedora: require cups-filesystem and cups for ${_prefix}/lib/cups et al.
+    + Fedora: require cups-filesystem and cups for %{_prefix}/lib/cups et al.
     + All but Fedora: require cups or cups-filters at build-time.
     + Fedora: require cups-filesystem at build-time, too.
-    + SUSE: require cups-filters at build- and run-time for ${_datadir}/ppd/.
-    + SUSE: require cups-backends for ${_datadir}/ppd/ for older release
+    + SUSE: require cups-filters at build- and run-time for %{_datadir}/ppd/.
+    + SUSE: require cups-backends for %{_datadir}/ppd/ for older release
       versions.
+    + Revert previous change. Own %{_datadir}/ppd/ for all SUSE releases for
+      the time being.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Tue, 10 Feb 2015 21:08:34 +0100
 

--
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