summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2019-12-20 18:17:33 +0000
committerB Stack <bgstack15@gmail.com>2019-12-20 18:17:33 +0000
commit79a376f7ac9db3d88456252efe4a14abd3747b7e (patch)
treeedde1ec35ef75dfb5144abf40d41262f7b15bf55
parentMerge branch 'updates' into 'master' (diff)
parentscite 4.2.3 for fc (diff)
downloadstackrpms-79a376f7ac9db3d88456252efe4a14abd3747b7e.tar.gz
stackrpms-79a376f7ac9db3d88456252efe4a14abd3747b7e.tar.bz2
stackrpms-79a376f7ac9db3d88456252efe4a14abd3747b7e.zip
Merge branch 'scite-bump' into 'master'
scite 4.2.3 for fedora See merge request bgstack15/stackrpms!105
-rw-r--r--scite-el/README.md15
-rw-r--r--scite-el/scite.spec3
-rw-r--r--scite-fedora/README.md15
-rwxr-xr-xscite-fedora/fc-el-scite-diff.sh3
-rw-r--r--scite-fedora/scite.spec5
5 files changed, 30 insertions, 11 deletions
diff --git a/scite-el/README.md b/scite-el/README.md
index d19fe20..fe53281 100644
--- a/scite-el/README.md
+++ b/scite-el/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.2.3
+Fedora 30 | 4.2.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-el/scite.spec b/scite-el/scite.spec
index ae64d07..ca8c3d6 100644
--- a/scite-el/scite.spec
+++ b/scite-el/scite.spec
@@ -98,6 +98,9 @@ desktop-file-install --delete-original \
%{_datadir}/applications/*
%changelog
+* 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
diff --git a/scite-fedora/README.md b/scite-fedora/README.md
index d19fe20..fe53281 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.2.3
+Fedora 30 | 4.2.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.spec b/scite-fedora/scite.spec
index b80a183..a8a6e93 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.2.3
%define tarballversion %( echo %pkgversion | tr -d '.' )
%define scl_env %{nil}
@@ -98,6 +98,9 @@ desktop-file-install --delete-original \
%{_datadir}/applications/*
%changelog
+* 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
bgstack15