rpms/lua/FC-5 .cvsignore, 1.3, 1.4 lua.spec, 1.13, 1.14 sources, 1.4, 1.5

Michael J Knox (mjk) fedora-extras-commits at redhat.com
Mon May 29 07:15:31 UTC 2006


Author: mjk

Update of /cvs/extras/rpms/lua/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28555/FC-5

Modified Files:
	.cvsignore lua.spec sources 
Log Message:
include shared lib, added autotools patch



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lua/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 May 2006 22:26:41 -0000	1.3
+++ .cvsignore	29 May 2006 07:15:31 -0000	1.4
@@ -1 +1 @@
-lua-5.1.tar.gz
+lua-5.1-autotoolize-r1.patch.bz2


Index: lua.spec
===================================================================
RCS file: /cvs/extras/rpms/lua/FC-5/lua.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- lua.spec	7 May 2006 22:52:04 -0000	1.13
+++ lua.spec	29 May 2006 07:15:31 -0000	1.14
@@ -1,12 +1,13 @@
 Name:           lua
 Version:        5.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Powerful light-weight programming language
 
 Group:          Development/Languages
 License:        MIT
 URL:            http://www.lua.org/
 Source0:        http://www.lua.org/ftp/lua-%{version}.tar.gz
+Patch0:		lua-5.1-autotoolize-r1.patch.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  readline-devel, ncurses-devel
@@ -25,31 +26,21 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-make %{?_smp_mflags} \
-  MYCFLAGS="$RPM_OPT_FLAGS -fPIC" \
-  MYLDFLAGS="-Wl,-E" \
-  LOADLIB=-DUSE_DLOPEN=1 \
-  DLLIB=-ldl \
-%ifarch %{ix86} x86_64
-  NUMBER="-DLUA_USER_H='\"../etc/luser_number.h\"' -DUSE_FASTROUND" \
-%endif
-  USERCONF="-DLUA_USERCONFIG='\"../../etc/saconfig.c\"' -DUSE_READLINE" \
-  EXTRA_LIBS="-lm -lreadline -lncurses" \
-  linux
+# fix perms on auto files
+chmod u+x autogen.sh config.guess config.sub configure depcomp install-sh missing
 
+./autogen.sh
 
-%install
-rm -rf %{buildroot}
-make install \
-	INSTALL_TOP=%{buildroot}/usr \
-	INSTALL_LIB=%{buildroot}/%{_libdir} \
-	INSTALL_MAN=%{buildroot}%{_mandir}/man1
+%configure --with-readline
 
-%check
-make test
+make %{?_smp_mflags} 
 
+%install
+rm -rf %{buildroot}
+%makeinstall 
 
 %clean
 rm -rf %{buildroot}
@@ -61,11 +52,15 @@
 %{_bindir}/lua*
 %{_includedir}/l*.h
 %{_includedir}/l*.hpp
-%{_libdir}/liblua*.a
+%{_libdir}/liblua*.*
+%{_libdir}/pkgconfig/*.pc
 %{_mandir}/man1/lua*.1*
 
 
 %changelog
+* Mon May 29 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.1-3
+- added autotools patch from Petri Lehtinen, http://lua-users.org
+
 * Mon May 08 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.1-2
 - fixed x86_64 builds
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lua/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 May 2006 22:26:41 -0000	1.4
+++ sources	29 May 2006 07:15:31 -0000	1.5
@@ -1 +1,2 @@
 3e8dfe8be00a744cec2f9e766b2f2aee  lua-5.1.tar.gz
+9e6a9655694450e26aa4e01220dd3636  lua-5.1-autotoolize-r1.patch.bz2




More information about the fedora-extras-commits mailing list