diff --git a/cups-2.3b2-source.tar.gz b/cups-2.3b2-source.tar.gz deleted file mode 100644 index b194037..0000000 --- a/cups-2.3b2-source.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b551466a8eb7b6475a8a25d6a39a5342ad06c6695f9ec77d0f017b4c1c76a255 -size 10172940 diff --git a/cups-2.3b2-source.tar.gz.sig b/cups-2.3b2-source.tar.gz.sig deleted file mode 100644 index 1db0bbd..0000000 Binary files a/cups-2.3b2-source.tar.gz.sig and /dev/null differ diff --git a/cups-2.3b3-source.tar.gz b/cups-2.3b3-source.tar.gz new file mode 100644 index 0000000..81dc0be --- /dev/null +++ b/cups-2.3b3-source.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c40e3cc378a9d5f2bfffece646c1619016b9f3a8b59b90252e17d6890ba78ad +size 10173349 diff --git a/cups-2.3b3-source.tar.gz.sig b/cups-2.3b3-source.tar.gz.sig new file mode 100644 index 0000000..0f32e54 Binary files /dev/null and b/cups-2.3b3-source.tar.gz.sig differ diff --git a/cups.changes b/cups.changes index 9c02c09..f3e0937 100644 --- a/cups.changes +++ b/cups.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Feb 8 14:21:22 CET 2018 - jsmeix@suse.de + +- Version upgrade to 2.3b3: + This is the third beta of the CUPS 2.3 series. + For details see https://github.com/apple/cups/releases + Changes include: + * More fixes for printing to old CUPS servers (Issue #5211) + * Additional changes for the scheduler to substitute + default values for invalid job attributes + when running in "relaxed conformance" mode + (Issue #5229 - a follow-up of issues #5186 and #5143) + A detailed list of changes can be found in the CHANGES.md file. +- fix_filter_Makefile.patch fixes + https://github.com/apple/cups/issues/5247 + ------------------------------------------------------------------- Thu Jan 18 10:26:58 CET 2018 - jsmeix@suse.de @@ -32,7 +48,7 @@ Wed Dec 20 11:40:23 CET 2017 - jsmeix@suse.de * Dropped hard-coded CGI scripting language support (Issue #5124) * The scheduler now substitutes default values for invalid job attributes when running in "relaxed conformance" - mode (Issue #5186) + mode (Issue #5186 - a follow-up of issue #5143) A detailed list of changes can be found in the CHANGES.md file. ------------------------------------------------------------------- diff --git a/cups.spec b/cups.spec index a55a056..9954fd4 100644 --- a/cups.spec +++ b/cups.spec @@ -19,28 +19,28 @@ # _tmpfilesdir is not defined in systemd macros up to openSUSE 13.2 %{!?_tmpfilesdir: %global _tmpfilesdir %{_libexecdir}/tmpfiles.d } Name: cups -# CUPS beta version numbers like "2.3b2" can be used as is because +# CUPS beta version numbers like "2.3b3" 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.3b2" show "2.2.99 is older than 2.3b2" so that +# "zypper vcmp 2.2.99 2.3b3" show "2.2.99 is older than 2.3b3" so that # version upgrades from 2.2.x via 2.3.b* to 2.3.0 work: -Version: 2.3b2 +Version: 2.3b3 Release: 0 Summary: The Common UNIX Printing System License: Apache-2.0 Group: Hardware/Printing Url: http://www.cups.org/ # To get Source0 go to https://www.cups.org/software.html or https://github.com/apple/cups/releases or use e.g. -# wget --no-check-certificate -O cups-2.3b2-source.tar.gz https://github.com/apple/cups/releases/download/v2.3b2/cups-2.3b2-source.tar.gz -Source0: https://github.com/apple/cups/releases/download/v2.3b2/cups-2.3b2-source.tar.gz +# wget --no-check-certificate -O cups-2.3b3-source.tar.gz https://github.com/apple/cups/releases/download/v2.3b3/cups-2.3b3-source.tar.gz +Source0: https://github.com/apple/cups/releases/download/v2.3b3/cups-2.3b3-source.tar.gz # To get Source1 go to https://www.cups.org/software.html or https://github.com/apple/cups/releases or use e.g. -# wget --no-check-certificate -O cups-2.3b2-source.tar.gz.sig https://github.com/apple/cups/releases/download/v2.3b2/cups-2.3b2-source.tar.gz.sig -Source1: https://github.com/apple/cups/releases/download/v2.3b2/cups-2.3b2-source.tar.gz.sig +# wget --no-check-certificate -O cups-2.3b3-source.tar.gz.sig https://github.com/apple/cups/releases/download/v2.3b3/cups-2.3b3-source.tar.gz.sig +Source1: https://github.com/apple/cups/releases/download/v2.3b3/cups-2.3b3-source.tar.gz.sig # To get Source2 go to https://www.cups.org/pgp.html Source2: cups.keyring # To manually verify Source0 with Source1 and Source2 do e.g. # gpg --import cups.keyring # gpg --list-keys | grep -1 'CUPS.org' | grep -v 'expired' -# gpg --verify cups-2.3b2-source.tar.gz.sig cups-2.3b2-source.tar.gz +# gpg --verify cups-2.3b3-source.tar.gz.sig cups-2.3b3-source.tar.gz Source102: Postscript.ppd.gz Source105: Postscript-level1.ppd.gz Source106: Postscript-level2.ppd.gz @@ -73,6 +73,8 @@ Patch101: cups-2.0.3-additional_policies.patch Patch103: cups-1.4-do_not_strip_recommended_from_PPDs.patch # Patch104 cups-config-libs.patch fixes option --libs in cups-config script: Patch104: cups-config-libs.patch +# Patch990 fix_filter_Makefile.patch fixes https://github.com/apple/cups/issues/5247 +Patch990: fix_filter_Makefile.patch BuildRequires: dbus-1-devel BuildRequires: fdupes BuildRequires: gcc-c++ @@ -321,6 +323,8 @@ printer drivers for CUPS. %patch103 -b do_not_strip_recommended_from_PPDs.orig # Patch104 cups-config-libs.patch fixes option --libs in cups-config script: %patch104 -b cups-config-libs.orig +# Patch990 fix_filter_Makefile.patch fixes https://github.com/apple/cups/issues/5247 +%patch990 -b fix_filter_Makefile.orig %build # Remove ".SILENT" rule for verbose build output diff --git a/fix_filter_Makefile.patch b/fix_filter_Makefile.patch new file mode 100644 index 0000000..a59c5b8 --- /dev/null +++ b/fix_filter_Makefile.patch @@ -0,0 +1,28 @@ +--- filter/Makefile.orig 2018-02-01 16:01:12.000000000 +0100 ++++ filter/Makefile 2018-02-08 14:17:24.000000000 +0100 +@@ -83,14 +83,14 @@ install-data: + + install-exec: + $(INSTALL_DIR) -m 755 $(SERVERBIN)/filter +- for file in $(FILTERS); do \ ++ for file in $(TARGETS); do \ + $(INSTALL_BIN) $$file $(SERVERBIN)/filter; \ + done + $(RM) $(SERVERBIN)/filter/rastertodymo + $(LN) rastertolabel $(SERVERBIN)/filter/rastertodymo + if test "x$(SYMROOT)" != "x"; then \ + $(INSTALL_DIR) $(SYMROOT); \ +- for file in $(FILTERS); do \ ++ for file in $(TARGETS); do \ + cp $$file $(SYMROOT); \ + dsymutil $(SYMROOT)/$$file; \ + done \ +@@ -116,7 +116,7 @@ install-libs: + # + + uninstall: +- for file in $(FILTERS); do \ ++ for file in $(TARGETS); do \ + $(RM) $(SERVERBIN)/filter/$$file; \ + done + $(RM) $(SERVERBIN)/filter/rastertodymo