5.3.3

2019-11-08 15:17:25 +01:00 · 2019-11-08 15:17:25 +01:00 · 5c6f194284
commit 5c6f194284
parent c8be449777
4 changed files with 44 additions and 41 deletions
--- a/.gitignore
+++ b/.gitignore
@ -23,3 +23,4 @@ gutenprint-5.2.6.tar.bz2
 /gutenprint-5.2.13.tar.bz2
 /gutenprint-5.2.14-pre2.tar.bz2
 /gutenprint-5.2.14.tar.bz2
+/gutenprint-5.3.3.tar.xz
--- a/gutenprint-postscriptdriver.patch
+++ b/gutenprint-postscriptdriver.patch
@ -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
--- gutenprint-5.2.6/src/main/gutenprint-internal.h.postscriptdriver	2010-08-04 02:33:56.000000000 +0200
-+++ gutenprint-5.2.6/src/main/gutenprint-internal.h	2010-08-11 16:11:19.000000000 +0200
-@@ -56,6 +56,8 @@ extern void stpi_init_printer(void);
+diff -up gutenprint-5.3.3/src/main/gutenprint-internal.h.postscriptdriver gutenprint-5.3.3/src/main/gutenprint-internal.h
+--- gutenprint-5.3.3/src/main/gutenprint-internal.h.postscriptdriver	2018-01-28 03:32:45.000000000 +0100
+++ gutenprint-5.3.3/src/main/gutenprint-internal.h	2019-11-06 12:13:29.936061606 +0100
+@@ -54,6 +54,8 @@ extern void stpi_init_printer(void);
 #define BUFFER_FLAG_FLIP_X	0x1
 #define BUFFER_FLAG_FLIP_Y	0x2
 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)						\
 do									\
-diff -up gutenprint-5.2.6/src/main/module.c.postscriptdriver gutenprint-5.2.6/src/main/module.c
--- gutenprint-5.2.6/src/main/module.c.postscriptdriver	2006-09-30 17:02:59.000000000 +0200
-+++ gutenprint-5.2.6/src/main/module.c	2010-08-11 16:13:43.000000000 +0200
-@@ -151,12 +151,20 @@ int stp_module_load(void)
+diff -up gutenprint-5.3.3/src/main/module.c.postscriptdriver gutenprint-5.3.3/src/main/module.c
+--- gutenprint-5.3.3/src/main/module.c.postscriptdriver	2019-05-25 16:34:21.000000000 +0200
+++ gutenprint-5.3.3/src/main/module.c	2019-11-06 12:13:29.936061606 +0100
+@@ -159,12 +159,20 @@ int stp_module_load(void)
     }
   else
     {
@ -34,29 +34,28 @@ diff -up gutenprint-5.2.6/src/main/module.c.postscriptdriver gutenprint-5.2.6/sr
     }
 #ifdef USE_LTDL
   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
--- gutenprint-5.2.6/src/main/path.c.postscriptdriver	2008-06-01 16:41:18.000000000 +0200
-+++ gutenprint-5.2.6/src/main/path.c	2010-08-11 16:13:43.000000000 +0200
-@@ -158,7 +158,17 @@ stpi_data_path(void)
-   if (getenv("STP_DATA_PATH"))
-     stp_path_split(dir_list, getenv("STP_DATA_PATH"));
-   else
-    stp_path_split(dir_list, PKGXMLDATADIR);
+diff -up gutenprint-5.3.3/src/main/path.c.postscriptdriver gutenprint-5.3.3/src/main/path.c
+--- gutenprint-5.3.3/src/main/path.c.postscriptdriver	2019-05-25 16:34:21.000000000 +0200
+++ gutenprint-5.3.3/src/main/path.c	2019-11-06 12:29:30.709190171 +0100
+@@ -154,6 +154,17 @@ stp_generate_path(const char *path)
+     return NULL;
+   stp_list_set_freefunc(dir_list, stp_list_node_free_data);
+   stp_path_split(dir_list, path);
+  if (!strncmp(PKGXMLDATADIR, path, strlen(path)))
+  {
+    const char *prefix = getenv("DESTDIR");
+    if (prefix)
 +    {
-+      const char *prefix = getenv("DESTDIR");
-+      stp_path_split(dir_list, PKGXMLDATADIR);
-+      if (prefix)
-+	{
-+	  stp_list_t *prefix_list;
-+	  prefix_list = stp_paths_copy_with_prefix(dir_list, prefix);
-+	  stp_list_destroy(dir_list);
-+	  dir_list = prefix_list;
-+	}
+      stp_list_t *prefix_list;
+      prefix_list = stp_paths_copy_with_prefix(dir_list, prefix);
+      stp_list_destroy(dir_list);
+      dir_list = prefix_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
     }
 }
 
