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

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
	ulogd.spec 
Added Files:
	ulogd-1.02-x86_64.patch 
Log Message:
x86_64 fix and sub-package requires fix

ulogd-1.02-x86_64.patch:

--- NEW FILE ulogd-1.02-x86_64.patch ---
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
@@ -1703,22 +1703,22 @@
 mysqldir=""
 echo $ac_n "checking for MySQL files""... $ac_c" 1>&6
 echo "configure:1706: checking for MySQL files" >&5
-for d in $dir /usr /usr/local /usr/local/mysql /opt/mysql /opt/packages/mysql
-do
-        if test -f $d/lib/mysql/libmysqlclient.so
+#for d in $dir /usr /usr/local /usr/local/mysql /opt/mysql /opt/packages/mysql
+#do
+        if test -f ${libdir}/mysql/libmysqlclient.so
         then
-                echo "$ac_t""found mysql in $d" 1>&6
-                mysqldir=$d
+                echo "$ac_t""found mysql in ${exec_prefix}" 1>&6
+                mysqldir=${exec_prefix}
                 mysqldir_suffix=/mysql
-                break
-        elif test -f $d/lib/libmysqlclient.so
-        then
-                echo "$ac_t""found mysql in $d" 1>&6
-                mysqldir=$d
-                mysqldir_suffix=
-                break
+#                break
+#        elif test -f $d/lib/libmysqlclient.so
+#        then
+#                echo "$ac_t""found mysql in $d" 1>&6
+#                mysqldir=$d
+#                mysqldir_suffix=
+#                break
         fi
-done
+#done
 
 if test x$mysqldir = x
 then
@@ -1796,20 +1796,20 @@
 pgsqldir=""
 echo $ac_n "checking for PGSQL files""... $ac_c" 1>&6
 echo "configure:1799: checking for PGSQL files" >&5
-for d in $dir /usr /usr/local /usr/local/pgsql /opt/pgsql /opt/packages/pgsql
-do
-        if test -f $d/lib/pgsql/libpq.so
-        then
-                echo "$ac_t""found pgsql in $d" 1>&6
-                pgsqldir=$d
-                break
-        elif test -f $d/lib/libpq.so
+#for d in $dir /usr /usr/local /usr/local/pgsql /opt/pgsql /opt/packages/pgsql
+#do
+        if test -f ${libdir}/libpq.so
         then
-                echo "$ac_t""found pgsql in $d" 1>&6
-                pgsqldir=$d
-                break
+                echo "$ac_t""found pgsql in ${exec_prefix}" 1>&6
+                pgsqldir=${exec_prefix}
+#                break
+#        elif test -f $d/lib/libpq.so
+#        then
+#                echo "$ac_t""found pgsql in $d" 1>&6
+#                pgsqldir=$d
+#                break
         fi
-done
+#done
 
 if test x$pgsqldir = x
 then


Index: ulogd.spec
===================================================================
RCS file: /cvs/extras/rpms/ulogd/devel/ulogd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ulogd.spec	26 Nov 2004 13:46:02 -0000	1.1
+++ ulogd.spec	17 Dec 2004 16:45:52 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           ulogd
 Version:        1.02
-Release:        6
+Release:        7
 Summary:        The userspace logging daemon for netfilter
 License:        GPL
 Group:          System Environment/Daemons
@@ -11,6 +11,7 @@
 Patch1:         ulogd-1.01-logdir.patch
 Patch2:         ulogd-1.02-init.patch
 Patch3:         ulogd-1.02-pgsql.patch
+Patch4:         ulogd-1.02-x86_64.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post):	initscripts, chkconfig
 Requires(postun): initscripts, chkconfig
@@ -27,7 +28,7 @@
 %package mysql
 Summary:        MySQL output plugin for ulogd
 Group:          System Environment/Daemons
-Requires:       %{name} = %{epoch}:%{version}
+Requires:       %{name} = %{version}
 
 %description mysql
 Ulogd-mysql is a MySQL output plugin for ulogd. It enables logging of
@@ -36,7 +37,7 @@
 %package pgsql
 Summary:        PostgreSQL output plugin for ulogd
 Group:          System Environment/Daemons
-Requires:       %{name} = %{epoch}:%{version}
+Requires:       %{name} = %{version}
 
 %description pgsql
 Ulogd-mysql is a PostgreSQL output plugin for ulogd. It enables logging of
@@ -47,6 +48,7 @@
 %patch1 -p1 -b .logdir
 %patch2 -p1 -b .fedora
 %patch3 -p1 -b .bigint
+%patch4 -p1 -b .x86_64
 
 %build
 %configure --with-mysql --with-pgsql
@@ -115,6 +117,10 @@
 %{_libdir}/ulogd/ulogd_PGSQL.so
 
 %changelog
+* 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.
+
 * Sun Oct 31 2004 Aurelien Bompard <gauret[AT]free.fr> 1.02-6
 - apply Michael Schwendt's suggestions in bug 1598