summaryrefslogtreecommitdiff
path: root/scite-el/stackrpms-scite.spec.diff
blob: aa96dedf0aca2527e1b5c97c27c6124a267e9f38 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
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
bgstack15