commit lua

27 Mar 2008

Hello community,

here is the log from the commit of package lua
checked in at Fri Mar 28 00:01:22 CET 2008.

--------

--- lua/lua.changes	2008-02-19 11:13:35.000000000 +0100
+++ /mounts/work_src_done/STABLE/lua/lua.changes	2008-03-26 21:29:50.088580000 +0100
@@ -1,0 +2,6 @@
+Wed Mar 26 21:29:35 CET 2008 - coolo@suse.de
+
+- do not package/provide the shared lib twice / follow shared lib
+  policy
+
+-------------------------------------------------------------------

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

Other differences:
------------------
++++++ lua.spec ++++++
--- /var/tmp/diff_new_pack.fn3083/_old	2008-03-28 00:00:41.000000000 +0100
+++ /var/tmp/diff_new_pack.fn3083/_new	2008-03-28 00:00:41.000000000 +0100
@@ -13,7 +13,7 @@
 
 Name:           lua
 Version:        5.1.3
-Release:        1
+Release:        8
 %define major_version 5.1
 License:        X11/MIT
 Group:          System/Libraries
@@ -72,11 +72,11 @@
     Waldemar Celes
     Luiz Henrique de Figueiredo
 
-%package libs
+%package -n liblua5_1
 Summary:        Small Embeddable Language with Simple Procedural Syntax
 Group:          System/Libraries
 
-%description libs
+%description -n liblua5_1
 Lua is a programming language originally designed for extending
 applications, but also frequently used as a general-purpose,
 stand-alone language.
@@ -126,7 +126,7 @@
 
 %prep
 %setup -q
-%patch0
+%patch0 -b .shared
 
 %build
 make -C src MYCFLAGS="$RPM_OPT_FLAGS -fPIC -DLUA_USE_LINUX" MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" V=%{major_version} all
@@ -154,11 +154,9 @@
     /usr/sbin/update-alternatives --remove lua %{_bindir}/lua%{major_version}
 fi
 
-%post libs
-/sbin/ldconfig
+%post -n liblua5_1 -p /sbin/ldconfig
 
-%postun libs
-/sbin/ldconfig
+%postun -n liblua5_1 -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
@@ -168,7 +166,7 @@
 %{_prefix}/bin/lua%{major_version}
 %{_prefix}/bin/luac%{major_version}
 
-%files libs
+%files -n liblua5_1
 %defattr(-,root,root)
 %{_libdir}/liblua.so.%{major_version}
 
@@ -188,6 +186,9 @@
 %doc doc/*
 
 %changelog
+* Wed Mar 26 2008 coolo@suse.de
+- do not package/provide the shared lib twice / follow shared lib
+  policy
 * Tue Feb 19 2008 pgajdos@suse.cz
 - created -doc package
 - updated to version 5.1.3, bug fix release. Fixed bugs:

++++++ lua-5.1.3-shared.diff ++++++
--- /var/tmp/diff_new_pack.fn3083/_old	2008-03-28 00:00:41.000000000 +0100
+++ /var/tmp/diff_new_pack.fn3083/_new	2008-03-28 00:00:41.000000000 +0100
@@ -1,22 +1,7 @@
-Index: Makefile
-===================================================================
---- Makefile.orig
-+++ Makefile
-@@ -42,7 +42,7 @@ PLATS= aix ansi bsd generic linux macosx
- # What to install.
- TO_BIN= lua luac
- TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
--TO_LIB= liblua.a
-+TO_LIB= liblua.a liblua.so liblua.so.$(V)
- TO_MAN= lua.1 luac.1
- 
- # Lua version and release.
-Index: etc/lua.pc
-===================================================================
---- etc/lua.pc.orig
-+++ etc/lua.pc
+--- etc/lua.pc.shared	2008-01-11 14:12:59.000000000 +0100
++++ etc/lua.pc	2008-03-26 21:19:51.000000000 +0100
 @@ -8,7 +8,7 @@ V= 5.1
- R= 5.1.1
+ R= 5.1.3
  
  # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
 -prefix= /usr/local
@@ -24,12 +9,21 @@
  INSTALL_BIN= ${prefix}/bin
  INSTALL_INC= ${prefix}/include
  INSTALL_LIB= ${prefix}/lib
-Index: src/Makefile
-===================================================================
---- src/Makefile.orig
-+++ src/Makefile
+--- src/luaconf.h.shared	2008-01-18 18:07:48.000000000 +0100
++++ src/luaconf.h	2008-03-26 21:19:51.000000000 +0100
+@@ -184,7 +184,7 @@
+ 
+ #elif defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \
+       defined(__ELF__)
+-#define LUAI_FUNC	__attribute__((visibility("hidden"))) extern
++#define LUAI_FUNC	extern
+ #define LUAI_DATA	LUAI_FUNC
+ 
+ #else
+--- src/Makefile.shared	2008-01-19 20:37:58.000000000 +0100
++++ src/Makefile	2008-03-26 21:19:51.000000000 +0100
 @@ -23,6 +23,7 @@ MYLIBS=
- PLATS= aix ansi bsd generic linux macosx mingw posix solaris
+ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
  
  LUA_A=	liblua.a
 +LUA_SO=	liblua.so
@@ -68,16 +62,22 @@
  
  clean:
  	$(RM) $(ALL_T) $(ALL_O)
-Index: src/luaconf.h
-===================================================================
---- src/luaconf.h.orig
-+++ src/luaconf.h
-@@ -184,7 +184,7 @@
+--- Makefile.shared	2008-01-17 18:53:37.000000000 +0100
++++ ./Makefile	2008-03-26 21:19:51.000000000 +0100
+@@ -38,7 +38,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 ../etc/lua.hpp
+-TO_LIB= liblua.a
++TO_LIB= liblua.a liblua.so.$(V)
+ TO_MAN= lua.1 luac.1
  
- #elif defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \
-       defined(__ELF__)
--#define LUAI_FUNC	__attribute__((visibility("hidden"))) extern
-+#define LUAI_FUNC	extern
- #define LUAI_DATA	LUAI_FUNC
+ # Lua version and release.
+@@ -57,6 +57,7 @@ install: dummy
+ 	cd src && $(MKDIR) -p $(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)
  
- #else


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



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit lua

root＠Hilbert.suse.de