rpms/pam_mysql/FC-3 pam_mysql-0.5-vars.patch, NONE, 1.1 pam_mysql.spec, 1.2, 1.3

[Ignacio Vazquez-Abrams (ivazquez)]

Author: ivazquez

Update of /cvs/extras/rpms/pam_mysql/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3141

Modified Files:
	pam_mysql.spec 
Added Files:
	pam_mysql-0.5-vars.patch 
Log Message:
Fixed build on x86_64

pam_mysql-0.5-vars.patch:

--- NEW FILE pam_mysql-0.5-vars.patch ---
--- pam_mysql/Makefile.orig	2005-03-23 18:17:08.885220061 -0500
+++ pam_mysql/Makefile	2005-03-23 18:18:08.427578059 -0500
@@ -1,15 +1,16 @@
 # Convenient defaults for compiling independently of the full source
 # tree.
 ifndef FULL_LINUX_PAM_SOURCE_TREE
-export DYNAMIC=-DPAM_DYNAMIC
-export CC=gcc
-export CFLAGS=-O2 -Dlinux -DLINUX_PAM \
-       -ansi -D_POSIX_SOURCE -Wall -Wwrite-strings \
-       -Wpointer-arith -Wcast-qual -Wcast-align -Wtraditional \
-       -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline \
-       -Wshadow -pedantic -fPIC
-export MKDIR=mkdir -p
-export LD_D=gcc -shared -Xlinker -x -L/usr/lib/mysql -lz
+DYNAMIC=-DPAM_DYNAMIC
+CC=gcc
+CFLAGS=-O2 -Dlinux -DLINUX_PAM \
+  -ansi -D_POSIX_SOURCE -Wall -Wwrite-strings \
+  -Wpointer-arith -Wcast-qual -Wcast-align -Wtraditional \
+  -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline \
+  -Wshadow -pedantic -fPIC
+MKDIR=mkdir -p
+LIBDIR=/usr/lib
+LD_D=gcc -shared -Xlinker -x -L$(LIBDIR)/mysql -lz
 endif
 
 #


Index: pam_mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_mysql/FC-3/pam_mysql.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pam_mysql.spec	16 Mar 2005 18:54:45 -0000	1.2
+++ pam_mysql.spec	24 Mar 2005 12:43:45 -0000	1.3
@@ -1,10 +1,11 @@
 Summary:	PAM module for auth UNIX users using MySQL data base
 Name:		pam_mysql
 Version:	0.50
-Release:	3
+Release:	4
 License:	GPL
 Group:		Base
 Source0:	http://dl.sf.net/pam-mysql/pam_mysql-0.5.tar.gz
+Patch:		pam_mysql-0.5-vars.patch
 URL:		http://sf.net/projects/pam-mysql/
 BuildRequires:	pam-devel mysql-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root-%(id -u -n)
@@ -15,9 +16,10 @@
 
 %prep
 %setup -q -n %{name}
+%patch -p 1 -b .vars
 
 %build
-make
+make LIBDIR=%{_libdir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -32,6 +34,9 @@
 /%{_lib}/security/pam_mysql.so
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-4
+- Fixed build on x86_64
+
 * Wed Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.50-3
 - Removed explicit Requires
 - Removed Polish Summary and Description