--- a/gutenprint.spec
+++ b/gutenprint.spec
@ -3,15 +3,14 @@

 Name:           gutenprint
 Summary:        Printer Drivers Package
-Version:        5.2.14
-Release:        7%{?dist}
+Version:        5.3.3
+Release:        1%{?dist}
 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.
 Source1:        cups-genppdupdate.py.in
 # ported from old gimp-print package - fix for a menu in gimp gutenprint plugin
 Patch0:         gutenprint-menu.patch
-Patch1:         gutenprint-O6.patch
 Patch3:         gutenprint-postscriptdriver.patch
 Patch4:         gutenprint-yyin.patch
 Patch5:         gutenprint-manpage.patch
@ -20,6 +19,7 @@ License:        GPLv2+

 #### 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}
@ -113,7 +113,7 @@ Epson, HP and compatible printers.
 # Fix menu placement of GIMP plugin.
 %patch0 -p1 -b .menu
 # Don't use -O6 compiler option.
-%patch1 -p1 -b .O6
+#%%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.
@ -168,12 +168,12 @@ rm -f %{name}.lang
 %find_lang %{name} --all-name
 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
 # to chrpath, please let me know!
 for file in \
-  %{buildroot}%{_sbindir}/cups-genppd.5.2 \
+  %{buildroot}%{_sbindir}/cups-genppd.5.3 \
  %{buildroot}%{_libdir}/gimp/*/plug-ins/* \
  %{buildroot}%{_libdir}/*.so.* \
  %{buildroot}%{_cups_serverbin}/driver/* \
@ -188,8 +188,8 @@ done
 %ldconfig_scriptlets libs-ui

 %post cups
-/usr/sbin/cups-genppdupdate >/dev/null 2>&1 || :
-/sbin/service cups reload >/dev/null 2>&1 || :
+%{_sbindir}/cups-genppdupdate >/dev/null 2>&1 || :
+%{_bindir}/systemctl restart cups >/dev/null 2>&1 || :
 exit 0


@ -205,12 +205,12 @@ exit 0
 %license COPYING

 %files libs
-%{_libdir}/libgutenprint.so.2
-%{_libdir}/libgutenprint.so.2.7.0
+%{_libdir}/libgutenprint.so.9
+%{_libdir}/libgutenprint.so.9.4.0

 %files libs-ui
-%{_libdir}/libgutenprintui2.so.1
-%{_libdir}/libgutenprintui2.so.1.0.0
+%{_libdir}/libgutenprintui2.so.2
+%{_libdir}/libgutenprintui2.so.2.4.0

 %files devel
 %doc ChangeLog doc/developer/reference-html doc/developer/gutenprint.pdf
@ -240,9 +240,12 @@ exit 0
 %{_bindir}/cups-calibrate
 %{_sbindir}/cups-genppd*
 %{_mandir}/man8/cups-calibrate.8*
-%{_mandir}/man8/cups-genppd*.8*
+%{_mandir}/man8/cups-genppd*8*.gz

 %changelog
+* 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

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (gutenprint-5.2.14.tar.bz2) = aeb06b4be45fcb67320b419b988ca59dbda51bb2c3ff4edd0f0757ac977565a6829f506ebea6872211c689a15925ad2119836424c3c9a97345a8cd506e9df9fd
+SHA512 (gutenprint-5.3.3.tar.xz) = d2c47eb4ccc3c46ccb2f1042682edf7443f5c57439ead72f49ecd10537cf967251bacf7ca7da29fb8dceecc7eebd55ed021f2594ff9fb6509bab543fab1dc8d6