Hello community,

here is the log from the commit of package lua for openSUSE:Factory checked in 
at 2012-01-06 11:45:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lua (Old)
 and      /work/SRC/openSUSE:Factory/.lua.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "lua", Maintainer is "[email protected]"

Changes:
--------
--- /work/SRC/openSUSE:Factory/lua/lua.changes  2011-09-23 02:12:12.000000000 
+0200
+++ /work/SRC/openSUSE:Factory/.lua.new/lua.changes     2012-01-06 
11:46:04.000000000 +0100
@@ -1,0 +2,72 @@
+Wed Dec 21 15:11:08 UTC 2011 - [email protected]
+
+- raise update-alternatives priority to 15 (lua51 have 10, lua50
+  have 5)
+
+-------------------------------------------------------------------
+Wed Dec 21 13:58:22 UTC 2011 - [email protected]
+
+- updated to 5.2.0:
+  * Main changes
+       yieldable pcall and metamethods
+       new lexical scheme for globals
+       ephemeron tables
+       new library for bitwise operations
+       light C functions
+       emergency garbage collector
+       [goto] statement
+       finalizers for tables
+  * Language
+       no more fenv for threads or functions
+       tables honor the [__len] metamethod
+       hex and [\z] escapes in strings
+       support for hexadecimal floats
+       order metamethods work for different types
+       no more verification of opcode consistency
+       hook event "tail return" replaced by "tail call"
+       empty statement
+       [break] statement may appear in the middle of a block
+  * Libraries
+       arguments for function called through [xpcall]
+       optional 'mode' argument to load and loadfile (to control binary x text)
+       optional 'env' argument to load and loadfile (environment for loaded 
chunk)
+       [loadlib] may load libraries with global names (RTLD_GLOBAL)
+       new function [package.searchpath]
+       modules receive their paths when loaded
+       optional base in [math.log]
+       optional separator in [string.rep]
+       [file:write] returns <CODE>file</CODE>
+       closing a pipe returns exit status
+       [os.exit] may close state
+       new metamethods [__pairs] and <CODE>__ipairs</CODE>
+       new option 'isrunning' for [collectgarbage] and <CODE>lua_gc</CODE>
+       frontier patterns
+       [\0] in patterns
+       new option [*L] for <CODE>io.read</CODE>
+       options for [io.lines]
+       [debug.getlocal] can access function varargs
+  * C API
+       new functions: lua_absindex, lua_arith, lua_compare, lua_copy, lua_len,
+                       lua_rawgetp, lua_rawsetp, lua_upvalueid, 
lua_upvaluejoin,
+                      lua_version, luaL_checkversion, luaL_setmetatable,
+                      luaL_testudata, luaL_tolstring
+        [lua_pushstring] and <CODE>pushlstring</CODE> return string 
+        [nparams] and <CODE>isvararg</CODE> available in debug API
+       new lua_Unsigned
+  * Implementation
+       max constants per function raised to 2^26
+       generational mode for garbage collection (experimental)
+       NaN trick (experimental)
+       internal (immutable) version of ctypes
+       simpler implementation for string buffers
+       parser uses much less C-stack space (no more auto arrays)
+  * Lua standalone interpreter
+       new [-E] option to avoid environment variables
+       handling of non-string error messages
+
+-------------------------------------------------------------------
+Tue Oct  4 11:44:08 UTC 2011 - [email protected]
+
+- cross-build fix: use %__cc macro
+
+-------------------------------------------------------------------

Old:
----
  lua-5.1.4-libdir.diff
  lua-5.1.4-module-path.diff
  lua-5.1.4-shared.diff
  lua-5.1.4-upstream-bugfix.diff
  lua-5.1.4.tar.bz2

New:
----
  lua-5.2.0.tar.bz2
  lua-suse.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ lua.spec ++++++
--- /var/tmp/diff_new_pack.yTxCUv/_old  2012-01-06 11:46:06.000000000 +0100
+++ /var/tmp/diff_new_pack.yTxCUv/_new  2012-01-06 11:46:06.000000000 +0100
@@ -1,7 +1,7 @@
 #
-# spec file for package lua (Version 5.1.4)
+# spec file for package lua
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,10 +19,11 @@
 
 
 Name:           lua
-Version:        5.1.4
+Version:        5.2.0
 Release:        17
-%define major_version 5.1
-License:        MIT License (or similar)
+%define major_version 5.2
+%define libsuf        5_2
+License:        MIT
 Group:          System/Libraries
 AutoReqProv:    on
 BuildRequires:  pkg-config readline-devel update-alternatives
