Compare commits
No commits in common. "c8s" and "c9s" have entirely different histories.
27
.gitignore
vendored
27
.gitignore
vendored
@ -1,2 +1,27 @@
|
|||||||
SOURCES/gutenprint-5.2.14.tar.bz2
|
gutenprint-5.0.0.tar.bz2
|
||||||
|
gutenprint-5.0.0.99.1.tar.bz2
|
||||||
|
gutenprint-5.0.1.tar.bz2
|
||||||
|
gutenprint-5.0.2.tar.bz2
|
||||||
|
gutenprint-5.2.2.tar.bz2
|
||||||
|
gutenprint-5.2.3.tar.bz2
|
||||||
|
gutenprint-5.2.4.tar.bz2
|
||||||
|
gutenprint-5.2.5.tar.bz2
|
||||||
|
gutenprint-5.2.6.tar.bz2
|
||||||
|
/gutenprint-5.2.7.tar.bz2
|
||||||
|
/gutenprint-5.2.8.tar.bz2
|
||||||
|
/gutenprint-5.2.9.tar.bz2
|
||||||
|
/gutenprint-5.2.10-pre1.tar.bz2
|
||||||
|
/gutenprint-5.2.10-pre2.tar.bz2
|
||||||
|
/gutenprint-5.2.10.tar.bz2
|
||||||
|
/gutenprint-5.2.11-pre2.tar.bz2
|
||||||
|
/gutenprint-5.2.11.tar.bz2
|
||||||
|
/gutenprint-5.2.12-pre2.tar.bz2
|
||||||
|
/gutenprint-5.2.12-pre3.tar.bz2
|
||||||
|
/gutenprint-5.2.12-pre4.tar.bz2
|
||||||
|
/gutenprint-5.2.12.tar.bz2
|
||||||
|
/gutenprint-5.2.13-pre1.tar.bz2
|
||||||
|
/gutenprint-5.2.13.tar.bz2
|
||||||
|
/gutenprint-5.2.14-pre2.tar.bz2
|
||||||
/gutenprint-5.2.14.tar.bz2
|
/gutenprint-5.2.14.tar.bz2
|
||||||
|
/gutenprint-5.3.3.tar.xz
|
||||||
|
/gutenprint-5.3.4.tar.xz
|
||||||
|
1
.gutenprint.metadata
Normal file
1
.gutenprint.metadata
Normal file
@ -0,0 +1 @@
|
|||||||
|
46167d00c2a4fb07c3fd3d62c80cd3fa004629f0 gutenprint-5.3.4.tar.xz
|
@ -255,6 +255,23 @@ def parse_options():
|
|||||||
|
|
||||||
return args
|
return args
|
||||||
|
|
||||||
|
def check_encoding(filename):
|
||||||
|
import chardet
|
||||||
|
|
||||||
|
with open(filename, 'rb') as f:
|
||||||
|
charenc = chardet.detect(f.read())['encoding']
|
||||||
|
|
||||||
|
if debug & 1:
|
||||||
|
print("File encoding: {}".format(charenc))
|
||||||
|
|
||||||
|
if charenc in ['ascii', 'utf-8']:
|
||||||
|
return 'utf-8'
|
||||||
|
else:
|
||||||
|
if debug & 1:
|
||||||
|
print("Trying to use latin1 for decoding {}".format(charenc))
|
||||||
|
|
||||||
|
return 'latin1'
|
||||||
|
|
||||||
def update_ppd (ppd_source_filename):
|
def update_ppd (ppd_source_filename):
|
||||||
global ppd_dest_filename
|
global ppd_dest_filename
|
||||||
global ppd_out_dir
|
global ppd_out_dir
|
||||||
@ -271,7 +288,8 @@ def update_ppd (ppd_source_filename):
|
|||||||
ppd_dest_filename = "%s/%s" % (ppd_out_dir,
|
ppd_dest_filename = "%s/%s" % (ppd_out_dir,
|
||||||
os.path.basename (ppd_dest_filename))
|
os.path.basename (ppd_dest_filename))
|
||||||
|
|
||||||
orig = open (ppd_source_filename, encoding="utf-8")
|
fenc = check_encoding(ppd_source_filename)
|
||||||
|
orig = open(ppd_source_filename, encoding=fenc)
|
||||||
orig_metadata = os.fstat (orig.fileno ())
|
orig_metadata = os.fstat (orig.fileno ())
|
||||||
if debug & 1:
|
if debug & 1:
|
||||||
print ("Source Filename: %s" % ppd_source_filename)
|
print ("Source Filename: %s" % ppd_source_filename)
|
||||||
@ -284,7 +302,17 @@ def update_ppd (ppd_source_filename):
|
|||||||
region = ""
|
region = ""
|
||||||
valid = 0
|
valid = 0
|
||||||
orig_locale = ""
|
orig_locale = ""
|
||||||
for line in orig.readlines ():
|
|
||||||
|
try:
|
||||||
|
orig_lines = orig.readlines()
|
||||||
|
except UnicodeDecodeError:
|
||||||
|
if debug & 1:
|
||||||
|
print('PPD {} has an unexpected enconding, '
|
||||||
|
'skipping.'.format(ppd_source_filename))
|
||||||
|
|
||||||
|
return -1
|
||||||
|
|
||||||
|
for line in orig_lines:
|
||||||
line.rstrip ()
|
line.rstrip ()
|
||||||
if line.find ("*StpLocale:") != -1:
|
if line.find ("*StpLocale:") != -1:
|
||||||
match = re.search ("\*StpLocale:\s*\"(.*)\"$", line)
|
match = re.search ("\*StpLocale:\s*\"(.*)\"$", line)
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
--- !Policy
|
--- !Policy
|
||||||
product_versions:
|
product_versions:
|
||||||
- rhel-8
|
- rhel-9
|
||||||
decision_context: osci_compose_gate
|
decision_context: osci_compose_gate
|
||||||
rules:
|
rules:
|
||||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
|
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
|
||||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
|
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
|
||||||
|
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.acceptance-tier.functional}
|
||||||
|
137
gutenprint-foomaticppdupdate
Normal file
137
gutenprint-foomaticppdupdate
Normal file
@ -0,0 +1,137 @@
|
|||||||
|
#!/usr/bin/python3
|
||||||
|
|
||||||
|
## gutenprint-foomaticppdupdate
|
||||||
|
|
||||||
|
## A utility for updating foomatic-generated PPDs so that they work with
|
||||||
|
## a newly-installed gutenprint package.
|
||||||
|
|
||||||
|
## Copyright (C) 2007, 2009, 2014 Red Hat, Inc.
|
||||||
|
## Author: Tim Waugh <twaugh@redhat.com
|
||||||
|
|
||||||
|
## This program is free software; you can redistribute it and/or modify
|
||||||
|
## it under the terms of the GNU General Public License as published by
|
||||||
|
## the Free Software Foundation; either version 2 of the License, or
|
||||||
|
## (at your option) any later version.
|
||||||
|
|
||||||
|
## This program is distributed in the hope that it will be useful,
|
||||||
|
## but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
## GNU General Public License for more details.
|
||||||
|
|
||||||
|
## You should have received a copy of the GNU General Public License
|
||||||
|
## along with this program; if not, write to the Free Software
|
||||||
|
## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
|
|
||||||
|
import sys
|
||||||
|
import glob
|
||||||
|
import os
|
||||||
|
import subprocess
|
||||||
|
import tempfile
|
||||||
|
|
||||||
|
import cups
|
||||||
|
|
||||||
|
if len (sys.argv) < 2 or sys.argv[1] == "--help":
|
||||||
|
print("Usage: gutenprint-foomaticppdupdate <version>")
|
||||||
|
sys.exit (1)
|
||||||
|
|
||||||
|
gutenprint_version = sys.argv[1]
|
||||||
|
dry_run = True
|
||||||
|
|
||||||
|
def generate_ppd (ppdfile, printer, driver):
|
||||||
|
p = subprocess.Popen (["foomatic-ppdfile", "-p", printer, "-d", driver],
|
||||||
|
stdin=subprocess.DEVNULL,
|
||||||
|
stdout=subprocess.PIPE,
|
||||||
|
stderr=subprocess.PIPE)
|
||||||
|
(ppd, stderr) = p.communicate ()
|
||||||
|
fname = ppdfile + ".tmp"
|
||||||
|
try:
|
||||||
|
with open (fname, "w") as f:
|
||||||
|
f.write (ppd)
|
||||||
|
except IOError as e:
|
||||||
|
print (e)
|
||||||
|
raise
|
||||||
|
|
||||||
|
ppdobj = cups.PPD (fname)
|
||||||
|
os.remove (fname)
|
||||||
|
return ppdobj
|
||||||
|
|
||||||
|
def update_ppdfile (ppdfile):
|
||||||
|
try:
|
||||||
|
ppd = cups.PPD (ppdfile)
|
||||||
|
except RuntimeError:
|
||||||
|
# Invalid PPD in some way.
|
||||||
|
return
|
||||||
|
|
||||||
|
attr = ppd.findAttr ("FoomaticIDs")
|
||||||
|
if not attr:
|
||||||
|
return
|
||||||
|
|
||||||
|
IDs = attr.value.split (" ")
|
||||||
|
if len (IDs) != 2:
|
||||||
|
print ("Don't understand FoomaticIDs: %s" % IDs)
|
||||||
|
return
|
||||||
|
|
||||||
|
if not IDs[1].startswith ("gutenprint"):
|
||||||
|
return
|
||||||
|
|
||||||
|
attr = ppd.findAttr ("FoomaticRIPCommandLine")
|
||||||
|
if not attr:
|
||||||
|
return
|
||||||
|
|
||||||
|
cmdline = attr.value
|
||||||
|
STP_VERSION="STP_VERSION="
|
||||||
|
i = cmdline.find (STP_VERSION)
|
||||||
|
if i == -1:
|
||||||
|
return
|
||||||
|
|
||||||
|
i += len (STP_VERSION)
|
||||||
|
j = i + 1
|
||||||
|
end = len (cmdline)
|
||||||
|
while j < end:
|
||||||
|
ch = cmdline[j]
|
||||||
|
if ch != '.' and not ch.isdigit ():
|
||||||
|
break
|
||||||
|
j += 1
|
||||||
|
|
||||||
|
version = cmdline[i:j]
|
||||||
|
if gutenprint_version == version:
|
||||||
|
return
|
||||||
|
|
||||||
|
# Needs updating.
|
||||||
|
firstdot = gutenprint_version.find ('.')
|
||||||
|
seconddot = firstdot + 1 + gutenprint_version[1 + firstdot:].find ('.')
|
||||||
|
major = gutenprint_version[:seconddot]
|
||||||
|
|
||||||
|
driver = IDs[1]
|
||||||
|
dot = driver.find ('.')
|
||||||
|
driver = driver[:dot] + "." + major
|
||||||
|
try:
|
||||||
|
genppd = generate_ppd (ppdfile, IDs[0], driver)
|
||||||
|
except:
|
||||||
|
return
|
||||||
|
|
||||||
|
os.environ['FILE'] = ppdfile
|
||||||
|
os.system ('cp -af "$FILE" "$FILE".bak')
|
||||||
|
|
||||||
|
def update_options (options, newppd, origppd):
|
||||||
|
for newopt in options:
|
||||||
|
origopt = origppd.findOption (newopt.keyword)
|
||||||
|
if origopt:
|
||||||
|
newppd.markOption (newopt.keyword, origopt.defchoice)
|
||||||
|
|
||||||
|
genppd.markDefaults ()
|
||||||
|
for group in genppd.optionGroups:
|
||||||
|
update_options (group.options, genppd, ppd)
|
||||||
|
for subgroup in group.subgroups:
|
||||||
|
update_options (subgroup.options, genppd, ppd)
|
||||||
|
|
||||||
|
ps = genppd.findOption ("PageSize")
|
||||||
|
if ps:
|
||||||
|
update_options ([ps], genppd, ppd)
|
||||||
|
|
||||||
|
with open (ppdfile, "w") as f:
|
||||||
|
genppd.writeFd (f.fileno ())
|
||||||
|
print ("Updated PPD file %s" % ppdfile)
|
||||||
|
|
||||||
|
for ppdfile in glob.glob ("/etc/cups/ppd/*.ppd"):
|
||||||
|
update_ppdfile (ppdfile)
|
47
gutenprint-foomaticppdupdate.8
Normal file
47
gutenprint-foomaticppdupdate.8
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
.\" Copyright (C) 2000 Roger Leigh <rleigh@debian.org>
|
||||||
|
.\" Copyright (C) 2014 Red Hat, Inc.
|
||||||
|
.\"
|
||||||
|
.\" This program is free software; you can redistribute it and/or modify
|
||||||
|
.\" it under the terms of the GNU General Public License as published by
|
||||||
|
.\" the Free Software Foundation; either version 2, or (at your option)
|
||||||
|
.\" any later version.
|
||||||
|
.\"
|
||||||
|
.\" This program is distributed in the hope that it will be useful,
|
||||||
|
.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
.\" GNU General Public License for more details.
|
||||||
|
.\"
|
||||||
|
.\" You should have received a copy of the GNU General Public License
|
||||||
|
.\" along with this program; if not, write to the Free Software
|
||||||
|
.\" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
.\"
|
||||||
|
.\" Based on cups-genppdupdate(8)
|
||||||
|
.\"
|
||||||
|
.TH GUTENPRINT-FOOMATICPPDUPDATE "8" "05 Aug 2014" "5.2.10" "Gutenprint"
|
||||||
|
.SH NAME
|
||||||
|
gutenprint-foomaticppdupdate \- update Gutenprint Foomatic PPD files
|
||||||
|
.SH SYNOPSIS
|
||||||
|
.B gutenprint-foomaticppdupdate VERSION
|
||||||
|
.SH DESCRIPTION
|
||||||
|
\fBgutenprint\-foomaticppdupdate\fP regenerates the \fIGutenprint\fP
|
||||||
|
Foomatic PPD files in use by CUPS, using freshly generated Foomatic
|
||||||
|
PPD files as templates. The new PPD file replaces the old PPD file
|
||||||
|
under \fI/etc/cups/ppd\fP, but all the options set in the old PPD will
|
||||||
|
be merged into the new PPD, provided that they are still valid in the
|
||||||
|
new file.
|
||||||
|
.PP
|
||||||
|
\fBgutenprint\-foomaticppdupdate\fP does \fBnot\fP restart cupsd.
|
||||||
|
cupsd will need manual reloading (or send SIGHUP) once
|
||||||
|
\fBgutenprint\-foomaticppdupdate\fP has completed.
|
||||||
|
.PP
|
||||||
|
This is not intended to be used directly but instead is run
|
||||||
|
automatically on package upgrade.
|
||||||
|
.SH OPTIONS
|
||||||
|
.B VERSION
|
||||||
|
The version number of the Gutenprint package just installed.
|
||||||
|
.SH SEE ALSO
|
||||||
|
.BR cups\-genppdupdate (8)
|
||||||
|
.PP
|
||||||
|
This program is free software; you can redistribute it and/or modify
|
||||||
|
it under the terms fo the GNU General Public License, version 2, or
|
||||||
|
(at your option) any later version.
|
@ -1,7 +1,7 @@
|
|||||||
diff -up gutenprint-5.2.6/src/main/gutenprint-internal.h.postscriptdriver gutenprint-5.2.6/src/main/gutenprint-internal.h
|
diff -up gutenprint-5.3.3/src/main/gutenprint-internal.h.postscriptdriver gutenprint-5.3.3/src/main/gutenprint-internal.h
|
||||||
--- gutenprint-5.2.6/src/main/gutenprint-internal.h.postscriptdriver 2010-08-04 02:33:56.000000000 +0200
|
--- gutenprint-5.3.3/src/main/gutenprint-internal.h.postscriptdriver 2018-01-28 03:32:45.000000000 +0100
|
||||||
+++ gutenprint-5.2.6/src/main/gutenprint-internal.h 2010-08-11 16:11:19.000000000 +0200
|
+++ gutenprint-5.3.3/src/main/gutenprint-internal.h 2019-11-06 12:13:29.936061606 +0100
|
||||||
@@ -56,6 +56,8 @@ extern void stpi_init_printer(void);
|
@@ -54,6 +54,8 @@ extern void stpi_init_printer(void);
|
||||||
#define BUFFER_FLAG_FLIP_X 0x1
|
#define BUFFER_FLAG_FLIP_X 0x1
|
||||||
#define BUFFER_FLAG_FLIP_Y 0x2
|
#define BUFFER_FLAG_FLIP_Y 0x2
|
||||||
extern stp_image_t* stpi_buffer_image(stp_image_t* image, unsigned int flags);
|
extern stp_image_t* stpi_buffer_image(stp_image_t* image, unsigned int flags);
|
||||||
@ -10,10 +10,10 @@ diff -up gutenprint-5.2.6/src/main/gutenprint-internal.h.postscriptdriver gutenp
|
|||||||
|
|
||||||
#define STPI_ASSERT(x,v) \
|
#define STPI_ASSERT(x,v) \
|
||||||
do \
|
do \
|
||||||
diff -up gutenprint-5.2.6/src/main/module.c.postscriptdriver gutenprint-5.2.6/src/main/module.c
|
diff -up gutenprint-5.3.3/src/main/module.c.postscriptdriver gutenprint-5.3.3/src/main/module.c
|
||||||
--- gutenprint-5.2.6/src/main/module.c.postscriptdriver 2006-09-30 17:02:59.000000000 +0200
|
--- gutenprint-5.3.3/src/main/module.c.postscriptdriver 2019-05-25 16:34:21.000000000 +0200
|
||||||
+++ gutenprint-5.2.6/src/main/module.c 2010-08-11 16:13:43.000000000 +0200
|
+++ gutenprint-5.3.3/src/main/module.c 2019-11-06 12:13:29.936061606 +0100
|
||||||
@@ -151,12 +151,20 @@ int stp_module_load(void)
|
@@ -159,12 +159,20 @@ int stp_module_load(void)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -34,17 +34,16 @@ diff -up gutenprint-5.2.6/src/main/module.c.postscriptdriver gutenprint-5.2.6/sr
|
|||||||
}
|
}
|
||||||
#ifdef USE_LTDL
|
#ifdef USE_LTDL
|
||||||
file_list = stp_path_search(dir_list, ".la");
|
file_list = stp_path_search(dir_list, ".la");
|
||||||
diff -up gutenprint-5.2.6/src/main/path.c.postscriptdriver gutenprint-5.2.6/src/main/path.c
|
diff -up gutenprint-5.3.3/src/main/path.c.postscriptdriver gutenprint-5.3.3/src/main/path.c
|
||||||
--- gutenprint-5.2.6/src/main/path.c.postscriptdriver 2008-06-01 16:41:18.000000000 +0200
|
--- gutenprint-5.3.3/src/main/path.c.postscriptdriver 2019-05-25 16:34:21.000000000 +0200
|
||||||
+++ gutenprint-5.2.6/src/main/path.c 2010-08-11 16:13:43.000000000 +0200
|
+++ gutenprint-5.3.3/src/main/path.c 2019-11-06 12:29:30.709190171 +0100
|
||||||
@@ -158,7 +158,17 @@ stpi_data_path(void)
|
@@ -154,6 +154,17 @@ stp_generate_path(const char *path)
|
||||||
if (getenv("STP_DATA_PATH"))
|
return NULL;
|
||||||
stp_path_split(dir_list, getenv("STP_DATA_PATH"));
|
stp_list_set_freefunc(dir_list, stp_list_node_free_data);
|
||||||
else
|
stp_path_split(dir_list, path);
|
||||||
- stp_path_split(dir_list, PKGXMLDATADIR);
|
+ if (!strncmp(PKGXMLDATADIR, path, strlen(path)))
|
||||||
+ {
|
+ {
|
||||||
+ const char *prefix = getenv("DESTDIR");
|
+ const char *prefix = getenv("DESTDIR");
|
||||||
+ stp_path_split(dir_list, PKGXMLDATADIR);
|
|
||||||
+ if (prefix)
|
+ if (prefix)
|
||||||
+ {
|
+ {
|
||||||
+ stp_list_t *prefix_list;
|
+ stp_list_t *prefix_list;
|
||||||
@ -56,7 +55,7 @@ diff -up gutenprint-5.2.6/src/main/path.c.postscriptdriver gutenprint-5.2.6/src/
|
|||||||
return dir_list;
|
return dir_list;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -226,6 +236,40 @@ stp_path_split(stp_list_t *list, /* List
|
@@ -262,6 +273,40 @@ stp_path_split(stp_list_t *list, /* List
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -72,7 +71,7 @@ diff -up gutenprint-5.2.6/src/main/path.c.postscriptdriver gutenprint-5.2.6/src/
|
|||||||
+ stp_list_item_t *item;
|
+ stp_list_item_t *item;
|
||||||
+ int prefixlen = strlen (prefix);
|
+ int prefixlen = strlen (prefix);
|
||||||
+ if (!(new_list = stp_list_create()))
|
+ if (!(new_list = stp_list_create()))
|
||||||
+ return;
|
+ return NULL;
|
||||||
+
|
+
|
||||||
+ item = stp_list_get_start (list);
|
+ item = stp_list_get_start (list);
|
||||||
+ while (item)
|
+ while (item)
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
--- gutenprint-5.2.12/src/cups/cups-genppdupdate.in.python36syntax
|
--- gutenprint-5.2.12/src/cups/cups-genppdupdate.in.python36syntax
|
||||||
+++ gutenprint-5.2.12/src/cups/cups-genppdupdate.in
|
+++ gutenprint-5.2.12/src/cups/cups-genppdupdate.in
|
||||||
@@ -287,7 +287,7 @@ def update_ppd (ppd_source_filename):
|
@@ -287,7 +287,7 @@ def update_ppd (ppd_source_filename):
|
||||||
for line in orig.readlines ():
|
for line in orig_lines:
|
||||||
line.rstrip ()
|
line.rstrip ()
|
||||||
if line.find ("*StpLocale:") != -1:
|
if line.find ("*StpLocale:") != -1:
|
||||||
- match = re.search ("\*StpLocale:\s*\"(.*)\"$", line)
|
- match = re.search ("\*StpLocale:\s*\"(.*)\"$", line)
|
||||||
|
12
gutenprint-selinux.patch
Normal file
12
gutenprint-selinux.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -up gutenprint-5.2.2/src/cups/cups-genppdupdate.in.selinux gutenprint-5.2.2/src/cups/cups-genppdupdate.in
|
||||||
|
--- gutenprint-5.2.2/src/cups/cups-genppdupdate.in.selinux 2008-11-20 16:08:57.000000000 +0000
|
||||||
|
+++ gutenprint-5.2.2/src/cups/cups-genppdupdate.in 2008-11-20 16:21:48.000000000 +0000
|
||||||
|
@@ -667,6 +667,8 @@ default_loop:
|
||||||
|
unlink $tmpnew;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
+ my @args = ("chcon", "--reference=$ppd_dest_filename", $tmpnew);
|
||||||
|
+ system(@args);
|
||||||
|
|
||||||
|
if (! rename $tmpnew, $ppd_dest_filename) {
|
||||||
|
warn "Can't rename $tmpnew to $ppd_dest_filename: $!\n";
|
102
gutenprint.spec
102
gutenprint.spec
@ -3,15 +3,14 @@
|
|||||||
|
|
||||||
Name: gutenprint
|
Name: gutenprint
|
||||||
Summary: Printer Drivers Package
|
Summary: Printer Drivers Package
|
||||||
Version: 5.2.14
|
Version: 5.3.4
|
||||||
Release: 3%{?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.bz2
|
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-O6.patch
|
|
||||||
Patch3: gutenprint-postscriptdriver.patch
|
Patch3: gutenprint-postscriptdriver.patch
|
||||||
Patch4: gutenprint-yyin.patch
|
Patch4: gutenprint-yyin.patch
|
||||||
Patch5: gutenprint-manpage.patch
|
Patch5: gutenprint-manpage.patch
|
||||||
@ -20,19 +19,23 @@ License: GPLv2+
|
|||||||
|
|
||||||
#### removed patches, because the seems useless
|
#### removed patches, because the seems useless
|
||||||
# I'll leave them here, in case its removal will break something
|
# I'll leave them here, in case its removal will break something
|
||||||
|
#Patch1: gutenprint-O6.patch
|
||||||
#Patch2: gutenprint-selinux.patch
|
#Patch2: gutenprint-selinux.patch
|
||||||
|
|
||||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
# gcc is no longer in buildroot by default
|
# gcc is no longer in buildroot by default
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
|
# uses make
|
||||||
|
BuildRequires: make
|
||||||
BuildRequires: cups-libs, cups-devel, cups
|
BuildRequires: cups-libs, cups-devel, cups
|
||||||
BuildRequires: gettext-devel,pkgconfig
|
BuildRequires: gettext-devel,pkgconfig
|
||||||
BuildRequires: libtiff-devel,libjpeg-devel,libpng-devel
|
BuildRequires: libtiff-devel,libjpeg-devel,libpng-devel
|
||||||
BuildRequires: pkgconfig(libusb-1.0)
|
BuildRequires: pkgconfig(libusb-1.0)
|
||||||
BuildRequires: pkgconfig(gtk+-2.0)
|
BuildRequires: pkgconfig(gtk+-2.0)
|
||||||
|
%if 0%{?rhel} <= 8 || 0%{?fedora}
|
||||||
BuildRequires: pkgconfig(gimpui-2.0)
|
BuildRequires: pkgconfig(gimpui-2.0)
|
||||||
BuildRequires: gimp
|
%endif
|
||||||
BuildRequires: chrpath
|
BuildRequires: chrpath
|
||||||
|
|
||||||
# Make sure we get postscriptdriver tags.
|
# Make sure we get postscriptdriver tags.
|
||||||
@ -41,7 +44,7 @@ BuildRequires: python3-cups
|
|||||||
# autoreconf
|
# autoreconf
|
||||||
BuildRequires: autoconf automake libtool
|
BuildRequires: autoconf automake libtool
|
||||||
|
|
||||||
# needed for defining %%{__python3} macro in prep phase
|
# needed for defining %%{__python3} macro for prep phase
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
|
|
||||||
## NOTE ##
|
## NOTE ##
|
||||||
@ -83,6 +86,7 @@ Requires: gtk2-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 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}
|
||||||
@ -98,6 +102,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||||||
%description extras
|
%description extras
|
||||||
This package contains test pattern generator and the sample test pattern
|
This package contains test pattern generator and the sample test pattern
|
||||||
that is used by gutenprint-devel package.
|
that is used by gutenprint-devel package.
|
||||||
|
%endif
|
||||||
|
|
||||||
%package cups
|
%package cups
|
||||||
Summary: CUPS drivers for Canon, Epson, HP and compatible printers
|
Summary: CUPS drivers for Canon, Epson, HP and compatible printers
|
||||||
@ -113,7 +118,7 @@ Epson, HP and compatible printers.
|
|||||||
# Fix menu placement of GIMP plugin.
|
# Fix menu placement of GIMP plugin.
|
||||||
%patch0 -p1 -b .menu
|
%patch0 -p1 -b .menu
|
||||||
# Don't use -O6 compiler option.
|
# Don't use -O6 compiler option.
|
||||||
%patch1 -p1 -b .O6
|
#%%patch1 -p1 -b .O6
|
||||||
# Restore file contexts when updating PPDs.
|
# Restore file contexts when updating PPDs.
|
||||||
#%%patch2 -p1 -b .selinux
|
#%%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.
|
||||||
@ -168,13 +173,15 @@ rm -f %{name}.lang
|
|||||||
%find_lang %{name} --all-name
|
%find_lang %{name} --all-name
|
||||||
cat %{name}-po.lang >>%{name}.lang
|
cat %{name}-po.lang >>%{name}.lang
|
||||||
|
|
||||||
echo .so man8/cups-genppd.8 > %{buildroot}%{_mandir}/man8/cups-genppd.5.2.8
|
#echo .so man8/cups-genppd.8 > %{buildroot}%{_mandir}/man8/cups-genppd.5.3.3
|
||||||
|
|
||||||
# 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.5.2 \
|
%{buildroot}%{_sbindir}/cups-genppd.5.3 \
|
||||||
|
%if 0%{?rhel} <= 8 || 0%{?fedora}
|
||||||
%{buildroot}%{_libdir}/gimp/*/plug-ins/* \
|
%{buildroot}%{_libdir}/gimp/*/plug-ins/* \
|
||||||
|
%endif
|
||||||
%{buildroot}%{_libdir}/*.so.* \
|
%{buildroot}%{_libdir}/*.so.* \
|
||||||
%{buildroot}%{_cups_serverbin}/driver/* \
|
%{buildroot}%{_cups_serverbin}/driver/* \
|
||||||
%{buildroot}%{_cups_serverbin}/filter/* \
|
%{buildroot}%{_cups_serverbin}/filter/* \
|
||||||
@ -183,16 +190,16 @@ do
|
|||||||
chrpath --delete ${file}
|
chrpath --delete ${file}
|
||||||
done
|
done
|
||||||
|
|
||||||
|
%if 0%{?rhel} > 8
|
||||||
|
%{_bindir}/rm -f %{buildroot}%{_bindir}/testpattern \
|
||||||
|
%endif
|
||||||
|
|
||||||
%post libs -p /sbin/ldconfig
|
%ldconfig_scriptlets libs
|
||||||
%post libs-ui -p /sbin/ldconfig
|
%ldconfig_scriptlets libs-ui
|
||||||
|
|
||||||
%postun libs -p /sbin/ldconfig
|
|
||||||
%postun libs-ui -p /sbin/ldconfig
|
|
||||||
|
|
||||||
%post cups
|
%post cups
|
||||||
/usr/sbin/cups-genppdupdate >/dev/null 2>&1 || :
|
%{_sbindir}/cups-genppdupdate >/dev/null 2>&1 || :
|
||||||
/sbin/service cups reload >/dev/null 2>&1 || :
|
%{_bindir}/systemctl restart cups >/dev/null 2>&1 || :
|
||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
|
|
||||||
@ -208,12 +215,12 @@ exit 0
|
|||||||
%license COPYING
|
%license COPYING
|
||||||
|
|
||||||
%files libs
|
%files libs
|
||||||
%{_libdir}/libgutenprint.so.2
|
%{_libdir}/libgutenprint.so.9
|
||||||
%{_libdir}/libgutenprint.so.2.7.0
|
%{_libdir}/libgutenprint.so.9.5.0
|
||||||
|
|
||||||
%files libs-ui
|
%files libs-ui
|
||||||
%{_libdir}/libgutenprintui2.so.1
|
%{_libdir}/libgutenprintui2.so.2
|
||||||
%{_libdir}/libgutenprintui2.so.1.0.0
|
%{_libdir}/libgutenprintui2.so.2.5.0
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%doc ChangeLog doc/developer/reference-html doc/developer/gutenprint.pdf
|
%doc ChangeLog doc/developer/reference-html doc/developer/gutenprint.pdf
|
||||||
@ -225,6 +232,7 @@ exit 0
|
|||||||
%{_libdir}/pkgconfig/gutenprintui2.pc
|
%{_libdir}/pkgconfig/gutenprintui2.pc
|
||||||
%exclude %{_libdir}/*.la
|
%exclude %{_libdir}/*.la
|
||||||
|
|
||||||
|
%if 0%{?rhel} <= 8 || 0%{?fedora}
|
||||||
%files plugin
|
%files plugin
|
||||||
%{_libdir}/gimp/*/plug-ins/gutenprint
|
%{_libdir}/gimp/*/plug-ins/gutenprint
|
||||||
|
|
||||||
@ -232,6 +240,7 @@ exit 0
|
|||||||
%doc
|
%doc
|
||||||
%{_bindir}/testpattern
|
%{_bindir}/testpattern
|
||||||
%{_datadir}/gutenprint/samples/*
|
%{_datadir}/gutenprint/samples/*
|
||||||
|
%endif
|
||||||
|
|
||||||
%files cups
|
%files cups
|
||||||
%doc
|
%doc
|
||||||
@ -243,11 +252,58 @@ exit 0
|
|||||||
%{_bindir}/cups-calibrate
|
%{_bindir}/cups-calibrate
|
||||||
%{_sbindir}/cups-genppd*
|
%{_sbindir}/cups-genppd*
|
||||||
%{_mandir}/man8/cups-calibrate.8*
|
%{_mandir}/man8/cups-calibrate.8*
|
||||||
%{_mandir}/man8/cups-genppd*.8*
|
%{_mandir}/man8/cups-genppd*8*.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Aug 15 2018 Zdenek Dohnal <zdohnal@redhat.com> - 5.2.14-3
|
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 5.3.4-4
|
||||||
- rebuilt with fixed gimp module
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
|
Related: rhbz#1991688
|
||||||
|
|
||||||
|
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 5.3.4-3
|
||||||
|
- 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
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jan 13 2021 Zdenek Dohnal <zdohnal@redhat.com> - 5.3.4-1
|
||||||
|
- 5.3.4
|
||||||
|
|
||||||
|
* Fri Nov 06 2020 Zdenek Dohnal <zdohnal@redhat.com> - 5.3.3-7
|
||||||
|
- 1773690 - cups-genppdupdate doesnt work for non-utf-8 PPDs
|
||||||
|
|
||||||
|
* Thu Nov 05 2020 Zdenek Dohnal <zdohnal@redhat.com> - 5.3.3-6
|
||||||
|
- make is no longer in buildroot by default
|
||||||
|
|
||||||
|
* Wed Sep 30 2020 Zdenek Dohnal <zdohnal@redhat.com> - 5.3.3-5
|
||||||
|
- dont require the gimp package as build require, pkgconfig's gimpui-2.0 suffices
|
||||||
|
|
||||||
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.3-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Mar 25 2020 Tom Stellard <tstellar@redhat.com> - 5.3.3-3
|
||||||
|
- Fix warning building with clang
|
||||||
|
- non-void function 'stp_paths_copy_with_prefix' should return a value [-Wreturn-type]
|
||||||
|
|
||||||
|
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.3-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Nov 06 2019 Zdenek Dohnal <zdohnal@redhat.com> - 5.3.3-1
|
||||||
|
- 5.3.3
|
||||||
|
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.14-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Apr 09 2019 Zdenek Dohnal <zdohnal@redhat.com> - 5.2.14-6
|
||||||
|
- rebuilt again (because bodhi cannot release builds of unpushed updates)
|
||||||
|
|
||||||
|
* Mon Apr 08 2019 Zdenek Dohnal <zdohnal@redhat.com> - 5.2.14-5
|
||||||
|
- rebuilt for gimp-2.10.10
|
||||||
|
|
||||||
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.14-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.14-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
* Wed Jul 11 2018 Zdenek Dohnal <zdohnal@redhat.com> - 5.2.14-2
|
* Wed Jul 11 2018 Zdenek Dohnal <zdohnal@redhat.com> - 5.2.14-2
|
||||||
- use %%{__python3} macro
|
- use %%{__python3} macro
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (gutenprint-5.2.14.tar.bz2) = aeb06b4be45fcb67320b419b988ca59dbda51bb2c3ff4edd0f0757ac977565a6829f506ebea6872211c689a15925ad2119836424c3c9a97345a8cd506e9df9fd
|
SHA512 (gutenprint-5.3.4.tar.xz) = 63de0b62edbe255a7efaaeab1dcd22577b7b46d7e0e48441b79977f19e76bf3862e4e8e18c55dd1f2e7392d555f9e8ee875ea53b90c689852d2343491a8fbcc8
|
||||||
|
Loading…
Reference in New Issue
Block a user