rpms/scite/devel scintilla-makefile-flags.patch, NONE, 1.1 scite-makefile.patch, NONE, 1.1 scite-manpage-capitalization.patch, NONE, 1.1 scite-use-htmlview.patch, NONE, 1.1 scite.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Jorge Alberto Torres (jorge)
fedora-extras-commits at redhat.com
Tue Jun 6 04:40:29 UTC 2006
Author: jorge
Update of /cvs/extras/rpms/scite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12324/devel
Modified Files:
.cvsignore sources
Added Files:
scintilla-makefile-flags.patch scite-makefile.patch
scite-manpage-capitalization.patch scite-use-htmlview.patch
scite.spec
Log Message:
auto-import scite-1.69-3 on branch devel from scite-1.69-3.src.rpm
scintilla-makefile-flags.patch:
--- NEW FILE scintilla-makefile-flags.patch ---
diff -uNr scintilla.orig/gtk/makefile scintilla/gtk/makefile
--- scintilla.orig/gtk/makefile 2006-03-30 00:30:02.000000000 -0500
+++ scintilla/gtk/makefile 2006-06-02 19:02:29.000000000 -0500
@@ -23,7 +23,7 @@
vpath %.cxx ../src
INCLUDEDIRS=-I ../include -I ../src
-CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -pedantic -Os -DGTK -DSCI_LEXER $(INCLUDEDIRS)
+CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -pedantic -DGTK -DSCI_LEXER $(INCLUDEDIRS)
ifdef NOTHREADS
THREADFLAGS=-DG_THREADS_IMPL_NONE
@@ -32,9 +32,9 @@
endif
ifdef DEBUG
-CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
+CXXFLAGS=-DDEBUG $(OPTFLAGS) $(CXXBASEFLAGS) $(THREADFLAGS)
else
-CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
+CXXFLAGS=-DNDEBUG $(OPTFLAGS) $(CXXBASEFLAGS) $(THREADFLAGS)
endif
# If explicit setting of GTK1 or GTK2 then use that else look for
scite-makefile.patch:
--- NEW FILE scite-makefile.patch ---
diff -uNr scite.orig/gtk/makefile scite/gtk/makefile
--- scite.orig/gtk/makefile 2006-02-13 01:27:08.000000000 -0500
+++ scite/gtk/makefile 2006-06-02 19:00:20.000000000 -0500
@@ -45,7 +45,7 @@
bindir=$(prefix)/bin
SYSCONF_PATH=$(prefix)/share/scite
-INSTALL=install -o root -g root
+INSTALL=install
PROG = ../bin/SciTE
@@ -56,12 +56,12 @@
#CXXFLAGS= -g -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" -Wwrite-strings
INCLUDEDIRS=-I ../../scintilla/include -I ../src
-CXXBASEFLAGS=-W -Wall -pedantic -Os -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
+CXXBASEFLAGS=-W -Wall -pedantic -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
ifdef DEBUG
-CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
+CXXTFLAGS=-DDEBUG $(OPTFLAGS) $(CXXBASEFLAGS)
else
-CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)
+CXXTFLAGS=-DNDEBUG $(OPTFLAGS) $(CXXBASEFLAGS)
endif
ifndef NO_LUA
scite-manpage-capitalization.patch:
--- NEW FILE scite-manpage-capitalization.patch ---
diff -uNr scite.orig/doc/scite.1 scite/doc/scite.1
--- scite.orig/doc/scite.1 2001-03-01 03:24:54.000000000 -0500
+++ scite/doc/scite.1 2006-05-30 20:48:07.000000000 -0500
@@ -1,12 +1,12 @@
.TH SCITE 1 "2001 February 26"
.SH NAME
-scite \- a programmers text editor
+SciTE \- a programmers text editor
.SH SYNOPSIS
.br
-.B scite
+.B SciTE
[file ..]
.SH DESCRIPTION
-.B Scite
+.B SciTE
is a graphical GTK+ based editor. It has support
for indenting, highlighting, and shortcuts in a myriad
of languages and can be extended by editing object-oriented
@@ -17,7 +17,7 @@
Type Alt-H or Click the Help Pulldown menu.
.SH AUTHOR
Most of
-.B Scite
+.B SciTE
was made by Neil Hodgson, with a lot of help from others.
See Help
.br
scite-use-htmlview.patch:
--- NEW FILE scite-use-htmlview.patch ---
diff -uNr scite.orig/src/Embedded.properties scite/src/Embedded.properties
--- scite.orig/src/Embedded.properties 2006-05-23 00:20:12.000000000 -0500
+++ scite/src/Embedded.properties 2006-06-01 01:01:57.000000000 -0500
@@ -80,7 +80,7 @@
command.scite.help.subsystem=2
if PLAT_GTK
command.print.*=a2ps "$(FileNameExt)"
- command.scite.help=netscape "file://$(SciteDefaultHome)/SciTEDoc.html"
+ command.scite.help=htmlview "file://$(SciteDefaultHome)/SciTEDoc.html"
code.page=0
@@ -2876,7 +2876,7 @@
command.go.$(file.patterns.web)="file://$(FilePath)"
command.go.subsystem.$(file.patterns.web)=2
if PLAT_GTK
- command.go.$(file.patterns.web)=netscape "file://$(FilePath)"
+ command.go.$(file.patterns.web)=htmlview "file://$(FilePath)"
command.go.$(file.patterns.php)=php -f "$(FileNameExt)"
command.compile.$(file.patterns.php)=php -l "$(FileNameExt)"
diff -uNr scite.orig/src/html.properties scite/src/html.properties
--- scite.orig/src/html.properties 2006-03-02 04:58:44.000000000 -0500
+++ scite/src/html.properties 2006-06-01 01:02:10.000000000 -0500
@@ -514,7 +514,7 @@
command.go.$(file.patterns.web)="file://$(FilePath)"
command.go.subsystem.$(file.patterns.web)=2
if PLAT_GTK
- command.go.$(file.patterns.web)=netscape "file://$(FilePath)"
+ command.go.$(file.patterns.web)=htmlview "file://$(FilePath)"
command.go.$(file.patterns.php)=php -f "$(FileNameExt)"
command.compile.$(file.patterns.php)=php -l "$(FileNameExt)"
diff -uNr scite.orig/src/SciTEGlobal.properties scite/src/SciTEGlobal.properties
--- scite.orig/src/SciTEGlobal.properties 2006-05-20 21:54:53.000000000 -0500
+++ scite/src/SciTEGlobal.properties 2006-06-01 01:02:21.000000000 -0500
@@ -202,7 +202,7 @@
command.scite.help.subsystem=2
if PLAT_GTK
command.print.*=a2ps "$(FileNameExt)"
- command.scite.help=netscape "file://$(SciteDefaultHome)/SciTEDoc.html"
+ command.scite.help=htmlview "file://$(SciteDefaultHome)/SciTEDoc.html"
# Internationalisation
# Japanese input code page 932 and ShiftJIS character set 128
--- NEW FILE scite.spec ---
Name: scite
Version: 1.69
Release: 3%{?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/scite169.tgz
patch0: scintilla-makefile-flags.patch
patch1: scite-makefile.patch
patch2: scite-manpage-capitalization.patch
patch3: scite-use-htmlview.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel
BuildRequires: desktop-file-utils
%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
%patch1
%patch2
%patch3
%build
make %{?_smp_mflags} OPTFLAGS="%{optflags}" -C scintilla/gtk
make %{?_smp_mflags} OPTFLAGS="%{optflags}" -C scite/gtk
%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} -C scite/gtk install
ln -s SciTE %{buildroot}%{_bindir}/scite
# include man-page
mkdir -p %{buildroot}%{_mandir}/man1/
mv scite/doc/scite.1 %{buildroot}%{_mandir}/man1/
desktop-file-install --vendor fedora --delete-original \
--dir %{buildroot}%{_datadir}/applications \
--remove-key MultipleArgs \
--add-category Development \
--add-category X-Fedora \
%{buildroot}%{_datadir}/applications/SciTE.desktop
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc scite/README scite/License.txt
%{_mandir}/man1/scite.1*
%{_bindir}/SciTE
%{_bindir}/scite
%{_datadir}/scite/
%{_datadir}/pixmaps/*
%{_datadir}/applications/*
%changelog
* Sun Jun 04 2006 Jorge Torres <jtorresh at gmail.com> 1.69-3
- Remove usage of MultipleArgs in desktop file.
* Fri Jun 02 2006 Jorge Torres <jtorresh at 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 at gmail.com> 1.69-1
- Initial package version.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scite/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 6 Jun 2006 04:37:57 -0000 1.1
+++ .cvsignore 6 Jun 2006 04:40:29 -0000 1.2
@@ -0,0 +1 @@
+scite169.tgz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scite/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 6 Jun 2006 04:37:57 -0000 1.1
+++ sources 6 Jun 2006 04:40:29 -0000 1.2
@@ -0,0 +1 @@
+3f84986922ccf9c21a1481ba85153be6 scite169.tgz
More information about the fedora-extras-commits
mailing list