packages: libgnomeprint/libgnomeprint.spec, libgnomeprint/libgnomeprint-inc...

qboosh qboosh at pld-linux.org
Sat Nov 19 13:23:18 CET 2011 

Author: qboosh                       Date: Sat Nov 19 12:23:18 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added includes patch (adds missing <stdio.h> include) to build with current glibc
- added papi patch to kill libgnomeprintpapi soversion; build papi module (with bcond)
- package en at shaw locale (now supported via LANGUAGE)
- release 2

---- Files affected:
packages/libgnomeprint:
   libgnomeprint.spec (1.93 -> 1.94) , libgnomeprint-includes.patch (NONE -> 1.1)  (NEW), libgnomeprint-papi.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libgnomeprint/libgnomeprint.spec
diff -u packages/libgnomeprint/libgnomeprint.spec:1.93 packages/libgnomeprint/libgnomeprint.spec:1.94
--- packages/libgnomeprint/libgnomeprint.spec:1.93	Sat Oct  2 23:17:17 2010
+++ packages/libgnomeprint/libgnomeprint.spec	Sat Nov 19 13:23:12 2011
@@ -1,13 +1,19 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	papi	# PAPI printing support
+#
 Summary:	Printing library for GNOME
 Summary(pl.UTF-8):	Biblioteka drukowania dla GNOME
 Name:		libgnomeprint
 Version:	2.18.8
-Release:	1
+Release:	2
 License:	LGPL v2+
 Group:		Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/libgnomeprint/2.18/%{name}-%{version}.tar.bz2
 # Source0-md5:	63b05ffb5386e131487c6af30f4c56ac
+Patch0:		%{name}-includes.patch
+Patch1:		%{name}-papi.patch
 URL:		http://www.gnome.org/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake >= 1:1.7.2
@@ -26,11 +32,15 @@
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel >= 1:2.6.30
 BuildRequires:	pango-devel >= 1:1.18.3
+%{?with_papi:BuildRequires:	papi-devel}
 BuildRequires:	pkgconfig
 BuildRequires:	popt-devel
 BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	zlib-devel
 Requires:	fonts-Type1-urw
+Requires:	glib2 >= 1:2.14.1
+Requires:	libart_lgpl >= 2.3.19
+Requires:	libxml2 >= 1:2.6.30
 Requires:	pango >= 1:1.18.3
 # sr at Latn vs. sr at latin
 Conflicts:	glibc-misc < 6:2.7
@@ -108,6 +118,8 @@
 Summary(pl.UTF-8):	Moduł CUPS dla libgnomeprint
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	cups >= 1:1.1.20
+Requires:	libgnomecups >= 0.2.2
 
 %description cups
 CUPS module for libgnomeprint.
@@ -115,13 +127,27 @@
 %description cups -l pl.UTF-8
 Moduł CUPS dla libgnomeprint.
 
+%package papi
+Summary:	PAPI module for libgnomeprint
+Summary(pl.UTF-8):	Moduł PAPI dla libgnomeprint
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	libgnomecups >= 0.2.2
+Requires:	papi
+
+%description papi
+PAPI module for libgnomeprint.
+
+%description papi -l pl.UTF-8
+Moduł PAPI dla libgnomeprint.
+
 %prep
 %setup -q
-
-%{__sed} -i -e 's/^en at shaw//' po/LINGUAS
-rm -f po/en at shaw.po
+%patch0 -p1
+%patch1 -p1
 
 %build
+CPPFLAGS="%{rpmcppflags}%{?with_papi: -I/usr/include/papi}"
 %{__intltoolize}
 %{__libtoolize}
 %{__aclocal}
@@ -130,9 +156,10 @@
 %{__automake}
 %configure \
 	--disable-font-install \
-	--with-html-dir=%{_gtkdocdir} \
 	--enable-gtk-doc \
-	--with-cups
+	--with-cups \
+	--with-html-dir=%{_gtkdocdir} \
+	%{!?with_papi:--without-papi}
 %{__make}
 
 %install
@@ -145,7 +172,7 @@
 	HTML_DIR=%{_gtkdocdir}
 
 # no static modules and *.la files - shut up check-files
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*/modules/{*.{a,la},transports/*.{a,la},filters/*.{a,la}}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/*/modules/{*.{a,la},transports/*.{a,la},filters/*.{a,la}}
 
 %find_lang %{name}-2.2
 
@@ -182,7 +209,8 @@
 %{_datadir}/libgnomeprint
 # for now it's the only package that uses /etc/gnome
 %dir %{_sysconfdir}/gnome
-%{_sysconfdir}/gnome/libgnomeprint-*
+%dir %{_sysconfdir}/gnome/libgnomeprint-2.0
+%dir %{_sysconfdir}/gnome/libgnomeprint-2.0/fonts
 
 %files apidocs
 %defattr(644,root,root,755)
@@ -203,12 +231,22 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/%{version}/modules/libgnomeprintcups.so
 
+%files papi
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/%{version}/modules/libgnomeprintpapi.so
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.94  2011/11/19 12:23:12  qboosh
+- added includes patch (adds missing <stdio.h> include) to build with current glibc
+- added papi patch to kill libgnomeprintpapi soversion; build papi module (with bcond)
+- package en at shaw locale (now supported via LANGUAGE)
+- release 2
+
 Revision 1.93  2010/10/02 21:17:17  megabajt
 - updated to 2.18.8
 

================================================================
Index: packages/libgnomeprint/libgnomeprint-includes.patch
diff -u /dev/null packages/libgnomeprint/libgnomeprint-includes.patch:1.1
--- /dev/null	Sat Nov 19 13:23:18 2011
+++ packages/libgnomeprint/libgnomeprint-includes.patch	Sat Nov 19 13:23:12 2011
@@ -0,0 +1,10 @@
+--- libgnomeprint-2.18.8/libgnomeprint/modules/cups/gnome-print-cups-transport.c.orig	2010-02-09 13:32:51.000000000 +0100
++++ libgnomeprint-2.18.8/libgnomeprint/modules/cups/gnome-print-cups-transport.c	2011-11-19 13:04:12.848401082 +0100
+@@ -34,6 +34,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <stdio.h>
+ #include <unistd.h>
+ #include <locale.h>
+ 

================================================================
Index: packages/libgnomeprint/libgnomeprint-papi.patch
diff -u /dev/null packages/libgnomeprint/libgnomeprint-papi.patch:1.1
--- /dev/null	Sat Nov 19 13:23:18 2011
+++ packages/libgnomeprint/libgnomeprint-papi.patch	Sat Nov 19 13:23:12 2011
@@ -0,0 +1,9 @@
+--- libgnomeprint-2.18.8/libgnomeprint/modules/papi/Makefile.am.orig	2010-02-09 13:32:51.000000000 +0100
++++ libgnomeprint-2.18.8/libgnomeprint/modules/papi/Makefile.am	2011-11-19 13:17:09.308427081 +0100
+@@ -9,5 +9,5 @@
+ plugin_LTLIBRARIES = libgnomeprintpapi.la
+ 
+ libgnomeprintpapi_la_SOURCES = gnome-print-papi.c gnome-print-papi-transport.c
+-libgnomeprintpapi_la_LDFLAGS = $(PAPI_LIBS) $(Z_LIBS)
++libgnomeprintpapi_la_LDFLAGS = $(PAPI_LIBS) $(Z_LIBS) -avoid-version -module -no-undefined
+ libgnomeprintpapi_la_LIBADD  = ../../libgnomeprint-2-2.la
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libgnomeprint/libgnomeprint.spec?r1=1.93&r2=1.94&f=u

More information about the pld-cvs-commit mailing list