@@ -32,10 +33,8 @@
 Source:         %{name}-%{version}.tar.bz2
 Source1:        macros.lua
 Source2:        baselibs.conf
-Patch0:         %{name}-%{version}-shared.diff
-Patch1:         %{name}-%{version}-module-path.diff
-Patch2:         %{name}-%{version}-upstream-bugfix.diff
-Patch3:         %{name}-%{version}-libdir.diff
+# prefix and build shared libraries (upstream don't want this in Makefile)
+Patch0:         %{name}-suse.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -52,7 +51,7 @@
 simplicity, efficiency, portability, and low embedding cost.
 
 %package devel
-License:        MIT License (or similar)
+License:        MIT
 Summary:        Development files for lua
 Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}
@@ -67,14 +66,14 @@
 This package contains files needed for embedding lua into your
 application.
 
-%package -n liblua5_1
-License:        MIT License (or similar)
+%package -n liblua%{libsuf}
+License:        MIT
 Summary:        Small Embeddable Language with Simple Procedural Syntax
 Group:          System/Libraries
 Provides:       %{name}-libs = 5.1.3
 Obsoletes:      %{name}-libs <= 5.1.3
 
-%description -n liblua5_1
+%description -n liblua%{libsuf}
 Lua is a programming language originally designed for extending
 applications, but also frequently used as a general-purpose,
 stand-alone language.
@@ -88,7 +87,7 @@
 simplicity, efficiency, portability, and low embedding cost.
 
 %package doc
-License:        MIT License (or similar)
+License:        MIT
 Summary:        Small Embeddable Language with Simple Procedural Syntax
 Group:          System/Libraries
 %if 0%{?suse_version} >= 1120
@@ -110,24 +109,17 @@
 
 %prep
 %setup -q
-%patch0 -b .shared
-%patch1 -p1
-%patch2
-%patch3 -p1
+%patch0 -p1
 
 %build
-sed -i 's:LUA_ROOT2 "LIBDIR/lua/%{major_version}/":LUA_ROOT2 
\"%{_lib}/lua/%{major_version}/":' src/luaconf.h
-make %{?_smp_mflags} -C src MYCFLAGS="$RPM_OPT_FLAGS -fPIC -DLUA_USE_LINUX" 
MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" V=%{major_version} all
+make %{?_smp_mflags} -C src CC="%{__cc}" MYCFLAGS="$RPM_OPT_FLAGS -fPIC 
-DLUA_USE_LINUX" MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" 
V=%{major_version} all
 
 %install
 make install INSTALL_TOP="$RPM_BUILD_ROOT%{_prefix}" 
INSTALL_LIB="$RPM_BUILD_ROOT%{_libdir}" 
INSTALL_CMOD=$RPM_BUILD_ROOT%{_libdir}/lua/%{major_version} 
INSTALL_MAN="$RPM_BUILD_ROOT%{_mandir}/man1"
-install -D -m644 etc/lua.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/lua.pc
 for file in lua luac ; do
     mv "%{buildroot}%{_bindir}/${file}"        
"%{buildroot}%{_bindir}/${file}%{major_version}"
     mv "%{buildroot}%{_mandir}/man1/${file}.1" 
"%{buildroot}%{_mandir}/man1/${file}%{major_version}.1"
 done
-install -d -m 0755 $RPM_BUILD_ROOT%{_libdir}/lua/%{major_version}
-install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/lua/%{major_version}
 install -D %{SOURCE1} %buildroot/etc/rpm/macros.lua
 
 %clean
@@ -135,7 +127,7 @@
 
 %post
 /usr/sbin/update-alternatives --install                                        
           \
-            %{_bindir}/lua            lua       %{_bindir}/lua%{major_version} 
        10 \
+            %{_bindir}/lua            lua       %{_bindir}/lua%{major_version} 
        15 \
     --slave %{_bindir}/luac           luac      
%{_bindir}/luac%{major_version}           \
     --slave %{_mandir}/man1/lua.1.gz  lua.1.gz  
%{_mandir}/man1/lua%{major_version}.1.gz  \
     --slave %{_mandir}/man1/luac.1.gz luac.1.gz 
%{_mandir}/man1/luac%{major_version}.1.gz
@@ -145,13 +137,13 @@
     /usr/sbin/update-alternatives --remove lua %{_bindir}/lua%{major_version}
 fi
 
-%post -n liblua5_1 -p /sbin/ldconfig
+%post -n liblua%{libsuf} -p /sbin/ldconfig
 
