[libgxps] Update to 0.2.0 upstream release

Thu Dec 1 12:13:05 UTC 2011

commit 721f380814d936b38c3f6b9c9595e6a34fcf976d
Author: Tom Hughes <tom at compton.nu>
Date:   Thu Dec 1 12:10:09 2011 +0000

    Update to 0.2.0 upstream release

 .gitignore                   |    2 +-
 libgxps-0.2.0-libm.patch     |   63 ++++++++++++++++++++++++++++++++++++++++++
 libgxps-0.2.0-libpng15.patch |   24 ++++++++++++++++
 libgxps.spec                 |   37 ++++++++++++++++++++++--
 sources                      |    2 +-
 5 files changed, 122 insertions(+), 6 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index abc3376..b329d38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/libgxps-0.1.0.tar.bz2
+/libgxps-0.2.0.tar.bz2
diff --git a/libgxps-0.2.0-libm.patch b/libgxps-0.2.0-libm.patch
new file mode 100644
index 0000000..f53ccb8
--- /dev/null
+++ b/libgxps-0.2.0-libm.patch
@@ -0,0 +1,63 @@
+commit 7bc33181d7e44aab35db01d4ac1560dcf408d5d9
+Author: Dominique Leuenberger <dimstar at opensuse.org>
+Date:   Mon Nov 21 08:51:54 2011 +0100
+
+    Build: link with libm. Fixes bgo#664439.
+
+diff --git a/configure.ac b/configure.ac
+index b7d38c6..7ef4310 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -47,6 +47,7 @@ AC_ISC_POSIX
+ AC_PROG_CC_STDC
+ AC_STDC_HEADERS
+ AC_C_BIGENDIAN
++LT_LIB_M
+ 
+ GNOME_MAINTAINER_MODE_DEFINES
+ GNOME_COMPILE_WARNINGS
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index ccb7e05..0bf1538 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -54,6 +54,7 @@ xpstopng_CFLAGS = \
+ 
+ xpstopng_LDADD = \
+ 	libgxpstools.la		\
++	$(LIBM)                 \
+ 	$(LIBPNG_LIBS)
+ endif # HAVE_LIBPNG
+ 
+@@ -77,6 +78,7 @@ xpstojpeg_CFLAGS = \
+ 
+ xpstojpeg_LDADD = \
+ 	libgxpstools.la		\
++	$(LIBM)                 \
+ 	$(LIBJPEG)
+ endif # HAVE_LIBJPEG
+ 
+@@ -99,6 +101,7 @@ xpstopdf_CFLAGS = \
+ 
+ xpstopdf_LDADD = \
+ 	libgxpstools.la		\
++	$(LIBM)                 \
+ 	$(CAIRO_PDF_LIBS)
+ endif # HAVE_CAIRO_PDF
+ 
+@@ -121,6 +124,7 @@ xpstops_CFLAGS = \
+ 
+ xpstops_LDADD = \
+ 	libgxpstools.la		\
++	$(LIBM)                 \
+ 	$(CAIRO_PS_LIBS)
+ endif # HAVE_CAIRO_PS
+ 
+@@ -143,5 +147,6 @@ xpstosvg_CFLAGS = \
+ 
+ xpstosvg_LDADD = \
+ 	libgxpstools.la		\
++	$(LIBM)                 \
+ 	$(CAIRO_SVG_LIBS)
+-endif # HAVE_CAIRO_SVG
+\ No newline at end of file
++endif # HAVE_CAIRO_SVG
diff --git a/libgxps-0.2.0-libpng15.patch b/libgxps-0.2.0-libpng15.patch
new file mode 100644
index 0000000..b0429c5
--- /dev/null
+++ b/libgxps-0.2.0-libpng15.patch
@@ -0,0 +1,24 @@
+commit 5a63ac53db13fe75b9105ee7b4c03dfeaac54247
+Author: Alexandre Rostovtsev <tetromino at gentoo.org>
+Date:   Wed Nov 23 13:24:50 2011 -0500
+
+    Fix building with libpng15
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=664666
+
+diff --git a/tools/gxps-png-writer.c b/tools/gxps-png-writer.c
+index 7d78ec9..369e0e0 100644
+--- a/tools/gxps-png-writer.c
++++ b/tools/gxps-png-writer.c
+@@ -23,6 +23,11 @@
+ #include <png.h>
+ #include <stdint.h>
+ 
++/* starting with libpng15, png.h no longer #includes zlib.h */
++#ifndef Z_BEST_COMPRESSION
++#define Z_BEST_COMPRESSION 9
++#endif
++
+ struct _GXPSPngWriter {
+ 	GObject parent;
+ 
diff --git a/libgxps.spec b/libgxps.spec
index e119427..1c43f52 100644
--- a/libgxps.spec
+++ b/libgxps.spec
@@ -1,11 +1,18 @@
 Name:           libgxps
-Version:        0.1.0
-Release:        2%{?dist}
+Version:        0.2.0
+Release:        1%{?dist}
 Summary:        GObject based library for handling and rendering XPS documents
+Group:          System Environment/Libraries
 
 License:        LGPLv2+
 URL:            http://live.gnome.org/libgxps
-Source0:        http://ftp.gnome.org/pub/gnome/sources/%{name}/0.1/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/gnome/sources/%{name}/0.2/%{name}-%{version}.tar.bz2
+# Patch from upstream to link with libm
+# https://bugzilla.gnome.org/show_bug.cgi?id=664439
+Patch0:         libgxps-0.2.0-libm.patch
+# Patch from upstream for libpng15 support
+# https://bugzilla.gnome.org/show_bug.cgi?id=664666
+Patch1:         libgxps-0.2.0-libpng15.patch
 
 BuildRequires:  gtk3-devel
 BuildRequires:  glib2-devel
@@ -16,6 +23,9 @@ BuildRequires:  libarchive-devel
 BuildRequires:  freetype-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libtiff-devel
+BuildRequires:  lcms2-devel
+# Required temporarily for libm patch
+BuildRequires:  libtool
 
 %description
 libgxps is a GObject based library for handling and rendering XPS
@@ -23,19 +33,31 @@ documents.
 
 %package        devel
 Summary:        Development files for %{name}
+Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
+%package        tools
+Summary:        Development files for %{name}
+Group:          Applications/Text
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description    tools
+The %{name}-tools contains command-line programs for manipulating GPX format
+documents using the %{name} library.
+
 
 %prep
 %setup -q
+%patch0 -p1 -b .libm
+%patch1 -p1 -b .libpng15
 
 
 %build
-%configure --disable-static
+%configure --disable-static --enable-man
 make %{?_smp_mflags}
 
 
@@ -62,8 +84,15 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %{_datadir}/gir-1.0/*.gir
 %{_datadir}/gtk-doc/html/libgxps
 
+%files tools
+%{_bindir}/xpsto*
+%{_mandir}/man1/xpsto*.1.gz
+
 
 %changelog
+* Thu Dec  1 2011 Tom Hughes <tom at compton.nu> - 0.2.0-1
+- Update to 0.2.0 upstream release.
+
 * Sat Nov  5 2011 Tom Hughes <tom at compton.nu> - 0.1.0-2
 - Fix base package dependency in devel package.
 
diff --git a/sources b/sources
index b2be8e1..22b68fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c3fbbf5db3d3505e22c0679393916333  libgxps-0.1.0.tar.bz2
+362c0d7e28e077be3595a19110ef2244  libgxps-0.2.0.tar.bz2
