[packages/gutenprint] - updated to 5.3.4 (new sonames)

qboosh qboosh at pld-linux.org
Tue Aug 29 08:05:43 CEST 2023 

commit 150d91533bf8058afc101313ff3595932fe9a618
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Aug 29 06:37:44 2023 +0200

    - updated to 5.3.4 (new sonames)

 gutenprint-am.patch  | 12 ++++++------
 gutenprint-opt.patch | 12 ++++++------
 gutenprint.spec      | 27 ++++++++++++++-------------
 3 files changed, 26 insertions(+), 25 deletions(-)
---
diff --git a/gutenprint.spec b/gutenprint.spec
index ca2c024..f47f0ff 100644
--- a/gutenprint.spec
+++ b/gutenprint.spec
@@ -8,19 +8,19 @@
 #
 Summary:	Collection of high-quality printer drivers
 Summary(pl.UTF-8):	Zestaw wysokiej jakości sterowników do drukarek
-%define	majorver	5.2
+%define	majorver	5.3
 Name:		gutenprint
-Version:	%{majorver}.15
+Version:	%{majorver}.4
 Release:	1
 License:	GPL
 Group:		Applications/Printing
 Source0:	http://downloads.sourceforge.net/gimp-print/%{name}-%{version}.tar.bz2
-# Source0-md5:	d0769dd44be985f1135518d4a5c73a8a
+# Source0-md5:	537851d7b82e77a4c466c2c4f3a6a43e
 Patch0:		%{name}-opt.patch
 Patch1:		%{name}-static.patch
 Patch2:		%{name}-am.patch
 URL:		http://sourceforge.net/projects/gimp-print/
-BuildRequires:	autoconf >= 2.53
+BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake >= 1:1.9
 %{?with_cups:BuildRequires:	cups-devel >= 1.2}
 BuildRequires:	docbook-style-dsssl
@@ -30,7 +30,7 @@ BuildRequires:	gettext-tools >= 0.16
 BuildRequires:	gtk+2-devel >= 1:2.0.0
 BuildRequires:	libpng-devel
 BuildRequires:	libtiff-devel
-BuildRequires:	libtool >= 1:1.4.2-9
+BuildRequires:	libtool >= 2:2
 BuildRequires:	libusb-devel >= 1.0
 BuildRequires:	openssl-devel
 BuildRequires:	pkgconfig
@@ -270,7 +270,7 @@ Wtyczka print dla Gimpa.
 %build
 %{__gettextize}
 %{__libtoolize}
-%{__aclocal} -I m4 -I m4extra
+%{__aclocal} -I m4 -I m4local
 %{__autoconf}
 %{__automake}
 %configure \
