Merge branch 'updates' into 'master'

scite 4.2.2 rpm

See merge request bgstack15/stackrpms!103

3 files changed, 140 insertions, 2 deletions

diff --git a/scite-el/scite.spec b/scite-el/scite.spec
index 8217793..ae64d07 100644
--- a/scite-el/scite.spec
+++ b/scite-el/scite.spec
@@ -1,5 +1,5 @@
 # el is on 3.x, fc is on 4.x
-%global pkgversion 3.7.5
+%global pkgversion 3.7.6
 %define tarballversion %( echo %pkgversion | tr -d '.' )
 
 %define scl_env %{nil}
@@ -98,6 +98,9 @@ desktop-file-install --delete-original  \
 %{_datadir}/applications/*
 
 %changelog
+* Mon Nov 11 2019 B Stack <bgstack15@gmail.com> - 4.2.2-1/3.7.6-1
+- Update version
+
 * Mon Nov 11 2019 B Stack <bgstack15@gmail.com> - 4.2.1-1/3.7.6-1
 - Rewritten to build Fedora and Enterprise Linux versions from a single spec with minor flags changed
 
diff --git a/scite-el/stackrpms-scite.spec.diff b/scite-el/stackrpms-scite.spec.diff
new file mode 100644
index 0000000..aa96ded
--- /dev/null
+++ b/scite-el/stackrpms-scite.spec.diff
@@ -0,0 +1,132 @@
+--- /usr/src/scite/scite.spec	2019-11-11 17:30:41.918108111 -0500
++++ /home/bgstack15/dev/stackrpms/scite-fedora/scite.spec	2019-11-11 17:40:50.389848953 -0500
+@@ -1,23 +1,33 @@
+-%global tarballversion 375
++# el is on 3.x, fc is on 4.x
++%global pkgversion 4.2.1
++%define tarballversion %( echo %pkgversion | tr -d '.' )
+ 
+-Name: scite 
+-Version: 3.7.5
+-Release: 3%{?dist}
+-Summary: SCIntilla based GTK2 text editor
++%define scl_env %{nil}
++%define scl_buildreq coreutils
++%if 0%{?el6}
++   %define scl_env devtoolset-7
++   %define scl_buildreq devtoolset-7-toolchain
++%endif
++
++Name: scite
++Version: %{pkgversion}
++Release: 1%{?dist}
++Summary: SCIntilla-based GTK text editor
+ License: MIT
+ Group: Applications/Editors
+ Url: http://www.scintilla.org/SciTE.html
++Packager: B Stack <bgstack15@gmail.com>
+ 
+-Source0: http://download.sourceforge.net/scintilla/scite%{tarballversion}.tgz
++Source0: https://www.scintilla.org/scite%{tarballversion}.tgz
+ Patch0: scite-utf8.patch
+ 
+-%if 0%{?fedora}%{?el7}
+-BuildRequires:  gcc-c++
++BuildRequires: desktop-file-utils
++BuildRequires: gcc-c++
++BuildRequires: %{scl_buildreq}
++%if !0%{?el6}
+ BuildRequires: gtk3-devel
+ %endif
+-
+ BuildRequires: gtk2-devel
+-BuildRequires: desktop-file-utils
+ 
+ Provides: bundled(scintilla) = %{version}
+ 
+@@ -33,20 +43,25 @@
+ rm -rf scite/lua
+ 
+ %build
+-%if 0%{?el6}
+-make %{?_smp_mflags} LDFLAGS="%{?__global_ldflags}" \
+-CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" DEBUG=1 -C scintilla/gtk
+-#Build without lua support
+-make %{?_smp_mflags} LDFLAGS="%{?__global_ldflags}" \
+-CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" DEBUG=1 NO_LUA=1 -C scite/gtk
+-%endif
+ 
+-%if 0%{?fedora}%{?el7}
+-make %{?_smp_mflags} LDFLAGS="%{?__global_ldflags}" \
+-CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" GTK3=1 DEBUG=1 -C scintilla/gtk
+-#Build without lua support
+-make %{?_smp_mflags} LDFLAGS="%{?__global_ldflags}" \
+-CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" GTK3=1 DEBUG=1 NO_LUA=1 -C scite/gtk
++%if 0%{?el6}
++   %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
++   #Build without lua support
++   make %{?_smp_mflags} LDFLAGS="%{?__global_ldflags}" \
++      CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" DEBUG=1 NO_LUA=1 -C scite/gtk
++   %if "%{?scl_env}" != ""
++EOFSCL
++   %endif
++%else
++   make %{?_smp_mflags} LDFLAGS="%{?__global_ldflags}" \
++      CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" GTK3=1 DEBUG=1 -C scintilla/gtk
++   #Build without lua support
++   make %{?_smp_mflags} LDFLAGS="%{?__global_ldflags}" \
++      CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" GTK3=1 DEBUG=1 NO_LUA=1 -C scite/gtk
+ %endif
+ 
+ %install
+@@ -62,15 +77,19 @@
+   --remove-key Encoding					\
+   %{buildroot}%{_datadir}/applications/SciTE.desktop
+ 
+-
++%if 0%{?fedora}
++%posttrans
++/usr/bin/update-desktop-database &> /dev/null || :
++%else
+ %post
+ /usr/bin/update-desktop-database &> /dev/null || :
+ 
+ %postun
+ /usr/bin/update-desktop-database &> /dev/null || :
++%endif
+ 
+ %files
+-%doc scite/License.txt 
++%doc scite/License.txt
+ %{_mandir}/man1/scite.1*
+ %{_bindir}/SciTE
+ %{_bindir}/scite
+@@ -79,6 +98,15 @@
+ %{_datadir}/applications/*
+ 
+ %changelog
++* Mon Nov 11 2019 B Stack <bgstack15@gmail.com> - 4.2.1-1/3.7.6-1
++- Rewritten to build Fedora and Enterprise Linux versions from a single spec with minor flags changed
++
++* Tue Jun  6 2019 B Stack <bgstack15@gmail.com> - 4.1.6-1/3.7.5-1
++- Rewritten to build Fedora and Enterprise Linux versions from a single spec with minor flags changed
++
++* Mon May  6 2019 B Stack <bgstack15@gmail.com> - 4.1.5-1
++- Brought to latest version
++
+ * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.5-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+ 
+@@ -155,7 +183,7 @@
+ - drop vendor from desktop-file-install
+ - use correct LDFLAGS and CXXFLAGS
+ - install man page correctly
+-- drop no longer needed install step and defattr 
++- drop no longer needed install step and defattr
+ 
+ * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.22-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/scite-fedora/scite.spec b/scite-fedora/scite.spec
index 4f35b86..b80a183 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.2.1
+%global pkgversion 4.2.2
 %define tarballversion %( echo %pkgversion | tr -d '.' )
 
 %define scl_env %{nil}
@@ -98,6 +98,9 @@ desktop-file-install --delete-original  \
 %{_datadir}/applications/*
 
 %changelog
+* Mon Nov 11 2019 B Stack <bgstack15@gmail.com> - 4.2.2-1/3.7.6-1
+- Update version
+
 * Mon Nov 11 2019 B Stack <bgstack15@gmail.com> - 4.2.1-1/3.7.6-1
 - Rewritten to build Fedora and Enterprise Linux versions from a single spec with minor flags changed