WIP: split scite into el and fedora packages

4 files changed, 231 insertions, 24 deletions

diff --git a/scite/scite-utf8.patch b/scite-el/scite-utf8.patch
index a606d40..a606d40 100644
--- a/scite/scite-utf8.patch
+++ b/scite-el/scite-utf8.patch
diff --git a/scite/scite.spec b/scite-el/scite.spec
index 7072223..98ba3e0 100644
--- a/scite/scite.spec
+++ b/scite-el/scite.spec
@@ -1,14 +1,7 @@
-%global tarballversion 415
+%global tarballversion 375
 
-%define scl_env %{nil}
-%define scl_buildreq coreutils
-%if 0%{?el6}%{?el7}
-   %define scl_env devtoolset-7
-   %define scl_buildreq devtoolset-7-toolchain
-%endif
-
-Name: scite
-Version: 4.1.5
+Name: scite 
+Version: 3.7.5
 Release: 1%{?dist}
 Summary: SCIntilla based GTK2 text editor
 License: MIT
@@ -19,10 +12,9 @@ Packager: B Stack <bgstack15@gmail.com>
 Source0: https://www.scintilla.org/scite%{tarballversion}.tgz
 Patch0: scite-utf8.patch
 
-%if 0%{?fedora}%{?el7}
+%if 0%{?el7}
 BuildRequires: gcc-c++
 BuildRequires: gtk3-devel
-BuildRequires: %{scl_buildreq}
 %endif
 
 BuildRequires: gtk2-devel
@@ -42,9 +34,6 @@ building and running programs.
 rm -rf scite/lua
 
 %build
-%if "%{?scl_env}" != ""
-   scl enable %{scl_env} /bin/bash <<'EOFSCL'
-%endif
 %if 0%{?el6}
 make %{?_smp_mflags} LDFLAGS="%{?__global_ldflags}" \
    CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" DEBUG=1 -C scintilla/gtk
@@ -53,17 +42,13 @@ make %{?_smp_mflags} LDFLAGS="%{?__global_ldflags}" \
    CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" DEBUG=1 NO_LUA=1 -C scite/gtk
 %endif
 
