Author: oden
Date: Sat Feb 3 15:46:23 2007
New Revision: 116081
Added:
packages/cooker/netacct-mysql/current/SOURCES/netacct-mysql-initscript.patch
packages/cooker/netacct-mysql/current/SOURCES/netacct-mysql-lib64_shared.diff
Removed:
packages/cooker/netacct-mysql/current/SOURCES/netacct-mysql-initscript.patch.bz2
Modified:
packages/cooker/netacct-mysql/current/SPECS/netacct-mysql.spec
Log:
- added P1 (lib64 and shared fixes)
Added:
packages/cooker/netacct-mysql/current/SOURCES/netacct-mysql-initscript.patch
==============================================================================
--- (empty file)
+++
packages/cooker/netacct-mysql/current/SOURCES/netacct-mysql-initscript.patch
Sat Feb 3 15:46:23 2007
@@ -0,0 +1,11 @@
+--- contrib/nacctd.redhat 2002-09-28 12:25:17.000000000 -0400
++++ contrib/nacctd.redhat.oden 2002-09-29 05:39:44.000000000 -0400
+@@ -18,7 +18,7 @@
+
+ INITLOG_ARGS=""
+
+-nacctd=/usr/local/sbin/nacctd
++nacctd=/usr/sbin/nacctd
+ OPTIONS=""
+ RETVAL=0
+
Added:
packages/cooker/netacct-mysql/current/SOURCES/netacct-mysql-lib64_shared.diff
==============================================================================
--- (empty file)
+++
packages/cooker/netacct-mysql/current/SOURCES/netacct-mysql-lib64_shared.diff
Sat Feb 3 15:46:23 2007
@@ -0,0 +1,13 @@
+--- configure.in 2005-02-21 11:56:04.000000000 +0100
++++ configure.in.oden 2007-02-03 15:34:13.000000000 +0100
+@@ -159,8 +159,8 @@
+ fi
+ else
+
+- for i in mysql lib lib/mysql; do
+- str="$MYSQL_DIR/$i/libmysqlclient.a"
++ for i in mysql lib lib/mysql lib64 lib64/mysql; do
++ str="$MYSQL_DIR/$i/libmysqlclient.so"
+ for j in `echo $str`; do
+ if test -r $j; then
+ MYSQL_LIB_DIR="$MYSQL_DIR/$i"
Modified: packages/cooker/netacct-mysql/current/SPECS/netacct-mysql.spec
==============================================================================
--- packages/cooker/netacct-mysql/current/SPECS/netacct-mysql.spec
(original)
+++ packages/cooker/netacct-mysql/current/SPECS/netacct-mysql.spec Sat Feb
3 15:46:23 2007
@@ -6,7 +6,8 @@
Group: System/Servers
URL: http://netacct-mysql.gabrovo.com/
Source0:
http://netacct-mysql.gabrovo.com/download/%{name}-%{version}.tar.bz2
-Patch0: %{name}-initscript.patch.bz2
+Patch0: %{name}-initscript.patch
+Patch1: netacct-mysql-lib64_shared.diff
Requires(post): rpm-helper
Requires(preun): rpm-helper
BuildRequires: MySQL-devel
@@ -25,12 +26,7 @@
%setup -q
%patch0 -p0
-
-# lib64 fix
-perl -pi -e "s|/lib\b|/%{_lib}|g" configure*
-
-# anti static fix
-perl -pi -e "s|mysqlclient\.a|mysqlclient\.so|g" configure*
+%patch1 -p0
%build
rm -f configure