@@ -308,8 +308,10 @@ rm -rf doc-installed
 	$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/%{majorver}/modules/*.{a,la}
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgutenprint*.la
 # locales source
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/locale/*/gutenprint_*.po
+%{__rm} $RPM_BUILD_ROOT%{_localedir}/*/gutenprint_*.po
 
 %find_lang %{name}
 
@@ -326,12 +328,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README doc/FAQ.html doc-installed/{gutenprint.pdf,gutenprint-users-manual.pdf}
 %attr(755,root,root) %{_libdir}/libgutenprint.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgutenprint.so.2
+%attr(755,root,root) %ghost %{_libdir}/libgutenprint.so.9
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/%{majorver}
 %dir %{_libdir}/%{name}/%{majorver}/modules
 %attr(755,root,root) %{_libdir}/%{name}/%{majorver}/modules/color-traditional.so
 %attr(755,root,root) %{_libdir}/%{name}/%{majorver}/modules/print-*.so
+%{_libdir}/%{name}/%{majorver}/config.summary
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/%{majorver}
 #%{_mandir}/man7/gutenprint-*.7*
@@ -340,7 +343,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc doc-installed/reference-html
 %attr(755,root,root) %{_libdir}/libgutenprint.so
-%{_libdir}/libgutenprint.la
 %{_includedir}/gutenprint
 %{_pkgconfigdir}/gutenprint.pc
 #%{_mandir}/man3/gutenprint.3*
@@ -354,12 +356,11 @@ rm -rf $RPM_BUILD_ROOT
 %files -n libgutenprintui
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgutenprintui2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgutenprintui2.so.1
+%attr(755,root,root) %ghost %{_libdir}/libgutenprintui2.so.2
 
 %files -n libgutenprintui-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgutenprintui2.so
-%{_libdir}/libgutenprintui2.la
 %{_includedir}/gutenprintui2
 %{_pkgconfigdir}/gutenprintui2.pc
 
@@ -378,7 +379,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with cups}
 %files cups
 %defattr(644,root,root,755)
-%doc src/cups/{README,command.txt,commands}
+%doc src/cups/{command.txt,commands}
 %{_sysconfdir}/cups/command.types
 %attr(755,root,root) %{_bindir}/cups-calibrate
 %attr(755,root,root) %{_sbindir}/cups-genppd.%{majorver}
@@ -387,7 +388,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{cupslibdir}/filter/commandtocanon
 %attr(755,root,root) %{cupslibdir}/filter/commandtoepson
 %attr(755,root,root) %{cupslibdir}/filter/rastertogutenprint.%{majorver}
-%attr(755,root,root) %{cupslibdir}/backend/gutenprint52+usb
+%attr(755,root,root) %{cupslibdir}/backend/gutenprint53+usb
 %{_datadir}/cups/calibrate.ppm
 %dir %{_datadir}/cups/usb
 %{_datadir}/cups/usb/net.sf.gimp-print.usb-quirks
diff --git a/gutenprint-am.patch b/gutenprint-am.patch
index 90bd46d..3c9ef11 100644
--- a/gutenprint-am.patch
+++ b/gutenprint-am.patch
@@ -1,6 +1,6 @@
---- gutenprint-5.2.9/configure.ac.orig	2013-03-24 09:45:04.996254643 +0100
-+++ gutenprint-5.2.9/configure.ac	2013-03-24 09:46:44.106250484 +0100
-@@ -140,7 +140,7 @@
+--- gutenprint-5.3.4/configure.ac.orig	2023-08-28 21:39:01.887771589 +0200
++++ gutenprint-5.3.4/configure.ac	2023-08-28 21:39:34.084263832 +0200
+@@ -189,7 +189,7 @@ gutenprintui2_version=${GUTENPRINT_VERSI
  GUTENPRINTUI2_LIBDEPS="${GUTENPRINTUI2_LIBDEPS} \$(GUTENPRINT_LIBS)"
  
  dnl Specify a configuration file.
@@ -8,9 +8,9 @@
 +AC_CONFIG_HEADERS([config.h])
  
  dnl Available languages (translations)
- ALL_LINGUAS="ca cs da de el en_GB es fi fr gl hu it ja nb nl pl pt ru sk sl sv tr uk vi zh_CN zh_TW"
-@@ -475,7 +475,6 @@
- AC_ISC_POSIX
+ ALL_LINGUAS="ca cs da de el en_GB es fi fr gl hr hu it ja nb nl pl pt ru sk sl sv tr uk vi zh_CN zh_TW"
+@@ -556,7 +556,6 @@ AM_ICONV_LINK
+ AC_SEARCH_LIBS([strerror],[cposix])
  AC_PROG_AWK
  AC_PROG_CC
 -AM_PROG_CC_STDC
diff --git a/gutenprint-opt.patch b/gutenprint-opt.patch
index 592e1a3..fc6918b 100644
--- a/gutenprint-opt.patch
+++ b/gutenprint-opt.patch
@@ -1,13 +1,13 @@
---- gutenprint-5.2.14/configure.ac.orig	2023-08-28 07:39:13.244083623 +0200
-+++ gutenprint-5.2.14/configure.ac	2023-08-28 17:00:23.323469623 +0200
-@@ -666,17 +666,6 @@ if test x$ac_compiler_gnu = "xyes"; then
+--- gutenprint-5.3.4/configure.ac.orig	2020-06-05 01:28:41.000000000 +0200
++++ gutenprint-5.3.4/configure.ac	2023-08-28 21:38:43.451204802 +0200
+@@ -753,17 +753,6 @@ if test x$ac_compiler_gnu = "xyes"; then
    if test x${USE_MAINTAINER_MODE} = xyes ; then
-     STP_ADD_COMPILER_ARGS([-D_POSIX_C_SOURCE=200809L -std=c99 -pedantic -Waggregate-return -Wcast-qual -Wshadow -Wredundant-decls],, [GNUCFLAGS])
+     STP_ADD_COMPILER_ARGS([ -pedantic -Waggregate-return -Wcast-qual -Wshadow -Wredundant-decls],, [GNUCFLAGS])
    fi
 -  if test x$ENABLE_DEBUG = xyes ; then
 -    STP_ADD_COMPILER_ARG([-g])
 -  else
--    STP_ADD_FIRST_COMPILER_ARG([-O6 -O3 -O2 -O1 -O])
+-    STP_ADD_FIRST_COMPILER_ARG([-O3 -O2 -O1 -O])
 -  fi
 -else
 -  if test x$ENABLE_DEBUG = xyes ; then
@@ -18,7 +18,7 @@
  fi
  if test x$ENABLE_PROFILE = xyes ; then
    STP_ADD_COMPILER_ARG([-pg])
-@@ -933,13 +922,6 @@ AM_CONDITIONAL(BUILD_MODULES, test x$MOD
+@@ -1019,13 +1008,6 @@ AM_CONDITIONAL(BUILD_MODULES, test x$MOD
  
  AM_CONDITIONAL(BUILD_GENPPD_STATIC, test x"$STATIC_GENPPD" = xyes)
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gutenprint.git/commitdiff/150d91533bf8058afc101313ff3595932fe9a618

More information about the pld-cvs-commit mailing list