From 838a2c0ad2e496c46a40dcf84d2d6bcb74568c6efb83528b838c1804fbee2101 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 20 Feb 2024 18:53:32 +0000 Subject: [PATCH 1/3] Accepting request 1147911 from home:dimstar:rpm4.20:z Prepare for RPM 4.20 OBS-URL: https://build.opensuse.org/request/show/1147911 OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/zerobranestudio?expand=0&rev=20 --- zerobranestudio.changes | 6 ++++++ zerobranestudio.spec | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/zerobranestudio.changes b/zerobranestudio.changes index 9a2b8ad..daf60dc 100644 --- a/zerobranestudio.changes +++ b/zerobranestudio.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 20 12:08:04 UTC 2024 - Dominique Leuenberger + +- Use %autosetup macro. Allows to eliminate the usage of deprecated + %patchN. + ------------------------------------------------------------------- Sun Jul 11 16:14:16 UTC 2021 - Callum Farmer diff --git a/zerobranestudio.spec b/zerobranestudio.spec index a440087..1577eb3 100644 --- a/zerobranestudio.spec +++ b/zerobranestudio.spec @@ -73,8 +73,7 @@ Marmalade Quick, Cocos2d-x, GSL-shell, Adobe Lightroom, OpenResty/Nginx and others). It originated from the Estrela Editor. %prep -%setup -q -n ZeroBraneStudio-%{version} -%patch0 -p1 +%autosetup -p1 -n ZeroBraneStudio-%{version} # remove pre-built binaries rm -rf bin zbstudio/ZeroBraneStudio.app zbstudio.exe From f77bee1639d11baa9e16c8163525292b75949dcfef68c86a8093071280fcdb61 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 20 Feb 2024 20:48:29 +0000 Subject: [PATCH 2/3] - Clean up SPEC file. OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/zerobranestudio?expand=0&rev=21 --- zerobranestudio.changes | 5 +++++ zerobranestudio.spec | 46 +++++++++++++++++++++-------------------- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/zerobranestudio.changes b/zerobranestudio.changes index daf60dc..55ad05a 100644 --- a/zerobranestudio.changes +++ b/zerobranestudio.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 20 20:48:16 UTC 2024 - Matej Cepl + +- Clean up SPEC file. + ------------------------------------------------------------------- Tue Feb 20 12:08:04 UTC 2024 - Dominique Leuenberger diff --git a/zerobranestudio.spec b/zerobranestudio.spec index 1577eb3..870b2a5 100644 --- a/zerobranestudio.spec +++ b/zerobranestudio.spec @@ -1,7 +1,7 @@ # # spec file for package zerobranestudio # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,7 +15,8 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%if 0%{suse_version} < 1550 + +%if 0%{?suse_version} < 1550 %define lua_version 5.1 %define lua_version_nodots 51 %else @@ -27,43 +28,43 @@ Release: 0 Summary: Lightweight Lua IDE License: MIT Group: Development/Tools/IDE -URL: http://studio.zerobrane.com/ +URL: https://studio.zerobrane.com/ Source: https://github.com/pkulchenko/ZeroBraneStudio/archive/%{version}.tar.gz # PATCH-FIX-OPENSUSE use system Lua Patch0: zbstudio.patch -BuildRequires: cmake >= 2.8 BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme -BuildRequires: lua%{lua_version_nodots}-devel BuildRequires: lua%{lua_version_nodots}-bit32 BuildRequires: lua%{lua_version_nodots}-copas +BuildRequires: lua%{lua_version_nodots}-devel BuildRequires: lua%{lua_version_nodots}-lpeg BuildRequires: lua%{lua_version_nodots}-luafilesystem BuildRequires: lua%{lua_version_nodots}-luasec -%if 0%{suse_version} < 1550 -BuildRequires: lua%{lua_version_nodots}-luasocket -%else -BuildRequires: luasocket -%endif BuildRequires: wxlua-devel +BuildRequires: cmake(x86-64) >= 2.8 +# Yes, we have to include this explicit Require Requires: libwxlua Requires: lua%{lua_version_nodots}-copas Requires: lua%{lua_version_nodots}-lpeg -BuildRequires: lua%{lua_version_nodots}-bit32 Requires: lua%{lua_version_nodots}-luafilesystem Requires: lua%{lua_version_nodots}-luasec -%if 0%{suse_version} < 1550 -Requires: lua%{lua_version_nodots}-luasocket -%else -Requires: luasocket -%endif Requires: Lua(API) = %{lua_version} Recommends: luajit Provides: zbstudio Provides: zerobrane-studio BuildArch: noarch +%if 0%{?suse_version} < 1550 +BuildRequires: lua%{lua_version_nodots}-luasocket +%else +BuildRequires: luasocket +%endif +%if 0%{?suse_version} < 1550 +Requires: lua%{lua_version_nodots}-luasocket +%else +Requires: luasocket +%endif %description ZeroBrane Studio is a lightweight cross-platform Lua IDE with code completion, @@ -80,13 +81,14 @@ rm -rf bin zbstudio/ZeroBraneStudio.app zbstudio.exe %build cd build -cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DLUA_EXECUTABLE=%{_bindir}/lua%{lua_version} - -make %{?_smp_mflags} +%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DLUA_EXECUTABLE=%{_bindir}/lua%{lua_version} +%cmake_build %install +( cd build %cmake_install +) cat >> %{buildroot}%{_datadir}/zbstudio/cfg/user.lua < Date: Tue, 20 Feb 2024 20:49:16 +0000 Subject: [PATCH 3/3] Don't limit ourselves to x86_64 OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/zerobranestudio?expand=0&rev=22 --- zerobranestudio.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zerobranestudio.spec b/zerobranestudio.spec index 870b2a5..c9e9d4a 100644 --- a/zerobranestudio.spec +++ b/zerobranestudio.spec @@ -32,6 +32,7 @@ URL: https://studio.zerobrane.com/ Source: https://github.com/pkulchenko/ZeroBraneStudio/archive/%{version}.tar.gz # PATCH-FIX-OPENSUSE use system Lua Patch0: zbstudio.patch +BuildRequires: cmake >= 2.8 BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: gcc-c++ @@ -43,7 +44,6 @@ BuildRequires: lua%{lua_version_nodots}-lpeg BuildRequires: lua%{lua_version_nodots}-luafilesystem BuildRequires: lua%{lua_version_nodots}-luasec BuildRequires: wxlua-devel -BuildRequires: cmake(x86-64) >= 2.8 # Yes, we have to include this explicit Require Requires: libwxlua Requires: lua%{lua_version_nodots}-copas