[packages/gutenprint] - updated to 5.2.9 - added am patch (fixes build with automake 1.13) - added link patch (fixes libgu

qboosh qboosh at pld-linux.org
Sun Mar 24 21:55:13 CET 2013 

commit 844a5ea68dad9a7228d9e9800a3fefedccc6b76b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Mar 24 21:55:14 2013 +0100

    - updated to 5.2.9
    - added am patch (fixes build with automake 1.13)
    - added link patch (fixes libgutenprintui linking)
    - removed obsolete missing_headers patch

 gutenprint-am.patch   | 30 ++++++++++++++++++++++
 gutenprint-link.patch | 13 ++++++++++
 gutenprint.spec       | 71 +++++++++++++++++++++++++++++----------------------
 missing_headers.patch | 23 -----------------
 4 files changed, 83 insertions(+), 54 deletions(-)
---
diff --git a/gutenprint.spec b/gutenprint.spec
index 17deffd..56a3d0c 100644
--- a/gutenprint.spec
+++ b/gutenprint.spec
@@ -13,31 +13,33 @@ Summary:	Collection of high-quality printer drivers
 Summary(pl.UTF-8):	Zestaw wysokiej jakości sterowników do drukarek
 %define	majorver	5.2
 Name:		gutenprint
-Version:	%{majorver}.7
-Release:	5
+Version:	%{majorver}.9
+Release:	1
 License:	GPL
 Group:		Applications/Printing
 Source0:	http://downloads.sourceforge.net/gimp-print/%{name}-%{version}.tar.bz2
-# Source0-md5:	b19029972bf28f6efd693270daf8f5de
+# Source0-md5:	aefbec27b96dd404d9ac9811e17d58ce
 Patch0:		%{name}-opt.patch
 Patch1:		%{name}-static.patch
-Patch2:		missing_headers.patch
+Patch2:		%{name}-am.patch
+Patch3:		%{name}-link.patch
 URL:		http://sourceforge.net/projects/gimp-print/
 BuildRequires:	autoconf >= 2.53
-BuildRequires:	automake
-%{?with_cups:BuildRequires:	cups-devel >= 1.1.15}
+BuildRequires:	automake >= 1:1.9
+%{?with_cups:BuildRequires:	cups-devel >= 1.2}
 BuildRequires:	docbook-style-dsssl
 BuildRequires:	docbook-utils
-%{?with_foomatic:BuildRequires:	foomatic-db-engine >= 2.9.1}
-BuildRequires:	gettext-autopoint
+%{?with_foomatic:BuildRequires:	foomatic-db-engine >= 3}
+BuildRequires:	gettext-devel >= 0.16
 %{?with_ijs:BuildRequires:	ghostscript-ijs-devel}
-%{?with_gimp:BuildRequires:	gimp-devel >= 1:2.0.0}
+%{?with_gimp:BuildRequires:	gimp-devel >= 1:2.2.0}
 BuildRequires:	gtk+2-devel >= 1:2.0.0
 BuildRequires:	libpng-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	openssl-devel
 BuildRequires:	pkgconfig
+BuildRequires:	readline-devel
 BuildRequires:	rpm-perlprov >= 3.0.3-16
 BuildRequires:	sed >= 4.0
 BuildRequires:	texinfo
@@ -219,7 +221,7 @@ Summary:	Gutenprint as CUPS plugin
 Summary(pl.UTF-8):	Gutenprint jako wtyczka do CUPS
 Summary(pt_BR.UTF-8):	Entradas ppd para serem usadas com o cups
 Group:		Applications/Printing
-Requires:	cups >= 1.1.15
+Requires:	cups >= 1.2
 Requires:	libgutenprint = %{version}-%{release}
 Obsoletes:	gimp-print-cups
 
@@ -262,7 +264,7 @@ Summary:	foomatic data for gutenprint IJS driver
 Summary(pl.UTF-8):	Dane foomatic dla sterownika IJS gutenprint
 Group:		Applications/Printing
 Requires:	%{name}-ijs = %{version}-%{release}
-Requires:	foomatic-db-engine >= 2.9.1
+Requires:	foomatic-db-engine >= 3
 Obsoletes:	foomatic-db-gimp-print
 
 %description -n foomatic-db-gutenprint
@@ -293,15 +295,14 @@ Wtyczka print dla Gimpa.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
-rm -f m4extra/{libtool.m4,gettext.m4,lcmessage.m4,progtest.m4}
+%{__gettextize}
 %{__libtoolize}
-%{__autopoint}
 %{__aclocal} -I m4 -I m4extra
-%{__automake}
 %{__autoconf}
-
+%{__automake}
 %configure \
 	%{?debug:--enable-debug} \
 	%{!?with_static_libs:--disable-static} \
@@ -343,11 +344,12 @@ mv -f $RPM_BUILD_ROOT%{_datadir}/gutenprint/samples \
 	$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %if %{with cups}
-rm -f $RPM_BUILD_ROOT%{_mandir}/man8/update-cups-genppd.8
-echo '.so cups-genppdconfig.8' > $RPM_BUILD_ROOT%{_mandir}/man8/update-cups-genppd.8
+echo '.so man8/cups-genppdconfig.8' > $RPM_BUILD_ROOT%{_mandir}/man8/update-cups-genppd.8
 %endif
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/%{majorver}/modules/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/%{majorver}/modules/*.{a,la}
+# locales source
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/locale/*/gutenprint_*.po
 
 %find_lang %{name}
 
@@ -362,16 +364,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n libgutenprint -f %{name}.lang
 %defattr(644,root,root,755)
-%doc doc-installed/{gutenprint.pdf,gutenprint-users-manual.pdf}
-%doc doc/FAQ.html AUTHORS ChangeLog NEWS README
+%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
 %dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/%{majorver}*
-%dir %{_libdir}/%{name}/%{majorver}*/modules
-%attr(755,root,root) %{_libdir}/%{name}/%{majorver}*/modules/*.so
+%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
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}/%{majorver}*
+%{_datadir}/%{name}/%{majorver}
 #%{_mandir}/man7/gutenprint-*.7*
 
 %files -n libgutenprint-devel
@@ -418,13 +420,18 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc src/cups/{README,command.txt,commands}
 %{_sysconfdir}/cups/command.types
-%attr(755,root,root) %{_bindir}/cups-*
-%attr(755,root,root) %{_sbindir}/cups-*
+%attr(755,root,root) %{_bindir}/cups-calibrate
+%attr(755,root,root) %{_sbindir}/cups-genppd.%{majorver}
+%attr(755,root,root) %{_sbindir}/cups-genppdupdate
 %attr(755,root,root) %{cupslibdir}/driver/gutenprint.%{majorver}
-%attr(755,root,root) %{cupslibdir}/filter/commandto*
+%attr(755,root,root) %{cupslibdir}/filter/commandtocanon
+%attr(755,root,root) %{cupslibdir}/filter/commandtoepson
 %attr(755,root,root) %{cupslibdir}/filter/rastertogutenprint.%{majorver}
 %{_datadir}/cups/calibrate.ppm
-%{_mandir}/man8/*cups*.8*
+%{_mandir}/man8/cups-calibrate.8*
+%{_mandir}/man8/cups-genppd.8*
+%{_mandir}/man8/cups-genppdupdate.8*
+%{_mandir}/man8/update-cups-genppd.8*
 %endif
 
 %files samples
@@ -434,15 +441,17 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with ijs}
 %files ijs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/ijsgutenprint*
+%attr(755,root,root) %{_bindir}/ijsgutenprint.%{majorver}
 %{_mandir}/man1/ijsgutenprint.1*
 %endif
 
 %if %{with foomatic}
 %files -n foomatic-db-gutenprint
 %defattr(644,root,root,755)
-%{_datadir}/foomatic/db/source/driver/*
-%{_datadir}/foomatic/db/source/opt/*
+%{_datadir}/foomatic/db/source/driver/gutenprint-ijs.%{majorver}.xml
+%{_datadir}/foomatic/db/source/driver/gutenprint-ijs-simplified.%{majorver}.xml
+%{_datadir}/foomatic/db/source/opt/gutenprint-ijs.%{majorver}-*.xml
+%{_datadir}/foomatic/db/source/opt/gutenprint-ijs-simplified.%{majorver}-*.xml
 %endif
 
 %if %{with gimp}
diff --git a/gutenprint-am.patch b/gutenprint-am.patch
new file mode 100644
index 0000000..5fc3a8e
--- /dev/null
+++ b/gutenprint-am.patch
@@ -0,0 +1,30 @@
+--- 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 @@
+ GUTENPRINTUI2_LIBDEPS="${GUTENPRINTUI2_LIBDEPS} \$(GUTENPRINT_LIBS)"
+ 
+ dnl Specify a configuration file.
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ 
+ dnl Available languages (translations)
+ ALL_LINGUAS="cs da de el en_GB es fi fr gl hu it ja nb nl pl pt ru sk sl sv uk zh_CN zh_TW"
+@@ -475,7 +475,6 @@
+ AC_ISC_POSIX
+ AC_PROG_AWK
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AM_PROG_CC_C_O
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+--- gutenprint-5.2.9/m4extra/glib.m4.orig	2006-01-29 12:53:10.000000000 +0100
++++ gutenprint-5.2.9/m4extra/glib.m4	2013-03-24 10:01:11.136214098 +0100
+@@ -5,7 +5,7 @@
+ dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
+ dnl gthread is specified in MODULES, pass to glib-config
+ dnl
+-AC_DEFUN(AM_PATH_GLIB,
++AC_DEFUN([AM_PATH_GLIB],
+ [dnl 
+ dnl Get the cflags and libraries from the glib-config script
+ dnl
diff --git a/gutenprint-link.patch b/gutenprint-link.patch
new file mode 100644
index 0000000..7f3fb99
--- /dev/null
+++ b/gutenprint-link.patch
@@ -0,0 +1,13 @@
+--- gutenprint-5.2.9/configure.ac.orig	2013-03-24 10:20:26.476165613 +0100
++++ gutenprint-5.2.9/configure.ac	2013-03-24 19:31:30.451444873 +0100
+@@ -723,8 +723,8 @@
+ AC_CHECK_LIB(m,pow,
+              GUTENPRINT_LIBDEPS="${GUTENPRINT_LIBDEPS} -lm"
+              gutenprint_libdeps="${gutenprint_libdeps} -lm"
+-             GUTENPRINTUI2_LIBDEPS="${GUTENPRINT_LIBDEPS} -lm"
+-             gutenprintui2_libdeps="${gutenprint_libdeps} -lm"
++             GUTENPRINTUI2_LIBDEPS="${GUTENPRINTUI2_LIBDEPS} -lm"
++             gutenprintui2_libdeps="${gutenprintui2_libdeps} -lm"
+ 	     LIBM=-lm
+ )
+ 
diff --git a/missing_headers.patch b/missing_headers.patch
deleted file mode 100644
index 1d9e947..0000000
--- a/missing_headers.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -uNr gutenprint-5.2.7.bak/src/cups/commandtocanon.c gutenprint-5.2.7/src/cups/commandtocanon.c
---- gutenprint-5.2.7.bak/src/cups/commandtocanon.c	2004-07-19 01:26:46.000000000 +0200
-+++ gutenprint-5.2.7/src/cups/commandtocanon.c	2011-08-01 19:54:36.768099106 +0200
-@@ -14,7 +14,7 @@
- #include <cups/cups.h>
- #include <ctype.h>
- #include <stdlib.h>
--
-+#include <stdio.h>
- 
- /*
-  * Macros...
-diff -uNr gutenprint-5.2.7.bak/src/cups/commandtoepson.c gutenprint-5.2.7/src/cups/commandtoepson.c
---- gutenprint-5.2.7.bak/src/cups/commandtoepson.c	2007-12-24 18:19:20.000000000 +0100
-+++ gutenprint-5.2.7/src/cups/commandtoepson.c	2011-08-01 19:54:48.808033878 +0200
-@@ -32,6 +32,7 @@
- #include <ctype.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <stdio.h>
- 
- /*
-  * Macros...
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gutenprint.git/commitdiff/844a5ea68dad9a7228d9e9800a3fefedccc6b76b

More information about the pld-cvs-commit mailing list