Compare commits

...

No commits in common. 'c10-beta' and 'c9' have entirely different histories.
c10-beta ... c9

@ -256,10 +256,10 @@ def parse_options():
return args return args
def check_encoding(filename): def check_encoding(filename):
import charset_normalizer import chardet
with open(filename, 'rb') as f: with open(filename, 'rb') as f:
charenc = charset_normalizer.detect(f.read())['encoding'] charenc = chardet.detect(f.read())['encoding']
if debug & 1: if debug & 1:
print("File encoding: {}".format(charenc)) print("File encoding: {}".format(charenc))

@ -1,24 +0,0 @@
commit 75af7caf4d3369de2d0c5432220da15fae64f58b
Author: Solomon Peachy <pizza@shaftnet.org>
Date: Fri Dec 22 08:56:32 2023 -0500
gimpui: Fix two implicit-pointer-cast-to-int instances
(The GIMP API uses an opaque 32-bit "handle")
diff --git a/src/gimp2/print.c b/src/gimp2/print.c
index fc1344f6..2ebdb352 100644
--- a/src/gimp2/print.c
+++ b/src/gimp2/print.c
@@ -114,8 +114,8 @@ stpui_get_thumbnail_data_function(void *image_ID, gint *width, gint *height,
{
if (gimp_thumbnail_data)
g_free(gimp_thumbnail_data);
- gint x = gimp_image_width(image_ID);
- gint y = gimp_image_height(image_ID);
+ gint x = gimp_image_width(p2gint(image_ID));
+ gint y = gimp_image_height(p2gint(image_ID));
if (*width > x)
*width = x;
if (*height > y)

@ -1,75 +0,0 @@
diff --git a/src/cups/backend_common.c b/src/cups/backend_common.c
index 6333408..b19668d 100644
--- a/src/cups/backend_common.c
+++ b/src/cups/backend_common.c
@@ -753,8 +753,7 @@ static struct dyesub_backend *backends[] = {
NULL,
};
-static int find_and_enumerate(struct libusb_context *ctx,
- struct libusb_device ***list,
+static int find_and_enumerate(struct libusb_device ***list,
const struct dyesub_backend *backend,
const char *match_serno,
const char *make,
@@ -777,7 +776,7 @@ static int find_and_enumerate(struct libusb_context *ctx,
STATE("+org.gutenprint.searching-for-device\n");
/* Enumerate and find suitable device */
- num = libusb_get_device_list(ctx, list);
+ num = libusb_get_device_list(NULL, list);
/* See if we can actually match on the supplied make! */
if (backend && make) {
@@ -1010,7 +1009,6 @@ along with this program; if not, see <https://www.gnu.org/licenses/>.\n\n";
void print_help(const char *argv0, const struct dyesub_backend *backend)
{
- struct libusb_context *ctx = NULL;
struct libusb_device **list = NULL;
const char *ptr = getenv("BACKEND");
@@ -1072,7 +1070,7 @@ void print_help(const char *argv0, const struct dyesub_backend *backend)
}
/* Scan for all printers for the specified backend */
- find_and_enumerate(ctx, &list, backend, NULL, ptr, 1, 1, NULL);
+ find_and_enumerate(&list, backend, NULL, ptr, 1, 1, NULL);
libusb_free_device_list(list, 1);
}
@@ -1251,7 +1249,6 @@ done:
int main (int argc, char **argv)
{
- struct libusb_context *ctx = NULL;
struct libusb_device **list = NULL;
struct dyesub_backend *backend = NULL;
@@ -1414,7 +1411,7 @@ int main (int argc, char **argv)
#endif
/* Libusb setup */
- ret = libusb_init(&ctx);
+ ret = libusb_init(NULL);
if (ret) {
ERROR("Failed to initialize libusb (%d)\n", ret);
ret = CUPS_BACKEND_RETRY_CURRENT;
@@ -1438,7 +1435,7 @@ int main (int argc, char **argv)
}
/* Enumerate devices */
- found = find_and_enumerate(ctx, &list, backend, use_serno, backend_str, 0, NUM_CLAIM_ATTEMPTS, &conn);
+ found = find_and_enumerate(&list, backend, use_serno, backend_str, 0, NUM_CLAIM_ATTEMPTS, &conn);
if (found == -1) {
ERROR("Printer open failure (No matching printers found!)\n");
@@ -1572,7 +1569,7 @@ done:
if (list)
libusb_free_device_list(list, 1);
- libusb_exit(ctx);
+ libusb_exit(NULL);
return ret;
}

@ -1,107 +0,0 @@
diff --git a/src/xml/escp2/inks/claria_xp.xml b/src/xml/escp2/inks/claria_xp.xml
index 44d38b5..693c2b1 100644
--- a/src/xml/escp2/inks/claria_xp.xml
+++ b/src/xml/escp2/inks/claria_xp.xml
@@ -78,7 +78,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
<InkName translate="text" name="CMYKk" text="Six Color Photo" InkID="OTHER">
<Channels>
<channel name="claria_photo_black" index="0">
- <subchannel color="0" subchannel="0" subchannel="0" name="Black" text="Black" translate="text">
+ <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
<ChannelDensityParam name="BlackDensity"/>
<SubchannelTransitionParam name="LightBlackTrans"/>
</subchannel>
diff --git a/src/xml/escp2/inputslots/standard_roll_feed.xml b/src/xml/escp2/inputslots/standard_roll_feed.xml
index 1422d39..16316c8 100644
--- a/src/xml/escp2/inputslots/standard_roll_feed.xml
+++ b/src/xml/escp2/inputslots/standard_roll_feed.xml
@@ -1,4 +1,4 @@
- <?xml version="1.0"?>
+<?xml version="1.0"?>
<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/src/xml/escp2/media/artisan.xml b/src/xml/escp2/media/artisan.xml
index 6e567ee..362759e 100644
--- a/src/xml/escp2/media/artisan.xml
+++ b/src/xml/escp2/media/artisan.xml
@@ -1125,7 +1125,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
</ink>
</paper>
-<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"class="premium">
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="premium">
<parameter type="integer" name="PaperMedia">19</parameter>
<parameter type="integer" name="PrintMethod">0x41</parameter>
diff --git a/src/xml/escp2/media/claria.xml b/src/xml/escp2/media/claria.xml
index ce894f5..5b6be23 100644
--- a/src/xml/escp2/media/claria.xml
+++ b/src/xml/escp2/media/claria.xml
@@ -1933,7 +1933,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
</ink>
</paper>
-<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"class="premium">
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="premium">
<parameter type="integer" name="PaperMedia">19</parameter>
<parameter type="integer" name="PrintMethod">0x54</parameter>
diff --git a/src/xml/escp2/media/claria1400.xml b/src/xml/escp2/media/claria1400.xml
index a9b36e5..6a5deb7 100644
--- a/src/xml/escp2/media/claria1400.xml
+++ b/src/xml/escp2/media/claria1400.xml
@@ -1933,7 +1933,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
</ink>
</paper>
-<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"class="premium">
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="premium">
<parameter type="integer" name="PaperMedia">19</parameter>
<parameter type="integer" name="PrintMethod">0x54</parameter>
diff --git a/src/xml/escp2/media/claria_xp.xml b/src/xml/escp2/media/claria_xp.xml
index 32759b5..79f43c3 100644
--- a/src/xml/escp2/media/claria_xp.xml
+++ b/src/xml/escp2/media/claria_xp.xml
@@ -2037,7 +2037,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
</ink>
</paper>
-<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"class="premium">
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="premium">
<parameter type="integer" name="PaperMedia">19</parameter>
<parameter type="integer" name="PrintMethod">0x54</parameter>
diff --git a/src/xml/escp2/weaves/standard.xml b/src/xml/escp2/weaves/standard.xml
index d9176db..efc89de 100644
--- a/src/xml/escp2/weaves/standard.xml
+++ b/src/xml/escp2/weaves/standard.xml
@@ -1,4 +1,4 @@
- <?xml version="1.0"?>
+<?xml version="1.0"?>
<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/src/xml/printers/dyesub.xml b/src/xml/printers/dyesub.xml
index 1bd62e6..aa7985d 100644
--- a/src/xml/printers/dyesub.xml
+++ b/src/xml/printers/dyesub.xml
@@ -95,7 +95,7 @@
<printer translate="name" name="Citizen CW-02" driver="citizen-cw-02" manufacturer="Citizen" model="6000" />
<printer translate="name" name="Citizen CX" driver="citizen-cx" deviceid="MANUFACTURER:CITIZEN SYSTEMS ;MODEL:CX;" manufacturer="Citizen" model="6000" />
<printer translate="name" name="Citizen CX-02" deviceid="MANUFACTURER:CITIZEN SYSTEMS ;MODEL:CX-02;" driver="citizen-cx-02" manufacturer="Citizen" model="6003" />
- <printer translate="name" name="Citizen CX-02W" "MANUFACTURER:CITIZEN SYSTEMS ;MODEL:CX-02W;" driver="citizen-cx-02w" manufacturer="Citizen" model="6007" />
+ <printer translate="name" name="Citizen CX-02W" deviceid="MANUFACTURER:CITIZEN SYSTEMS ;MODEL:CX-02W;" driver="citizen-cx-02w" manufacturer="Citizen" model="6007" />
<printer translate="name" name="Citizen CX-W" driver="citizen-cx-w" manufacturer="Citizen" model="6001" />
<printer translate="name" name="Citizen CY" driver="citizen-cy" manufacturer="Citizen" model="6002" />
<printer translate="name" name="Citizen CY-02" driver="citizen-cy-02" manufacturer="Citizen" model="6002" />
@@ -127,7 +127,7 @@
<printer translate="name" name="Kodak 1400" deviceid="MFG:Eastman Kodak Company;CMD:EK1;MDL: 1400 Printer;CLS:Printer;DES:Kodak 1400 Printer;`" driver="kodak-1400" manufacturer="Kodak" model="4004" />
<printer translate="name" name="Kodak 6800" deviceid="MFG:Eastman Kodak Company;CMD:ESC;MDL:Photo Printer 6800;CLS:PRINTER;DES:KODAK Photo Printer 6800;" driver="kodak-6800" manufacturer="Kodak" model="4001" />
<printer translate="name" name="Kodak 6850" deviceid="MFG:Eastman Kodak Company;CMD:ESC;MDL:Photo Printer 6850;CLS:PRINTER;DES:KODAK Photo Printer 6850;" driver="kodak-6850" manufacturer="Kodak" model="4002" />
- <printer translate="name" name="Kodak 6900" deviceid="MFG:Kodak Alaris Inc.;CMD:SUPCC;MDL:KODAK 6900 Photo Printer;CLS:PRINTER;DES Thermal Dye Photo Printer;"driver="kodak-6900" manufacturer="Kodak" model="4010">EXPERIMENTAL</printer>
+ <printer translate="name" name="Kodak 6900" deviceid="MFG:Kodak Alaris Inc.;CMD:SUPCC;MDL:KODAK 6900 Photo Printer;CLS:PRINTER;DES Thermal Dye Photo Printer;" driver="kodak-6900" manufacturer="Kodak" model="4010">EXPERIMENTAL</printer>
<printer translate="name" name="Kodak 7000" deviceid="MFG:Eastman Kodak Company;CMD:SUPCC;MDL:KODAK 7000 Photo Printer;CLS:PRINTER;DES:Thermal Dye Photo Printer;" driver="kodak-7000" manufacturer="Kodak" model="4008" />
<printer translate="name" name="Kodak 7010" deviceid="MFG:Eastman Kodak Company;CMD:SUPCC;MDL:KODAK 7010 Photo Printer;CLS:PRINTER;DES:Thermal Dye Photo Printer;" driver="kodak-7010" manufacturer="Kodak" model="4008">EXPERIMENTAL</printer>
<printer translate="name" name="Kodak 7015" driver="kodak-7015" manufacturer="Kodak" model="4009">EXPERIMENTAL</printer>

@ -1,96 +1,51 @@
#%%global prever pre2 #%%global prever pre2
#%%global ver %%{version}-%%{prever} #%%global ver %%{version}-%%{prever}
# change with every change of major or minor version number
#%%global majminver 5.3
%global majminver $(echo %{version} | sed -E 's/\.[0-9]+$//')
%if 0%{?rhel} <= 8 || 0%{?fedora}
%bcond_without plugin
%else
%bcond_with plugin
%endif
%if 0%{?rhel} <= 9 || 0%{?fedora}
%bcond_without gtk2
%else
%bcond_with gtk2
%endif
# added in cups-1:2.4.7-3 - remove once F40 is EOL and C10S is released
# (that's the safe bet for versions where macros will be always available)
%{!?_cups_datadir:%global _cups_datadir %(/usr/bin/pkg-config --variable=cups_datadir cups)}
%{!?_cups_serverroot:%global _cups_serverroot %(/usr/bin/pkg-config --variable=cups_serverroot cups)}
Name: gutenprint Name: gutenprint
Summary: Printer Drivers Package Summary: Printer Drivers Package
Version: 5.3.4 Version: 5.3.4
Release: 17%{?dist} Release: 4%{?dist}
URL: http://gimp-print.sourceforge.net/ URL: http://gimp-print.sourceforge.net/
Source0: http://downloads.sourceforge.net/gimp-print/%{name}-%{version}.tar.xz Source0: http://downloads.sourceforge.net/gimp-print/%{name}-%{version}.tar.xz
# Post-install script to update CUPS native PPDs. # Post-install script to update CUPS native PPDs.
Source1: cups-genppdupdate.py.in Source1: cups-genppdupdate.py.in
# ported from old gimp-print package - fix for a menu in gimp gutenprint plugin # ported from old gimp-print package - fix for a menu in gimp gutenprint plugin
Patch0: gutenprint-menu.patch Patch0: gutenprint-menu.patch
Patch1: gutenprint-postscriptdriver.patch Patch3: gutenprint-postscriptdriver.patch
Patch2: gutenprint-yyin.patch Patch4: gutenprint-yyin.patch
Patch3: gutenprint-manpage.patch Patch5: gutenprint-manpage.patch
Patch4: gutenprint-python36syntax.patch Patch6: gutenprint-python36syntax.patch
Patch5: gutenprint-xmlfixes.patch License: GPLv2+
Patch6: gutenprint-libusb-crash.patch
Patch7: gutenprint-c99.patch
License: GPL-2.0-or-later AND LGPL-2.0-or-later AND MIT AND GPL-3.0-or-later WITH Bison-exception-2.2
#### removed patches, because the seems useless
# I'll leave them here, in case its removal will break something
#Patch1: gutenprint-O6.patch
#Patch2: gutenprint-selinux.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
# autoreconf
BuildRequires: autoconf
BuildRequires: automake
# we remove rpath during %%install
BuildRequires: chrpath
# we use CUPS functions in CUPS driver
BuildRequires: cups
BuildRequires: cups-devel
BuildRequires: cups-libs
# gcc is no longer in buildroot by default # gcc is no longer in buildroot by default
BuildRequires: gcc BuildRequires: gcc
# for language support
BuildRequires: gettext-devel
# for JPEG, PNG and TIFF file format support
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libtiff-devel
# for autoreconf
BuildRequires: libtool
# uses make # uses make
BuildRequires: make BuildRequires: make
# we use pkgconfig in spec file to get correct devel packages BuildRequires: cups-libs, cups-devel, cups
BuildRequires: pkgconfig BuildRequires: gettext-devel,pkgconfig
# for gutenprint usb backend gutenprintMAJMIN+usb BuildRequires: libtiff-devel,libjpeg-devel,libpng-devel
BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(libusb-1.0)
# Make sure we get postscriptdriver tags - for automatic driver installation BuildRequires: pkgconfig(gtk+-2.0)
# via PackageKit. %if 0%{?rhel} <= 8 || 0%{?fedora}
BuildRequires: python3-cups
# needed for defining %%{__python3} macro for prep phase
BuildRequires: python3-devel
# we use sed in spec file to get majorver.minver string, which is used in directory
# structure
BuildRequires: sed
# the plugin is built only in Fedora, so
# no need gimp devel files for its ui
%if %{with plugin}
BuildRequires: pkgconfig(gimpui-2.0) BuildRequires: pkgconfig(gimpui-2.0)
%endif %endif
BuildRequires: chrpath
%if %{with gtk2} # Make sure we get postscriptdriver tags.
# gutenprint library uses functions from GTK2 for gutenprint UI library BuildRequires: python3-cups
BuildRequires: pkgconfig(gtk+-2.0)
%endif
# escputil uses lp for sending raw print commands to the printer... # autoreconf
Requires: cups-client%{?_isa} BuildRequires: autoconf automake libtool
# needed for defining %%{__python3} macro for prep phase
BuildRequires: python3-devel
## NOTE ## ## NOTE ##
# The README file in this package contains suggestions from upstream # The README file in this package contains suggestions from upstream
@ -114,30 +69,24 @@ Summary: libgutenprint library
%description libs %description libs
This package includes libgutenprint library, necessary to run gutenprint. This package includes libgutenprint library, necessary to run gutenprint.
%if %{with gtk2}
%package libs-ui %package libs-ui
Summary: libgutenprintui2 library Summary: libgutenprintui2 library
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
# function in the library tries to figure out local printing system by checking for lp binary
Requires: cups-client%{?_isa}
%description libs-ui %description libs-ui
This package includes libgutenprintui2 library, which contains This package includes libgutenprintui2 library, which contains
GTK+ widgets, which may be used for print dialogs etc. GTK+ widgets, which may be used for print dialogs etc.
%endif
%package devel %package devel
Summary: Library development files for gutenprint Summary: Library development files for gutenprint
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
%if %{with gtk2}
Requires: gtk2-devel Requires: gtk2-devel
%endif
%description devel %description devel
This package contains headers and libraries required to build applications that This package contains headers and libraries required to build applications that
uses gutenprint package. uses gutenprint package.
%if %{with plugin} %if 0%{?rhel} <= 8 || 0%{?fedora}
%package plugin %package plugin
Summary: GIMP plug-in for gutenprint Summary: GIMP plug-in for gutenprint
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
@ -159,9 +108,6 @@ that is used by gutenprint-devel package.
Summary: CUPS drivers for Canon, Epson, HP and compatible printers Summary: CUPS drivers for Canon, Epson, HP and compatible printers
Requires: cups Requires: cups
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
# for cups-genppdupdate python script
Requires: python3
Requires: python3-charset-normalizer
%description cups %description cups
This package contains native CUPS support for a wide range of Canon, This package contains native CUPS support for a wide range of Canon,
@ -170,13 +116,18 @@ Epson, HP and compatible printers.
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
# Fix menu placement of GIMP plugin. # Fix menu placement of GIMP plugin.
%patch -P 0 -p1 -b .menu %patch0 -p1 -b .menu
# Don't use -O6 compiler option.
#%%patch1 -p1 -b .O6
# Restore file contexts when updating PPDs.
#%%patch2 -p1 -b .selinux
# Allow the CUPS dynamic driver to run inside a build root. # Allow the CUPS dynamic driver to run inside a build root.
%patch -P 1 -p1 -b .postscriptdriver %patch3 -p1 -b .postscriptdriver
# Don't export yy* symbols (bug #882194). # Don't export yy* symbols (bug #882194).
%patch -P 2 -p1 -b .yyin %patch4 -p1 -b .yyin
# Added some escputil options to the manpage (bug #979064). # Added some escputil options to the manpage (bug #979064).
%patch -P 3 -p1 -b .manpage %patch5 -p1 -b .manpage
cp %{SOURCE1} src/cups/cups-genppdupdate.in cp %{SOURCE1} src/cups/cups-genppdupdate.in
@ -184,30 +135,21 @@ cp %{SOURCE1} src/cups/cups-genppdupdate.in
sed -i -e 's,^#!/usr/bin/python3,#!%{__python3},' src/cups/cups-genppdupdate.in sed -i -e 's,^#!/usr/bin/python3,#!%{__python3},' src/cups/cups-genppdupdate.in
# Python 3.6 invalid escape sequence deprecation fixes, COPYING as license (bug #1448303) # Python 3.6 invalid escape sequence deprecation fixes, COPYING as license (bug #1448303)
%patch -P 4 -p1 -b .python36syntax %patch6 -p1 -b .python36syntax
# fix xml error reported by rpminspect, sent upstream via email
%patch -P 5 -p1 -b .xmlfixes
# 2055504 - Set gutenprint53+usb backend to use the default USB context
%patch -P 6 -p1 -b .crash
%patch -P 7 -p1 -b .c99
%build %build
# Don't run the weave test as it takes a very long time. # Don't run the weave test as it takes a very long time.
sed -i -e 's,^\(TESTS *=.*\) run-weavetest,\1,' test/Makefile.in sed -i -e 's,^\(TESTS *=.*\) run-weavetest,\1,' test/Makefile.in
%configure --disable-dependency-tracking \ %configure --disable-dependency-tracking \
--disable-static \ --disable-static \
--enable-samples \ --enable-samples \
--enable-escputil \ --enable-escputil \
--enable-test \ --enable-test \
--disable-rpath \ --disable-rpath \
--enable-cups-1_2-enhancements \ --enable-cups-1_2-enhancements \
--disable-cups-ppds \ --disable-cups-ppds \
%if %{without gtk2} --enable-simplified-cups-ppds
--disable-libgutenprintui2 \
%endif
--enable-simplified-cups-ppds
%make_build %make_build
@ -222,9 +164,8 @@ mkdir -p %{buildroot}%{_sbindir}
rm -rf %{buildroot}%{_datadir}/gutenprint/doc rm -rf %{buildroot}%{_datadir}/gutenprint/doc
rm -f %{buildroot}%{_datadir}/foomatic/kitload.log rm -f %{buildroot}%{_datadir}/foomatic/kitload.log
rm -rf %{buildroot}%{_libdir}/gutenprint/5.2/modules/*.la
rm -rf %{buildroot}%{_libdir}/gutenprint/%{majminver}/modules/*.la rm -f %{buildroot}%{_sysconfdir}/cups/command.types
rm -f %{buildroot}%{_cups_serverroot}/command.types
%find_lang %{name} %find_lang %{name}
sed 's!%{_datadir}/locale/\([^/]*\)/LC_MESSAGES/gutenprint.mo!%{_datadir}/locale/\1/gutenprint_\1.po!g' %{name}.lang >%{name}-po.lang sed 's!%{_datadir}/locale/\([^/]*\)/LC_MESSAGES/gutenprint.mo!%{_datadir}/locale/\1/gutenprint_\1.po!g' %{name}.lang >%{name}-po.lang
@ -237,8 +178,8 @@ cat %{name}-po.lang >>%{name}.lang
# Fix up rpath. If you can find a way to do this without resorting # Fix up rpath. If you can find a way to do this without resorting
# to chrpath, please let me know! # to chrpath, please let me know!
for file in \ for file in \
%{buildroot}%{_sbindir}/cups-genppd.%{majminver} \ %{buildroot}%{_sbindir}/cups-genppd.5.3 \
%if %{with plugin} %if 0%{?rhel} <= 8 || 0%{?fedora}
%{buildroot}%{_libdir}/gimp/*/plug-ins/* \ %{buildroot}%{_libdir}/gimp/*/plug-ins/* \
%endif %endif
%{buildroot}%{_libdir}/*.so.* \ %{buildroot}%{_libdir}/*.so.* \
@ -249,7 +190,7 @@ do
chrpath --delete ${file} chrpath --delete ${file}
done done
%if %{without plugin} %if 0%{?rhel} > 8
%{_bindir}/rm -f %{buildroot}%{_bindir}/testpattern \ %{_bindir}/rm -f %{buildroot}%{_bindir}/testpattern \
%endif %endif
@ -277,26 +218,21 @@ exit 0
%{_libdir}/libgutenprint.so.9 %{_libdir}/libgutenprint.so.9
%{_libdir}/libgutenprint.so.9.5.0 %{_libdir}/libgutenprint.so.9.5.0
%if %{with gtk2}
%files libs-ui %files libs-ui
%{_libdir}/libgutenprintui2.so.2 %{_libdir}/libgutenprintui2.so.2
%{_libdir}/libgutenprintui2.so.2.5.0 %{_libdir}/libgutenprintui2.so.2.5.0
%endif
%files devel %files devel
%doc ChangeLog doc/developer/reference-html doc/developer/gutenprint.pdf %doc ChangeLog doc/developer/reference-html doc/developer/gutenprint.pdf
%doc doc/gutenprint %doc doc/gutenprint doc/gutenprintui2
%{_includedir}/gutenprint/ %{_includedir}/gutenprint/
%{_includedir}/gutenprintui2/
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/pkgconfig/gutenprint.pc %{_libdir}/pkgconfig/gutenprint.pc
%exclude %{_libdir}/*.la
%if %{with gtk2}
%doc doc/gutenprintui2
%{_includedir}/gutenprintui2/
%{_libdir}/pkgconfig/gutenprintui2.pc %{_libdir}/pkgconfig/gutenprintui2.pc
%endif %exclude %{_libdir}/*.la
%if %{with plugin} %if 0%{?rhel} <= 8 || 0%{?fedora}
%files plugin %files plugin
%{_libdir}/gimp/*/plug-ins/gutenprint %{_libdir}/gimp/*/plug-ins/gutenprint
@ -308,8 +244,8 @@ exit 0
%files cups %files cups
%doc %doc
%{_cups_datadir}/calibrate.ppm %{_datadir}/cups/calibrate.ppm
%{_cups_datadir}/usb/net.sf.gimp-print.usb-quirks %{_datadir}/cups/usb/net.sf.gimp-print.usb-quirks
%{_cups_serverbin}/filter/* %{_cups_serverbin}/filter/*
%{_cups_serverbin}/driver/* %{_cups_serverbin}/driver/*
%{_cups_serverbin}/backend/* %{_cups_serverbin}/backend/*
@ -319,54 +255,12 @@ exit 0
%{_mandir}/man8/cups-genppd*8*.gz %{_mandir}/man8/cups-genppd*8*.gz
%changelog %changelog
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 5.3.4-17 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 5.3.4-4
- Bump release for June 2024 mass rebuild - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.4-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.4-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jan 03 2024 Florian Weimer <fweimer@redhat.com> - 5.3.4-14
- Backport upstream patch to fix C compatibility issue
* Thu Nov 16 2023 Zdenek Dohnal <zdohnal@redhat.com> - 5.3.4-13
- make gutenprint and gutenprint-libs-ui dependant on cups-client - both checks for existence of lp
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.4-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jun 06 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 5.3.4-11
- Replace python3-chardet with python3-charset-normalizer
* Wed Apr 05 2023 Zdenek Dohnal <zdohnal@redhat.com> - 5.3.4-11
- GTK2 is not in CentOS Stream 10, dont ship libs-ui subpackage there
- Add other licenses to License tag and use SPDX identifiers to comply with FPG
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.4-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.4-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Mar 28 2022 Zdenek Dohnal <zdohnal@redhat.com> - 5.3.4-8
- 2055504 - Set gutenprint53+usb backend to use the default USB context
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Jan 11 2022 Zdenek Dohnal <zdohnal@redhat.com> - 5.3.4-6
- remove the static libraries which were shipped by mistake
* Mon Nov 22 2021 Zdenek Dohnal <zdohnal@redhat.com> - 5.3.4-5
- 2025107 - cups-genppdupdate needs python3-chardet
* Wed Aug 11 2021 Zdenek Dohnal <zdohnal@redhat.com> - 5.3.4-4
- fix xml errors reported by rpminspect
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.4-3 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 5.3.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.4-2 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Loading…
Cancel
Save