diff --git a/wxlua.changes b/wxlua.changes index 6814c29..8dc020f 100644 --- a/wxlua.changes +++ b/wxlua.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 11 08:47:18 UTC 2017 - tchvatal@suse.com + +- Fix build with namespaced lua + ------------------------------------------------------------------- Thu Jul 21 21:45:14 UTC 2016 - mailaender@opensuse.org diff --git a/wxlua.spec b/wxlua.spec index 910cbb6..7094f93 100644 --- a/wxlua.spec +++ b/wxlua.spec @@ -1,7 +1,7 @@ # # spec file for package wxlua # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -28,14 +28,15 @@ Source: %{name}-%{version}.tar.bz2 Patch0: wxlstate.patch BuildRequires: cmake >= 2.8.3 BuildRequires: desktop-file-utils -BuildRequires: hicolor-icon-theme -BuildRequires: gcc-c++ -BuildRequires: pkgconfig(glu) -BuildRequires: lua51-devel -BuildRequires: wxWidgets-devel >= 3 -BuildRequires: ncurses-devel -BuildRequires: readline-devel BuildRequires: doxygen +BuildRequires: gcc-c++ +BuildRequires: hicolor-icon-theme +BuildRequires: lua51-devel +BuildRequires: ncurses-devel +BuildRequires: pkgconfig +BuildRequires: readline-devel +BuildRequires: wxWidgets-devel >= 3 +BuildRequires: pkgconfig(glu) %if 0%{?suse_version} > 1320 BuildRequires: cppcheck %endif @@ -67,7 +68,7 @@ interpreter with the wxWidgets API. %prep %setup -q -%patch0 -p0 +%patch0 sed -r -i 's|LIBRARY DESTINATION .*$|LIBRARY DESTINATION %{_lib}|' CMakeLists.txt %build @@ -76,14 +77,14 @@ sed -r -i 's|LIBRARY DESTINATION .*$|LIBRARY DESTINATION %{_lib}|' CMakeLists.tx -DwxLua_LUA_LIBRARY_BUILD_SHARED=TRUE \ -DwxLua_LUA_LIBRARY_USE_BUILTIN=FALSE \ -DwxLua_LUA_LIBRARY_VERSION=5.1 \ - -DwxLua_LUA_INCLUDE_DIR=%{_includedir} \ + -DwxLua_LUA_INCLUDE_DIR=%{lua_incdir} \ -DwxLua_LUA_LIBRARY=%{_libdir}/liblua.so.5.1 \ -DBUILD_SHARED_LIBS=TRUE \ -DCMAKE_BUILD_TYPE=RelWithDebInfo make %{?_smp_mflags} %install -%{cmake_install} +%cmake_install mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ install -p art/wxlualogo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ @@ -126,19 +127,16 @@ mv %{buildroot}%{_libdir}/libwx.so %{buildroot}%{_libdir}/lua/5.1/wx.so %postun -n lib%{name} -p /sbin/ldconfig %files -%defattr(-,root,root) %{_bindir}/* %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/mime/packages/wxlua.xml %files -n lib%{name} -%defattr(-,root,root) %{_libdir}/lua/5.1/wx.so %{_libdir}/libwxlua*.so %files devel -%defattr(-,root,root) %{_includedir}/%{name} %{_datadir}/wxlua/