diff --git a/1.40.tar.gz b/1.40.tar.gz deleted file mode 100644 index a4857d5..0000000 --- a/1.40.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24f899a7013ddf959f14d6a43277377947350967661b18813389e3fbb2ab3731 -size 22476103 diff --git a/1.50.tar.gz b/1.50.tar.gz new file mode 100644 index 0000000..588f6c1 --- /dev/null +++ b/1.50.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb0933a58b0417cb579584338a5bded07c2b889e3922f2de5c828109e6a7157b +size 22739323 diff --git a/appdata.patch b/appdata.patch deleted file mode 100644 index 31bb797..0000000 --- a/appdata.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 7c2a24161969593dba579f96532f845de927e211 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= -Date: Sun, 18 Sep 2016 17:11:37 +0200 -Subject: [PATCH] Add an appdata.xml file. - ---- - build/CMakeLists.txt | 3 +++ - zbstudio/res/zbstudio.appdata.xml | 26 ++++++++++++++++++++++++++ - 2 files changed, 29 insertions(+) - create mode 100644 zbstudio/res/zbstudio.appdata.xml - -diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt -index 43b1644..6827153 100644 ---- a/build/CMakeLists.txt -+++ b/build/CMakeLists.txt -@@ -136,6 +136,9 @@ else() - install(DIRECTORY ${TOPDIR}/zbstudio/res/icons/ DESTINATION share/icons/hicolor) - install(FILES ${TOPDIR}/zbstudio/res/zbstudio.desktop DESTINATION share/applications) - -+ # install Linux software gallery metadata -+ install(FILES ${TOPDIR}/zbstudio/res/zbstudio.appdata.xml DESTINATION share/appdata) -+ - # install miscellaneous documentation files - install(FILES ${TOPDIR}/CHANGELOG.md ${TOPDIR}/LICENSE ${TOPDIR}/README.md DESTINATION share/doc/zbstudio) - -diff --git a/zbstudio/res/zbstudio.appdata.xml b/zbstudio/res/zbstudio.appdata.xml -new file mode 100644 -index 0000000..5f10f26 ---- /dev/null -+++ b/zbstudio/res/zbstudio.appdata.xml -@@ -0,0 +1,26 @@ -+ -+ -+ zbstudio.desktop -+ CC0-1.0 -+ MIT -+ ZeroBrane Studio -+ Lightweight Lua-based IDE for Lua -+ -+

-+ ZeroBrane Studio is a lightweight Lua IDE with code completion, syntax -+ highlighting, live coding, code analyzer, and debugging support for -+ Lua 5.1, Lua 5.2, Lua 5.3, LuaJIT, and other Lua engines. -+

-+

-+ It is simple and instantly usable for beginners yet feature-rich and -+ extensible for experienced developers. It has a small footprint and is -+ completely customizable with Lua while still including a full IDE feature -+ set including a remote debugger. -+

-+
-+ https://studio.zerobrane.com -+ -+ https://studio.zerobrane.com/images/scratchpad-linux-mint.png -+ -+ paul@kulchenko.com -+
diff --git a/zerobranestudio.changes b/zerobranestudio.changes index e05161d..3526ee9 100644 --- a/zerobranestudio.changes +++ b/zerobranestudio.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 10 11:30:39 UTC 2017 - mailaender@opensuse.org + +- update to version 1.50 +- remove appdata.patch (included upstream) + ------------------------------------------------------------------- Sun Sep 18 14:47:37 UTC 2016 - mailaender@opensuse.org diff --git a/zerobranestudio.spec b/zerobranestudio.spec index e5e2dba..ae6bd9e 100644 --- a/zerobranestudio.spec +++ b/zerobranestudio.spec @@ -1,7 +1,7 @@ # -# spec file for package ZeroBraneStudio +# spec file for package zerobranestudio # -# 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 @@ -17,7 +17,7 @@ Name: zerobranestudio -Version: 1.40 +Version: 1.50 Release: 0 Summary: Lightweight Lua IDE License: MIT @@ -26,24 +26,22 @@ Url: http://studio.zerobrane.com/ Source: https://github.com/pkulchenko/ZeroBraneStudio/archive/%{version}.tar.gz # PATCH-FIX-OPENSUSE use system Lua Patch0: zbstudio.patch -# PATCH-FEATURE-UPSTREAM https://github.com/pkulchenko/ZeroBraneStudio/pull/698 -Patch1: appdata.patch BuildRequires: cmake >= 2.8 BuildRequires: desktop-file-utils +BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme -BuildRequires: fdupes -BuildRequires: wxlua-devel BuildRequires: lua51 BuildRequires: lua51-luasocket +BuildRequires: wxlua-devel Requires: libwxlua Requires: lua51 -Requires: lua51-luasocket Requires: lua51-BitOp +Requires: lua51-luasocket Recommends: lua52 Recommends: luajit -Provides: zerobrane-studio Provides: zbstudio +Provides: zerobrane-studio BuildArch: noarch %description @@ -56,7 +54,6 @@ others). It originated from the Estrela Editor. %prep %setup -q -n ZeroBraneStudio-%{version} %patch0 -p1 -%patch1 -p1 # remove pre-built binaries rm -rf bin zbstudio/ZeroBraneStudio.app zbstudio.exe