rpms/gv/devel gv-3.6.5-pkgdatadir.patch, NONE, 1.1 gv.spec, 1.15, 1.16 gv-3.6.1-pkglibdir.patch, 1.1, NONE

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/pkgs/rpms/gv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20082

Modified Files:
	gv.spec 
Added Files:
	gv-3.6.5-pkgdatadir.patch 
Removed Files:
	gv-3.6.1-pkglibdir.patch 
Log Message:
* Thu Jul 18 2008 Orion Poplawski <orion at cora.nwra.com> 3.6.5-2
- Change install dir patch to be more palatable for upstream


gv-3.6.5-pkgdatadir.patch:

--- NEW FILE gv-3.6.5-pkgdatadir.patch ---
--- gv-3.6.5/src/Makefile.am.pkgdatadir	2008-06-22 04:57:35.000000000 -0600
+++ gv-3.6.5/src/Makefile.am	2008-07-18 10:22:22.000000000 -0600
@@ -6,9 +6,9 @@
 
 # File distribution
 bin_PROGRAMS = gv
-dist_pkglib_DATA = gv_system.ad gv_user.ad gv_class.ad gv_spartan.dat gv_user_res.dat gv_copyright.dat gv_widgetless.dat
+dist_pkgdata_DATA = gv_system.ad gv_user.ad gv_class.ad gv_spartan.dat gv_user_res.dat gv_copyright.dat gv_widgetless.dat
 
-appdefaultsdir = $(pkglibdir)
+appdefaultsdir = $(pkgdatadir)
 
 appdefaults_DATA = GV
 
@@ -30,7 +30,7 @@
 	     $(srcdir)/gv_intern_res_unix.dat
 
 # Compilation flags
-AM_CPPFLAGS = -DNON_BLOCKING_IO -DGV_CODE -DGV_CODE -DGV_LIBDIR=\"$(pkglibdir)\" \
+AM_CPPFLAGS = -DNON_BLOCKING_IO -DGV_CODE -DGV_CODE -DGV_LIBDIR=\"$(pkgdatadir)\" \
               -I$(top_srcdir)/lib -I$(top_builddir)/lib -g
 
 


Index: gv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gv/devel/gv.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gv.spec	18 Jul 2008 15:46:06 -0000	1.15
+++ gv.spec	18 Jul 2008 17:05:09 -0000	1.16
@@ -1,16 +1,19 @@
 Summary: A X front-end for the Ghostscript PostScript(TM) interpreter
 Name: gv
 Version: 3.6.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Publishing
 Requires: ghostscript
 URL: http://www.gnu.org/software/gv/
 Source0: ftp://ftp.gnu.org/gnu/gv/gv-%{version}.tar.gz
 Patch0: gv-3.5.8-buffer.patch
-Patch1: gv-3.6.1-pkglibdir.patch
+#Install data files in %{_datadir} not %{_libdir}
+#Sent upstream to bug-gv at gnu.org 20080718
+Patch1: gv-3.6.5-pkgdatadir.patch
 BuildRequires: /usr/bin/makeinfo
 BuildRequires: Xaw3d-devel, /usr/bin/desktop-file-install
+BuildRequires: automake
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info, /usr/bin/update-mime-database
 Requires(post): /usr/bin/update-desktop-database
@@ -27,10 +30,11 @@
 %prep
 %setup -q
 %patch0 -p1 -b .buffer
-%patch1 -p1 -b .pkglibdir
+%patch1 -p1 -b .pkgdatadir
 
 
 %build
+autoreconf
 %configure
 make %{?_smp_mflags}
 
@@ -100,6 +104,9 @@
 %{_mandir}/man1/gv.*
 
 %changelog
+* Thu Jul 18 2008 Orion Poplawski <orion at cora.nwra.com> 3.6.5-2
+- Change install dir patch to be more palatable for upstream
+
 * Thu Jul 17 2008 Orion Poplawski <orion at cora.nwra.com> 3.6.5-1
 - Update to 3.6.5
 


--- gv-3.6.1-pkglibdir.patch DELETED ---