Hello community, here is the log from the commit of package lua51 for openSUSE:Factory checked in at 2015-09-19 06:52:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lua51 (Old) and /work/SRC/openSUSE:Factory/.lua51.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lua51" Changes: -------- --- /work/SRC/openSUSE:Factory/lua51/lua51.changes 2014-09-15 17:40:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lua51.new/lua51.changes 2015-09-19 06:52:26.000000000 +0200 @@ -1,0 +2,12 @@ +Sat Sep 5 05:22:42 UTC 2015 - i...@marguerite.su + +- provides Lua(API) and Lua(devel) +- adjust update-alternative weight +- macros installs to -devel + +------------------------------------------------------------------- +Fri Jul 31 18:12:35 UTC 2015 - jeng...@inai.de + +- Update RPM group classification + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lua51.spec ++++++ --- /var/tmp/diff_new_pack.5hQDem/_old 2015-09-19 06:52:27.000000000 +0200 +++ /var/tmp/diff_new_pack.5hQDem/_new 2015-09-19 06:52:27.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package lua51 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,17 +16,14 @@ # +%define major_version 5.1 +%define lib_suffix 5_1 Name: lua51 Version: 5.1.5 Release: 0 -%define major_version 5.1 -BuildRequires: pkg-config -BuildRequires: readline-devel -BuildRequires: update-alternatives -PreReq: update-alternatives Summary: Small Embeddable Language with Simple Procedural Syntax License: MIT -Group: System/Libraries +Group: Development/Languages/Lua Url: http://www.lua.org Source: http://www.lua.org/ftp/lua-%{version}.tar.gz Source1: macros.lua @@ -35,6 +32,11 @@ Patch1: %{name}-%{version}-module-path.diff Patch3: %{name}-%{version}-libdir.diff Patch4: %{name}-%{version}-pkgconfig.patch +BuildRequires: pkg-config +BuildRequires: readline-devel +Requires(post): update-alternatives +Requires(preun): update-alternatives +Provides: Lua(API) = %{major_version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -54,8 +56,9 @@ Summary: Development files for lua Group: Development/Libraries/C and C++ Requires: %{name} = %{version} -Conflicts: lua50-devel -Conflicts: lua-devel +Requires: liblua%{lib_suffix} = %{version} +Provides: Lua(devel) = %{major_version} +Obsoletes: otherproviders(Lua(devel)) %description devel Lua is a programming language originally designed for extending @@ -65,13 +68,13 @@ This package contains files needed for embedding lua into your application. -%package -n liblua5_1 -Summary: Small Embeddable Language with Simple Procedural Syntax +%package -n liblua%{lib_suffix} +Summary: The Lua integration library Group: System/Libraries Provides: %{name}-libs = %{version} Obsoletes: %{name}-libs <= %{version} -%description -n liblua5_1 +%description -n liblua%{lib_suffix} Lua is a programming language originally designed for extending applications, but also frequently used as a general-purpose, stand-alone language. @@ -85,8 +88,8 @@ simplicity, efficiency, portability, and low embedding cost. %package doc -Summary: Small Embeddable Language with Simple Procedural Syntax -Group: System/Libraries +Summary: Documentation for Lua, a small embeddable language +Group: Documentation/HTML %if 0%{?suse_version} >= 1120 BuildArch: noarch %endif @@ -113,11 +116,12 @@ %build sed -i 's:LUA_ROOT2 "LIBDIR/lua/%{major_version}/":LUA_ROOT2 \"%{_lib}/lua/%{major_version}/":' src/luaconf.h -make %{?_smp_mflags} -C src CC="%{__cc}" MYCFLAGS="%{optflags} -fPIC -DLUA_USE_LINUX" MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" V=%{major_version} all +make %{?_smp_mflags} -C src CC="gcc" MYCFLAGS="%{optflags} -fPIC -DLUA_USE_LINUX" MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" V=%{major_version} all %install make install INSTALL_TOP="%{buildroot}%{_prefix}" INSTALL_LIB="%{buildroot}%{_libdir}" INSTALL_CMOD=%{buildroot}%{_libdir}/lua/%{major_version} INSTALL_MAN="%{buildroot}%{_mandir}/man1" -install -D -m644 etc/lua.pc %{buildroot}%{_libdir}/pkgconfig/lua.pc +find %{buildroot} -name "*.a" -delete -print +install -D -m644 etc/lua.pc %{buildroot}%{_libdir}/pkgconfig/lua-%{major_version}.pc # update-alternatives mkdir -p %{buildroot}%{_sysconfdir}/alternatives for file in lua luac ; do @@ -130,27 +134,27 @@ done install -d -m 0755 %{buildroot}%{_libdir}/lua/%{major_version} install -d -m 0755 %{buildroot}%{_datadir}/lua/%{major_version} -install -D -m 644 %{SOURCE1} %buildroot/etc/rpm/macros.lua51 +install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.lua-%{major_version} # Debian/Ubuntu/SteamOS/Arch Linux compatibility ln -s %{_libdir}/liblua.so.%{major_version} %{buildroot}%{_libdir}/liblua%{major_version}.so.0 ln -s %{_libdir}/liblua.so %{buildroot}%{_libdir}/liblua5.1.so %post -/usr/sbin/update-alternatives --install \ - %{_bindir}/lua lua %{_bindir}/lua%{major_version} 10 \ +%{_sbindir}/update-alternatives --install \ + %{_bindir}/lua lua %{_bindir}/lua%{major_version} 30 \ --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 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 -n liblua5_1 -p /sbin/ldconfig +%post -n liblua%{lib_suffix} -p /sbin/ldconfig -%postun -n liblua5_1 -p /sbin/ldconfig +%postun -n liblua%{lib_suffix} -p /sbin/ldconfig %files %defattr(-,root,root) @@ -167,26 +171,25 @@ %ghost %{_sysconfdir}/alternatives/luac %ghost %{_sysconfdir}/alternatives/lua.1.gz %ghost %{_sysconfdir}/alternatives/luac.1.gz -%{_sysconfdir}/rpm/macros.lua51 %dir %{_libdir}/lua %dir %{_libdir}/lua/%{major_version} %dir %{_datadir}/lua %dir %{_datadir}/lua/%{major_version} -%files -n liblua5_1 +%files -n liblua%{lib_suffix} %defattr(-,root,root) %{_libdir}/liblua.so.%{major_version} %{_libdir}/liblua%{major_version}.so.0 %files devel %defattr(-,root,root) +%{_sysconfdir}/rpm/macros.lua-%{major_version} %{_includedir}/lauxlib.h %{_includedir}/lua.h %{_includedir}/lua.hpp %{_includedir}/luaconf.h %{_includedir}/lualib.h -%{_libdir}/pkgconfig/lua.pc -%{_libdir}/liblua.a +%{_libdir}/pkgconfig/lua-%{major_version}.pc %{_libdir}/liblua.so %{_libdir}/liblua5.1.so
