rpms/scite/F-7 scite-utf8.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 scite.spec, 1.3, 1.4 sources, 1.4, 1.5
Jorge Alberto Torres (jorge)
fedora-extras-commits at redhat.com
Sun Jul 1 02:21:17 UTC 2007
Author: jorge
Update of /cvs/pkgs/rpms/scite/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8036
Modified Files:
.cvsignore scite.spec sources
Added Files:
scite-utf8.patch
Log Message:
Update to 1.74
scite-utf8.patch:
--- NEW FILE scite-utf8.patch ---
diff -uNr scite.orig/src/SciTEGlobal.properties scite/src/SciTEGlobal.properties
--- scite.orig/src/SciTEGlobal.properties 2007-06-20 15:07:43.000000000 -0500
+++ scite/src/SciTEGlobal.properties 2007-06-20 15:08:06.000000000 -0500
@@ -217,8 +217,8 @@
#code.page=932
#character.set=128
# Unicode
-#code.page=65001
-code.page=0
+code.page=65001
+#code.page=0
#character.set=204
# Required for Unicode to work on GTK+:
#LC_CTYPE=en_US.UTF-8
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scite/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 2 Sep 2006 02:33:31 -0000 1.4
+++ .cvsignore 1 Jul 2007 02:20:41 -0000 1.5
@@ -1 +1 @@
-scite171.tgz
+scite174.tgz
Index: scite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scite/F-7/scite.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scite.spec 2 Sep 2006 02:33:31 -0000 1.3
+++ scite.spec 1 Jul 2007 02:20:41 -0000 1.4
@@ -1,15 +1,16 @@
Name: scite
-Version: 1.71
+Version: 1.74
Release: 1%{?dist}
Summary: SCIntilla based GTK2 text editor
License: MIT
Group: Applications/Editors
Url: http://www.scintilla.org/SciTE.html
-Source0: http://download.sourceforge.net/scintilla/scite171.tgz
+Source0: http://download.sourceforge.net/scintilla/scite174.tgz
patch0: scintilla-makefile-flags.patch
patch1: scite-makefile.patch
patch2: scite-use-htmlview.patch
+patch3: scite-utf8.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel
@@ -25,10 +26,7 @@
%patch0
%patch1
%patch2
-
-# fix .desktop file encoding
-iconv -f ISO-8859-1 -t utf-8 scite/gtk/SciTE.desktop -o scite/gtk/SciTE.desktop.new
-mv scite/gtk/SciTE.desktop.new scite/gtk/SciTE.desktop
+%patch3
%build
make %{?_smp_mflags} OPTFLAGS="%{optflags}" -C scintilla/gtk
@@ -45,7 +43,7 @@
desktop-file-install --vendor fedora --delete-original \
--dir %{buildroot}%{_datadir}/applications \
- --add-category X-Fedora \
+ --remove-category Application \
%{buildroot}%{_datadir}/applications/SciTE.desktop
%clean
@@ -62,6 +60,11 @@
%{_datadir}/applications/*
%changelog
+* Wed Jun 30 2007 Jorge Torres <jtorresh at 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 at gmail.com> 1.71-1
- Upgrade to 1.71
- Use 'iconv' to work around a desktop file encoding issue
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scite/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 2 Sep 2006 02:33:31 -0000 1.4
+++ sources 1 Jul 2007 02:20:41 -0000 1.5
@@ -1 +1 @@
-b62946c770686909a4d4d0e42de3754c scite171.tgz
+09ad25f1fa6dab3feec41dba2480047f scite174.tgz
More information about the scm-commits
mailing list