Hello community, here is the log from the commit of package lsyncd for openSUSE:Factory checked in at 2012-11-12 16:05:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lsyncd (Old) and /work/SRC/openSUSE:Factory/.lsyncd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lsyncd", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/lsyncd/lsyncd.changes 2012-03-20 11:30:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lsyncd.new/lsyncd.changes 2012-11-12 16:05:20.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Oct 9 01:45:43 UTC 2012 - crrodrig...@opensuse.org + +- Build against LUA 5.2 + +------------------------------------------------------------------- Old: ---- lsyncd-2.0.5.tar.gz New: ---- lsyncd-2.0.7.tar.gz lsyncd-lua52.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lsyncd.spec ++++++ --- /var/tmp/diff_new_pack.7yoivb/_old 2012-11-12 16:05:21.000000000 +0100 +++ /var/tmp/diff_new_pack.7yoivb/_new 2012-11-12 16:05:21.000000000 +0100 @@ -15,11 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: lsyncd -Version: 2.0.5 +Version: 2.0.7 Release: 0 Url: http://code.google.com/p/lsyncd/ -Source0: %{name}-%{version}.tar.gz +Source0: http://lsyncd.googlecode.com/files/%{name}-%{version}.tar.gz Source1: %{name}-init.d Source2: %{name}.conf Source3: rsync_sudo.sh @@ -29,23 +30,24 @@ %else BuildRequires: pkgconfig %endif -%if 0%{?suse_version} > 1210 -BuildRequires: lua51-devel -%else +BuildRequires: automake BuildRequires: lua-devel >= 5.1 -%endif Requires: rsync Summary: Live Syncing (Mirror) Daemon License: GPL-2.0 Group: Productivity/Networking/Other +Patch: lsyncd-lua52.patch %description Lsyncd (Live Syncing (Mirror) Daemon) uses rsync to synchronize local directories with a remote machine running rsyncd. It watches multiple directory trees through inotify. The first step after adding the watches is to rsync all directories with the remote host, and then the software synchronizes single files by collecting the inotify events. lsyncd is a lightweight live mirror solution that should be easy to install and use while blending well with your system. %prep %setup -q +%patch %build +autoreconf -fiv +export CFLAGS="%optflags" export LIBLUA_LIBS=$(pkg-config --libs lua) export LIBLUA_CFLAGS=$(pkg-config --cflags lua) %configure --docdir=%{_docdir}/%{name} ++++++ lsyncd-2.0.5.tar.gz -> lsyncd-2.0.7.tar.gz ++++++ ++++ 19857 lines of diff (skipped) ++++++ lsyncd-lua52.patch ++++++ --- lsyncd.h.orig +++ lsyncd.h @@ -23,9 +23,19 @@ #include <stdbool.h> #include <stdlib.h> -#define LUA_USE_APICHECK 1 +#define LUA_COMPAT_ALL #include <lua.h> +#ifndef luaL_Reg +/* Lua 5.0 */ +#define luaL_Reg luaL_reg +#endif + +#ifndef lua_open +#define lua_open luaL_newstate +#endif + + /** * Lsyncd runtime configuration */ --- configure.ac.orig +++ configure.ac @@ -6,7 +6,9 @@ AC_CONFIG_SRCDIR([lsyncd.c]) AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) # Checks for programs. -AC_PROG_CC +AC_PROG_CC_STDC +AC_USE_SYSTEM_EXTENSIONS +AC_SYS_LARGEFILE AC_PROG_INSTALL AC_PROG_MAKE_SET --- Makefile.am.orig +++ Makefile.am @@ -1,7 +1,8 @@ AUTOMAKE_OPTIONS = foreign -CFLAGS += -Wall $(LUA_CFLAGS) +AM_CFLAGS = -Wall $(LUA_CFLAGS) bin_PROGRAMS = lsyncd -lsyncd_SOURCES = lsyncd.h lsyncd.c lsyncd.lua default-rsync.lua +BUILT_SOURCES = runner.c defaults.c +lsyncd_SOURCES = lsyncd.h lsyncd.c runner.c defaults.c lsyncd.lua default-rsync.lua if INOTIFY lsyncd_SOURCES += inotify.c @@ -39,8 +40,6 @@ doc/lsyncd.1: doc/lsyncd.1.txt CLEANFILES = runner.out defaults.out runner.c defaults.c -# compiles the runner and the defaults into the binary -lsyncd_LDADD += runner.o defaults.o runner.o: runner.c defaults.o: defaults.c -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
