use full global.properties in rpm

2 files changed, 4 insertions, 19 deletions

diff --git a/scite-fedora/add-emitUnicode.patch b/scite-fedora/add-emitUnicode.patch
deleted file mode 100644
index faff06d..0000000
--- a/scite-fedora/add-emitUnicode.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/scite/src/SciTEGlobal.properties	2022-03-30 20:48:24.000000000 -0400
-+++ b/scite/src/SciTEGlobal.properties	2022-04-04 10:14:32.803893680 -0400
-@@ -550,6 +550,13 @@
- # The set of imports allowed can be set with
- #imports.include=ave
- 
-+ext.lua.startup.script=$(SciteDefaultHome)/emitUnicode.lua
-+command.name.8.*=Emit UTF8 Unicode
-+command.subsystem.8.*=3
-+command.8.*=emitUtf8UnicodeIntoTheSciteEditor
-+command.mode.8.*=savebefore:no
-+command.shortcut.8.*=Ctrl+U
-+
- # Import all the language specific properties files in this directory
- import *
- 
diff --git a/scite-fedora/scite.spec b/scite-fedora/scite.spec
index fe90350..d51ddd2 100644
--- a/scite-fedora/scite.spec
+++ b/scite-fedora/scite.spec
@@ -50,8 +50,8 @@ Source0: https://www.scintilla.org/scite%{tarballversion}.tgz
 %if 0%{with_emitunicode}
 Source1: emitUnicode.lua
 %endif
+Source2: SciTEGlobal.properties
 Patch0: scite-utf8.patch
-Patch1: add-emitUnicode.patch
 %if 0%{with_lua} && !0%{with_bundled_lua}
 Patch2: use-lua5.4.4.patch
 %endif
@@ -89,7 +89,6 @@ rm -rf scite/lua
 %patch2 -p1
 %endif
 %endif
-%patch1 -p1
 
 %build
 %if "%{?scl_env}" != ""
@@ -110,7 +109,7 @@ EOFSCL
 %endif
 
 %install
-make DESTDIR=%{buildroot} -C scite/gtk install libdir=%{_libdir}
+make DESTDIR=%{buildroot} %{gtkflag} -C scite/gtk install libdir=%{_libdir}
 ln -s SciTE %{buildroot}%{_bindir}/scite
 
 # include man-page
@@ -125,6 +124,7 @@ desktop-file-install --delete-original  \
 %if 0%{with_emitunicode}
 install -D -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/scite/emitUnicode.lua
 %endif
+install -D -p -m 666 %{SOURCE2} %{buildroot}%{_datadir}/scite/SciTEGlobal.properties
 %if 0%{?fedora}
 %posttrans
 /usr/bin/update-desktop-database &> /dev/null || :
@@ -150,6 +150,7 @@ install -D -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/scite/emitUnicode.lua
 * Mon Apr 04 2022 B. Stack <bgstack15@gmail.com> - 5.2.2-1/3.7.6-1
 - Update version
 - Add tunables: gtk, lua, bundled lua, add emitunicode
+- Add customized SciTEGlobal.properties
 
 * Thu Mar 24 2022 B. Stack <bgstack15@gmail.com> - 5.2.1-1/3.7.6-1
 - Update version