rpms/xdvik/devel pxdvik-22.84.13-use-system-libs.patch, 1.1, 1.2 xdvik.spec, 1.10, 1.11

[Jonathan G. Underwood (jgu)]

Author: jgu

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

Modified Files:
	pxdvik-22.84.13-use-system-libs.patch xdvik.spec 
Log Message:
* 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


pxdvik-22.84.13-use-system-libs.patch:

Index: pxdvik-22.84.13-use-system-libs.patch
===================================================================
RCS file: /cvs/extras/rpms/xdvik/devel/pxdvik-22.84.13-use-system-libs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pxdvik-22.84.13-use-system-libs.patch	15 Jan 2008 10:12:28 -0000	1.1
+++ pxdvik-22.84.13-use-system-libs.patch	2 Feb 2008 14:53:30 -0000	1.2
@@ -1,22 +1,21 @@
-diff -ru xdvik-22.84.13-orig/texk/pxdvik/Makefile.in xdvik-22.84.13/texk/pxdvik/Makefile.in
---- xdvik-22.84.13-orig/texk/pxdvik/Makefile.in	2008-01-12 12:37:10.000000000 -0500
-+++ xdvik-22.84.13/texk/pxdvik/Makefile.in	2008-01-12 18:35:39.000000000 -0500
-@@ -59,7 +59,7 @@
+diff -ru --exclude='*.orig' texk-orig/pxdvik/Makefile.in texk/pxdvik/Makefile.in
+--- texk-orig/pxdvik/Makefile.in	2008-02-02 14:48:22.000000000 +0000
++++ texk/pxdvik/Makefile.in	2008-02-02 14:50:09.000000000 +0000
+@@ -70,7 +70,7 @@
+ ps_def = @PS_DEF@
  vflib_def = -DDEFAULT_FONTMAP=\"$(VFONTMAP)\"
- freetype_cflags = @FT2_CFLAGS@
- prog_cflags = @XTRA_WARN_CFLAGS@ $(LIBT1CPPFLAGS) $(ps_def) $(freetype_cflags) \
+ prog_cflags = @XTRA_WARN_CFLAGS@ $(LIBT1CPPFLAGS) $(FREETYPE2CPPFLAGS) $(ZLIBCPPFLAGS) $(ps_def) \
 --I$(srcdir)/gui -I../../libs/t1lib/lib/t1lib -I../kpathsea $(x_cppflags) $(vflib_def)
-+-I$(srcdir)/gui $(x_cppflags) $(vflib_def)
++-I$(srcdir)/gui $(vflib_def)
  
  # Note: to be able to use one depend.mk file for both Motif/Xaw (which
  # is needed since only maintainers are supposed to invoke `make depend')
-@@ -131,7 +131,7 @@
+@@ -142,7 +142,7 @@
  test_verbose:
  	cd tests; $(MAKE) $(makeargs) test_verbose
  
-- at final_exec_name@: $(kpathsea) $(objects) $(LIBT1DEP) $(LIBGUIDEP)
-+ at final_exec_name@: $(objects) $(LIBT1DEP) $(LIBGUIDEP)
+- at final_exec_name@: $(kpathsea) $(objects) $(LIBT1DEP) $(FREETYPE2DEP) $(ZLIBDEP) $(LIBGUIDEP)
++ at final_exec_name@: $(objects) $(LIBT1DEP) $(FREETYPE2DEP) $(ZLIBDEP) $(LIBGUIDEP)
  	$(kpathsea_link) $(objects) $(LIBGUI) $(x_link) $(LOADLIBES)
  
  squeeze.o: squeeze.c
-


Index: xdvik.spec
===================================================================
RCS file: /cvs/extras/rpms/xdvik/devel/xdvik.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xdvik.spec	2 Feb 2008 14:10:05 -0000	1.10
+++ xdvik.spec	2 Feb 2008 14:53:30 -0000	1.11
@@ -5,7 +5,7 @@
 Summary:        An X viewer for DVI files
 Name:           xdvik
 Version:        22.84.13
-Release:        12%{?dist}
+Release:        13%{?dist}
 Url:            http://xdvi.sourceforge.net/
 # encodings.c is GPLv2+ and LGPL and MIT
 # read-mapfile.c tfmload.c are from dvips
@@ -105,7 +105,7 @@
 %patch1001 -p0
 
 # Build pxdvik against system libs
-%patch1002 -p1
+%patch1002 -p0
 
 # XXX Is this really necessary?
 mv texk/pxdvik/vfontmap.sample texk/pxdvik/vfontmap.sample.orig
@@ -264,6 +264,9 @@
 %endif
 
 %changelog
+* 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
 - Fix errors in changelog
 - Small modifications to xdvik-22.84.13-j1.36.patch.gz so it will apply cleanly