[X2Go-Commits] [cups-x2go] 01/01: cups-x2go.spec: fixup %{_datadir}/ppd/ directory owning.

[git-admin at x2go.org]

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

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

commit d54e301aecee114f15083821419576ef73279f72
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Nov 17 07:39:10 2017 +0100

    cups-x2go.spec: fixup %{_datadir}/ppd/ directory owning.
    
    On SLE{S,D} 11 and 12, this directory is owned/provided by cups-drivers
    and cups-filters respectively.
    
    On OpenSuSE systems prior to 13.2, this directory was not provided by
    any package, so cups-x2go has to own it.
    
    OpenSuSE 42.1+ provides cups-filters that owns this directory,
    consistently with SLE{S,D} 12.
    
    OpenSuSE 13.2 is a special case: even though the cups-filters package is
    available there (and also owns %{_datadir}/ppd/), it conflicts with the
    cups package, which makes it useless. Let cups-x2go own this directory
    instead on OpenSuSE 13.2.
---
 cups-x2go.spec   | 32 ++++++++++++++++++++------------
 debian/changelog | 10 ++++++++++
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/cups-x2go.spec b/cups-x2go.spec
index 9d371c2..cffc799 100644
--- a/cups-x2go.spec
+++ b/cups-x2go.spec
@@ -11,13 +11,21 @@ Source0:        http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.
 BuildArch:      noarch
 
 # %%{_datadir}/ppd/ is provided by ,,cups-filters'' for OpenSUSE 13.2+ and SLES 12+.
-# Older releases provide %%{_datadir}/ppd/ not at all.
+# SLE{S,D} 11 provides %%{_datadir}/ppd/ via cups-drivers.
+# Older OpenSuSE releases do not provide %%{_datadir}/ppd 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
+# OpenSUSE 13.2. Do not use this package on that platform.
+%if 0%{?suse_version}
+%if 0%{?suse_version} >= 1315 && 0%{?suse_version} != 1320
+Requires:       cups-filters
+BuildRequires:  cups-filters
+%else
+%if 0%{?suse_version} == 1110
+Requires:       cups-drivers
+BuildRequires:  cups-drivers
+%endif
+%endif
+%endif
 # Also needed at build-time as the package owning the common directories on SUSE.
 %if 0%{?fedora}
 Requires:       cups
@@ -27,8 +35,6 @@ BuildRequires:  cups-filesystem
 Requires:       cups
 BuildRequires:  cups
 %endif
-#%endif
-#%endif
 
 Requires:       ghostscript
 %if 0%{?fedora} || 0%{?el5} || 0%{?el6} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?rhel}
@@ -112,10 +118,12 @@ 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
+# Nothing provides %%{_datadir}/ppd/ on OpenSUSE < 13.2.
+# The package that provides %%{_datadir}/ppd/ on OpenSuSE >= 13.2
+# (cups-filters) conflicts with cups on OpenSuSE 13.2.
+# Make sure to exclude SLE{S,D} 11 and 12, for which %%{_datadir}/ppd/
+# is provided by cups-drivers and cups-filters respectively.
+%if 0%{?suse_version} && 0%{?suse_version} <= 1320 && 0%{?suse_version} != 1110 && 0%{?suse_version} != 1315
 %{_datadir}/ppd/
 %endif
 %{_datadir}/ppd/cups-x2go/
diff --git a/debian/changelog b/debian/changelog
index 650deeb..8abd83b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,16 @@ cups-x2go (3.0.1.4-0x2go1) UNRELEASED; urgency=low
     - Maintainer change in package: X2Go Developers <x2go-dev at lists.x2go.org>.
     - Uploaders: add myself. Also, force a rebuild due to the changed
       versioning.
+  * cups-x2go.spec:
+    - Fixup %{_datadir}/ppd/ directory owning. On SLE{S,D} 11 and 12, this
+      directory is owned/provided by cups-drivers and cups-filters
+      respectively. On OpenSuSE systems prior to 13.2, this directory was not
+      provided by any package, so cups-x2go has to own it. OpenSuSE 42.1+
+      provides cups-filters that owns this directory, consistently with
+      SLE{S,D} 12. OpenSuSE 13.2 is a special case: even though the
+      cups-filters package is available there (and also owns
+      %{_datadir}/ppd/), it conflicts with the cups package, which makes it
+      useless. Let cups-x2go own this directory instead on OpenSuSE 13.2.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Fri, 19 Jun 2015 23:34:49 +0200
 

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