Accepting request 883250 from home:jsmeix:branches:Printing

Disable testsuite for now until https://github.com/OpenPrinting/cups/issues/155 is fixed. Additionally improved syntax of some recent changes entries.

OBS-URL: https://build.opensuse.org/request/show/883250
OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=371
This commit is contained in:
Johannes Meixner 2021-04-06 10:09:56 +00:00 committed by Git OBS Bridge
parent 84eb7906f6
commit 43801330ab
2 changed files with 220 additions and 180 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Apr 6 11:34:50 CEST 2021 - jsmeix@suse.de
- Disable testsuite for now via "bcond_with testsuite"
until https://github.com/OpenPrinting/cups/issues/155 is fixed
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 25 20:47:22 CET 2021 - Florian <sp1ritCS@protonmail.com> Thu Mar 25 20:47:22 CET 2021 - Florian <sp1ritCS@protonmail.com>
@ -13,81 +19,105 @@ Fri Mar 19 12:02:38 UTC 2021 - Samuel Cabrero <scabrero@suse.de>
Fri Mar 19 11:25:44 UTC 2021 - Florian <sp1ritCS@protonmail.com> Fri Mar 19 11:25:44 UTC 2021 - Florian <sp1ritCS@protonmail.com>
- Upstream changed to https://github.com/OpenPrinting/cups - Upstream changed to https://github.com/OpenPrinting/cups
- Added %check section to specfile that executes the old `make check` and the new (see 2.3.3op1) `make test` - Added %check section to specfile that executes
the old 'make check' and the new (see 2.3.3op1) 'make test'
- Version upgrade to 2.3.3op2: - Version upgrade to 2.3.3op2:
- Security: Fixed a buffer (read) overflow in the ippReadIO function (CVE-2020-10001) * Security: Fixed a buffer (read) overflow
- Clarified the documentation for the "Listen" directive in the ippReadIO function (CVE-2020-10001)
- Fixed duplicate ColorModel entries for AirPrint printers * Clarified the documentation for the "Listen" directive
- Fixed directory/permission defaults for Debian kfreebsd-based systems * Fixed duplicate ColorModel entries for AirPrint printers
- Fixed crash bug in ppdOpen * Fixed directory/permission defaults for Debian
- Fixed regression in snprintf emulation function kfreebsd-based systems
- The scheduler's systemd service file now waits for the nslcd service to start * Fixed crash bug in ppdOpen
- The libusb-based USB backend now uses a simpler read timer implementation to avoid a regression in a previous change * Fixed regression in snprintf emulation function
- The PPD caching code now only tracks the APPrinterIconPath value on macOS * The scheduler's systemd service file now waits
- Fixed segfault in help.cgi when searching in man pages for the nslcd service to start
- Root certificates were incorrectly stored in "~/.cups/ssl". * The libusb-based USB backend now uses a simpler read timer
- Version upgrade to 2.3.3op1: implementation to avoid a regression in a previous change
- The automated test suite can now be activated using make test for consistency with other projects and CI environments - the old make check continues to work as well, and the previous test server behavior can be accessed by running make testserver. * The PPD caching code now only tracks the APPrinterIconPath
- ippeveprinter now supports multiple icons and strings files. value on macOS
- ippeveprinter now uses the system's FQDN with Avahi. * Fixed segfault in help.cgi when searching in man pages
- ippeveprinter now supports Get-Printer-Attributes on "/". * Root certificates were incorrectly stored in "~/.cups/ssl".
- ippeveprinter now uses a deterministic "printer-uuid" value. * Version upgrade to 2.3.3op1:
- ippeveprinter now uses system sounds on macOS for Identify-Printer. * The automated test suite can now be activated using make test
- Updated ippfind to look for files in "~/Desktop" on Windows. for consistency with other projects and CI environments - the
- Updated ippfind to honor SKIP-XXX directives with PAUSE. old make check continues to work as well, and the previous test
- Updated IPP Everywhere support to work around printers that only advertise color raster support but really also support grayscale server behavior can be accessed by running make testserver.
- ipptool now supports DNS-SD URIs like ipps://My%20Printer._ipps._tcp.local * ippeveprinter now supports multiple icons and strings files.
- The scheduler now allows root backends to have world read permissions but not world execute permissions * ippeveprinter now uses the system's FQDN with Avahi.
- Failures to bind IPv6 listener sockets no longer cause errors if IPv6 is disabled on the host * ippeveprinter now supports Get-Printer-Attributes on "/".
- The SNMP backend now supports the HP and Ricoh vendor MIBs * ippeveprinter now uses a deterministic "printer-uuid" value.
- The scheduler no longer includes a timestamp in files it writes * ippeveprinter now uses system sounds on macOS
- The systemd service names are now "cups.service" and "cups-lpd.service" for Identify-Printer.
- The scheduler no longer adds the local hostname to the ServerAlias list * Updated ippfind to look for files in "~/Desktop" on Windows.
- Added LogFileGroup directive in "cups-files.conf" to control the group owner of log files * Updated ippfind to honor SKIP-XXX directives with PAUSE.
- Added --with-max-log-size configure option * Updated IPP Everywhere support to work around printers that only
- Added --enable-sync-on-close configure option advertise color raster support but really also support grayscale
- Added --with-error-policy configure option * ipptool now supports DNS-SD URIs like
- IPP Everywhere PPDs could have an "unknown" default InputSlot ipps://My%20Printer._ipps._tcp.local
- The httpAddrListen function now uses a listen backlog of 128. * The scheduler now allows root backends to have world read
- Added USB quirks permissions but not world execute permissions
- Fixed IPP Everywhere v1.1 conformance issues in ippeveprinter. * Failures to bind IPv6 listener sockets no longer cause errors
- Fixed DNS-SD name collision support in ippeveprinter. if IPv6 is disabled on the host
- Fixed compiler and code analyzer warnings. * The SNMP backend now supports the HP and Ricoh vendor MIBs
- Fixed TLS support on Windows. * The scheduler no longer includes a timestamp in files it writes
- Fixed ippfind sub-type searches with Avahi. * The systemd service names are now "cups.service"
- Fixed the default hostname used by ippeveprinter on macOS. and "cups-lpd.service"
- Fixed resolution of local IPP-USB printers with Avahi. * The scheduler no longer adds the local hostname to
- Fixed coverity issues the ServerAlias list
- Fixed httpAddrConnect issues * Added LogFileGroup directive in "cups-files.conf" to control
- Fixed web interface device URI issue the group owner of log files
- Fixed lp/lpr "printer/class not found" error reporting * Added --with-max-log-size configure option
- Fixed xinetd support for LPD clients * Added --enable-sync-on-close configure option
- Fixed libtool build issue * Added --with-error-policy configure option
- Fixed a memory leak in the scheduler * IPP Everywhere PPDs could have an "unknown" default InputSlot
- Fixed a potential integer overflow in the PPD hashing code * The httpAddrListen function now uses a listen backlog of 128.
- Fixed output-bin and print-quality handling issues * Added USB quirks
- Fixed PPD options getting mapped to odd IPP values like "tray---4" * Fixed IPP Everywhere v1.1 conformance issues in ippeveprinter.
- Fixed remote access to the cupsd.conf and log files * Fixed DNS-SD name collision support in ippeveprinter.
- Fixed the automated test suite when running in certain build/CI environments * Fixed compiler and code analyzer warnings.
- Fixed a logging regression caused by a previous change for Apple issue #5604 * Fixed TLS support on Windows.
- Fixed fax phone number handling with GNOME * Fixed ippfind sub-type searches with Avahi.
- Fixed potential rounding error in rastertopwg filter * Fixed the default hostname used by ippeveprinter on macOS.
- Fixed the "uri-security-supported" value from the scheduler * Fixed resolution of local IPP-USB printers with Avahi.
- Fixed IPP backend crash bug with "printer-alert" values * Fixed coverity issues
- Removed old Solaris inetconv(1m) reference in cups-lpd man page * Fixed httpAddrConnect issues
- Fixed default options that incorrectly use the "custom" prefix * Fixed web interface device URI issue
- Fixed a memory leak when resolving DNS-SD URIs * Fixed lp/lpr "printer/class not found" error reporting
- Fixed systemd status reporting by adopting the notify interface * Fixed xinetd support for LPD clients
- Fixed crash in rastertopwg * Fixed libtool build issue
- Fixed cupsManualCopies values in IPP Everywhere PPDs * Fixed a memory leak in the scheduler
- Removed let-cupsd-start-after-network.patch as it is no longer required * Fixed a potential integer overflow in the PPD hashing code
* Fixed output-bin and print-quality handling issues
* Fixed PPD options getting mapped to odd IPP values
like "tray---4"
* Fixed remote access to the cupsd.conf and log files
* Fixed the automated test suite when running in certain
build/CI environments
* Fixed a logging regression caused by a previous change
for Apple issue #5604
* Fixed fax phone number handling with GNOME
* Fixed potential rounding error in rastertopwg filter
* Fixed the "uri-security-supported" value from the scheduler
* Fixed IPP backend crash bug with "printer-alert" values
* Removed old Solaris inetconv(1m) reference in cups-lpd man page
* Fixed default options that incorrectly use the "custom" prefix
* Fixed a memory leak when resolving DNS-SD URIs
* Fixed systemd status reporting by adopting the notify interface
* Fixed crash in rastertopwg
* Fixed cupsManualCopies values in IPP Everywhere PPDs
- Removed let-cupsd-start-after-network.patch
as it is no longer required
- Removed CVE-2020-10001.patch as a fix as been merged upstream - Removed CVE-2020-10001.patch as a fix as been merged upstream
- Removed section of specfile responsible for renaming "org.cups.cups*" systemd files to cups*, due to upstream renaming these files - Removed section of specfile responsible for
renaming "org.cups.cups*" systemd files to cups*, due to
upstream renaming these files
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 18 18:18:18 UTC 2021 - olaf@aepfle.de Thu Mar 18 18:18:18 UTC 2021 - olaf@aepfle.de
- Remove code comments from expanded scriptlets to reduce size - Remove code comments from expanded scriptlets to reduce size
cf. https://build.opensuse.org/request/show/879976
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 2 14:22:38 CET 2021 - jsmeix@suse.de Tue Feb 2 14:22:38 CET 2021 - jsmeix@suse.de
@ -99,161 +129,161 @@ Tue Feb 2 14:22:38 CET 2021 - jsmeix@suse.de
Wed Oct 14 09:11:00 UTC 2020 - Michael Gorse <mgorse@suse.com> Wed Oct 14 09:11:00 UTC 2020 - Michael Gorse <mgorse@suse.com>
- Version upgrade to 2.3.3: - Version upgrade to 2.3.3:
- CVE-2020-3898: The `ppdOpen` function did not handle invalid UI * CVE-2020-3898: The 'ppdOpen' function did not handle invalid UI
constraint. `ppdcSource::get_resolution` function did not constraint. 'ppdcSource::get_resolution' function did not
handle invalid resolution strings. handle invalid resolution strings.
- CVE-2019-8842: The `ippReadIO` function may under-read an * CVE-2019-8842: The 'ippReadIO' function may under-read an
extension field. extension field.
- Fixed WARNING_OPTIONS support for GCC 9.x * Fixed WARNING_OPTIONS support for GCC 9.x
Changes in CUPS 2.3.2: Changes in CUPS 2.3.2:
Localization updates Localization updates
Changes in CUPS 2.3.1: Changes in CUPS 2.3.1:
- CVE-2019-2228: The `ippSetValuetag` function did not validate * CVE-2019-2228: The 'ippSetValuetag' function did not validate
the default language value. the default language value.
- Fixed a crash bug in the web interface. * Fixed a crash bug in the web interface.
- The PPD cache code now looks up page sizes using their * The PPD cache code now looks up page sizes using their
dimensions. dimensions.
- PPD files containing "custom" option keywords did not work. * PPD files containing "custom" option keywords did not work.
- Added a workaround for the scheduler's systemd support. * Added a workaround for the scheduler's systemd support.
- Added a DigestOptions directive for the `client.conf` file to * Added a DigestOptions directive for the 'client.conf' file to
control whether MD5-based Digest authentication is allowed. control whether MD5-based Digest authentication is allowed.
- Fixed a bug in the handling of printer resource files. * Fixed a bug in the handling of printer resource files.
- The libusb-based USB backend now reports an error when the * The libusb-based USB backend now reports an error when the
distribution permissions are wrong. distribution permissions are wrong.
- Added paint can labels to Dymo driver. * Added paint can labels to Dymo driver.
- The `ippeveprinter` program now supports authentication. * The 'ippeveprinter' program now supports authentication.
- The `ippeveprinter` program now advertises DNS-SD services on * The 'ippeveprinter' program now advertises DNS-SD services on
the correct interfaces, and provides a way to turn them off. the correct interfaces, and provides a way to turn them off.
- The `--with-dbusdir` option was ignored by the configure * The '--with-dbusdir' option was ignored by the configure
script. script.
- Sandboxed applications were not able to get the default * Sandboxed applications were not able to get the default
printer. printer.
- Log file access controls were not preserved by `cupsctl`. * Log file access controls were not preserved by 'cupsctl'.
- Default printers set with `lpoptions` did not work in all * Default printers set with 'lpoptions' did not work in all
cases. cases.
- Fixed an error in the jobs web interface template. * Fixed an error in the jobs web interface template.
- Fixed an off-by-one error in `ippEnumString`. * Fixed an off-by-one error in 'ippEnumString'.
- Fixed some new compiler warnings. * Fixed some new compiler warnings.
- Fixed a few issues with the Apple Raster support. * Fixed a few issues with the Apple Raster support.
- The IPP backend did not detect all cases where a job should be * The IPP backend did not detect all cases where a job should be
retried using a raster format. retried using a raster format.
- Fixed spelling of "fold-accordion". * Fixed spelling of "fold-accordion".
- Fixed the default common name for TLS certificates used by * Fixed the default common name for TLS certificates used by
`ippeveprinter`. 'ippeveprinter'.
- Fixed the option names used for IPP Everywhere finishing * Fixed the option names used for IPP Everywhere finishing
options. options.
- Added support for the second roll of the DYMO Twin/DUO label * Added support for the second roll of the DYMO Twin/DUO label
printers. printers.
Changes in CUPS v2.3.0: Changes in CUPS v2.3.0:
- CVE-2019-8696 and CVE-2019-8675: Fixed SNMP buffer overflows. * CVE-2019-8696 and CVE-2019-8675: Fixed SNMP buffer overflows.
- Added a GPL2/LGPL2 exception to the new CUPS license terms. * Added a GPL2/LGPL2 exception to the new CUPS license terms.
- Fixed a bug in the scheduler job cleanup code. * Fixed a bug in the scheduler job cleanup code.
- Fixed builds when there is no TLS library. * Fixed builds when there is no TLS library.
- "make" failed with GZIP options. * "make" failed with GZIP options.
- Fixed potential excess logging from the scheduler when removing * Fixed potential excess logging from the scheduler when removing
job files. job files.
- Fixed a NULL pointer dereference bug in `httpGetSubField2`. * Fixed a NULL pointer dereference bug in 'httpGetSubField2'.
- Added FIPS-140 workarounds for GNU TLS. * Added FIPS-140 workarounds for GNU TLS.
- The scheduler no longer provides a default value for the * The scheduler no longer provides a default value for the
description. description.
- The scheduler now logs jobs held for authentication using the * The scheduler now logs jobs held for authentication using the
error level so it is clear what happened. error level so it is clear what happened.
- The `lpadmin` command did not always update the PPD file for * The 'lpadmin' command did not always update the PPD file for
changes to the `cupsIPPSupplies` and `cupsSNMPSupplies` keywords. changes to the 'cupsIPPSupplies' and 'cupsSNMPSupplies' keywords.
- The scheduler now uses both the group's membership list as well * The scheduler now uses both the group's membership list as well
as the various OS-specific membership functions to determine as the various OS-specific membership functions to determine
whether a user belongs to a named group. whether a user belongs to a named group.
- Added USB quirks rule for HP LaserJet 1015. * Added USB quirks rule for HP LaserJet 1015.
- Fixed some PPD parser issues. * Fixed some PPD parser issues.
- The IPP parser no longer allows invalid member attributes in * The IPP parser no longer allows invalid member attributes in
collections. collections.
- The configure script now treats the "wheel" group as a * The configure script now treats the "wheel" group as a
potential system group. potential system group.
- Fixed IPP buffer overflow. * Fixed IPP buffer overflow.
- Fixed memory disclosure issue in the scheduler. * Fixed memory disclosure issue in the scheduler.
- Fixed DoS issues in the scheduler. * Fixed DoS issues in the scheduler.
- Fixed an issue with unsupported "sides" values in the IPP * Fixed an issue with unsupported "sides" values in the IPP
backend. backend.
- The scheduler would restart continuously when idle and printers * The scheduler would restart continuously when idle and printers
were not shared. were not shared.
- Fixed an issue with `EXPECT !name WITH-VALUE ...` tests. * Fixed an issue with 'EXPECT !name WITH-VALUE ...' tests.
- Fixed a command ordering issue in the Zebra ZPL driver. * Fixed a command ordering issue in the Zebra ZPL driver.
- Fixed a memory leak in `ppdOpen`. * Fixed a memory leak in 'ppdOpen'.
Changes in CUPS v2.3rc1: Changes in CUPS v2.3rc1:
- The `cups-config` script no longer adds extra libraries when linking against * The 'cups-config' script no longer adds extra libraries when linking against
shared libraries. shared libraries.
- The supplied example print documents have been optimized for * The supplied example print documents have been optimized for
size. size.
- The `cupsctl` command now prevents setting "cups-files.conf" * The 'cupsctl' command now prevents setting "cups-files.conf"
directives. directives.
- The "forbidden" message in the web interface is now explained. * The "forbidden" message in the web interface is now explained.
- The footer in the web interface covered some content on small * The footer in the web interface covered some content on small
displays. displays.
- The libusb-based USB backend now enforces read limits, * The libusb-based USB backend now enforces read limits,
improving print speed in many cases. improving print speed in many cases.
- The `ippeveprinter` command now looks for print commands in * The 'ippeveprinter' command now looks for print commands in
the "command" subdirectory. the "command" subdirectory.
- The `ipptool` command now supports `$date-current` and * The 'ipptool' command now supports '$date-current' and
`$date-start` variables to insert the current and starting date '$date-start' variables to insert the current and starting date
and time values, as well as ISO-8601 relative time values such and time values, as well as ISO-8601 relative time values such
as "PT30S" for 30 seconds in the future. as "PT30S" for 30 seconds in the future.
Changes in CUPS v2.3b8 Changes in CUPS v2.3b8
- Media size matching now uses a tolerance of 0.5mm. * Media size matching now uses a tolerance of 0.5mm.
- The lpadmin command would hang with a bad PPD file. * The lpadmin command would hang with a bad PPD file.
- Fixed a potential crash bug in cups-driverd. * Fixed a potential crash bug in cups-driverd.
- Fixed a performance regression with large PPDs. * Fixed a performance regression with large PPDs.
- Fixed a memory reallocation bug in HTTP header value expansion. * Fixed a memory reallocation bug in HTTP header value expansion.
- Timed out job submission now yields an error. * Timed out job submission now yields an error.
- Restored minimal support for the `Emulators` keyword in PPD * Restored minimal support for the 'Emulators' keyword in PPD
files to allow old Samsung printer drivers to continue to work. files to allow old Samsung printer drivers to continue to work.
- The scheduler did not encode octetString values like * The scheduler did not encode octetString values like
"job-password" correctly for the print filters. "job-password" correctly for the print filters.
- The `cupsCheckDestSupported` function did not check octetString * The 'cupsCheckDestSupported' function did not check octetString
values correctly. values correctly.
- Added support for `UserAgentTokens` directive in "client.conf". * Added support for 'UserAgentTokens' directive in "client.conf".
- Updated the systemd service file for cupsd. * Updated the systemd service file for cupsd.
- The `ippValidateAttribute` function did not catch all instances * The 'ippValidateAttribute' function did not catch all instances
of invalid UTF-8 strings. of invalid UTF-8 strings.
- Fixed an issue with the self-signed certificates generated by * Fixed an issue with the self-signed certificates generated by
GNU TLS. GNU TLS.
- Fixed a potential memory leak when reading at the end of a * Fixed a potential memory leak when reading at the end of a
file. file.
- Fixed potential unaligned accesses in the string pool. * Fixed potential unaligned accesses in the string pool.
- Fixed a potential memory leak when loading a PPD file. * Fixed a potential memory leak when loading a PPD file.
- Added a USB quirks rule for the Lexmark E120n. * Added a USB quirks rule for the Lexmark E120n.
- Updated the USB quirks rule for Zebra label printers. * Updated the USB quirks rule for Zebra label printers.
- The lpadmin command, web interface, and scheduler all queried * The lpadmin command, web interface, and scheduler all queried
an IPP Everywhere printer differently, resulting in different an IPP Everywhere printer differently, resulting in different
PPDs for the same printer. PPDs for the same printer.
- The web interface no longer provides access to the log files. * The web interface no longer provides access to the log files.
- Non-Kerberized printing to Windows via IPP was broken. * Non-Kerberized printing to Windows via IPP was broken.
- The scheduler no longer stops a printer if an error occurs when * The scheduler no longer stops a printer if an error occurs when
a job is canceled or aborted. a job is canceled or aborted.
- Added a USB quirks rule for the DYMO 450 Turbo. * Added a USB quirks rule for the DYMO 450 Turbo.
- Added a USB quirks rule for Xerox printers. * Added a USB quirks rule for Xerox printers.
- The scheduler's self-signed certificate did not include all of * The scheduler's self-signed certificate did not include all of
the alternate names for the server when using GNU TLS. the alternate names for the server when using GNU TLS.
- Fixed some PPD caching and IPP Everywhere PPD * Fixed some PPD caching and IPP Everywhere PPD
accounting/password bugs. accounting/password bugs.
- Fixed `PreserveJobHistory` bug with time values. * Fixed 'PreserveJobHistory' bug with time values.
- The scheduler no longer advertises the HTTP methods it * The scheduler no longer advertises the HTTP methods it
supports. supports.
- The scheduler did not always idle exit as quickly as it could. * The scheduler did not always idle exit as quickly as it could.
- Added a new `ippeveprinter` command based on the old ippserver * Added a new 'ippeveprinter' command based on the old ippserver
sample code. sample code.
Changes in CUPS v2.3b7 Changes in CUPS v2.3b7
- Running ppdmerge with the same input and output filenames did * Running ppdmerge with the same input and output filenames did
not work as advertised. not work as advertised.
- Rebase let-cupsd-start-after-network.patch and * Rebase let-cupsd-start-after-network.patch and
cups-config-libs.patch. cups-config-libs.patch.
- Drop issue5509-fix-utf-8-validation-issue.patch and * Drop issue5509-fix-utf-8-validation-issue.patch and
issue5453.patch: fixed upstream. issue5453.patch: fixed upstream.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 25 12:24:13 UTC 2020 - Ludwig Nussel <lnussel@suse.de> Thu Jun 25 12:24:13 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- make cups-devel pull in cups-rpm-helper to fix printer driver provides - make cups-devel pull in cups-rpm-helper to fix printer driver
(boo#1172407) provides (boo#1172407)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 5 10:25:47 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com> Fri Jun 5 10:25:47 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
@ -439,9 +469,9 @@ Wed Mar 28 13:58:32 CEST 2018 - jsmeix@suse.de
were made that required a restart (Issue #5263) were made that required a restart (Issue #5263)
* Fixed an Avahi crash bug in the scheduler (Issue #5268) * Fixed an Avahi crash bug in the scheduler (Issue #5268)
* TLS connections now properly timeout (rdar://34938533) * TLS connections now properly timeout (rdar://34938533)
* Removed support for the `-D_PPD_DEPRECATED=""` developer * Removed support for the '-D_PPD_DEPRECATED=""' developer
cheat - the PPD API should no longer be used. cheat - the PPD API should no longer be used.
* Removed support for `-D_IPP_PRIVATE_STRUCTURES=1` developer * Removed support for '-D_IPP_PRIVATE_STRUCTURES=1' developer
cheat - the IPP accessor functions should be used instead. cheat - the IPP accessor functions should be used instead.
* The symlink rastertodymo -> rastertolabel * The symlink rastertodymo -> rastertolabel
in /usr/lib/cups/filter is no longer provided. in /usr/lib/cups/filter is no longer provided.

View File

@ -15,8 +15,12 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
# Disabling tests for now, until gh#155 is fixed
%bcond_without testsuite # Cf. https://rpm.org/user_doc/conditional_builds.html
# by default enable testsuite (i.e. in the 'check' section run make check and make test)
#bcond_without testsuite
# disable testsuite for now until https://github.com/OpenPrinting/cups/issues/155 is fixed
%bcond_with testsuite
# _tmpfilesdir is not defined in systemd macros up to openSUSE 13.2 # _tmpfilesdir is not defined in systemd macros up to openSUSE 13.2
%{!?_tmpfilesdir: %global _tmpfilesdir /usr/lib/tmpfiles.d } %{!?_tmpfilesdir: %global _tmpfilesdir /usr/lib/tmpfiles.d }
@ -358,16 +362,6 @@ export CC=cc
localedir=%{_datadir}/locale localedir=%{_datadir}/locale
make %{?_smp_mflags} make %{?_smp_mflags}
%check
%if %{with testsuite}
# there appears to be some kind of race condition when running make check and make test,
# if it fails, we'll print all logs for debugging purposes if either testsuite fails.
echo "DEBUG: running make check"
bash -c 'make %{?_smp_mflags} check; EXIT=$?; if [ $EXIT -gt 0 ]; then cat test/*_log*-$(whoami); fi; exit $EXIT'
echo "DEBUG: running make test"
bash -c 'make %{?_smp_mflags} test; EXIT=$?; if [ $EXIT -gt 0 ]; then cat test/*_log*-$(whoami); fi; exit $EXIT'
%endif
%install %install
make BUILDROOT=%{buildroot} install make BUILDROOT=%{buildroot} install
# Make directory for ssl files: # Make directory for ssl files:
@ -432,6 +426,19 @@ EOF
# boundaries, compare https://bugzilla.novell.com/show_bug.cgi?id=784869 # boundaries, compare https://bugzilla.novell.com/show_bug.cgi?id=784869
%fdupes -s %{buildroot}/%{_datadir}/cups/templates %fdupes -s %{buildroot}/%{_datadir}/cups/templates
%check
%if %{with testsuite}
# There appears to be some kind of race condition when running make check and make test
# cf. https://github.com/OpenPrinting/cups/issues/155
# We print all logs for debugging purposes if either testsuite fails
echo "DEBUG: running make check"
bash -c 'make %{?_smp_mflags} check; EXIT=$?; if [ $EXIT -ne 0 ]; then cat test/*_log*-$(whoami); fi; exit $EXIT'
echo "DEBUG: running make test"
bash -c 'make %{?_smp_mflags} test; EXIT=$?; if [ $EXIT -ne 0 ]; then cat test/*_log*-$(whoami); fi; exit $EXIT'
%else
echo "DEBUG: skipped running make check and make test, cf. https://github.com/OpenPrinting/cups/issues/155"
%endif
%pre -p /bin/bash %pre -p /bin/bash
getent group ntadmin >/dev/null || %{_sbindir}/groupadd -g 71 -o -r ntadmin getent group ntadmin >/dev/null || %{_sbindir}/groupadd -g 71 -o -r ntadmin
%service_add_pre cups.service cups-lpd.socket cups.socket %service_add_pre cups.service cups-lpd.socket cups.socket
@ -449,6 +456,9 @@ getent group ntadmin >/dev/null || %{_sbindir}/groupadd -g 71 -o -r ntadmin
%postun -p /bin/bash %postun -p /bin/bash
%service_del_postun cups.service cups-lpd.socket cups.socket %service_del_postun cups.service cups-lpd.socket cups.socket
# Removed code comments from expanded scriptlets to reduce scriptlet size in binary RPMs
# but then users could no longer see the comments via "rpm -q --scripts cups"
# cf. https://build.opensuse.org/request/show/879976
%posttrans -p /bin/bash %posttrans -p /bin/bash
%if 0 %if 0
# Use a real bash script with an explicit "exit 0" at the end to be by default fail safe # Use a real bash script with an explicit "exit 0" at the end to be by default fail safe