-%postun -n liblua5_1 -p /sbin/ldconfig
+%postun -n liblua%{libsuf} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
-%doc COPYRIGHT HISTORY README
+%doc README
 %{_mandir}/man1/lua%{major_version}.1*
 %{_mandir}/man1/luac%{major_version}.1*
 %{_prefix}/bin/lua%{major_version}
@@ -162,7 +154,7 @@
 %dir %{_datadir}/lua/%{major_version}
 /etc/rpm/macros.lua
 
-%files -n liblua5_1
+%files -n liblua%{libsuf}
 %defattr(-,root,root)
 %{_libdir}/liblua.so.%{major_version}
 
@@ -173,7 +165,6 @@
 %{_includedir}/lua.hpp
 %{_includedir}/luaconf.h
 %{_includedir}/lualib.h
-%{_libdir}/pkgconfig/lua.pc
 %{_libdir}/liblua.a
 %{_libdir}/liblua.so
 

++++++ lua-5.1.4.tar.bz2 -> lua-5.2.0.tar.bz2 ++++++
++++ 36363 lines of diff (skipped)

++++++ lua-suse.diff ++++++
Index: lua-5.2.0/Makefile
===================================================================
--- lua-5.2.0.orig/Makefile
+++ lua-5.2.0/Makefile
@@ -41,7 +41,7 @@ PLATS= aix ansi bsd freebsd generic linu
 # What to install.
 TO_BIN= lua luac
 TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
-TO_LIB= liblua.a
+TO_LIB= liblua.a liblua.so.$(V)
 TO_MAN= lua.1 luac.1
 
 # Lua version and release.
@@ -61,6 +61,7 @@ install: dummy
        cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) 
$(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
        cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
        cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
+       ln -s liblua.so.$(V) $(INSTALL_LIB)/liblua.so
        cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
        cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
 
Index: lua-5.2.0/src/Makefile
===================================================================
--- lua-5.2.0.orig/src/Makefile
+++ lua-5.2.0/src/Makefile
@@ -29,6 +29,7 @@ MYOBJS=
 PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
 
 LUA_A= liblua.a
+LUA_SO= liblua.so
 CORE_O=        lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o 
llex.o \
        lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
        ltm.o lundump.o lvm.o lzio.o
@@ -43,7 +44,7 @@ LUAC_T=       luac
 LUAC_O=        luac.o
 
 ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
+ALL_T= $(LUA_SO) $(LUA_A) $(LUA_T) $(LUAC_T) 
 ALL_A= $(LUA_A)
 
 # Targets start here.
@@ -55,15 +56,20 @@ o:  $(ALL_O)
 
 a:     $(ALL_A)
 
+# shared libraries (for Linux)
+$(LUA_SO): $(CORE_O) $(LIB_O)
+       $(CC) -o $(LUA_SO).$V -shared -Wl,-soname,$(LUA_SO).$V $(CORE_O) 
$(LIB_O) -lm -ldl
+       ln -fs $(LUA_SO).$(V) $(LUA_SO)
+
 $(LUA_A): $(BASE_O)
        $(AR) $@ $?
        $(RANLIB) $@
 
 $(LUA_T): $(LUA_O) $(LUA_A)
-       $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+       $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) -L. -llua $(LIBS)
 
 $(LUAC_T): $(LUAC_O) $(LUA_A)
-       $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
+       $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) -L. -llua $(LIBS)
 
 clean:
        $(RM) $(ALL_T) $(ALL_O)
Index: lua-5.2.0/src/luaconf.h
===================================================================
--- lua-5.2.0.orig/src/luaconf.h
+++ lua-5.2.0/src/luaconf.h
@@ -100,7 +100,7 @@
 #else                  /* }{ */
 
 #define LUA_VDIR       LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
-#define LUA_ROOT       "/usr/local/"
+#define LUA_ROOT       "/usr"
 #define LUA_LDIR       LUA_ROOT "share/lua/" LUA_VDIR
 #define LUA_CDIR       LUA_ROOT "lib/lua/" LUA_VDIR
 #define LUA_PATH_DEFAULT  \
@@ -176,7 +176,7 @@
 */
 #if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \
     defined(__ELF__)           /* { */
-#define LUAI_FUNC      __attribute__((visibility("hidden"))) extern
+#define LUAI_FUNC      extern
 #define LUAI_DDEC      LUAI_FUNC
 #define LUAI_DDEF      /* empty */
 
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to