This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository cups-x2go. commit bd3b782c9ed505f65353a48f5a5494ec8abffb01 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 11 07:13:15 2015 +0100 cups-x2go: Fedora: Require cups(R) and cups-filesystem(BR). OpenSUSE 13.2+ or SLES 12+: Require cups-filters(BR). Else require cups(BR). --- cups-x2go.spec | 13 +++++++------ debian/changelog | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/cups-x2go.spec b/cups-x2go.spec index df18d20..162d263 100644 --- a/cups-x2go.spec +++ b/cups-x2go.spec @@ -8,22 +8,23 @@ License: GPLv2+ URL: http://www.x2go.org/ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz -Requires: cups # /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 -%endif +%else # Also needed at build-time as the package owning the common directories on SUSE. -%if 0%{?suse_version} || 0%{?el5} || 0%{?el6} || 0%{?rhel} || 0%{?rhel_version} || 0%{?centos_version} -BuildRequires: cups -%endif - %if 0%{?fedora} +Requires: cups Requires: cups-filesystem BuildRequires: cups-filesystem +%else +Requires: cups +BuildRequires: cups +%endif %endif + Requires: ghostscript %if 0%{?fedora} || 0%{?el5} || 0%{?el6} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?rhel} Requires: openssh-clients diff --git a/debian/changelog b/debian/changelog index b275a7c..84e717f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,8 +11,8 @@ cups-x2go (3.0.1.2-0x2go1) UNRELEASED; urgency=low + Add docs. + Re-add ${_datadir}/ppd/cups-x2go as owned directory. + Use slashes to correctly mark directories. - + Fedora: require cups-filesystem for ${_prefix}/lib/cups et al. - + All but Fedora: require cups at build-time. + + 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/. -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/cups-x2go.git