commit lua51-toluapp for openSUSE:Factory
Hello community, here is the log from the commit of package lua51-toluapp for openSUSE:Factory checked in at 2016-01-08 15:23:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lua51-toluapp (Old) and /work/SRC/openSUSE:Factory/.lua51-toluapp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lua51-toluapp" Changes: -------- --- /work/SRC/openSUSE:Factory/lua51-toluapp/lua51-toluapp.changes 2015-11-26 17:02:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lua51-toluapp.new/lua51-toluapp.changes 2016-01-08 15:23:42.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Jan 7 04:17:11 UTC 2016 - i@marguerite.su + +- rename the library to libtolua++-5.1 +- libtolua++-5_1-devel should require toluapp-5.1, + which will require the library +- fix build on openSUSE without lua-5.1.pc + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lua51-toluapp.spec ++++++ --- /var/tmp/diff_new_pack.yWUkHp/_old 2016-01-08 15:23:43.000000000 +0100 +++ /var/tmp/diff_new_pack.yWUkHp/_new 2016-01-08 15:23:43.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package lua51-toluapp # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -42,7 +42,7 @@ * support for class templates as well as other features and bugfixes. -%package -n toluapp-%{lua_suffix} +%package -n toluapp-%{lua_major_version} Summary: C/C++ with Lua Integration Tool Group: Development/Languages/Lua Requires(preun): update-alternatives @@ -51,7 +51,7 @@ Provides: tolua++ = %{version}-99.1 Obsoletes: tolua++ < %{version}-99.1 -%description -n toluapp-%{lua_suffix} +%description -n toluapp-%{lua_major_version} tolua++ is an extended version of tolua, a tool to integrate C/C++ code with Lua. tolua++ includes new features oriented to c++ such as: * support for std::string as a basic type (this can be turned off by a command @@ -59,26 +59,26 @@ * support for class templates as well as other features and bugfixes. -%package -n libtoluapp-%{lua_suffix}-1 -Summary: Runtime libraries for toluapp +%package -n libtolua++-%{lua_suffix}-1 +Summary: Runtime libraries for tolua++ Group: System/Libraries -%description -n libtoluapp-%{lua_suffix}-1 -This package provides shared libraries for toluapp. +%description -n libtolua++-%{lua_suffix}-1 +This package provides shared libraries for tolua++. -%package -n libtoluapp-%{lua_suffix}-devel -Summary: Development headers for toluapp +%package -n libtolua++-%{lua_suffix}-devel +Summary: Development headers for tolua++ Group: Development/Libraries/C and C++ -Requires: libtoluapp-%{lua_suffix}-1 +Requires: toluapp-%{lua_major_version} -%description -n libtoluapp-%{lua_suffix}-devel -This package provides development headers for toluapp. +%description -n libtolua++-%{lua_suffix}-devel +This package provides development headers for tolua++. %prep %setup -q -n toluapp-%{version} %patch -p1 %patch1 -p1 -sed -i "s/@SUFFIX@/%{lua_suffix}/" SConstruct +sed -i "s/@SUFFIX@/%{lua_major_version}/" SConstruct %build cat <<'EOF' > config_linux.py @@ -89,8 +89,8 @@ prefix = "%{_prefix}" EOF -CCFLAGS="%{optflags} `pkg-config lua-%{lua_major_version} --cflags` -fPIC" \ -LIBS="`pkg-config lua-%{lua_major_version} --libs-only-l`" \ +CCFLAGS="%{optflags} -fPIC" \ +LIBS="-llua -lm -ldl" \ scons %{?_smp_mflags} \ prefix="%{_prefix}" \ libdir="%{_libdir}" \ @@ -98,8 +98,8 @@ lib bin %install -CCFLAGS="%{optflags} `pkg-config lua-%{lua_major_version} --cflags` -fPIC" \ -LIBS="`pkg-config lua-%{lua_major_version} --libs-only-l`" \ +CCFLAGS="%{optflags} -fPIC" \ +LIBS="-llua -lm -ldl" \ scons %{?_smp_flags} \ prefix="%{buildroot}%{_prefix}" \ libdir="%{buildroot}%{_libdir}" \ @@ -108,58 +108,57 @@ # pkgconfig file mkdir -p %{buildroot}%{_libdir}/pkgconfig -cat > %{buildroot}%{_libdir}/pkgconfig/toluapp.pc << EOF +cat > %{buildroot}%{_libdir}/pkgconfig/tolua++.pc << EOF prefix=%{_prefix} exec_prefix=%{_prefix} libdir=%{_libdir} sharedlibdir=%{_libdir} includedir=%{_includedir} -Name: toluapp +Name: tolua++ Description: C/C++ with Lua Integration Tool Version: %{version} -Requires: -Libs: -ltoluapp-%{lua_suffix} +Libs: -ltolua++-%{lua_major_version} Cflags: -I%{_includedir} EOF # update-alternatives mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ -touch %{buildroot}%{_sysconfdir}/alternatives/toluapp -ln -sf %{_sysconfdir}/alternatives/toluapp %{buildroot}%{_bindir}/tolua++ +touch %{buildroot}%{_sysconfdir}/alternatives/tolua++ +ln -sf %{_sysconfdir}/alternatives/tolua++ %{buildroot}%{_bindir}/tolua++ -%post -n libtoluapp-%{lua_suffix}-1 -p /sbin/ldconfig +%post -n libtolua++-%{lua_suffix}-1 -p /sbin/ldconfig -%postun -n libtoluapp-%{lua_suffix}-1 -p /sbin/ldconfig +%postun -n libtolua++-%{lua_suffix}-1 -p /sbin/ldconfig -%post -n toluapp-%{lua_suffix} +%post -n toluapp-%{lua_major_version} /sbin/ldconfig -%{_sbindir}/update-alternatives --install %{_bindir}/tolua++ toluapp %{_bindir}/toluapp-%{lua_suffix} 10 +%{_sbindir}/update-alternatives --install %{_bindir}/tolua++ tolua++ %{_bindir}/toluapp-%{lua_major_version} 10 -%preun -n toluapp-%{lua_suffix} +%preun -n toluapp-%{lua_major_version} if [ "$1" = 0 ] ; then - %{_sbindir}/update-alternatives --remove toluapp %{_bindir}/toluapp-%{lua_suffix} + %{_sbindir}/update-alternatives --remove tolua++ %{_bindir}/toluapp-%{lua_major_version} fi -%postun -n toluapp-%{lua_suffix} -p /sbin/ldconfig +%postun -n toluapp-%{lua_major_version} -p /sbin/ldconfig -%files -n toluapp-%{lua_suffix} +%files -n toluapp-%{lua_major_version} %defattr(-,root,root) %doc COPYRIGHT README -%ghost %{_sysconfdir}/alternatives/toluapp +%ghost %{_sysconfdir}/alternatives/tolua++ %{_bindir}/tolua++ -%{_bindir}/toluapp-%{lua_suffix} +%{_bindir}/toluapp-%{lua_major_version} -%files -n libtoluapp-%{lua_suffix}-devel +%files -n libtolua++-%{lua_suffix}-devel %defattr(-,root,root) %{_includedir}/tolua++.h -%{_libdir}/libtoluapp-%{lua_suffix}.so -%{_libdir}/pkgconfig/toluapp.pc +%{_libdir}/libtolua++-%{lua_major_version}.so +%{_libdir}/pkgconfig/tolua++.pc -%files -n libtoluapp-%{lua_suffix}-1 +%files -n libtolua++-%{lua_suffix}-1 %defattr(-,root,root) -%{_libdir}/libtoluapp-%{lua_suffix}.so.1 -%{_libdir}/libtoluapp-%{lua_suffix}.so.%{version} +%{_libdir}/libtolua++-%{lua_major_version}.so.1 +%{_libdir}/libtolua++-%{lua_major_version}.so.%{version} %changelog ++++++ toluapp-versioned-shared-lib.patch ++++++ --- /var/tmp/diff_new_pack.yWUkHp/_old 2016-01-08 15:23:43.000000000 +0100 +++ /var/tmp/diff_new_pack.yWUkHp/_new 2016-01-08 15:23:43.000000000 +0100 @@ -18,7 +18,7 @@ -opts.Add('tolua_bin', 'the resulting binary', 'tolua++') -opts.Add('tolua_lib', 'the resulting library', 'tolua++') +opts.Add('tolua_bin', 'the resulting binary', 'toluapp-@SUFFIX@') -+opts.Add('tolua_lib', 'the resulting library', 'toluapp-@SUFFIX@') ++opts.Add('tolua_lib', 'the resulting library', 'tolua++-@SUFFIX@') opts.Add('TOLUAPP', 'the name of the tolua++ binary (to use with built_dev=1)', 'tolua++') opts.Add('prefix', 'The installation prefix')
participants (1)
-
root@hilbert.suse.de