rpms/joe/devel joe-3.4-selinux.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 joe-3.1-joerc.patch, 1.1, 1.2 joe.spec, 1.29, 1.30 sources, 1.8, 1.9 joe-3.1-selinux.patch, 1.1, NONE joe-3.3-head.patch, 1.1, NONE joe-3.3-polish.patch, 1.1, NONE

Wed May 31 12:02:14 UTC 2006

Author: varekova

Update of /cvs/dist/rpms/joe/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27898

Modified Files:
	.cvsignore joe-3.1-joerc.patch joe.spec sources 
Added Files:
	joe-3.4-selinux.patch 
Removed Files:
	joe-3.1-selinux.patch joe-3.3-head.patch joe-3.3-polish.patch 
Log Message:
- update to 3.4


joe-3.4-selinux.patch:
 configure |    2 +-
 selinux.c |   18 +++++++++---------
 ufile.c   |    4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

--- NEW FILE joe-3.4-selinux.patch ---
--- joe-3.4/ufile.c.selinux	2006-05-26 19:42:31.000000000 +0200
+++ joe-3.4/ufile.c	2006-05-31 11:37:29.000000000 +0200
@@ -17,7 +17,7 @@
 #endif
 #endif
 
-#ifdef WITH_SELINUX
+#ifdef HAVE_SELINUX
 int copy_security_context(const char *from_file, const char *to_file);
 #endif
 
@@ -159,7 +159,7 @@
 	utime(to, &utbuf);
 #endif
 
-#ifdef WITH_SELINUX
+#ifdef HAVE_SELINUX
 	copy_security_context(from,to);
 #endif
 
--- joe-3.4/configure.selinux	2006-05-30 20:05:13.000000000 +0200
+++ joe-3.4/configure	2006-05-31 11:39:15.000000000 +0200
@@ -5659,7 +5659,7 @@
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_SELINUX 1
 _ACEOF
-
+LIBS="$LIBS -lselinux"
 fi
 
 # Checks for typedefs, structures, and compiler characteristics.
--- joe-3.4/selinux.c.selinux	2006-05-22 15:33:09.000000000 +0200
+++ joe-3.4/selinux.c	2006-05-31 11:36:50.000000000 +0200
@@ -4,7 +4,9 @@
  */
 #include "types.h"
 
-#ifdef WITH_SELINUX
+#include "config.h"
+
+#ifdef HAVE_SELINUX
 #include <selinux/selinux.h>
 static int selinux_enabled = -1;
 #endif
@@ -13,7 +15,7 @@
 copy_security_context(const char *from_file, const char *to_file)
 {
 	int status = 0;
-#ifdef WITH_SELINUX
+#ifdef HAVE_SELINUX
 	security_context_t from_context;
 	security_context_t to_context;
 
@@ -38,9 +40,7 @@
 	}
 
 	if (getfilecon(to_file, &to_context) < 0) {
-		MSG_PUTS(_(joe_gettext(_("\nCould not get security context for "))));
-		msg_outtrans(to_file);
-		msg_putchar('\n');
+		error(0, errno, "Could not get security context for %s", to_file);
 		freecon(from_context);
 		return 1;
 	}
@@ -63,7 +63,7 @@
 int
 match_default_security_context(const char *from_file)
 {
-#ifdef WITH_SELINUX
+#ifdef HAVE_SELINUX
 	security_context_t scontext;
 
 	if (selinux_enabled == -1)
@@ -102,7 +102,7 @@
 int
 reset_default_security_context()
 {
-#ifdef WITH_SELINUX
+#ifdef HAVE_SELINUX
 	if (selinux_enabled == -1)
 		selinux_enabled = (is_selinux_enabled() > 0);
 
@@ -121,7 +121,7 @@
 int
 output_security_context(char *from_file)
 {
-#ifdef WITH_SELINUX
+#ifdef HAVE_SELINUX
 	security_context_t scontext;
 
 	if (selinux_enabled == -1)
@@ -153,7 +153,7 @@
 
 /*
   Test program compile using the following command
-  cc -o t t.c -DWITH_SELINUX -DTEST -lselinux
+  cc -o t t.c -DHAVE_SELINUX -DTEST -lselinux
  */
 
 #include <stdio.h>


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/joe/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Jun 2005 07:01:13 -0000	1.8
+++ .cvsignore	31 May 2006 12:01:52 -0000	1.9
@@ -1 +1 @@
-joe-3.3.tar.gz
+joe-3.4.tar.gz

joe-3.1-joerc.patch:
 joerc.in.orig |only
 rc/joerc.in   |   12 ++++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

Index: joe-3.1-joerc.patch
===================================================================
RCS file: /cvs/dist/rpms/joe/devel/joe-3.1-joerc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- joe-3.1-joerc.patch	9 Sep 2004 06:41:54 -0000	1.1
+++ joe-3.1-joerc.patch	31 May 2006 12:01:55 -0000	1.2
@@ -1,6 +1,6 @@
 diff -ur joe-3.1/joerc.in joe-3.1-lhh/joerc.in
---- joe-3.1/joerc.in	2004-05-29 00:20:17.000000000 -0400
-+++ joe-3.1-lhh/joerc.in	2004-06-01 10:27:37.555629065 -0400
+--- joe-3.1/rc/joerc.in	2004-05-29 00:20:17.000000000 -0400
++++ joe-3.1-lhh/rc/joerc.in	2004-06-01 10:27:37.555629065 -0400
 @@ -730,6 +730,8 @@
  nextw		^K N		Goto next window
  nextw		^K ^N


Index: joe.spec
===================================================================
RCS file: /cvs/dist/rpms/joe/devel/joe.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- joe.spec	10 Apr 2006 08:53:22 -0000	1.29
+++ joe.spec	31 May 2006 12:01:56 -0000	1.30
@@ -2,8 +2,8 @@
 
 Summary: An easy to use, modeless text editor.
 Name: joe
-Version: 3.3
-Release: 3
+Version: 3.4
+Release: 1
 License: GPL
 Group: Applications/Editors
 Source: http://prdownloads.sourceforge.net/joe-editor/joe-%{version}.tar.gz
@@ -12,10 +12,8 @@
 BuildRequires: ncurses-devel libselinux-devel
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Patch0: joe-3.1-joerc.patch
-Patch2: joe-3.1-selinux.patch
+Patch2: joe-3.4-selinux.patch
 Patch4: joe-3.1-ret.patch
-Patch5: joe-3.3-head.patch
-Patch6: joe-3.3-polish.patch
 
 %description
 Joe is a powerful, easy to use, modeless text editor.
@@ -27,8 +25,6 @@
 %patch0 -p1 -b .joerc
 %patch2 -p1 -b .selinux
 %patch4 -p1 -b .ret
-%patch5 -p1 -b .head
-%patch6 -p1 -b .pol
 
 %build
 %configure
@@ -58,6 +54,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed May 31 2006 Ivana Varekova <varekova at redhat.com> 3.4-1
+- update to 3.4
+
 * Mon Apr 10 2006 Ivana Varekova <varekova at redhat.com> 3.3-3
 - fix problem with Polish characters - bug 188235
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/joe/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Jun 2005 07:01:13 -0000	1.8
+++ sources	31 May 2006 12:01:56 -0000	1.9
@@ -1 +1 @@
-02221716679c039c5da00c275d61dbf4  joe-3.3.tar.gz
+068d21205a12c6d5bbb02c55cda342ee  joe-3.4.tar.gz


--- joe-3.1-selinux.patch DELETED ---


--- joe-3.3-head.patch DELETED ---


--- joe-3.3-polish.patch DELETED ---


