[arch-commits] Commit in lua/repos (4 files)

[Eric Belanger]

    Date: Monday, May 19, 2008 @ 20:24:12
  Author: eric
Revision: 1805

fixed svn conflict

Modified:
  lua/repos/extra-x86_64/	(properties)
  lua/repos/extra-x86_64/PKGBUILD
  lua/repos/extra-x86_64/lua-arch.patch
Deleted:
  lua/repos/extra-x86_64/LICENSE.txt

----------------+
 LICENSE.txt    |   21 ---------------------
 PKGBUILD       |   13 ++++++-------
 lua-arch.patch |    2 +-
 3 files changed, 7 insertions(+), 29 deletions(-)


Property changes on: lua/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /lua/trunk:1
   + /lua/trunk:1-1804

Deleted: extra-x86_64/LICENSE.txt
===================================================================
--- extra-x86_64/LICENSE.txt	2008-05-20 00:20:48 UTC (rev 1804)
+++ extra-x86_64/LICENSE.txt	2008-05-20 00:24:12 UTC (rev 1805)
@@ -1,21 +0,0 @@
-License for Lua 5.0 and later versions
-Copyright © 1994-2008 Lua.org, PUC-Rio.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions: 
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software. 
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-05-20 00:20:48 UTC (rev 1804)
+++ extra-x86_64/PKGBUILD	2008-05-20 00:24:12 UTC (rev 1805)
@@ -5,7 +5,7 @@
 
 pkgname=lua 
 pkgver=5.1.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A powerful light-weight programming language designed for extending applications." 
 arch=(i686 x86_64)
 url="http://www.lua.org/" 
@@ -16,12 +16,11 @@
 	lua-${pkgver}-official-patch1.diff\
 	lua-${pkgver}-official-patch2.diff\
 	lua-${pkgver}-official-patch3.diff\
-	lua-${pkgver}-official-patch4.diff\
-	LICENSE.txt)
-md5sums=('a70a8dfaa150e047866dc01a46272599' '4f770160aa5f1885d6e1e050f50bcb75'\
+	lua-${pkgver}-official-patch4.diff)
+md5sums=('a70a8dfaa150e047866dc01a46272599' '1bd1164a19abf9165e231ba0d8a0bbc7'\
          '249582bf1fd861ccf492d2c35a9fe732' '203027f2ddcfaf5697293c23d7915f57'\
          'd06c5b23daaa414348948d5b8c308d6f' 'dde56cd1d48a8bb2fb661a9aaf8380ad'\
-         '616808cee32ff328077b848131df7670' '3399f129690adf29bfd81d801978dcfc')
+         '616808cee32ff328077b848131df7670')
 
 build() { 
   cd $startdir/src/$pkgname-$pkgver 
@@ -32,9 +31,9 @@
   patch -p0  -i $startdir/src/lua-${pkgver}-official-patch4.diff || return 1
   [ "$CARCH" == "x86_64" ] && patch -Np1 -i ../lua-5.1-cflags.diff
   [ "$CARCH" == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC"
-  make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so.5.1 liblua.so" LUA_SO=liblua.so  INSTALL_TOP=$startdir/pkg/usr INSTALL_MAN=$startdir/pkg/usr/share/man/man1\
+  make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so.5.1 liblua.so" LUA_SO=liblua.so  INSTALL_TOP=$startdir/pkg/usr INSTALL_MAN=$startdir/pkg/usr/share/man/man1 \
     linux install  || return 1
   install -D -m 644 etc/lua.pc $startdir/pkg/usr/lib/pkgconfig/lua.pc
-  install -D -m 644 ../LICENSE.txt $startdir/pkg/usr/share/licenses/$pkgname/LICENSE.txt
+  install -D -m644 COPYRIGHT $startdir/pkg/usr/share/licenses/$pkgname/COPYRIGHT
 }
 # vim: ts=2 sw=2 et ft=sh

Modified: extra-x86_64/lua-arch.patch
===================================================================
--- extra-x86_64/lua-arch.patch	2008-05-20 00:20:48 UTC (rev 1804)
+++ extra-x86_64/lua-arch.patch	2008-05-20 00:24:12 UTC (rev 1805)
@@ -35,7 +35,7 @@
  	$(RANLIB) $@
  
 +$(LUA_SO): $(CORE_O) $(LIB_O)
-+	$(CC) -shared -Wl,-soname,liblua.so -o $@.5.1 $? $(MYLDFLAGS)
++	$(CC) -shared -ldl -Wl,-soname,liblua.so -o $@.5.1 $? $(MYLDFLAGS)
 +	ln -s $@.5.1 $@
 +
  $(LUA_T): $(LUA_O) $(LUA_A)