Author: glen Date: Wed Aug 4 13:15:31 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- install example lua
---- Files affected:
packages/mysql-proxy:
mysql-proxy.spec (1.31 -> 1.32) , install-examples.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/mysql-proxy/mysql-proxy.spec
diff -u packages/mysql-proxy/mysql-proxy.spec:1.31
packages/mysql-proxy/mysql-proxy.spec:1.32
--- packages/mysql-proxy/mysql-proxy.spec:1.31 Fri May 21 16:27:50 2010
+++ packages/mysql-proxy/mysql-proxy.spec Wed Aug 4 15:15:21 2010
@@ -36,8 +36,9 @@
Source2: %{name}.sysconfig
Source3: %{name}.conf
Source4: admin-1.lua
+Patch0: install-examples.patch
URL: http://forge.mysql.com/wiki/MySQL_Proxy
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.62
BuildRequires: automake
BuildRequires: glib2-devel >= 1:2.4.0
BuildRequires: libevent-devel
@@ -82,9 +83,10 @@
%prep
%setup -q
+%patch0 -p1
-sed -i -e 's/g_build_filename(base_dir, "lib"/g_build_filename(base_dir,
"%{_lib}"/g' src/chassis.c
-sed -i -e 's/g_build_filename(srv->base_dir,
"lib"/g_build_filename(srv->base_dir, "%{_lib}"/g' src/chassis.c
+%{__sed} -i -e 's/g_build_filename(base_dir, "lib"/g_build_filename(base_dir,
"%{_lib}"/g' src/chassis.c
+%{__sed} -i -e 's/g_build_filename(srv->base_dir,
"lib"/g_build_filename(srv->base_dir, "%{_lib}"/g' src/chassis.c
%build
%{__libtoolize}
@@ -121,6 +123,7 @@
# noarch data to %{_datadir}
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/lua
mv $RPM_BUILD_ROOT{%{_libdir},%{_datadir}}/%{name}/lua/proxy
+mv $RPM_BUILD_ROOT{%{_libdir},%{_datadir}}/%{name}/lua/examples
# contrib lua
cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/%{name}/lua/proxy
@@ -190,6 +193,9 @@
%dir %{_datadir}/%{name}/lua
%dir %{_datadir}/%{name}/lua/proxy
%{_datadir}/%{name}/lua/proxy/*.lua
+%dir %{_datadir}/%{name}/lua/examples
+%{_datadir}/%{name}/lua/examples/*.lua
+%{_datadir}/%{name}/lua/examples/*.msc
%dir %{_libdir}/%{name}/plugins
%attr(755,root,root) %{_libdir}/%{name}/plugins/libadmin.so
@@ -211,6 +217,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.32 2010/08/04 13:15:21 glen
+- install example lua
+
Revision 1.31 2010/05/21 14:27:50 glen
- release 2
================================================================
Index: packages/mysql-proxy/install-examples.patch
diff -u /dev/null packages/mysql-proxy/install-examples.patch:1.1
--- /dev/null Wed Aug 4 15:15:31 2010
+++ packages/mysql-proxy/install-examples.patch Wed Aug 4 15:15:21 2010
@@ -0,0 +1,24 @@
+--- mysql-proxy-0.8.0/lib/Makefile.am~ 2010-01-24 12:26:34.000000000 +0200
++++ mysql-proxy-0.8.0/lib/Makefile.am 2010-08-04 16:07:07.937180312 +0300
+@@ -3,7 +3,8 @@
+ SUBDIRS = proxy
+
+ ## those are in the end examples or proof-of-concepts
+-example_scripts = \
++example_scriptsdir = $(luaextdir)/examples
++example_scripts_DATA = \
+ active-queries.lua \
+ active-transactions.lua \
+ admin-sql.lua \
+@@ -22,9 +23,9 @@
+ if USE_WRAPPER_SCRIPT
+ ## only install them if we are self-contained
+ ## otherwise let the packager decide where to put them
+-dist_doc_DATA = ${example_scripts}
++dist_doc_DATA = $(example_scripts_DATA)
+ else
+-EXTRA_DIST += ${example_scripts}
++EXTRA_DIST += $(example_scripts_DATA)
+ endif
+
+ luaext_LTLIBRARIES = lfs.la glib2.la chassis.la mysql.la lpeg.la posix.la
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql-proxy/mysql-proxy.spec?r1=1.31&r2=1.32&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
