nmu3

.gitignore

@@ -1,2 +1,3 @@
 libpaper_1.1.24.tar.gz
 /libpaper_1.1.24+nmu1.tar.gz
+/libpaper_1.1.24+nmu3.tar.gz

libpaper-useglibcfallback.patch

@@ -1,6 +1,6 @@
-diff -up libpaper-1.1.24/lib/paper.c.useglibcfallback libpaper-1.1.24/lib/paper.c
---- libpaper-1.1.24/lib/paper.c.useglibcfallback	2010-04-24 08:12:11.000000000 -0400
-+++ libpaper-1.1.24/lib/paper.c	2010-04-24 12:04:59.549538425 -0400
+diff -up libpaper-1.1.24+nmu3/lib/paper.c.useglibcfallback libpaper-1.1.24+nmu3/lib/paper.c
+--- libpaper-1.1.24+nmu3/lib/paper.c.useglibcfallback	2010-04-24 08:12:11.000000000 -0400
++++ libpaper-1.1.24+nmu3/lib/paper.c	2014-04-22 15:58:33.120039001 -0400
 @@ -20,6 +20,9 @@
  
  #include <unistd.h>
@@ -39,14 +39,14 @@ diff -up libpaper-1.1.24/lib/paper.c.useglibcfallback libpaper-1.1.24/lib/paper.
      return PAPERSIZE;
  }
  
-diff -up libpaper-1.1.24/man/paperconf.1.in.useglibcfallback libpaper-1.1.24/man/paperconf.1.in
---- libpaper-1.1.24/man/paperconf.1.in.useglibcfallback	2004-01-19 23:35:04.000000000 -0500
-+++ libpaper-1.1.24/man/paperconf.1.in	2010-04-24 12:03:56.866532268 -0400
+diff -up libpaper-1.1.24+nmu3/man/paperconf.1.in.useglibcfallback libpaper-1.1.24+nmu3/man/paperconf.1.in
+--- libpaper-1.1.24+nmu3/man/paperconf.1.in.useglibcfallback	2014-04-22 15:58:33.121038995 -0400
++++ libpaper-1.1.24+nmu3/man/paperconf.1.in	2014-04-22 16:00:15.973428376 -0400
 @@ -48,10 +48,12 @@ looking in order at the
  .B @PAPERSIZEVAR@
  environment variable, at the contents of the file specified by the
  .B @PAPERCONFVAR@
--environment variable, at the contects of
+-environment variable, at the contents of
 +environment variable, at the contents of the file
  .B @PAPERCONF@
 -or by using
@@ -58,9 +58,9 @@ diff -up libpaper-1.1.24/man/paperconf.1.in.useglibcfallback libpaper-1.1.24/man
  as a fall-back value if none of the other alternatives are successful.
  By default, width and height of the paper are printed in PostScript points.
  .SH OPTIONS
-diff -up libpaper-1.1.24/src/paperconf.c.useglibcfallback libpaper-1.1.24/src/paperconf.c
---- libpaper-1.1.24/src/paperconf.c.useglibcfallback	2007-09-26 02:13:38.000000000 -0400
-+++ libpaper-1.1.24/src/paperconf.c	2010-04-24 12:03:56.867538135 -0400
+diff -up libpaper-1.1.24+nmu3/src/paperconf.c.useglibcfallback libpaper-1.1.24+nmu3/src/paperconf.c
+--- libpaper-1.1.24+nmu3/src/paperconf.c.useglibcfallback	2012-05-03 15:05:12.000000000 -0400
++++ libpaper-1.1.24+nmu3/src/paperconf.c	2014-04-22 15:58:33.121038995 -0400
 @@ -13,6 +13,7 @@
  #include <errno.h>
  

libpaper.spec

@@ -1,19 +1,13 @@
-%global nmu +nmu1
+%global nmu +nmu3
 
 Name:		libpaper
 Version:	1.1.24
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Library and tools for handling papersize
 Group:		System Environment/Libraries
 License:	GPLv2
 URL:		http://packages.qa.debian.org/libp/libpaper.html
 Source0:	http://ftp.debian.org/debian/pool/main/libp/libpaper/%{name}_%{version}%{nmu}.tar.gz
-# Filed	upstream as:
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=496126
-Patch0:		libpaper-1.1.20-automake_1.10.patch
-# Upstream bug:
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=475683
-Patch1:		libpaper-1.1.23-debianbug475683.patch
 # Filed upstream as:
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=481213
 Patch2:		libpaper-useglibcfallback.patch
@@ -38,8 +32,6 @@ to develop applications which use libpaper.
 
 %prep
 %setup -q -n %{name}-%{version}%{nmu}
-%patch0 -p1 -b .automake110
-%patch1 -p1 -b .dlfix
 %patch2 -p1 -b .useglibcfallback
 libtoolize
 

sources

@@ -1 +1 @@
-30d9c62b5757072fa90aee6f46ba2c39  libpaper_1.1.24+nmu1.tar.gz
+2d7239e4e7cb295aff54814f0d97992d  libpaper_1.1.24+nmu3.tar.gz