Merge branch 'scite-bump' into 'master'

Scite 4.4.4

See merge request bgstack15/stackrpms!172

4 files changed, 26 insertions, 12 deletions

diff --git a/scite-el/README.md b/scite-el/README.md
index 6a22a2e..2d139e8 100644
--- a/scite-el/README.md
+++ b/scite-el/README.md
@@ -9,8 +9,8 @@ Distro     | scite version
 ---------- | ---------------
 CentOS 6   | 3.7.6
 CentOS 7   | 3.7.6
-CentOS 8   | 4.3.3
-Fedora 30  | 4.3.3
+CentOS 8   | 4.4.3
+Fedora 30  | 4.4.3
 
 # Differences
 ## From upstream
diff --git a/scite-el/scite.spec b/scite-el/scite.spec
index a899b56..d2b86bb 100644
--- a/scite-el/scite.spec
+++ b/scite-el/scite.spec
@@ -98,6 +98,9 @@ desktop-file-install --delete-original  \
 %{_datadir}/applications/*
 
 %changelog
+* Wed Jun 03 2020 B Stack <bgstack15@gmail.com> - 4.4.3-1/3.7.6-1
+- Update version
+
 * Tue May 05 2020 B Stack <bgstack15@gmail.com> - 4.3.3-1/3.7.6-1
 - Update version
 
diff --git a/scite-fedora/README.md b/scite-fedora/README.md
index 6a22a2e..2d139e8 100644
--- a/scite-fedora/README.md
+++ b/scite-fedora/README.md
@@ -9,8 +9,8 @@ Distro     | scite version
 ---------- | ---------------
 CentOS 6   | 3.7.6
 CentOS 7   | 3.7.6
-CentOS 8   | 4.3.3
-Fedora 30  | 4.3.3
+CentOS 8   | 4.4.3
+Fedora 30  | 4.4.3
 
 # Differences
 ## From upstream
diff --git a/scite-fedora/scite.spec b/scite-fedora/scite.spec
index 43ee922..9c62f6a 100644
--- a/scite-fedora/scite.spec
+++ b/scite-fedora/scite.spec
@@ -1,5 +1,5 @@
 # el is on 3.x, fc is on 4.x
-%global pkgversion 4.3.3
+%global pkgversion 4.4.4
 %define tarballversion %( echo %pkgversion | tr -d '.' )
 
 %define scl_env %{nil}
@@ -48,24 +48,28 @@ rm -rf scite/lua
    %if "%{?scl_env}" != ""
       scl enable %{scl_env} /bin/bash <<'EOFSCL'
    %endif
-   make %{?_smp_mflags} LDFLAGS="%{?__global_ldflags}" \
-      CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" DEBUG=1 -C scintilla/gtk
+   make %{?_smp_mflags} LDFLAGS="%{?__global_ldflags} -shared -dynamiclib" \
+      CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" DEBUG=1 -C scintilla/gtk \
+      libdir=%{_libdir}
    #Build without lua support
    make %{?_smp_mflags} LDFLAGS="%{?__global_ldflags}" \
-      CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" DEBUG=1 NO_LUA=1 -C scite/gtk
+      CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" DEBUG=1 NO_LUA=1 -C scite/gtk \
+      libdir=%{_libdir}
    %if "%{?scl_env}" != ""
 EOFSCL
    %endif
 %else
-   make %{?_smp_mflags} LDFLAGS="%{?__global_ldflags}" \
-      CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" GTK3=1 DEBUG=1 -C scintilla/gtk
+   make %{?_smp_mflags} LDFLAGS="%{?__global_ldflags} -shared -dynamiclib" \
+      CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" GTK3=1 DEBUG=1 -C scintilla/gtk \
+      libdir=%{_libdir}
    #Build without lua support
    make %{?_smp_mflags} LDFLAGS="%{?__global_ldflags}" \
-      CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" GTK3=1 DEBUG=1 NO_LUA=1 -C scite/gtk
+      CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" GTK3=1 DEBUG=1 NO_LUA=1 -C scite/gtk \
+      libdir=%{_libdir}
 %endif
 
 %install
-make DESTDIR=%{buildroot} -C scite/gtk install
+make DESTDIR=%{buildroot} -C scite/gtk install libdir=%{_libdir}
 ln -s SciTE %{buildroot}%{_bindir}/scite
 
 # include man-page
@@ -96,8 +100,15 @@ desktop-file-install --delete-original  \
 %{_datadir}/scite/
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*
+%{_libdir}/*
 
 %changelog
+* Thu Jul 23 2020 B Stack <bgstack15@gmail.com> - 4.4.4-1/3.7.6-1
+- Update version
+
+* Wed Jun 03 2020 B Stack <bgstack15@gmail.com> - 4.4.3-1/3.7.6-1
+- Update version
+
 * Tue May 05 2020 B Stack <bgstack15@gmail.com> - 4.3.3-1/3.7.6-1
 - Update version