From b949a0a9f9d6dff283c2a88ac37a54ccf3986355 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Thu, 14 Jan 2021 12:45:06 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/gutenprint.git#f541214b450d9edaa8ce10b2285fdec0ffbca212 --- .gitignore | 1 + gutenprint.spec | 22 ++++++++++++++++++---- sources | 2 +- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3becf21..ba2d13d 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ gutenprint-5.2.6.tar.bz2 /gutenprint-5.2.14-pre2.tar.bz2 /gutenprint-5.2.14.tar.bz2 /gutenprint-5.3.3.tar.xz +/gutenprint-5.3.4.tar.xz diff --git a/gutenprint.spec b/gutenprint.spec index 011bfee..fdf7591 100644 --- a/gutenprint.spec +++ b/gutenprint.spec @@ -3,8 +3,8 @@ Name: gutenprint Summary: Printer Drivers Package -Version: 5.3.3 -Release: 7%{?dist} +Version: 5.3.4 +Release: 1%{?dist} URL: http://gimp-print.sourceforge.net/ Source0: http://downloads.sourceforge.net/gimp-print/%{name}-%{version}.tar.xz # Post-install script to update CUPS native PPDs. @@ -33,7 +33,9 @@ BuildRequires: gettext-devel,pkgconfig BuildRequires: libtiff-devel,libjpeg-devel,libpng-devel BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(gtk+-2.0) +%if 0%{?rhel} <= 8 || 0%{?fedora} BuildRequires: pkgconfig(gimpui-2.0) +%endif BuildRequires: chrpath # Make sure we get postscriptdriver tags. @@ -84,6 +86,7 @@ Requires: gtk2-devel This package contains headers and libraries required to build applications that uses gutenprint package. +%if 0%{?rhel} <= 8 || 0%{?fedora} %package plugin Summary: GIMP plug-in for gutenprint Requires: %{name}%{?_isa} = %{version}-%{release} @@ -99,6 +102,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description extras This package contains test pattern generator and the sample test pattern that is used by gutenprint-devel package. +%endif %package cups Summary: CUPS drivers for Canon, Epson, HP and compatible printers @@ -175,7 +179,9 @@ cat %{name}-po.lang >>%{name}.lang # to chrpath, please let me know! for file in \ %{buildroot}%{_sbindir}/cups-genppd.5.3 \ +%if 0%{?rhel} <= 8 || 0%{?fedora} %{buildroot}%{_libdir}/gimp/*/plug-ins/* \ +%endif %{buildroot}%{_libdir}/*.so.* \ %{buildroot}%{_cups_serverbin}/driver/* \ %{buildroot}%{_cups_serverbin}/filter/* \ @@ -184,6 +190,9 @@ do chrpath --delete ${file} done +%if 0%{?rhel} > 8 +%{_bindir}/rm -f %{buildroot}%{_bindir}/testpattern \ +%endif %ldconfig_scriptlets libs %ldconfig_scriptlets libs-ui @@ -207,11 +216,11 @@ exit 0 %files libs %{_libdir}/libgutenprint.so.9 -%{_libdir}/libgutenprint.so.9.4.0 +%{_libdir}/libgutenprint.so.9.5.0 %files libs-ui %{_libdir}/libgutenprintui2.so.2 -%{_libdir}/libgutenprintui2.so.2.4.0 +%{_libdir}/libgutenprintui2.so.2.5.0 %files devel %doc ChangeLog doc/developer/reference-html doc/developer/gutenprint.pdf @@ -223,6 +232,7 @@ exit 0 %{_libdir}/pkgconfig/gutenprintui2.pc %exclude %{_libdir}/*.la +%if 0%{?rhel} <= 8 || 0%{?fedora} %files plugin %{_libdir}/gimp/*/plug-ins/gutenprint @@ -230,6 +240,7 @@ exit 0 %doc %{_bindir}/testpattern %{_datadir}/gutenprint/samples/* +%endif %files cups %doc @@ -244,6 +255,9 @@ exit 0 %{_mandir}/man8/cups-genppd*8*.gz %changelog +* Wed Jan 13 2021 Zdenek Dohnal - 5.3.4-1 +- 5.3.4 + * Fri Nov 06 2020 Zdenek Dohnal - 5.3.3-7 - 1773690 - cups-genppdupdate doesnt work for non-utf-8 PPDs diff --git a/sources b/sources index 8d4137f..fca03cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gutenprint-5.3.3.tar.xz) = d2c47eb4ccc3c46ccb2f1042682edf7443f5c57439ead72f49ecd10537cf967251bacf7ca7da29fb8dceecc7eebd55ed021f2594ff9fb6509bab543fab1dc8d6 +SHA512 (gutenprint-5.3.4.tar.xz) = 63de0b62edbe255a7efaaeab1dcd22577b7b46d7e0e48441b79977f19e76bf3862e4e8e18c55dd1f2e7392d555f9e8ee875ea53b90c689852d2343491a8fbcc8