rpms/mysql-proxy/devel mysql-proxy.init, NONE, 1.1 mysql-proxy.sysconfig, NONE, 1.1 .cvsignore, 1.4, 1.5 mysql-proxy.spec, 1.9, 1.10 sources, 1.4, 1.5

[Ruben Kerkhof]

Author: ruben

Update of /cvs/pkgs/rpms/mysql-proxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7041

Modified Files:
	.cvsignore mysql-proxy.spec sources 
Added Files:
	mysql-proxy.init mysql-proxy.sysconfig 
Log Message:
* Wed Aug 12 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.7.2-1
- Upstream released new version



--- NEW FILE mysql-proxy.init ---
#!/bin/bash
#
# mysql-proxy This script starts and stops the mysql-proxy daemon
#
# chkconfig: - 78 30
# processname: mysql-proxy
# description: mysql-proxy is a proxy daemon for mysql

# Source function library.
. /etc/rc.d/init.d/functions

prog="mysql-proxy"

# Source networking configuration.
if [ -f /etc/sysconfig/network ]; then
    . /etc/sysconfig/network
fi

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

# Set default mysql-proxy configuration.
PROXY_OPTIONS="--daemon"
PROXY_PID=/var/run/mysql-proxy.pid
PROXY_USER="mysql-proxy"

# Source mysql-proxy configuration.
if [ -f /etc/sysconfig/mysql-proxy ]; then
    . /etc/sysconfig/mysql-proxy
fi

RETVAL=0

start() {
    echo -n $"Starting $prog: "
    daemon $prog $PROXY_OPTIONS --pid-file $PROXY_PID --user $PROXY_USER
    RETVAL=$?
    echo
    if [ $RETVAL -eq 0 ]; then
        touch /var/lock/subsys/mysql-proxy
    fi
}

stop() {
    echo -n $"Stopping $prog: "
    killproc -p $PROXY_PID -d 3 $prog
    RETVAL=$?
    echo
    if [ $RETVAL -eq 0 ]; then
        rm -f /var/lock/subsys/mysql-proxy
        rm -f $PROXY_PID
    fi
}
# See how we were called.
case "$1" in
    start)
        start
        ;;
    stop)
        stop
        ;;
    restart)
        stop
        start
        ;;
    condrestart|try-restart)
        if status -p $PROXY_PIDFILE $prog >&/dev/null; then
            stop
            start
        fi
        ;;
    status)
        status -p $PROXY_PID $prog
        ;;
    *)
        echo "Usage: $0 {start|stop|restart|reload|status|condrestart|try-restart}"
        RETVAL=1
        ;;
esac

exit $RETVAL



--- NEW FILE mysql-proxy.sysconfig ---
# Options for mysql-proxy 
PROXY_USER="mysql-proxy"
PROXY_OPTIONS="--daemon --log-level=info --log-use-syslog"



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-proxy/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	9 Feb 2008 13:14:14 -0000	1.4
+++ .cvsignore	12 Aug 2009 17:28:31 -0000	1.5
@@ -1 +1 @@
-mysql-proxy-0.6.1.tar.gz
+mysql-proxy-0.7.2.tar.gz


Index: mysql-proxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-proxy/devel/mysql-proxy.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mysql-proxy.spec	25 Jul 2009 15:31:48 -0000	1.9
+++ mysql-proxy.spec	12 Aug 2009 17:28:31 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           mysql-proxy
-Version:        0.6.1
-Release:        4%{?dist}
+Version:        0.7.2
+Release:        1%{?dist}
 Summary:        A proxy for the MySQL Client/Server protocol
 
 Group:          Applications/Databases
@@ -9,6 +9,8 @@ URL:            http://forge.mysql.com/w
 
 # I haven't found a link to a direct download location, only to mirrors
 Source0:        http://mysql.he.net/Downloads/MySQL-Proxy/%{name}-%{version}.tar.gz
+Source1:    %{name}.init
+Source2:    %{name}.sysconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  lua-devel
@@ -19,6 +21,12 @@ BuildRequires:  gawk
 BuildRequires:  check-devel
 BuildRequires:  flex
 
+Requires(pre):  shadow-utils
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(preun): initscripts
+Requires(postun): initscripts
+
 %description
 MySQL Proxy is a simple program that sits between your client and MySQL
 server(s) that can monitor, analyze or transform their communication.
@@ -27,33 +35,69 @@ failover, query analysis, query filterin
 
 %prep
 %setup -q -n %{name}-%{version}
-
+sed -i 's/g_build_filename(base_dir, "lib"/g_build_filename(base_dir, "%{_lib}"/g' src/chassis.c
+sed -i 's/g_build_filename(srv->base_dir, "lib"/g_build_filename(srv->base_dir, "%{_lib}"/g' src/chassis.c
 
 %build
 %configure
+# strip rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
-rm -v %{buildroot}%{_datadir}/*.lua
-rm -v examples/Makefile*
+find %{buildroot} -type f -name \*.la -exec rm -v {} \;
+rm -v examples/Makefile* examples/CMakeLists.txt
+install -Dp -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
+install -Dp -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 
 %clean
 rm -rf %{buildroot}
 
+%pre
+getent group %{name} &>/dev/null || groupadd -r %{name} &>/dev/null
+getent passwd %{name} &>/dev/null || \
+useradd -r -g %{name} -d / -s /sbin/nologin \
+    -c "MySQL-Proxy user" %{name} &>/dev/null || :
+
+%post
+ldconfig
+/sbin/chkconfig --add %{name} || :
+
+%preun
+if [ "$1" = 0 ] ; then
+    /sbin/service %{name} stop > /dev/null 2>&1
+    /sbin/chkconfig --del %{name} || :
+fi
+
+%postun
+ldconfig
+if [ "$1" -ge 1 ]; then
+    /sbin/service %{name} condrestart >/dev/null 2>&1 || :
+fi
+
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README NEWS
 %doc examples/
 %{_sbindir}/%{name}
-%{_datadir}/%{name}
-
-
+%{_initrddir}/%{name}
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%{_bindir}/mysql-binlog-dump
+%{_bindir}/mysql-myisam-dump
+%{_libdir}/libmysql-chassis.so*
+%{_libdir}/libmysql-proxy.so*
+%{_libdir}/%{name}
 
 %changelog
+* Wed Aug 12 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.7.2-1
+- Upstream released new version
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-proxy/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	9 Feb 2008 13:14:14 -0000	1.4
+++ sources	12 Aug 2009 17:28:31 -0000	1.5
@@ -1 +1 @@
-f5b003f069c294002ae37c6df3a7a0a5  mysql-proxy-0.6.1.tar.gz
+85caf142acfb4ee7ae5a8bce175579f7  mysql-proxy-0.7.2.tar.gz