[joe] Update to 3.8 stable release - resolves: #1204542

Jan Chaloupka jchaloup at fedoraproject.org
Mon Mar 23 13:38:01 UTC 2015


commit 48ec7b32d36edad19ecfe63b1693b91071bfb88f
Author: Jan Chaloupka <jchaloup at redhat.com>
Date:   Mon Mar 23 14:28:08 2015 +0100

    Update to 3.8 stable release
    - resolves: #1204542

 .gitignore                                         |    2 +-
 joe-3.7-aarch64.patch                              | 2539 --------------------
 joe-3.7-format-security.patch                      |  162 --
 joe-3.7-orphan.patch                               |   12 -
 joe-3.8-aarch64.patch                              |  193 ++
 joe-3.8-format-security.patch                      |   77 +
 joe-3.7-indent-ow.patch => joe-3.8-indent-ow.patch |   36 +-
 joe-3.4-selinux.patch => joe-3.8-selinux.patch     |   52 +-
 joe-3.5-time.patch => joe-3.8-time.patch           |   26 +-
 joe.spec                                           |   25 +-
 sources                                            |    2 +-
 11 files changed, 362 insertions(+), 2764 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 49d9f9b..01a635d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-joe-3.7.tar.gz
+/joe-3.8.tar.gz
diff --git a/joe-3.8-aarch64.patch b/joe-3.8-aarch64.patch
new file mode 100644
index 0000000..dab0bd2
--- /dev/null
+++ b/joe-3.8-aarch64.patch
@@ -0,0 +1,193 @@
+From 1dfd3c12adc4e53d36faf925e6a6d04647559544 Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup at redhat.com>
+Date: Mon, 23 Mar 2015 13:52:08 +0100
+Subject: [PATCH] aarch64
+
+---
+ config.sub | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 72 insertions(+)
+
+diff --git a/config.sub b/config.sub
+index 9633db7..c0c2d7e 100755
+--- a/config.sub
++++ b/config.sub
+@@ -201,6 +201,10 @@ case $os in
+ 		# Don't forget version if it is 3.2v4 or newer.
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
++	-sco5v6*)
++		# Don't forget version if it is 3.2v4 or newer.
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
+ 	-sco*)
+ 		os=-sco3.2v2
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+@@ -224,6 +228,12 @@ case $os in
+ 	-lynx*5)
+ 		os=-lynxos5
+ 		;;
++	-lynx*178)
++		os=-lynxos178
++		;;
++	-lynx*5)
++		os=-lynxos5
++		;;
+ 	-lynx*)
+ 		os=-lynxos
+ 		;;
+@@ -506,6 +516,10 @@ case $basic_machine in
+ 		basic_machine=i386-pc
+ 		os=-aros
+ 		;;
++	aros)
++		basic_machine=i386-pc
++		os=-aros
++		;;
+ 	aux)
+ 		basic_machine=m68k-apple
+ 		os=-aux
+@@ -614,6 +628,10 @@ case $basic_machine in
+ 		basic_machine=i686-pc
+ 		os=-dicos
+ 		;;
++	dicos)
++		basic_machine=i686-pc
++		os=-dicos
++		;;
+ 	djgpp)
+ 		basic_machine=i586-pc
+ 		os=-msdosdjgpp
+@@ -775,6 +793,14 @@ case $basic_machine in
+ 		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		os=-linux
+ 		;;
++	m68knommu)
++		basic_machine=m68k-unknown
++		os=-linux
++		;;
++	m68knommu-*)
++		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
++		os=-linux
++		;;
+ 	m88k-omron*)
+ 		basic_machine=m88k-omron
+ 		;;
+@@ -911,6 +937,12 @@ case $basic_machine in
+ 	nse-tandem)
+ 		basic_machine=nse-tandem
+ 		;;
++	neo-tandem)
++		basic_machine=neo-tandem
++		;;
++	nse-tandem)
++		basic_machine=nse-tandem
++		;;
+ 	nsr-tandem)
+ 		basic_machine=nsr-tandem
+ 		;;
+@@ -949,6 +981,14 @@ case $basic_machine in
+ 		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		os=-linux
+ 		;;
++	parisc)
++		basic_machine=hppa-unknown
++		os=-linux
++		;;
++	parisc-*)
++		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
++		os=-linux
++		;;
+ 	pbd)
+ 		basic_machine=sparc-tti
+ 		;;
+@@ -964,6 +1004,12 @@ case $basic_machine in
+ 	pc98-*)
+ 		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
++	pc98)
++		basic_machine=i386-pc
++		;;
++	pc98-*)
++		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	pentium | p5 | k5 | k6 | nexgen | viac3)
+ 		basic_machine=i586-pc
+ 		;;
+@@ -1029,6 +1075,10 @@ case $basic_machine in
+ 		basic_machine=i386-pc
+ 		os=-rdos
+ 		;;
++	rdos)
++		basic_machine=i386-pc
++		os=-rdos
++		;;
+ 	rom68k)
+ 		basic_machine=m68k-rom68k
+ 		os=-coff
+@@ -1059,6 +1109,10 @@ case $basic_machine in
+ 		basic_machine=mipsisa32-sde
+ 		os=-elf
+ 		;;
++	sde)
++		basic_machine=mipsisa32-sde
++		os=-elf
++		;;
+ 	sei)
+ 		basic_machine=mips-sei
+ 		os=-seiux
+@@ -1073,6 +1127,9 @@ case $basic_machine in
+ 	sh5el)
+ 		basic_machine=sh5le-unknown
+ 		;;
++	sh5el)
++		basic_machine=sh5le-unknown
++		;;
+ 	sh64)
+ 		basic_machine=sh64-unknown
+ 		;;
+@@ -1097,6 +1154,9 @@ case $basic_machine in
+ 	strongarm-* | thumb-*)
+ 		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
++	strongarm-* | thumb-*)
++		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	sun2)
+ 		basic_machine=m68000-sun
+ 		;;
+@@ -1227,6 +1287,9 @@ case $basic_machine in
+ 	xscale-* | xscalee[bl]-*)
+ 		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+ 		;;
++	xscale-* | xscalee[bl]-*)
++		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
++		;;
+ 	ymp)
+ 		basic_machine=ymp-cray
+ 		os=-unicos
+@@ -1239,6 +1302,10 @@ case $basic_machine in
+ 		basic_machine=z80-unknown
+ 		os=-sim
+ 		;;
++	z80-*-coff)
++		basic_machine=z80-unknown
++		os=-sim
++		;;
+ 	none)
+ 		basic_machine=none-none
+ 		os=-none
+@@ -1506,6 +1573,11 @@ case $os in
+ 		;;
+ 	-nacl*)
+ 		;;
++	-dicos*)
++		os=-dicos
++		;;
++	-nacl*)
++		;;
+ 	-none)
+ 		;;
+ 	*)
+-- 
+1.9.3
+
diff --git a/joe-3.8-format-security.patch b/joe-3.8-format-security.patch
new file mode 100644
index 0000000..dbc9260
--- /dev/null
+++ b/joe-3.8-format-security.patch
@@ -0,0 +1,77 @@
+From 042def505a4dd5cf22e61c0b85428c16766a5f46 Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup at redhat.com>
+Date: Mon, 23 Mar 2015 14:17:24 +0100
+Subject: [PATCH] format-security
+
+---
+ joe/cmd.c    | 4 ++--
+ joe/uerror.c | 4 ++--
+ joe/ufile.c  | 6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/joe/cmd.c b/joe/cmd.c
+index 863edb9..150c1a5 100644
+--- a/joe/cmd.c
++++ b/joe/cmd.c
+@@ -235,7 +235,7 @@ int steal_lock(BW *bw,int c,B *b,int *notify)
+ 			if(bf1[0])
+ 				joe_snprintf_1(bf,sizeof(bf),joe_gettext(LOCKMSG1),bf1);
+ 			else
+-				joe_snprintf_0(bf, sizeof(bf), joe_gettext(LOCKMSG2));
++				joe_snprintf_1(bf,sizeof(bf),"%s",joe_gettext(LOCKMSG2));
+ 			if (mkqw(bw->parent, sz(bf), steal_lock, NULL, b, notify)) {
+ 				return 0;
+ 			} else {
+@@ -293,7 +293,7 @@ int try_lock(BW *bw,B *b)
+ 			if(bf1[0])
+ 				joe_snprintf_1(bf,sizeof(bf),joe_gettext(LOCKMSG1),bf1);
+ 			else
+-				joe_snprintf_0(bf, sizeof(bf), joe_gettext(LOCKMSG2));
++				joe_snprintf_1(bf,sizeof(bf),"%s",joe_gettext(LOCKMSG2));
+ 			if (mkqw(bw->parent, sz(bf), steal_lock, NULL, b, NULL)) {
+ 				uquery(bw);
+ 				if (!b->locked)
+diff --git a/joe/uerror.c b/joe/uerror.c
+index ab58908..8e112b5 100644
+--- a/joe/uerror.c
++++ b/joe/uerror.c
+@@ -327,7 +327,7 @@ int parserrb(B *b)
+ 	if (n)
+ 		joe_snprintf_1(msgbuf, JOE_MSGBUFSIZE, joe_gettext(_("%d messages found")), n);
+ 	else
+-		joe_snprintf_0(msgbuf, sizeof(msgbuf), joe_gettext(_("No messages found")));
++		joe_snprintf_1(msgbuf, JOE_MSGBUFSIZE, "%s", joe_gettext(_("No messages found")));
+ 	msgnw(bw->parent, msgbuf);
+ 	return 0;
+ }
+@@ -341,7 +341,7 @@ int uparserr(BW *bw)
+ 	if (n)
+ 		joe_snprintf_1(msgbuf, JOE_MSGBUFSIZE, joe_gettext(_("%d messages found")), n);
+ 	else
+-		joe_snprintf_0(msgbuf, sizeof(msgbuf), joe_gettext(_("No messages found")));
++		joe_snprintf_1(msgbuf, JOE_MSGBUFSIZE, "%s", joe_gettext(_("No messages found")));
+ 	msgnw(bw->parent, msgbuf);
+ 	return 0;
+ }
+diff --git a/joe/ufile.c b/joe/ufile.c
+index e0f7754..347ff66 100644
+--- a/joe/ufile.c
++++ b/joe/ufile.c
+@@ -62,11 +62,11 @@ void genexmsgmulti(BW *bw, int saved, int skipped)
+ {
+ 	if (saved)
+ 		if (skipped)
+-			joe_snprintf_0(msgbuf, sizeof(msgbuf), joe_gettext(_("Some files have not been saved.")));
++			joe_snprintf_0(msgbuf, JOE_MSGBUFSIZE, joe_gettext(_("Some files have not been saved.")));
+ 		else
+-			joe_snprintf_0(msgbuf, sizeof(msgbuf), joe_gettext(_("All modified files have been saved.")));
++			joe_snprintf_0(msgbuf, JOE_MSGBUFSIZE, joe_gettext(_("All modified files have been saved.")));
+ 	else
+-		joe_snprintf_0(msgbuf, sizeof(msgbuf), joe_gettext(_("No modified files, so no updates needed.")));
++		joe_snprintf_1(msgbuf, JOE_MSGBUFSIZE, "%s", joe_gettext(_("No modified files, so no updates needed.")));
+ 
+ 	msgnw(bw->parent, msgbuf);
+ 
+-- 
+1.9.3
+
diff --git a/joe-3.7-indent-ow.patch b/joe-3.8-indent-ow.patch
similarity index 63%
rename from joe-3.7-indent-ow.patch
rename to joe-3.8-indent-ow.patch
index 5358f42..ca00384 100644
--- a/joe-3.7-indent-ow.patch
+++ b/joe-3.8-indent-ow.patch
@@ -1,7 +1,17 @@
-diff -up joe-3.7/uformat.c.pom joe-3.7/uformat.c
---- joe-3.7/uformat.c.pom	2008-10-28 05:13:56.000000000 +0100
-+++ joe-3.7/uformat.c	2011-01-03 12:58:53.000000000 +0100
-@@ -330,6 +330,7 @@ void wrapword(BW *bw, P *p, long int ind
+From 7703890e459da2399f4def7f8fd1c53f46e53a0e Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup at redhat.com>
+Date: Mon, 23 Mar 2015 11:57:53 +0100
+Subject: [PATCH] indent-ow
+
+---
+ joe/uformat.c | 18 ++++++++++++------
+ 1 file changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/joe/uformat.c b/joe/uformat.c
+index 8e1caa8..e552896 100644
+--- a/joe/uformat.c
++++ b/joe/uformat.c
+@@ -330,6 +330,7 @@ void wrapword(BW *bw, P *p, long int indent, int french, int no_over, unsigned c
  	int c;
  	long to = p->byte;
  	int my_indents = 0;
@@ -9,7 +19,7 @@ diff -up joe-3.7/uformat.c.pom joe-3.7/uformat.c
  	
  	/* autoindent when called by utype */
  	if (!indents) {
-@@ -347,7 +348,8 @@ void wrapword(BW *bw, P *p, long int ind
+@@ -347,7 +348,8 @@ void wrapword(BW *bw, P *p, long int indent, int french, int no_over, unsigned c
  
  			indent = nindent(bw, q, 0);
  			pcol(r, indent);
@@ -19,7 +29,7 @@ diff -up joe-3.7/uformat.c.pom joe-3.7/uformat.c
  			prm(r);
  		} else {
  			/* First line */
-@@ -356,14 +358,15 @@ void wrapword(BW *bw, P *p, long int ind
+@@ -356,7 +358,8 @@ void wrapword(BW *bw, P *p, long int indent, int french, int no_over, unsigned c
  
  			indent = nindent(bw, s, 1);
  			pcol(r, indent);
@@ -29,15 +39,16 @@ diff -up joe-3.7/uformat.c.pom joe-3.7/uformat.c
  			prm(r);
  			if (!bw->o.autoindent) {
  				/* Don't indent second line of single-line paragraphs if autoindent is off */
- 				int x = zlen(indents);
+@@ -364,7 +367,7 @@ void wrapword(BW *bw, P *p, long int indent, int french, int no_over, unsigned c
+ 				int orgx = x;
  				while (x && (indents[x - 1] == ' ' || indents[x - 1] == '\t'))
  					indents[--x] = 0;
--				if (x) {
-+				if ((x) && (x < indents_size)) {
+-				if (x && orgx != x) {
++				if (x && orgx != x && (x < indents_size)) {
  					indents[x++] = ' ';
  					indents[x] = 0;
  				}
-@@ -522,6 +525,7 @@ int uformat(BW *bw)
+@@ -523,6 +526,7 @@ int uformat(BW *bw)
  	long curoff;
  	int c;
  	P *p, *q;
@@ -45,7 +56,7 @@ diff -up joe-3.7/uformat.c.pom joe-3.7/uformat.c
  
  	p = pdup(bw->cursor, USTR "uformat");
  	p_goto_bol(p);
-@@ -552,21 +556,23 @@ int uformat(BW *bw)
+@@ -553,21 +557,23 @@ int uformat(BW *bw)
  
  		indent = nindent(bw, q, 0);
  		pcol(r, indent);
@@ -72,3 +83,6 @@ diff -up joe-3.7/uformat.c.pom joe-3.7/uformat.c
  				indents[x++] = ' ';
  				indents[x] = 0;
  			}
+-- 
+1.9.3
+
diff --git a/joe-3.4-selinux.patch b/joe-3.8-selinux.patch
similarity index 62%
rename from joe-3.4-selinux.patch
rename to joe-3.8-selinux.patch
index e9a9709..581b173 100644
--- a/joe-3.4-selinux.patch
+++ b/joe-3.8-selinux.patch
@@ -1,18 +1,30 @@
-diff -up joe-3.7/configure.selinux joe-3.7/configure
---- joe-3.7/configure.selinux	2008-10-30 04:07:22.000000000 +0100
-+++ joe-3.7/configure	2009-02-02 11:13:50.000000000 +0100
-@@ -6531,7 +6531,7 @@ if test "$ac_cv_header_selinux_selinux_h
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_SELINUX 1
- _ACEOF
--
+From d4a984eeb9978611725a9a91ccee787cddb6b38b Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup at redhat.com>
+Date: Mon, 23 Mar 2015 10:57:15 +0100
+Subject: [PATCH] selinux
+
+---
+ configure     |  1 +
+ joe/selinux.c | 18 +++++++++---------
+ joe/ufile.c   |  4 ++--
+ 3 files changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/configure b/configure
+index 1293ec9..89237d6 100755
+--- a/configure
++++ b/configure
+@@ -5434,6 +5434,7 @@ if test "$ac_cv_header_selinux_selinux_h" = "yes" -a "$ac_cv_header_selinux_cont
+ 
+ $as_echo "#define HAVE_SELINUX 1" >>confdefs.h
+ 
 +LIBS="$LIBS -lselinux"
  fi
  
  # Checks for typedefs, structures, and compiler characteristics.
-diff -up joe-3.7/selinux.c.selinux joe-3.7/selinux.c
---- joe-3.7/selinux.c.selinux	2006-05-22 06:15:41.000000000 +0200
-+++ joe-3.7/selinux.c	2009-02-02 11:13:50.000000000 +0100
+diff --git a/joe/selinux.c b/joe/selinux.c
+index 953e0fd..8bdbb0a 100644
+--- a/joe/selinux.c
++++ b/joe/selinux.c
 @@ -4,7 +4,9 @@
   */
  #include "types.h"
@@ -33,7 +45,7 @@ diff -up joe-3.7/selinux.c.selinux joe-3.7/selinux.c
  	security_context_t from_context;
  	security_context_t to_context;
  
-@@ -38,9 +40,7 @@ copy_security_context(const char *from_f
+@@ -38,9 +40,7 @@ copy_security_context(const char *from_file, const char *to_file)
  	}
  
  	if (getfilecon(to_file, &to_context) < 0) {
@@ -44,7 +56,7 @@ diff -up joe-3.7/selinux.c.selinux joe-3.7/selinux.c
  		freecon(from_context);
  		return 1;
  	}
-@@ -63,7 +63,7 @@ copy_security_context(const char *from_f
+@@ -63,7 +63,7 @@ copy_security_context(const char *from_file, const char *to_file)
  int
  match_default_security_context(const char *from_file)
  {
@@ -53,7 +65,7 @@ diff -up joe-3.7/selinux.c.selinux joe-3.7/selinux.c
  	security_context_t scontext;
  
  	if (selinux_enabled == -1)
-@@ -102,7 +102,7 @@ match_default_security_context(const cha
+@@ -102,7 +102,7 @@ match_default_security_context(const char *from_file)
  int
  reset_default_security_context()
  {
@@ -80,9 +92,10 @@ diff -up joe-3.7/selinux.c.selinux joe-3.7/selinux.c
   */
  
  #include <stdio.h>
-diff -up joe-3.7/ufile.c.selinux joe-3.7/ufile.c
---- joe-3.7/ufile.c.selinux	2008-11-02 21:39:52.000000000 +0100
-+++ joe-3.7/ufile.c	2009-02-02 11:13:50.000000000 +0100
+diff --git a/joe/ufile.c b/joe/ufile.c
+index fe3c252..e0f7754 100644
+--- a/joe/ufile.c
++++ b/joe/ufile.c
 @@ -15,7 +15,7 @@
  #endif
  #endif
@@ -92,7 +105,7 @@ diff -up joe-3.7/ufile.c.selinux joe-3.7/ufile.c
  int copy_security_context(const char *from_file, const char *to_file);
  #endif
  
-@@ -157,7 +157,7 @@ static int cp(unsigned char *from, unsig
+@@ -157,7 +157,7 @@ static int cp(unsigned char *from, unsigned char *to)
  	utime((char *)to, &utbuf);
  #endif
  
@@ -101,3 +114,6 @@ diff -up joe-3.7/ufile.c.selinux joe-3.7/ufile.c
  	copy_security_context(from,to);
  #endif
  
+-- 
+1.9.3
+
diff --git a/joe-3.5-time.patch b/joe-3.8-time.patch
similarity index 61%
rename from joe-3.5-time.patch
rename to joe-3.8-time.patch
index 82393ce..80c36fd 100644
--- a/joe-3.5-time.patch
+++ b/joe-3.8-time.patch
@@ -1,8 +1,17 @@
-Index: joe-3.5/tty.c
-===================================================================
---- joe-3.5.orig/tty.c
-+++ joe-3.5/tty.c
-@@ -242,18 +242,19 @@ void ttclose(void)
+From deb5b349c2551268b4cf93f267a672c136fba74e Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup at redhat.com>
+Date: Mon, 23 Mar 2015 11:44:13 +0100
+Subject: [PATCH] time
+
+---
+ joe/tty.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/joe/tty.c b/joe/tty.c
+index 3404455..830b9d3 100644
+--- a/joe/tty.c
++++ b/joe/tty.c
+@@ -244,18 +244,19 @@ void ttclose(void)
  }
  
  static int winched = 0;
@@ -23,7 +32,7 @@ Index: joe-3.5/tty.c
  static RETSIGTYPE dotick(int unused)
  {
  	ticked = 1;
-@@ -277,6 +278,8 @@ void tickon(void)
+@@ -279,6 +280,8 @@ void tickon(void)
  {
  #ifdef HAVE_SETITIMER
  	struct itimerval val;
@@ -32,7 +41,7 @@ Index: joe-3.5/tty.c
  	val.it_interval.tv_sec = 0;
  	val.it_interval.tv_usec = 0;
  	if (auto_scroll) {
-@@ -287,8 +290,8 @@ void tickon(void)
+@@ -289,8 +292,8 @@ void tickon(void)
  		val.it_value.tv_sec = 0;
  		val.it_value.tv_usec = tim;
  	} else {
@@ -43,3 +52,6 @@ Index: joe-3.5/tty.c
  	}
  	ticked = 0;
  	joe_set_signal(SIGALRM, dotick);
+-- 
+1.9.3
+
diff --git a/joe.spec b/joe.spec
index c5799b5..d04756c 100644
--- a/joe.spec
+++ b/joe.spec
@@ -1,7 +1,7 @@
 Summary: An easy to use, modeless text editor
 Name: joe
-Version: 3.7
-Release: 16%{?dist}
+Version: 3.8
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Editors
 URL: http://sourceforge.net/projects/joe-editor/
@@ -10,12 +10,11 @@ Source: http://downloads.sourceforge.net/joe-editor/joe-%{version}.tar.gz
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Patch0: joe-3.7-joerc.patch
-Patch1: joe-3.4-selinux.patch
-Patch2: joe-3.5-time.patch
-Patch3: joe-3.7-orphan.patch
-Patch4: joe-3.7-indent-ow.patch
-Patch5: joe-3.7-aarch64.patch
-Patch6: joe-3.7-format-security.patch
+Patch1: joe-3.8-selinux.patch
+Patch2: joe-3.8-time.patch
+Patch4: joe-3.8-indent-ow.patch
+Patch5: joe-3.8-aarch64.patch
+Patch6: joe-3.8-format-security.patch
 
 BuildRequires: ncurses-devel libselinux-devel
 
@@ -29,16 +28,12 @@ environment.
 %patch0 -p1 -b .joerc
 %patch1 -p1 -b .selinux
 %patch2 -p1 -b .time
-%patch3 -p1 -b .orphan
 %patch4 -p1 -b .of
 %patch5 -p1 -b .aarch64
 %patch6 -p1 -b .format-security
 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
-iconv -f ISO_8859-1 -t UTF-8 HACKING > HACKING.tmp
-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
 mv ChangeLog.tmp ChangeLog
@@ -59,7 +54,7 @@ ln -s joe.1 rjoe.1
 popd
 
 %files
-%doc README TODO HINTS NEWS LIST COPYING
+%doc README.md joe/TODO NEWS.md docs/list.md COPYING setup.hint docs/options.md docs/tasks.md
 %{_bindir}/*
 %dir /etc/joe
 %config(noreplace) /etc/joe/*
@@ -68,6 +63,10 @@ popd
 %{_datadir}/%{name}
 
 %changelog
+* Mon Mar 23 2015 jchaloup <jchaloup at redhat.com> - 3.8-1
+- Update to 3.8 stable release
+  resolves: #1204542
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 6493f7e..f66ad52 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-66de1b073e869ba12abbfcde3885c577  joe-3.7.tar.gz
+6bc642ed5a0d15f24b51ee42fdf78505  joe-3.8.tar.gz


More information about the scm-commits mailing list