Accepting request 558807 from home:jsmeix:branches:Printing
CUPS version upgrade to 2.3b1 (first beta of the CUPS 2.3 series) OBS-URL: https://build.opensuse.org/request/show/558807 OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=344
This commit is contained in:
Git OBS Bridge
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:40385778c2b3bdf55030d1c999734e22774c79e3425d91339ce677825620169b
|
||||
size 10315433
|
||||
Binary file not shown.
3
cups-2.3b1-source.tar.gz
Normal file
3
cups-2.3b1-source.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:56252ebed42c603789f4b5b34489656326e106443b1ac502c6086b48e92d60a9
|
||||
size 10171312
|
||||
BIN
cups-2.3b1-source.tar.gz.sig
Normal file
BIN
cups-2.3b1-source.tar.gz.sig
Normal file
Binary file not shown.
12
cups.changes
12
cups.changes
@@ -1,7 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 20 11:40:23 CET 2017 - jsmeix@suse.de
|
||||
|
||||
- Version upgrade to 2.3b1:
|
||||
This is the first beta of the CUPS 2.3 series which
|
||||
adopts the new CUPS license (Apache License, Version 2.0),
|
||||
adds support for IPP presets and finishing templates,
|
||||
and fixes a number of bugs and "polish" issues.
|
||||
For details see https://github.com/apple/cups/releases
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 14 13:23:21 UTC 2017 - christophe@krop.fr
|
||||
|
||||
- Make sure cups-libs-<targettype> is removed
|
||||
- Make sure cups-libs-<targettype> is removed.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 7 14:40:42 CET 2017 - jsmeix@suse.de
|
||||
|
||||
71
cups.spec
71
cups.spec
@@ -19,18 +19,22 @@
|
||||
# _tmpfilesdir is not defined in systemd macros up to openSUSE 13.2
|
||||
%{!?_tmpfilesdir: %global _tmpfilesdir %{_libexecdir}/tmpfiles.d }
|
||||
Name: cups
|
||||
Version: 2.2.6
|
||||
# CUPS beta version numbers like "2.3b1" can be used as is because
|
||||
# "zypper vcmp 2.3.b99 2.3.0" shows "2.3.b99 is older than 2.3.0" and
|
||||
# "zypper vcmp 2.2.99 2.3b1" show "2.2.99 is older than 2.3b1" so that
|
||||
# version upgrades from 2.2.x via 2.3.b* to 2.3.0 work:
|
||||
Version: 2.3b1
|
||||
Release: 0
|
||||
Summary: The Common UNIX Printing System
|
||||
License: GPL-2.0 and LGPL-2.1
|
||||
Group: Hardware/Printing
|
||||
Url: http://www.cups.org/
|
||||
# To download it use e.g.
|
||||
# wget --no-check-certificate -O cups-2.2.6-source.tar.gz https://github.com/apple/cups/releases/download/v2.2.6/cups-2.2.6-source.tar.gz
|
||||
Source0: https://github.com/apple/cups/releases/download/v2.2.6/cups-2.2.6-source.tar.gz
|
||||
# wget --no-check-certificate -O cups-2.3b1-source.tar.gz https://github.com/apple/cups/releases/download/v2.3b1/cups-2.3b1-source.tar.gz
|
||||
Source0: https://github.com/apple/cups/releases/download/v2.3b1/cups-2.3b1-source.tar.gz
|
||||
# To download it use e.g.
|
||||
# wget --no-check-certificate -O cups-2.2.6-source.tar.gz.sig https://github.com/apple/cups/releases/download/v2.2.6/cups-2.2.6-source.tar.gz.sig
|
||||
Source1: https://github.com/apple/cups/releases/download/v2.2.6/cups-2.2.6-source.tar.gz.sig
|
||||
# wget --no-check-certificate cups-2.3b1-source.tar.gz.sig https://github.com/apple/cups/releases/download/v2.3b1/cups-2.3b1-source.tar.gz.sig
|
||||
Source1: https://github.com/apple/cups/releases/download/v2.3b1/cups-2.3b1-source.tar.gz.sig
|
||||
Source2: cups.keyring
|
||||
Source102: Postscript.ppd.gz
|
||||
Source105: Postscript-level1.ppd.gz
|
||||
@@ -89,11 +93,10 @@ BuildRequires: pkgconfig(libsystemd)
|
||||
BuildRequires: pkgconfig(libsystemd-daemon)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
# Require the exact matching version-release of the cups-client and cups-libs
|
||||
# sub-package because because all CUPS software is built from the one same
|
||||
# CUPS source tar ball do that there could be whatever subtle CUPS-internal
|
||||
# dependencies.
|
||||
# The exact matching version-release of the cups-client sub-package is available
|
||||
# Require the exact matching version-release of the cups-client sub-package
|
||||
# (that requires all native CUPS libraries i.e. the libcups* sub-packages)
|
||||
# and the cups-config sub-package.
|
||||
# The exact matching version-release of each sub-package is available
|
||||
# on the same package repository where the cups package is because
|
||||
# all are built simulaneously from the same cups source package
|
||||
# and all required packages are provided on the same repository:
|
||||
@@ -116,6 +119,7 @@ Recommends: foomatic-filters
|
||||
# (e.g. on client systems in the network where the filtering hapens on a CUPS server
|
||||
# or on a CUPS server with only "raw" queues), so that a weak Recommends fits better:
|
||||
Recommends: ghostscript
|
||||
# Install into this non-root directory (required when it is built as non-root user):
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%{?systemd_requires}
|
||||
# Conflicts with other print spoolers which provide same binaries like
|
||||
@@ -222,14 +226,18 @@ License: GPL-2.0
|
||||
Group: Hardware/Printing
|
||||
# Require the exact matching version-release of the libcups* sub-packages because
|
||||
# non-matching CUPS libraries may let CUPS software crash (e.g. segfault)
|
||||
# because all CUPS software is built from the one same CUPS source tarball
|
||||
# so that there are CUPS-internal dependencies via CUPS private API calls
|
||||
# because all CUPS software is provided as one single CUPS source tarball
|
||||
# and there are CUPS-internal dependencies via CUPS private API calls
|
||||
# (which do not happen for third-party software which uses only the CUPS public API).
|
||||
# The exact matching version-release of the libcups* sub-packages is available
|
||||
# The exact matching version-release of each libcups* sub-package is available
|
||||
# on the same package repository where the cups package is because
|
||||
# all are built simultaneously from the same cups source package
|
||||
# and all required packages are provided on the same repository:
|
||||
Requires: libcups2 = %{version}-%{release}
|
||||
Requires: libcupscgi1 = %{version}-%{release}
|
||||
Requires: libcupsimage2 = %{version}-%{release}
|
||||
Requires: libcupsmime1 = %{version}-%{release}
|
||||
Requires: libcupsppdc1 = %{version}-%{release}
|
||||
# Conflicts with other print spoolers which provide same binaries like /usr/bin/lp and so on:
|
||||
Conflicts: lprng
|
||||
Conflicts: lprold
|
||||
@@ -248,11 +256,12 @@ System V and Berkeley print systems.
|
||||
Summary: Development Environment for CUPS
|
||||
License: GPL-2.0
|
||||
Group: Development/Libraries/C and C++
|
||||
# Do not require the exact matching version-release of cups-libs
|
||||
# but only a cups-libs package with matching version because
|
||||
# Do not require the exact matching version-release
|
||||
# of the native CUPS libraries (i.e. the libcups* sub-packages)
|
||||
# but only CUPS libraries with matching version because
|
||||
# for building third-party software which uses only the CUPS public API
|
||||
# there are no CUPS-internal dependencies via CUPS private API calls
|
||||
# (the latter would require the exact matching cups-libs version-release):
|
||||
# (the latter would require the exact matching CUPS libraries version-release):
|
||||
Requires: glibc-devel
|
||||
Requires: libcups2 = %{version}
|
||||
Requires: libcupscgi1 = %{version}
|
||||
@@ -374,28 +383,6 @@ make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
make BUILDROOT=%{buildroot} install
|
||||
# Use CUPS' own fonts (i.e. make CUPS work again in compliance with upstream).
|
||||
# In ancient times (see the RPM changelog entry dated "Thu Aug 16 17:05:19 CEST 2001")
|
||||
# there was the general opinion it would be a great idea to deviate from CUPS upstream
|
||||
# and save some disk space and do not install CUPS' own fonts in CUPS' own font directory.
|
||||
# Therefore CUPS' own fonts were removed and the CUPS font directory was replaced
|
||||
# by a symbolic link /usr/share/cups/fonts -> ../ghostscript/fonts
|
||||
# because at that times the Ghostscript fonts had been the same as CUPS' own fonts.
|
||||
# In any case such a link is a fragile non-future-proof interference because when either
|
||||
# the Ghostscript fonts or CUPS' own fonts change, linking them as same is wrong.
|
||||
# Meanwhile (I don't know exactly since when but since a long time) the Ghostscript fonts
|
||||
# do no longer work for CUPS' particular needs (CUPS has its own fonts because it needs them).
|
||||
# Nobody noticed it until 2014 via https://bugzilla.novell.com/show_bug.cgi?id=856731
|
||||
# But it is not possible with RPM to replace a directory by a symbolic link or vice versa
|
||||
# see https://bugzilla.novell.com/show_bug.cgi?id=856731#c7
|
||||
# and https://bugzilla.novell.com/show_bug.cgi?id=856731#c8
|
||||
# This means /usr/share/cups/fonts must stay forever as a symbolic link
|
||||
# and the only way out is to move CUPS' own fonts to an artificial
|
||||
# surrogate directory /usr/share/cups/CUPSfonts and have the
|
||||
# symbolic link /usr/share/cups/fonts -> /usr/share/cups/CUPSfonts:
|
||||
pushd %{buildroot}%{_datadir}/cups/
|
||||
mv fonts CUPSfonts && ln -s CUPSfonts fonts
|
||||
popd
|
||||
# Make directory for ssl files:
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/cups/ssl
|
||||
# Add a client.conf as template (Source108: cups-client.conf):
|
||||
@@ -409,9 +396,8 @@ install -d -m755 %{buildroot}%{_localstatedir}/cache/cups
|
||||
# Add conf/pam.suse regarding support for PAM (see Patch100: cups-pam.diff):
|
||||
install -m 644 -D conf/pam.suse %{buildroot}%{_sysconfdir}/pam.d/cups
|
||||
# Add missing usual documentation.
|
||||
# (since CUPS-2.2.5 it is no longer CREDITS.txt INSTALL.txt README.txt but CREDITS.md INSTALL.md README.md):
|
||||
install -d -m755 %{buildroot}/%{_defaultdocdir}/cups
|
||||
for f in CHANGES*.txt CREDITS.md INSTALL.md LICENSE.txt README.md
|
||||
for f in CHANGES.md CREDITS.md INSTALL.md LICENSE README.md
|
||||
do install -m 644 "$f" %{buildroot}%{_defaultdocdir}/cups/
|
||||
done
|
||||
# Add generic PostScript printer PPDs:
|
||||
@@ -431,15 +417,14 @@ rm -rf %{buildroot}%{_datadir}/icons
|
||||
# because if upstream changed it 'sed' would silently no longer change the files:
|
||||
grep -q '^# Configuration ' %{buildroot}/%{_sysconfdir}/cups/cupsd.conf.default
|
||||
sed -i -e 's/^# Configuration /# Default configuration /' %{buildroot}/%{_sysconfdir}/cups/cupsd.conf.default
|
||||
|
||||
# install the systemd control files
|
||||
# Install the systemd control files:
|
||||
mv %{buildroot}%{_unitdir}/org.cups.cupsd.path %{buildroot}%{_unitdir}/cups.path
|
||||
mv %{buildroot}%{_unitdir}/org.cups.cupsd.service %{buildroot}%{_unitdir}/cups.service
|
||||
mv %{buildroot}%{_unitdir}/org.cups.cupsd.socket %{buildroot}%{_unitdir}/cups.socket
|
||||
mv %{buildroot}%{_unitdir}/org.cups.cups-lpd.socket %{buildroot}%{_unitdir}/cups-lpd.socket
|
||||
mv %{buildroot}%{_unitdir}/org.cups.cups-lpd@.service %{buildroot}%{_unitdir}/cups-lpd@.service
|
||||
sed -i -e "s,org.cups.cupsd,cups,g" %{buildroot}%{_unitdir}/cups.service
|
||||
# rcbla aliases
|
||||
# rcbla aliases:
|
||||
ln -s service %{buildroot}%{_sbindir}/rccups
|
||||
ln -s service %{buildroot}%{_sbindir}/rccups-lpd
|
||||
# Install /usr/lib/tmpfiles.d/cups.conf
|
||||
|
||||
Reference in New Issue
Block a user