summaryrefslogtreecommitdiff
path: root/scite-fedora
diff options
context:
space:
mode:
Diffstat (limited to 'scite-fedora')
-rw-r--r--scite-fedora/README.md15
-rwxr-xr-xscite-fedora/fc-el-scite-diff.sh3
-rw-r--r--scite-fedora/scite-utf8.patch4
-rw-r--r--scite-fedora/scite.spec41
4 files changed, 47 insertions, 16 deletions
diff --git a/scite-fedora/README.md b/scite-fedora/README.md
index d19fe20..2d139e8 100644
--- a/scite-fedora/README.md
+++ b/scite-fedora/README.md
@@ -7,10 +7,15 @@ Fedora and CentOS do not package scite and I have use of them. CentOS 7 relies o
# Reverse dependency matrix
Distro | scite version
---------- | ---------------
-CentOS 6 | 3.7.5
-CentOS 7 | 3.7.5
-CentOS 8 | 4.1.6
-Fedora 30 | 4.1.6
+CentOS 6 | 3.7.6
+CentOS 7 | 3.7.6
+CentOS 8 | 4.4.3
+Fedora 30 | 4.4.3
-# Differences from upstream
+# Differences
+## From upstream
See file [stackrpms-scite.spec.diff](stackrpms-scite.spec.diff)
+## Between scite-fedora and scite-el
+Run file [fc-el-scite-diff.sh](fc-el-scite-diff.sh).
+
+ scite-fedora/fc-el-scite-diff.sh | vi -
diff --git a/scite-fedora/fc-el-scite-diff.sh b/scite-fedora/fc-el-scite-diff.sh
new file mode 100755
index 0000000..bae0376
--- /dev/null
+++ b/scite-fedora/fc-el-scite-diff.sh
@@ -0,0 +1,3 @@
+# use this file to display the differences between fedora and el scite rpm source directories
+# usage: scite-fedora/fc-el-scite-diff.sh | vi -
+diff -x debian -x stackrpms*.diff -x '*scite*.sh' -x '*z' -x '.*.swp' -Naur scite-fedora scite-el
diff --git a/scite-fedora/scite-utf8.patch b/scite-fedora/scite-utf8.patch
index a606d40..4b23bfa 100644
--- a/scite-fedora/scite-utf8.patch
+++ b/scite-fedora/scite-utf8.patch
@@ -1,6 +1,6 @@
--- scite.orig/src/SciTEGlobal.properties 2014-04-15 13:58:07.371190890 +0200
+++ scite/src/SciTEGlobal.properties 2014-04-15 14:05:45.441406862 +0200
-@@ -278,8 +278,8 @@
+@@ -297,8 +297,8 @@
#code.page=932
#character.set=128
# Unicode
@@ -10,4 +10,4 @@
+#code.page=0
#character.set=204
#command.discover.properties=python /home/user/FileDetect.py "$(FilePath)"
- # Required for Unicode to work on GTK+:
+ # Forward LC_CTYPE to setlocale which may affect language support.
diff --git a/scite-fedora/scite.spec b/scite-fedora/scite.spec
index b80a183..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.2.2
+%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,15 +100,34 @@ 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
+
+* Wed Mar 04 2020 B Stack <bgstack15@gmail.com> - 4.3.1-1/3.7.6-1
+- Update version
+
+* Thu Jan 16 2020 B Stack <bgstack15@gmail.com> - 4.3.0-1/3.7.6-1
+- Update version
+
+* Thu Dec 19 2019 B Stack <bgstack15@gmail.com> - 4.2.3-1/3.7.6-1
+- Update version
+
* 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
-* Tue Jun 6 2019 B Stack <bgstack15@gmail.com> - 4.1.6-1/3.7.5-1
+* Thu 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
bgstack15