rpms/joe/devel joe-3.7-orphan.patch,NONE,1.1 joe.spec,1.43,1.44

[Ivana Varekova]

Author: varekova

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

Modified Files:
	joe.spec 
Added Files:
	joe-3.7-orphan.patch 
Log Message:
- fix 528817 - problem when orphan mode is set


joe-3.7-orphan.patch:
 main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE joe-3.7-orphan.patch ---
diff -up ./joe-3.7/main.c.pom ./joe-3.7/main.c
--- joe-3.7/main.c.pom	2008-10-27 04:01:11.000000000 +0100
+++ joe-3.7/main.c	2010-02-09 13:40:14.000000000 +0100
@@ -431,7 +431,7 @@ int main(int argc, char **real_argv, cha
 				b->orphan = 1;
 				b->oldcur = pdup(b->bof, USTR "main");
 				pline(b->oldcur, get_file_pos(b->name));
-				p_goto_bol(bw->cursor);
+				p_goto_bol(b->oldcur);
 				line = b->oldcur->line - (maint->h - 1) / 2;
 				if (line < 0)
 					line = 0;


Index: joe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/joe/devel/joe.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- joe.spec	25 Jul 2009 04:05:28 -0000	1.43
+++ joe.spec	10 Feb 2010 06:53:53 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: An easy to use, modeless text editor
 Name: joe
 Version: 3.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: Applications/Editors
 Source: http://downloads.sourceforge.net/joe-editor/joe-%{version}.tar.gz
@@ -10,6 +10,7 @@ BuildRequires: ncurses-devel libselinux-
 Patch0: joe-3.7-joerc.patch
 Patch2: joe-3.4-selinux.patch
 Patch3: joe-3.5-time.patch
+Patch4: joe-3.7-orphan.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -22,6 +23,7 @@ environment.
 %patch0 -p1 -b .joerc
 %patch2 -p1 -b .selinux
 %patch3 -p1 -b .time
+%patch4 -p1 -b .orphan
 iconv -f koi8-r -t utf-8 ./man/ru/joe.1.in >./man/ru/joe.1.in.aux
 touch -r ./man/ru/joe.1.in ./man/ru/joe.1.in.aux
 mv ./man/ru/joe.1.in.aux ./man/ru/joe.1.in
@@ -29,7 +31,7 @@ iconv -f ISO_8859-1 -t UTF-8 HACKING > H
 touch -r HACKING HACKING.tmp 
 mv HACKING.tmp HACKING
 iconv -f ISO_8859-1 -t UTF-8 ChangeLog > ChangeLog.tmp
-touch -r ChangeLog ChangeLog.tmp 
+touch -r ChangeLog ChangeLog.tmp
 mv ChangeLog.tmp ChangeLog
 
 %build
@@ -42,10 +44,10 @@ make install DESTDIR=$RPM_BUILD_ROOT PAC
 
 # This is automatically compressed afterwards...
 pushd $RPM_BUILD_ROOT/%{_mandir}/man1
-ln -s joe.1 jmacs.1 
-ln -s joe.1 jpico.1 
-ln -s joe.1 jstar.1 
-ln -s joe.1 rjoe.1 
+ln -s joe.1 jmacs.1
+ln -s joe.1 jpico.1
+ln -s joe.1 jstar.1
+ln -s joe.1 rjoe.1
 popd
 
 
@@ -63,6 +65,9 @@ popd
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Feb 10 2010 Ivana Hutarova Varekova <varekova at redhat.com> - 3.7-5
+- fix 528817 - problem when orphan mode is set
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild