1.1.14

.cvsignore

@@ -1 +1 @@
-libpaper_1.1.23+nmu2.tar.gz
+libpaper_1.1.24.tar.gz

libpaper-useglibcfallback.patch

@@ -1,9 +1,9 @@
-diff -ru libpaper-1.1.23.orig/lib/paper.c libpaper-1.1.23/lib/paper.c
---- libpaper-1.1.23.orig/lib/paper.c	2008-08-12 13:20:48.000000000 +0100
-+++ libpaper-1.1.23/lib/paper.c	2008-08-12 14:26:44.000000000 +0100
-@@ -22,6 +22,9 @@
+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
+@@ -20,6 +20,9 @@
  
- #include <stdlib.h>
+ #include <unistd.h>
  
 +#include <locale.h>
 +#include <langinfo.h>
@@ -11,7 +11,7 @@ diff -ru libpaper-1.1.23.orig/lib/paper.c libpaper-1.1.23/lib/paper.c
  #include "paper.h"
  
  struct paper {
-@@ -110,6 +113,27 @@
+@@ -108,6 +111,27 @@ in PAPERCONFVAR, fall-back to the old be
  }
  
  const char* defaultpapername(void) {
@@ -39,10 +39,10 @@ diff -ru libpaper-1.1.23.orig/lib/paper.c libpaper-1.1.23/lib/paper.c
      return PAPERSIZE;
  }
  
-diff -ru libpaper-1.1.23.orig/man/paperconf.1.in libpaper-1.1.23/man/paperconf.1.in
---- libpaper-1.1.23.orig/man/paperconf.1.in	2008-08-12 13:20:48.000000000 +0100
-+++ libpaper-1.1.23/man/paperconf.1.in	2008-08-12 14:34:06.000000000 +0100
-@@ -48,10 +48,12 @@
+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
+@@ -48,10 +48,12 @@ looking in order at the
  .B @PAPERSIZEVAR@
  environment variable, at the contents of the file specified by the
  .B @PAPERCONFVAR@
@@ -58,9 +58,9 @@ diff -ru libpaper-1.1.23.orig/man/paperconf.1.in libpaper-1.1.23/man/paperconf.1
  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 -ru libpaper-1.1.23.orig/src/paperconf.c libpaper-1.1.23/src/paperconf.c
---- libpaper-1.1.23.orig/src/paperconf.c	2008-08-12 13:20:48.000000000 +0100
-+++ libpaper-1.1.23/src/paperconf.c	2008-08-12 14:13:33.000000000 +0100
+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
 @@ -13,6 +13,7 @@
  #include <errno.h>
  
@@ -69,7 +69,7 @@ diff -ru libpaper-1.1.23.orig/src/paperconf.c libpaper-1.1.23/src/paperconf.c
  
  
  /* needed for GNU/Hurd */
-@@ -99,6 +100,8 @@
+@@ -99,6 +100,8 @@ int main(int argc, char** argv)
  
      const char* progname;
  

libpaper.spec

@@ -1,11 +1,11 @@
 Name:		libpaper
-Version:	1.1.23
-Release:	7%{?dist}
+Version:	1.1.24
+Release:	1%{?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}+nmu2.tar.gz
+Source0:	http://ftp.debian.org/debian/pool/main/libp/libpaper/%{name}_%{version}.tar.gz
 # Filed	upstream as:
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=496126
 Patch0:		libpaper-1.1.20-automake_1.10.patch
@@ -36,7 +36,7 @@ This package contains headers and libraries that programmers will need
 to develop applications which use libpaper.
 
 %prep
-%setup -q -n %{name}-%{version}+nmu2
+%setup -q -n %{name}-%{version}
 %patch0 -p1 -b .automake110
 %patch1 -p1 -b .dlfix
 %patch2 -p1 -b .useglibcfallback
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sat Apr 24 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 1.1.24-1
+- update to 1.1.24
+
 * Thu Mar  4 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 1.1.23-7
 - update to 1.1.23+nmu2
 

sources

@@ -1 +1 @@
-30e58b56c0b891b89e7d8c287be368b8  libpaper_1.1.23+nmu2.tar.gz
+5bc87d494ba470aba54f6d2d51471834  libpaper_1.1.24.tar.gz