commit lua50 for openSUSE:Factory
Hello community, here is the log from the commit of package lua50 for openSUSE:Factory checked in at 2014-08-25 11:03:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lua50 (Old) and /work/SRC/openSUSE:Factory/.lua50.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lua50" Changes: -------- --- /work/SRC/openSUSE:Factory/lua50/lua50.changes 2011-09-23 02:12:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lua50.new/lua50.changes 2014-08-25 11:05:04.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 20 16:04:49 UTC 2014 - i@marguerite.su + +- update 5.0.3 + * minor bugfix release + +------------------------------------------------------------------- Old: ---- lua50-5.0.2.tar.bz2 New: ---- baselibs.conf lua-5.0.3.tar.gz macros.lua50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lua50.spec ++++++ --- /var/tmp/diff_new_pack.ruCGjo/_old 2014-08-25 11:05:05.000000000 +0200 +++ /var/tmp/diff_new_pack.ruCGjo/_new 2014-08-25 11:05:05.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package lua50 (Version 5.0.2) +# spec file for package lua50 # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -15,22 +15,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - -Name: lua50 -Version: 5.0.2 -Release: 122 %define major_version 5.0 +%define libsuf 5_0 +Name: lua50 +Version: 5.0.3 +Release: 0 +Summary: Small Embeddable Language with Simple Procedural Syntax License: MIT Group: System/Libraries -AutoReqProv: on -BuildRequires: readline-devel update-alternatives -PreReq: update-alternatives -Summary: Small Embeddable Language with Simple Procedural Syntax Url: http://www.lua.org -Source: %{name}-%{version}.tar.bz2 -Patch: %{name}-%{version}-dynamic-loading.diff +Source: lua-%{version}.tar.gz +Source1: macros.lua50 +Source98: baselibs.conf +Patch0: %{name}-5.0.2-dynamic-loading.diff +BuildRequires: pkg-config +BuildRequires: readline-devel +Requires(post): update-alternatives +Requires(postun): update-alternatives BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -46,13 +48,11 @@ of C functions, written in ANSI C, and the implementation goals are simplicity, efficiency, portability, and low embedding cost. - - %package devel -License: MIT Summary: Development files for lua Group: Development/Libraries/C and C++ Requires: %{name} = %{version} +Requires: liblua%{libsuf} = %{version} Conflicts: lua-devel Conflicts: lua51-devel @@ -64,14 +64,13 @@ This package contains files needed for embedding lua into your application. - - -%package libs -License: MIT +%package -n liblua%{libsuf} Summary: Small Embeddable Language with Simple Procedural Syntax Group: System/Libraries +Provides: %{name}-libs = %{version} +Obsoletes: %{name}-libs < %{version} -%description libs +%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. @@ -84,62 +83,117 @@ of C functions, written in ANSI C, and the implementation goals are simplicity, efficiency, portability, and low embedding cost. +%package doc +Summary: Small Embeddable Language with Simple Procedural Syntax +Group: System/Libraries +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif +%description doc +Lua is a programming language originally designed for extending +applications, but also frequently used as a general-purpose, +stand-alone language. + +Lua combines simple procedural syntax (similar to Pascal) with powerful +data description constructs based on associative arrays and extensible +semantics. Lua is dynamically typed, interpreted from byte codes, and +has automatic memory management, making it ideal for configuration, +scripting, and rapid prototyping. Lua is implemented as a small library +of C functions, written in ANSI C, and the implementation goals are +simplicity, efficiency, portability, and low embedding cost. %prep %setup -q -n lua-%{version} -%patch +%patch0 %build -make MYCFLAGS="$RPM_OPT_FLAGS -fPIC" all so sobin +make MYCFLAGS="%{optflags} -fPIC" all %{?_smp_mflags} +# can't be merged into one line in parallel build, or it'll link .so before +# src/*.o is built +make MYCFLAGS="%{optflags} -fPIC" so sobin %{?_smp_mflags} %install -make install soinstall INSTALL_ROOT="$RPM_BUILD_ROOT/%{_prefix}" INSTALL_LIB="$RPM_BUILD_ROOT/%{_libdir}" INSTALL_MAN="$RPM_BUILD_ROOT/%{_mandir}/man1" STRIP=true +make install soinstall INSTALL_ROOT="%{buildroot}%{_prefix}" INSTALL_LIB="%{buildroot}%{_libdir}" INSTALL_MAN="%{buildroot}%{_mandir}/man1" STRIP=true +# update-alternatives +mkdir -p %{buildroot}%{_sysconfdir}/alternatives for file in lua luac ; do mv "%{buildroot}%{_bindir}/${file}" "%{buildroot}%{_bindir}/${file}%{major_version}" + touch "%{buildroot}%{_sysconfdir}/alternatives/${file}" + ln -sf "%{_sysconfdir}/alternatives/${file}" "%{buildroot}%{_bindir}/${file}" mv "%{buildroot}%{_mandir}/man1/${file}.1" "%{buildroot}%{_mandir}/man1/${file}%{major_version}.1" + touch "%{buildroot}%{_sysconfdir}/alternatives/${file}.1.gz" + ln -sf "%{_sysconfdir}/alternatives/${file}.1.gz" "%{buildroot}%{_mandir}/man1/${file}.1.gz" done -%clean -rm -rf $RPM_BUILD_ROOT +install -D %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.lua50 + +# create pkg-config file +cat > lua.pc <<-EOF +prefix=%{_prefix} +exec_prefix=%{_prefix} +libdir=%{_libdir} +includedir=%{_prefix}}/include + +Name: Lua +Description: An Extensible Extension Language +Version: %{version} +Libs: -llua -lm +Cflags: +EOF +install -D -m 644 lua.pc %{buildroot}/%{_libdir}/pkgconfig/lua.pc %post -/usr/sbin/update-alternatives --install \ +%{_sbindir}/update-alternatives --install \ %{_bindir}/lua lua %{_bindir}/lua%{major_version} 5 \ --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 -%preun +%postun if [ "$1" = 0 ] ; then - /usr/sbin/update-alternatives --remove lua %{_bindir}/lua%{major_version} + %{_sbindir}/update-alternatives --remove lua %{_bindir}/lua%{major_version} fi -%post libs -p /sbin/ldconfig +%post -n liblua%{libsuf} -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig +%postun -n liblua%{libsuf} -p /sbin/ldconfig %files %defattr(-,root,root) -%doc COPYRIGHT HISTORY README doc/* -%{_mandir}/man1/lua%{major_version}.1* -%{_mandir}/man1/luac%{major_version}.1* -%{_prefix}/bin/lua%{major_version} -%{_prefix}/bin/luac%{major_version} +%doc COPYRIGHT HISTORY README +%{_sysconfdir}/rpm/macros.lua50 +%{_bindir}/lua%{major_version} +%{_bindir}/luac%{major_version} +%{_mandir}/man1/lua%{major_version}.1.gz +%{_mandir}/man1/luac%{major_version}.1.gz +%{_bindir}/lua +%{_bindir}/luac +%{_mandir}/man1/lua.1.gz +%{_mandir}/man1/luac.1.gz +%ghost %{_sysconfdir}/alternatives/lua +%ghost %{_sysconfdir}/alternatives/luac +%ghost %{_sysconfdir}/alternatives/lua.1.gz +%ghost %{_sysconfdir}/alternatives/luac.1.gz -%files libs +%files -n liblua%{libsuf} %defattr(-,root,root) %{_libdir}/liblua.so.%{major_version} %{_libdir}/liblualib.so.%{major_version} %files devel %defattr(-,root,root) -%{_prefix}/include/lauxlib.h -%{_prefix}/include/lua.h -%{_prefix}/include/lualib.h +%{_includedir}/lauxlib.h +%{_includedir}/lua.h +%{_includedir}/lualib.h %{_libdir}/liblua.a %{_libdir}/liblualib.a %{_libdir}/liblua.so %{_libdir}/liblualib.so +%{_libdir}/pkgconfig/lua.pc + +%files doc +%defattr(-,root,root) +%doc doc/* %changelog ++++++ baselibs.conf ++++++ liblua5_0 ++++++ macros.lua50 ++++++ # RPM macros for Lua 5.0 # The major.minor version of Lua %lua_version %(lua -e 'print(_VERSION)' | cut -d ' ' -f 2) # compiled modules should go here %lua_archdir %{_libdir}/lua/%{lua_version} # pure Lua modules should go here %lua_noarchdir %{_datadir}/lua/%{lua_version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de