rpms/ulogd/devel ulogd-1.02-x86_64.patch, 1.1, 1.2 ulogd.spec, 1.2, 1.3

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/ulogd/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv12892

Modified Files:
	ulogd-1.02-x86_64.patch ulogd.spec 
Log Message:
another attempt -- no AMD64 to test with

ulogd-1.02-x86_64.patch:

Index: ulogd-1.02-x86_64.patch
===================================================================
RCS file: /cvs/extras/rpms/ulogd/devel/ulogd-1.02-x86_64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ulogd-1.02-x86_64.patch	17 Dec 2004 16:45:52 -0000	1.1
+++ ulogd-1.02-x86_64.patch	17 Dec 2004 20:00:47 -0000	1.2
@@ -1,6 +1,6 @@
 diff -Nur ulogd-1.02-orig/configure ulogd-1.02/configure
 --- ulogd-1.02-orig/configure	2003-10-08 22:35:17.000000000 +0200
-+++ ulogd-1.02/configure	2004-12-17 17:34:25.810212360 +0100
++++ ulogd-1.02/configure	2004-12-17 20:57:23.294953288 +0100
 @@ -1703,22 +1703,22 @@
  mysqldir=""
  echo $ac_n "checking for MySQL files""... $ac_c" 1>&6
@@ -37,6 +37,15 @@
  
  if test x$mysqldir = x
  then
+@@ -1729,7 +1729,7 @@
+ EOF
+ 
+         MYSQLINCLUDES=${mysqldir}/include${mysqldir_suffix}
+-        MYSQLLIBS=${mysqldir}/lib${mysqldir_suffix}
++        MYSQLLIBS=${libdir}${mysqldir_suffix}
+ 
+ 	DATABASE_DIR="${DATABASE_DIR} mysql"
+ 
 @@ -1796,20 +1796,20 @@
  pgsqldir=""
  echo $ac_n "checking for PGSQL files""... $ac_c" 1>&6
@@ -70,3 +79,12 @@
  
  if test x$pgsqldir = x
  then
+@@ -1827,7 +1827,7 @@
+ 			break
+ 		fi
+ 	done
+-	PGSQLLIBS=${pgsqldir}/lib
++	PGSQLLIBS=${libdir}
+ 
+ 	DATABASE_DIR="${DATABASE_DIR} pgsql"
+ 


Index: ulogd.spec
===================================================================
RCS file: /cvs/extras/rpms/ulogd/devel/ulogd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ulogd.spec	17 Dec 2004 16:45:52 -0000	1.2
+++ ulogd.spec	17 Dec 2004 20:00:47 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           ulogd
 Version:        1.02
-Release:        7
+Release:        8
 Summary:        The userspace logging daemon for netfilter
 License:        GPL
 Group:          System Environment/Daemons
@@ -117,6 +117,9 @@
 %{_libdir}/ulogd/ulogd_PGSQL.so
 
 %changelog
+* Fri Dec 17 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 1.02-8
+- revise x86_64 patch to remove more hardcoded /lib badness
+
 * Fri Dec 17 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 1.02-7
 - x86_64, patch configure to look for mysql/pgsql below %%_libdir.
 - delete undefined %%epoch in mysql/pgsql sub package dep.