rpms/gift-openft/devel gift-openft-0.2.1.6-fhs.patch, NONE, 1.1 gift-openft.spec, 1.4, 1.5 gift-openft-0.2.1.6-lib64.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/gift-openft/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11912

Modified Files:
	gift-openft.spec 
Added Files:
	gift-openft-0.2.1.6-fhs.patch 
Removed Files:
	gift-openft-0.2.1.6-lib64.patch 
Log Message:
* Fri Nov 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.2.1.6-5
- respin for new db4 (fc7)

* Tue Oct 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.2.1.6-4
- cleanup lib64 patch (now -fhs patch)


gift-openft-0.2.1.6-fhs.patch:

--- NEW FILE gift-openft-0.2.1.6-fhs.patch ---
--- gift-openft-0.2.1.6/aclocal.m4.fhs	2005-04-30 19:05:50.000000000 -0500
+++ gift-openft-0.2.1.6/aclocal.m4	2006-10-31 07:34:12.000000000 -0600
@@ -6951,10 +6951,10 @@
      AC_SUBST(prefix)
    fi
 
-   plugindir=${prefix}/lib/giFT
+   plugindir=${libdir}/giFT
    AC_SUBST(plugindir)
 
-   datadir=${prefix}/share/giFT
+   datadir=${datadir}/giFT
    AC_SUBST(datadir)
   ])
 
--- gift-openft-0.2.1.6/configure.fhs	2005-04-30 19:05:57.000000000 -0500
+++ gift-openft-0.2.1.6/configure	2006-10-31 07:35:23.000000000 -0600
@@ -20198,10 +20198,10 @@
 
    fi
 
-   plugindir=${prefix}/lib/giFT
+   plugindir=${libdir}/giFT
 
 
-   datadir=${prefix}/share/giFT
+   datadir=${datadir}/giFT
 
 
 


Index: gift-openft.spec
===================================================================
RCS file: /cvs/extras/rpms/gift-openft/devel/gift-openft.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gift-openft.spec	29 Aug 2006 17:36:44 -0000	1.4
+++ gift-openft.spec	10 Nov 2006 19:11:22 -0000	1.5
@@ -2,7 +2,7 @@
 Summary: Openft plugin for giFT 
 Name:	 gift-openft	
 Version: 0.2.1.6
-Release: 3%{?dist}
+Release: 5%{?dist}
 
 License: GPL
 Group:	 System Environment/Libraries
@@ -10,7 +10,7 @@
 Source:	 http://dl.sourceforge.net/sourceforge/gift/gift-openft-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: gift-openft-0.2.1.6-lib64.patch
+Patch1: gift-openft-0.2.1.6-fhs.patch
 
 BuildRequires: gift-devel
 BuildRequires: zlib-devel
@@ -23,7 +23,8 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .lib64
+# See also related gift bug: http://bugzilla.redhat.com/210114
+%patch1 -p1 -b .fhs
 
 
 %build
@@ -50,6 +51,12 @@
 
 
 %changelog
+* Fri Nov 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.2.1.6-5
+- respin for new db4 (fc7)
+
+* Tue Oct 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.2.1.6-4
+- cleanup lib64 patch (now -fhs patch)
+
 * Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.2.1.6-3
 - fc6 respin
 


--- gift-openft-0.2.1.6-lib64.patch DELETED ---