-%if 0%{?fedora}%{?el7}
+%if 0%{?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
 %endif
-:
-%if "%{?scl_env}" != ""
-EOFSCL
-%endif
 
 %install
 make DESTDIR=%{buildroot} -C scite/gtk install
@@ -85,7 +70,7 @@ desktop-file-install --delete-original  \
 /usr/bin/update-desktop-database &> /dev/null || :
 
 %files
-%doc scite/License.txt
+%doc scite/License.txt 
 %{_mandir}/man1/scite.1*
 %{_bindir}/SciTE
 %{_bindir}/scite
@@ -94,8 +79,8 @@ desktop-file-install --delete-original  \
 %{_datadir}/applications/*
 
 %changelog
-* Sun May 05 2019 B Stack <bgstack15@gmail.com> - 4.1.5-1
-- Brought to latest version
+* Mon May 06 2019 B Stack <bgstack15@gmail.com> - 3.7.5-1
+- Rebuilt for Enterprise Linux
 
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
@@ -173,7 +158,7 @@ desktop-file-install --delete-original  \
 - 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-utf8.patch b/scite-fedora/scite-utf8.patch
new file mode 100644
index 0000000..a606d40
--- /dev/null
+++ b/scite-fedora/scite-utf8.patch
@@ -0,0 +1,13 @@
+--- 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 @@
+ #code.page=932
+ #character.set=128
+ # Unicode
+-#code.page=65001
+-code.page=0
++code.page=65001
++#code.page=0
+ #character.set=204
+ #command.discover.properties=python /home/user/FileDetect.py "$(FilePath)"
+ # Required for Unicode to work on GTK+:
diff --git a/scite-fedora/scite.spec b/scite-fedora/scite.spec
new file mode 100644
index 0000000..d5b5686
--- /dev/null
+++ b/scite-fedora/scite.spec
@@ -0,0 +1,209 @@
+%global tarballversion 415
+
+Name: scite
+Version: 4.1.5
+Release: 1%{?dist}
+Summary: SCIntilla based GTK2 text editor
+License: MIT
+Group: Applications/Editors
+Url: http://www.scintilla.org/SciTE.html
+Packager: B Stack <bgstack15@gmail.com>
+
+Source0: https://www.scintilla.org/scite%{tarballversion}.tgz
+Patch0: scite-utf8.patch
+
+%if 0%{?fedora}
+BuildRequires: gcc-c++
+BuildRequires: gtk3-devel
+%endif
+
+BuildRequires: gtk2-devel
+BuildRequires: desktop-file-utils
+
+Provides: bundled(scintilla) = %{version}
+
+%description
+SciTE is a SCIntilla based Text Editor. Originally built to demonstrate
+Scintilla, it has grown to be a generally useful editor with facilities for
+building and running programs.
+
+%prep
+%setup -q -c
+%patch0
+#remove bundled lua
+rm -rf scite/lua
+
+%build
+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
+
+%install
+make DESTDIR=%{buildroot} -C scite/gtk install
+ln -s SciTE %{buildroot}%{_bindir}/scite
+
+# include man-page
+install -D -p -m 644 scite/doc/scite.1 %{buildroot}%{_mandir}/man1/scite.1
+
+desktop-file-install --delete-original  \
+  --dir %{buildroot}%{_datadir}/applications            \
+  --remove-category Application                         \
+  --remove-key Encoding					\
+  %{buildroot}%{_datadir}/applications/SciTE.desktop
+
+%post
+/usr/bin/update-desktop-database &> /dev/null || :
+
+%postun
+/usr/bin/update-desktop-database &> /dev/null || :
+
+%files
+%doc scite/License.txt
+%{_mandir}/man1/scite.1*
+%{_bindir}/SciTE
+%{_bindir}/scite
+%{_datadir}/scite/
+%{_datadir}/pixmaps/*
+%{_datadir}/applications/*
+
+%changelog
+* Mon May 06 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
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sat Aug 12 2017 Johan Swensson <kupo@kupo.se> 3.7.5-1
+- Update to 3.7.5
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Tue Sep 27 2016 Johan Swensson <kupo@kupo.se> - 3.6.7-1
+- Update to 3.6.7
+
+* Mon Feb 22 2016 Johan Swensson <kupo@kupo.se> - 3.6.3-1
+- Update to 3.6.3
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Nov 10 2015 Johan Swensson <kupo@kupo.se> - 3.6.2-1
+- Update to 3.6.2
+
+* Fri Sep 18 2015 Johan Swensson <kupo@kupo.se> - 3.6.1-1
+- Update to 3.6.1
+
+* Sun Aug 23 2015 Johan Swensson <kupo@kupo.se> - 3.6.0-1
+- Update to 3.6.0
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Wed May 06 2015 Johan Swensson <kupo@kupo.se> - 3.5.5-2
+- Added bundled(scintilla)
+
+* Thu Apr 30 2015 Johan Swensson <kupo@kupo.se> - 3.5.5-1
+- Update to 3.5.5
+
+* Sat Feb 21 2015 Johan Swensson <kupo@kupo.se> - 3.5.3-1
+- Update to 3.5.3
+
+* Sat Dec 20 2014 Johan Swensson <kupo@kupo.se> - 3.5.2-1
+- Update to 3.5.2
+
+* Thu Oct 16 2014 Johan Swensson <kupo@kupo.se> - 3.5.1-1
+- Update to 3.5.1
+
+* Mon Aug 18 2014 Johan Swensson <kupo@kupo.se> - 3.5.0-1
+- Update to 3.5.0
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.4.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Thu Jul 24 2014 Johan Swensson <kupo@kupo.se> - 3.4.4-1
+- update to 3.4.4
+- remove bundled lua library
+- build without lua scripting support for now
+- use --remove-key instead of sed
+- add update-desktop-database scriptlets
+- remove unnecessary README file
+- add support for el6
+- fix build conditional
+- fixed BuildRequires conditional
+- fix LDFLAGS macro
+- remove deprecated key in desktop file
+- use GTK3 (el7 and fedora)
+- drop vendor from desktop-file-install
+- use correct LDFLAGS and CXXFLAGS
+- install man page correctly
+- 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
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.22-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.22-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Sat Dec 4 2010 Jorge Torres <jtorresh@gmail.com> 2.22-1
+- Update to 2.22
+
+* Sat Apr 17 2010 Jorge Torres <jtorresh@gmail.com> 2.11-1
+- Update to 2.11
+- Fix bug #564689
+
+* Thu Oct 1 2009 Jorge Torres <jtorresh@gmail.com> 2.01-1
+- Update to 2.01
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.77-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Apr 4 2009 Jorge Torres <jtorresh@gmail.com> 1.77-1
+- Upgrade to 1.77
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.74-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.74-3
+- Autorebuild for GCC 4.3
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.74-2
+- Rebuild for selinux ppc32 issue.
+
+* Wed Jun 20 2007 Jorge Torres <jtorresh@gmail.com> 1.74-1
+- Upgrade to 1.74.
+- Default to UTF-8 encoding (fixes bug #240558).
+- Remove iconv workaround for desktop file encoding.
+
+* Fri Sep 01 2006 Jorge Torres <jtorresh@gmail.com> 1.71-1
+- Upgrade to 1.71
+- Use 'iconv' to work around a desktop file encoding issue
+
+* Thu Jun 22 2006 Jorge Torres <jtorresh@gmail.com> 1.70-1
+- Upgrade to 1.70
+- Drop man-page capitalization patch
+
+* Sun Jun 04 2006 Jorge Torres <jtorresh@gmail.com> 1.69-3
+- Remove usage of MultipleArgs in desktop file.
+
+* Fri Jun 02 2006 Jorge Torres <jtorresh@gmail.com> 1.69-2
+- Changed license to MIT.
+- Added patches to support compiling with %%{optflags}.
+- Misc fixes.
+
+* Thu Jun 01 2006 Jorge Torres <jtorresh@gmail.com> 1.69-1
+- Initial package version.