rpms/xdvik/devel xdvik-22.84.13-uint32_t-fix.patch, 1.1, 1.2 xdvik.spec, 1.11, 1.12

[Jonathan G. Underwood (jgu)]

Author: jgu

Update of /cvs/extras/rpms/xdvik/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24468

Modified Files:
	xdvik-22.84.13-uint32_t-fix.patch xdvik.spec 
Log Message:
* Sat Feb  2  2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.13-13
- Rework xdvik-22.84.13-uint32_t-fix.patch so as to be consistent with the
  upstream japanese patch and to stop the build barfing
- Remove parallel make since occasionally this fails


xdvik-22.84.13-uint32_t-fix.patch:

Index: xdvik-22.84.13-uint32_t-fix.patch
===================================================================
RCS file: /cvs/extras/rpms/xdvik/devel/xdvik-22.84.13-uint32_t-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xdvik-22.84.13-uint32_t-fix.patch	15 Jan 2008 10:12:28 -0000	1.1
+++ xdvik-22.84.13-uint32_t-fix.patch	2 Feb 2008 22:47:18 -0000	1.2
@@ -1,14 +1,13 @@
---- texk/xdvik/c-auto.in.orig	2008-01-05 21:32:24.000000000 +0000
-+++ texk/xdvik/c-auto.in	2008-01-05 21:32:58.000000000 +0000
-@@ -316,7 +316,11 @@
- #undef vfork
- 
- /* Define to `unsigned long' if <sys/types.h> does not define. */
-+#ifndef HAVE_STDINT_H
-+#ifndef HAVE_INTTYPES_H
- #undef uint32_t
+diff -u -r1.1.1.2 -r1.2
+--- xdvik-22.84.13.orig/texk/etc/autoconf/acgeneral.m4  19 Oct 2003 12:59:43 -0000      1.1.1.2
++++ xdvik-22.84.13/texk/etc/autoconf/acgeneral.m4       14 Dec 2007 05:47:37 -0000      1.2
+@@ -2037,6 +2037,9 @@
+ #if STDC_HEADERS
+ #include <stdlib.h>
+ #include <stddef.h>
 +#endif
-+#endif
- 
- /* Define if the vsnprintf function works.  */
- #undef HAVE_GOOD_VSNPRINTF
++#if HAVE_STDINT_H
++#include <stdint.h>
+ #endif], ac_cv_type_$1=yes, ac_cv_type_$1=no)])dnl
+ AC_MSG_RESULT($ac_cv_type_$1)
+ if test $ac_cv_type_$1 = no; then


Index: xdvik.spec
===================================================================
RCS file: /cvs/extras/rpms/xdvik/devel/xdvik.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xdvik.spec	2 Feb 2008 14:53:30 -0000	1.11
+++ xdvik.spec	2 Feb 2008 22:47:18 -0000	1.12
@@ -5,7 +5,7 @@
 Summary:        An X viewer for DVI files
 Name:           xdvik
 Version:        22.84.13
-Release:        13%{?dist}
+Release:        14%{?dist}
 Url:            http://xdvi.sourceforge.net/
 # encodings.c is GPLv2+ and LGPL and MIT
 # read-mapfile.c tfmload.c are from dvips
@@ -50,7 +50,7 @@
 
 %if %{with japanese}
 # Japanese patch for xdvi dervied from http://sourceforge.jp/projects/xdvi/
-# with minor modifications made to make it apply cleanly
+# The only change is we have moved the first hunk to patch2001
 Patch1000:      xdvik-22.84.13-j1.36.1.patch.gz
 Patch1001:      pxdvik-22.84.13.patch
 Patch1002:      pxdvik-22.84.13-use-system-libs.patch
@@ -117,7 +117,7 @@
 %patch2000 -p1 -b .use-system-libs
 
 # Fix unin32_t problem for xdvik (pxdvik is already fixed by Patch1000)
-%patch2001 -p0
+%patch2001 -p1
 
 # Re-run autoconf against patched Makefile.ins
 ( cd texk/xdvik ; autoconf-2.13 -m $RPM_BUILD_DIR/%{name}-%{version}/texk/etc/autoconf )
@@ -160,7 +160,8 @@
 
 rm -rf libs texk/contrib/ texk/kpathsea
 
-make %{?_smp_mflags}
+# Here we don't use make %{?_smp_mflags} since occasionally it fails
+make
 
 # Doc files (the full list of changes is in the texk/xdvik/CHANGES file)
 iconv -f ISO-8859-1 -t UTF8 texk/xdvik/CHANGES -o CHANGES
@@ -265,6 +266,11 @@
 
 %changelog
 * Sat Feb  2  2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.13-13
+- Rework xdvik-22.84.13-uint32_t-fix.patch so as to be consistent with the
+  upstream japanese patch and to stop the build barfing
+- Remove parallel make since occasionally this fails
+
+* Sat Feb  2  2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.13-13
 - Rework pxdvik-22.84.13-use-system-libs.patch for new japanes patch
 
 * Sat Feb  2  2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.13-12