rpms/joe/devel joe-3.7-joerc.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 joe.spec, 1.39, 1.40 sources, 1.10, 1.11 joe-3.5-documentation.patch, 1.1, NONE joe-3.5-joerc.patch, 1.1, NONE

[Ivana Varekova]

Author: varekova

Update of /cvs/pkgs/rpms/joe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10348

Modified Files:
	.cvsignore joe.spec sources 
Added Files:
	joe-3.7-joerc.patch 
Removed Files:
	joe-3.5-documentation.patch joe-3.5-joerc.patch 
Log Message:
update to 3.7


joe-3.7-joerc.patch:

--- NEW FILE joe-3.7-joerc.patch ---
diff -up joe-3.7/rc/joerc.in.joerc joe-3.7/rc/joerc.in
--- joe-3.7/rc/joerc.in.joerc	2008-11-02 04:29:43.000000000 +0100
+++ joe-3.7/rc/joerc.in	2009-02-03 12:26:34.000000000 +0100
@@ -718,6 +718,8 @@ msg		^[ ^H		Display a message
 nextw		^K N		Goto next window
 nextw		^K ^N
 nextw		^K n
+nextw		^[ [ 1 ; 3 C	alt right in (newer) xterm
+nextw		^[ [ 3 C	alt right in gnome-terminal
 pgdn		.kN		Screen down
 pgdn		^V
 pgdn		^[ [ 6 ~
@@ -730,6 +732,8 @@ play		^K 0 TO 9	Execute macro
 prevw		^K P		Goto previous window
 prevw		^K ^P
 prevw		^K p
+prevw		^[ [ 1 ; 3 D	alt left in (newer) xterm
+prevw		^[ [ 3 D	alt left in gnome-terminal
 query		^K ?		Macro query insert
 record		^K [		Record a macro
 retype		^R		Refresh screen
@@ -763,8 +767,8 @@ if,"char==65",then,"it's an A",else,"it'
 :def ispellword psh,nextword,markk,prevword,markb,filt,"cat >ispell.tmp;ispell ispell.tmp </dev/tty >/dev/tty;tr -d <ispell.tmp '\\012';/bin/rm ispell.tmp",rtn,retype,nextword
 
  Aspell
-:def aspellfile filt,"SPLTMP=ispell.tmp;cat >$SPLTMP;aspell --lang=",language,".",charset," -x -c $SPLTMP </dev/tty >/dev/tty;cat $SPLTMP;/bin/rm $SPLTMP",rtn,retype
-:def aspellword psh,nextword,markk,prevword,markb,filt,"SPLTMP=ispell.tmp;cat >$SPLTMP;aspell --lang=",language,".",charset," -x -c $SPLTMP </dev/tty >/dev/tty;tr -d <$SPLTMP '\\012';/bin/rm $SPLTMP",rtn,retype,nextword
+:def aspellfile filt,"SPLTMP=`mktemp -t joespell.XXXXXXXXXX`;cat >$SPLTMP;aspell --lang=",language,".",charset," -x -c $SPLTMP </dev/tty >/dev/tty;cat $SPLTMP;/bin/rm $SPLTMP",rtn,retype
+:def aspellword psh,nextword,markk,prevword,markb,filt,"SPLTMP=`mktemp -t joespell.XXXXXXXXXX`;cat >$SPLTMP;aspell --lang=",language,".",charset," -x -c $SPLTMP </dev/tty >/dev/tty;tr -d <$SPLTMP '\\012';/bin/rm $SPLTMP",rtn,retype,nextword
 
 
 aspellfile	^[ l
@@ -1015,9 +1019,13 @@ markk		^K k
 menu,"root",rtn	^T
 nextpos		^K =		Goto next position in position history
 nextword	^X		Goto next word
+nextword	^[ [ 1 ; 5 C	ctrl right in (newer) xterm
+nextword	^[ [ 5 C	ctrl right in gnome-terminal
 open		^]		Split line
 prevpos		^K -		Previous position in history
 prevword	^Z		Previous word
+prevword	^[ [ 1 ; 5 D	ctrl left in (newer) xterm
+prevword	^[ [ 5 D	ctrl left in gnome-terminal
 reload		^K `		Revert file
 redo		^^		Redo changes
 rindent		^K .		Indent to right


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/joe/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	23 Oct 2006 10:40:59 -0000	1.10
+++ .cvsignore	3 Feb 2009 11:39:29 -0000	1.11
@@ -1 +1 @@
-joe-3.5.tar.gz
+joe-3.7.tar.gz


Index: joe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/joe/devel/joe.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- joe.spec	20 Feb 2008 06:36:34 -0000	1.39
+++ joe.spec	3 Feb 2009 11:39:29 -0000	1.40
@@ -1,17 +1,16 @@
 Summary: An easy to use, modeless text editor
 Name: joe
-Version: 3.5
-Release: 5%{?dist}
+Version: 3.7
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Editors
 Source: http://prdownloads.sourceforge.net/joe-editor/joe-%{version}.tar.gz
 URL: http://sourceforge.net/projects/joe-editor/
 Requires: ncurses
 BuildRequires: ncurses-devel libselinux-devel
-Patch0: joe-3.5-joerc.patch
+Patch0: joe-3.7-joerc.patch
 Patch2: joe-3.4-selinux.patch
 Patch3: joe-3.5-time.patch
-Patch4: joe-3.5-documentation.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -24,7 +23,6 @@
 %patch0 -p1 -b .joerc
 %patch2 -p1 -b .selinux
 %patch3 -p1 -b .time
-%patch4 -p1 -b .doc
 iconv -f koi8-r -t utf-8 ./man/ru/joe.1.in >./man/ru/joe.1.in.aux
 mv ./man/ru/joe.1.in.aux ./man/ru/joe.1.in
 
@@ -34,7 +32,7 @@
 
 %install
 rm -fr $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT PACKAGE_TARNAME=joe-%{version}
 
 # This is automatically compressed afterwards...
 pushd $RPM_BUILD_ROOT/%{_mandir}/man1
@@ -44,11 +42,20 @@
 ln -s joe.1 rjoe.1 
 popd
 
+# Have to be fixed - compiled to .mo format and put to /usr/share/locale
+rm $RPM_BUILD_ROOT/%{_datadir}/joe/lang/*.po
+
 %files
 %defattr(-,root,root,-)
 %doc README TODO HINTS NEWS LIST COPYING
 %{_bindir}/*
 %dir /etc/joe
+%dir %{_datadir}/joe
+%dir %{_datadir}/joe/syntax
+%dir %{_datadir}/joe/charmaps
+%{_datadir}/joe/syntax/*
+%{_datadir}/joe/charmaps
+
 %config(noreplace) /etc/joe/*
 %{_mandir}/man1/*
 %{_mandir}/ru/man1/*
@@ -57,6 +64,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb  3 2009 Ivana Varekova <varekova at redhat.com> - 3.7-1
+- update to 3.7
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.5-5
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/joe/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	23 Oct 2006 10:40:59 -0000	1.10
+++ sources	3 Feb 2009 11:39:29 -0000	1.11
@@ -1 +1 @@
-9bdffecce7ef910feaa06452d48843de  joe-3.5.tar.gz
+66de1b073e869ba12abbfcde3885c577  joe-3.7.tar.gz


--- joe-3.5-documentation.patch DELETED ---


--- joe-3.5-joerc.patch DELETED ---