rpms/jed/devel import.log, NONE, 1.1 jed-multilib-newauto.patch, NONE, 1.1 selinux.c, NONE, 1.1 .cvsignore, 1.4, 1.5 jed-etc.patch, 1.1, 1.2 jed-selinux.patch, 1.2, 1.3 jed.spec, 1.22, 1.23 sources, 1.4, 1.5 jed-multilib.patch, 1.2, NONE jed-newauto.patch, 1.1, NONE
Rakesh Pandit
rakesh at fedoraproject.org
Sat Jan 16 08:44:38 UTC 2010
Author: rakesh
Update of /cvs/pkgs/rpms/jed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16973/devel
Modified Files:
.cvsignore jed-etc.patch jed-selinux.patch jed.spec sources
Added Files:
import.log jed-multilib-newauto.patch selinux.c
Removed Files:
jed-multilib.patch jed-newauto.patch
Log Message:
* Sat Jan 16 2010 Rakesh Pandit <rakesh at fedoraproject.org> - 0.99.19-1
- Updated to latest 0.99.19
- Rebased all patches
- Included selinux.c in Makefile.in
- Fixed %%install jed command failure
--- NEW FILE import.log ---
jed-0_99_19-1_fc13:HEAD:jed-0.99.19-1.fc13.src.rpm:1263632269
jed-multilib-newauto.patch:
aclocal.m4 | 39 +++++++++++++++++++--------------------
1 file changed, 19 insertions(+), 20 deletions(-)
--- NEW FILE jed-multilib-newauto.patch ---
--- jed-0.99-19.org/autoconf/aclocal.m4 2010-01-16 12:38:55.849789880 +0530
+++ jed-0.99-19/autoconf/aclocal.m4 2010-01-16 12:57:11.071786401 +0530
@@ -218,7 +218,7 @@
JD_Search_Dirs="$JD_Search_Dirs \
$jd_prefix_incdir,$jd_prefix_libdir \
- $HOME/include,$HOME/lib"
+ $HOME/include,$HOME/lib64"
if test -n "$ARCH"
then
@@ -231,10 +231,10 @@
# version.
JD_Search_Dirs="$JD_Search_Dirs \
- /usr/local/include,/usr/local/lib \
- /usr/include,/usr/lib \
- /usr/include/$1,/usr/lib \
- /usr/include/$1,/usr/lib/$1"
+ /usr/local/include,/usr/local/lib64 \
+ /usr/include,/usr/lib64 \
+ /usr/include/$1,/usr/lib64 \
+ /usr/include/$1,/usr/lib64/$1"
echo looking for the JD_UP_NAME library
@@ -290,7 +290,7 @@
JD_UP_NAME[]_INC=""
fi
-if test "[$]JD_UP_NAME[]_LIB" = "-L/usr/lib"
+if test "[$]JD_UP_NAME[]_LIB" = "-L/usr/lib64"
then
JD_UP_NAME[]_LIB=""
RPATH_[]JD_UP_NAME=""
@@ -510,7 +510,6 @@
AC_PROG_CC
AC_PROG_CPP
AC_PROG_GCC_TRADITIONAL
-AC_ISC_POSIX
dnl #This stuff came from Yorick config script
dnl
@@ -775,7 +774,7 @@
fi
AC_ARG_WITH($1,
- [ --with-$1=DIR Use DIR/lib and DIR/include for $1],
+ [ --with-$1=DIR Use DIR/lib64 and DIR/include for $1],
[jd_with_$1_arg=$withval], [jd_with_$1_arg=unspecified])
case "x$jd_with_$1_arg" in
@@ -794,7 +793,7 @@
*)
jd_with_$1_library="yes"
jd_$1_include_dir="$jd_with_$1_arg"/include
- jd_$1_library_dir="$jd_with_$1_arg"/lib
+ jd_$1_library_dir="$jd_with_$1_arg"/lib64
;;
esac
@@ -862,15 +861,15 @@
then
inc_and_lib_dirs="\
$jd_prefix_incdir,$jd_prefix_libdir \
- /usr/local/$1/include,/usr/local/$1/lib \
- /usr/local/include/$1,/usr/local/lib \
- /usr/local/include,/usr/local/lib \
- /usr/include/$1,/usr/lib \
- /usr/$1/include,/usr/$1/lib \
- /usr/include,/usr/lib \
- /opt/include/$1,/opt/lib \
- /opt/$1/include,/opt/$1/lib \
- /opt/include,/opt/lib"
+ /usr/local/$1/include,/usr/local/$1/lib64 \
+ /usr/local/include/$1,/usr/local/lib64 \
+ /usr/local/include,/usr/local/lib64 \
+ /usr/include/$1,/usr/lib64 \
+ /usr/$1/include,/usr/$1/lib64 \
+ /usr/include,/usr/lib64 \
+ /opt/include/$1,/opt/lib64 \
+ /opt/$1/include,/opt/$1/lib64 \
+ /opt/include,/opt/lib64"
if test X$3 != X
then
@@ -924,10 +923,10 @@
then
AC_MSG_RESULT(yes: $jd_$1_library_dir and $jd_$1_include_dir)
jd_with_$1_library="yes"
- dnl# Avoid using /usr/lib and /usr/include because of problems with
+ dnl# Avoid using /usr/lib64 and /usr/include because of problems with
dnl# gcc on some solaris systems.
JD_ARG1[]_LIB=-L$jd_$1_library_dir
- if test "X$jd_$1_library_dir" = "X/usr/lib"
+ if test "X$jd_$1_library_dir" = "X/usr/lib64"
then
JD_ARG1[]_LIB=""
else
--- NEW FILE selinux.c ---
/*
* Example code to show how to copy the security context from one file to
* another.
*/
#include "config.h"
#ifdef HAVE_LIBSELINUX
#include <selinux/selinux.h>
static int selinux_enabled = -1;
#endif
#include <string.h>
#include "misc.h"
#include <errno.h>
int
copy_security_context(const char *from_file, const char *to_file)
{
int status = 0;
#ifdef HAVE_LIBSELINUX
security_context_t from_context;
security_context_t to_context;
if (selinux_enabled == -1)
selinux_enabled = (is_selinux_enabled() > 0);
if (!selinux_enabled)
return 0;
if (getfilecon(from_file, &from_context) < 0) {
/*
* If the filesystem doesn't support extended
* attributes, the original had no special security
* context and the target cannot have one either.
*/
if (errno == EOPNOTSUPP)
return 0;
jed_verror("Could not get security context for %s",
from_file);
return 1;
}
if (getfilecon(to_file, &to_context) < 0) {
jed_verror("Could not get security context for %s",
to_file);
freecon(from_context);
return 1;
}
if (strcmp(from_context, to_context) != 0) {
if (setfilecon(to_file, from_context) < 0) {
jed_verror("Could not set security context for %s",
to_file);
status = 1;
}
}
freecon(to_context);
freecon(from_context);
#endif
return status;
}
int
set_default_security_context(const char *file)
{
int status = 0;
#ifdef HAVE_LIBSELINUX
security_context_t scontext;
if (selinux_enabled == -1)
selinux_enabled = (is_selinux_enabled() > 0);
if (!selinux_enabled)
return 0;
set_matchpathcon_printf(jed_verror);
if (matchpathcon(file,0,&scontext)) {
return 1;
}
if (setfilecon(file, scontext) < 0) {
status = match_default_security_context(file);
}
freecon(scontext);
#endif
return status;
}
int
match_default_security_context(const char *from_file)
{
#ifdef HAVE_LIBSELINUX
security_context_t scontext;
if (selinux_enabled == -1)
selinux_enabled = (is_selinux_enabled() > 0);
if (!selinux_enabled)
return 0;
if (getfilecon(from_file, &scontext) < 0) {
/*
* If the filesystem doesn't support extended
* attributes, the original had no special security
* context and the target cannot have one either.
*/
if (errno == EOPNOTSUPP)
return 0;
jed_verror("Could not get security context for %s",
from_file);
return 1;
}
if (setfscreatecon(scontext) < 0) {
jed_verror("Could not set default security context for %s",
from_file);
freecon(scontext);
return 1;
}
freecon(scontext);
#endif
return 0;
}
int
reset_default_security_context()
{
#ifdef HAVE_LIBSELINUX
if (selinux_enabled == -1)
selinux_enabled = (is_selinux_enabled() > 0);
if (!selinux_enabled)
return 0;
if (setfscreatecon(0) < 0) {
jed_verror("Could not reset default security context");
return 1;
}
#endif
return 0;
}
int
output_security_context(char *from_file)
{
#ifdef HAVE_LIBSELINUX
security_context_t scontext;
if (selinux_enabled == -1)
selinux_enabled = (is_selinux_enabled() > 0);
if (!selinux_enabled)
return 0;
if (getfilecon(from_file, &scontext) < 0) {
/*
* If the filesystem doesn't support extended
* attributes, the original had no special security
* context and the target cannot have one either.
*/
if (errno == EOPNOTSUPP)
return 0;
jed_verror("Could not get security context for %s",
from_file);
return 1;
}
jed_verror("%s Security Context %s", from_file, scontext);
freecon(scontext);
#endif
return 0;
}
#if 0
/*
Test program compile using the following command
cc -o t t.c -DHAVE_LIBSELINUX -DTEST -lselinux
*/
#include <stdio.h>
#include <stdlib.h>
main(int argc, char **argv)
{
printf("%d: %s\n", argc, argv[1]);
if (argc == 3) {
copy_security_context(argv[1], argv[2]);
output_security_context(argv[2]);
}
if (argc == 2) {
FILE *fd;
char *temp;
match_default_security_context(argv[1]);
mkstemp(temp);
printf("temp=%s", temp);
fd = fopen(temp, "w");
fclose(fd);
output_security_context(temp);
reset_default_security_context();
}
}
#endif
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jed/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 18 Apr 2006 15:25:23 -0000 1.4
+++ .cvsignore 16 Jan 2010 08:44:38 -0000 1.5
@@ -1 +1 @@
-jed-0.99-18.tar.bz2
+jed-0.99-19.tar.bz2
jed-etc.patch:
site.sl | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
Index: jed-etc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jed/devel/jed-etc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jed-etc.patch 10 May 2006 03:18:48 -0000 1.1
+++ jed-etc.patch 16 Jan 2010 08:44:38 -0000 1.2
@@ -1,6 +1,6 @@
---- jed-0.99-18/lib/site.sl.foo 2006-05-09 23:11:26.000000000 -0400
-+++ jed-0.99-18/lib/site.sl 2006-05-09 23:13:57.000000000 -0400
-@@ -3274,13 +3274,7 @@
+--- jed-0.99-19.org/lib/site.sl 2010-01-16 12:48:54.802785974 +0530
++++ jed-0.99-19/lib/site.sl 2010-01-16 12:42:49.525739941 +0530
+@@ -3309,13 +3309,7 @@
$1 = getenv ("JED_CONF_DIR");
if ($1 == NULL)
{
jed-selinux.patch:
autoconf/configure.ac | 2 ++
src/Makefile.in | 7 +++++--
src/config.hin | 2 ++
src/file.c | 13 +++++++++++++
src/modules.unx | 1 +
5 files changed, 23 insertions(+), 2 deletions(-)
Index: jed-selinux.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jed/devel/jed-selinux.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- jed-selinux.patch 30 Nov 2005 21:54:31 -0000 1.2
+++ jed-selinux.patch 16 Jan 2010 08:44:38 -0000 1.3
@@ -1,6 +1,6 @@
---- jed-0.99-16/autoconf/configure.ac.selinux 2004-09-25 01:33:25.000000000 -0400
-+++ jed-0.99-16/autoconf/configure.ac 2004-09-25 01:40:05.000000000 -0400
-@@ -38,6 +38,8 @@
+--- jed-0.99-19.org/autoconf/configure.ac 2010-01-16 12:38:55.849789880 +0530
++++ jed-0.99-19/autoconf/configure.ac 2010-01-16 13:01:16.504723535 +0530
+@@ -46,6 +46,8 @@
AC_CHECK_LIB(util,openpty)
@@ -9,9 +9,9 @@
AC_CHECK_FUNCS(\
memset \
memcpy \
---- jed-0.99-16/src/file.c.selinux 2002-10-20 02:55:31.000000000 -0400
-+++ jed-0.99-16/src/file.c 2004-09-25 01:40:42.000000000 -0400
-@@ -107,6 +107,11 @@
+--- jed-0.99-19.org/src/file.c 2010-01-16 12:38:55.843785342 +0530
++++ jed-0.99-19/src/file.c 2010-01-16 13:39:11.576728495 +0530
+@@ -104,6 +104,11 @@
# define O_BINARY 0
#endif
@@ -23,7 +23,7 @@
/*}}}*/
/*{{{ local inclue files */
-@@ -1047,6 +1052,10 @@
+@@ -1084,6 +1089,10 @@
(void) utime (to, &ut);
#endif
@@ -34,7 +34,7 @@
return ret;
}
/*}}}*/
-@@ -1192,6 +1201,9 @@
+@@ -1231,6 +1240,9 @@
#endif
}
@@ -44,7 +44,7 @@
/* Since we wrote the buffer to the file, it is not modified. */
if (CBuf == find_file_buffer (dirfile))
CBuf->flags &= ~FILE_MODIFIED;
-@@ -1250,6 +1262,7 @@
+@@ -1292,6 +1304,7 @@
flush_message("autosaving...");
(void) sys_delete_file(tmp);
(void) write_file_internal (tmp, _JED_OPEN_CREATE_EXCL);
@@ -52,220 +52,9 @@
message("autosaving...done");
}
}
---- /dev/null 2004-09-24 19:41:07.393180112 -0400
-+++ jed-0.99-16/src/selinux.c 2004-09-25 01:40:32.000000000 -0400
-@@ -0,0 +1,208 @@
-+/*
-+ * Example code to show how to copy the security context from one file to
-+ * another.
-+ */
-+#include "config.h"
-+#ifdef HAVE_LIBSELINUX
-+#include <selinux/selinux.h>
-+static int selinux_enabled = -1;
-+#endif
-+#include <string.h>
-+#include "misc.h"
-+#include <errno.h>
-+
-+int
-+copy_security_context(const char *from_file, const char *to_file)
-+{
-+ int status = 0;
-+#ifdef HAVE_LIBSELINUX
-+ security_context_t from_context;
-+ security_context_t to_context;
-+
-+ if (selinux_enabled == -1)
-+ selinux_enabled = (is_selinux_enabled() > 0);
-+
-+ if (!selinux_enabled)
-+ return 0;
-+
-+ if (getfilecon(from_file, &from_context) < 0) {
-+ /*
-+ * If the filesystem doesn't support extended
-+ * attributes, the original had no special security
-+ * context and the target cannot have one either.
-+ */
-+ if (errno == EOPNOTSUPP)
-+ return 0;
-+
-+ jed_verror("Could not get security context for %s",
-+ from_file);
-+ return 1;
-+ }
-+
-+ if (getfilecon(to_file, &to_context) < 0) {
-+ jed_verror("Could not get security context for %s",
-+ to_file);
-+ freecon(from_context);
-+ return 1;
-+ }
-+
-+ if (strcmp(from_context, to_context) != 0) {
-+ if (setfilecon(to_file, from_context) < 0) {
-+ jed_verror("Could not set security context for %s",
-+ to_file);
-+ status = 1;
-+ }
-+ }
-+
-+ freecon(to_context);
-+ freecon(from_context);
-+#endif
-+ return status;
-+}
-+
-+int
-+set_default_security_context(const char *file)
-+{
-+ int status = 0;
-+
-+#ifdef HAVE_LIBSELINUX
-+ security_context_t scontext;
-+
-+ if (selinux_enabled == -1)
-+ selinux_enabled = (is_selinux_enabled() > 0);
-+
-+ if (!selinux_enabled)
-+ return 0;
-+
-+ set_matchpathcon_printf(jed_verror);
-+
-+ if (matchpathcon(file,0,&scontext)) {
-+ return 1;
-+ }
-+
-+ if (setfilecon(file, scontext) < 0) {
-+ status = match_default_security_context(file);
-+ }
-+ freecon(scontext);
-+#endif
-+ return status;
-+}
-+
-+int
-+match_default_security_context(const char *from_file)
-+{
-+#ifdef HAVE_LIBSELINUX
-+ security_context_t scontext;
-+
-+ if (selinux_enabled == -1)
-+ selinux_enabled = (is_selinux_enabled() > 0);
-+
-+ if (!selinux_enabled)
-+ return 0;
-+
-+ if (getfilecon(from_file, &scontext) < 0) {
-+ /*
-+ * If the filesystem doesn't support extended
-+ * attributes, the original had no special security
-+ * context and the target cannot have one either.
-+ */
-+ if (errno == EOPNOTSUPP)
-+ return 0;
-+
-+ jed_verror("Could not get security context for %s",
-+ from_file);
-+ return 1;
-+ }
-+
-+ if (setfscreatecon(scontext) < 0) {
-+ jed_verror("Could not set default security context for %s",
-+ from_file);
-+ freecon(scontext);
-+ return 1;
-+ }
-+ freecon(scontext);
-+#endif
-+ return 0;
-+}
-+
-+
-+int
-+reset_default_security_context()
-+{
-+#ifdef HAVE_LIBSELINUX
-+ if (selinux_enabled == -1)
-+ selinux_enabled = (is_selinux_enabled() > 0);
-+
-+ if (!selinux_enabled)
-+ return 0;
-+
-+ if (setfscreatecon(0) < 0) {
-+ jed_verror("Could not reset default security context");
-+ return 1;
-+ }
-+#endif
-+ return 0;
-+}
-+
-+
-+int
-+output_security_context(char *from_file)
-+{
-+#ifdef HAVE_LIBSELINUX
-+ security_context_t scontext;
-+
-+ if (selinux_enabled == -1)
-+ selinux_enabled = (is_selinux_enabled() > 0);
-+ if (!selinux_enabled)
-+ return 0;
-+
-+ if (getfilecon(from_file, &scontext) < 0) {
-+ /*
-+ * If the filesystem doesn't support extended
-+ * attributes, the original had no special security
-+ * context and the target cannot have one either.
-+ */
-+ if (errno == EOPNOTSUPP)
-+ return 0;
-+
-+ jed_verror("Could not get security context for %s",
-+ from_file);
-+ return 1;
-+ }
-+
-+ jed_verror("%s Security Context %s", from_file, scontext);
-+ freecon(scontext);
-+#endif
-+ return 0;
-+}
-+
-+#if 0
-+
-+/*
-+ Test program compile using the following command
-+ cc -o t t.c -DHAVE_LIBSELINUX -DTEST -lselinux
-+ */
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+main(int argc, char **argv)
-+{
-+
-+ printf("%d: %s\n", argc, argv[1]);
-+ if (argc == 3) {
-+ copy_security_context(argv[1], argv[2]);
-+ output_security_context(argv[2]);
-+ }
-+ if (argc == 2) {
-+ FILE *fd;
-+ char *temp;
-+ match_default_security_context(argv[1]);
-+ mkstemp(temp);
-+ printf("temp=%s", temp);
-+ fd = fopen(temp, "w");
-+ fclose(fd);
-+ output_security_context(temp);
-+ reset_default_security_context();
-+ }
-+}
-+#endif
---- jed-0.99-16/src/config.hin.selinux 2004-09-25 01:42:56.000000000 -0400
-+++ jed-0.99-16/src/config.hin 2004-09-25 01:43:21.000000000 -0400
-@@ -80,6 +80,8 @@
+--- jed-0.99-19.org/src/config.hin 2010-01-16 12:38:55.832785334 +0530
++++ jed-0.99-19/src/config.hin 2010-01-16 13:01:16.507723384 +0530
+@@ -114,6 +114,8 @@
/* Undefine this to disable floating point support. */
#define FLOAT_TYPE
@@ -274,10 +63,40 @@
#if defined(ultrix) && !defined(__GNUC__)
# ifndef NO_PROTOTYPES
# define NO_PROTOTYPES
---- jed-0.99-16/src/modules.unx.foo 2004-09-25 01:51:55.000000000 -0400
-+++ jed-0.99-16/src/modules.unx 2004-09-25 01:52:33.000000000 -0400
+--- jed-0.99-19.org/src/modules.unx 2010-01-16 12:38:55.844785513 +0530
++++ jed-0.99-19/src/modules.unx 2010-01-16 13:37:42.429789149 +0530
@@ -31,3 +31,4 @@
version vterm.h
hooks window.h
colors
+selinux
+--- jed-0.99-19.org/src/Makefile.in 2010-01-16 12:38:55.829785417 +0530
++++ jed-0.99-19/src/Makefile.in 2010-01-16 14:03:00.905722962 +0530
+@@ -110,7 +110,7 @@
+ screen.o paste.o ledit.o line.o search.o text.o keymap.o replace.o \
+ window.o undo.o vfile.o intrin.o syntax.o abbrev.o indent.o \
+ jprocess.o lineattr.o blocal.o mouse.o userinfo.o lock.o \
+- version.o hooks.o colors.o main.o
++ version.o hooks.o colors.o main.o selinux.o
+ COMMON_OBJS = $(OBJDIR)/buffer.o $(OBJDIR)/cmds.o $(OBJDIR)/misc.o \
+ $(OBJDIR)/file.o $(OBJDIR)/ins.o $(OBJDIR)/sig.o $(OBJDIR)/sysdep.o \
+ $(OBJDIR)/screen.o $(OBJDIR)/paste.o $(OBJDIR)/ledit.o $(OBJDIR)/line.o \
+@@ -120,7 +120,7 @@
+ $(OBJDIR)/jprocess.o $(OBJDIR)/lineattr.o $(OBJDIR)/blocal.o \
+ $(OBJDIR)/mouse.o $(OBJDIR)/menu.o $(OBJDIR)/userinfo.o $(OBJDIR)/lock.o \
+ $(OBJDIR)/version.o $(OBJDIR)/hooks.o $(OBJDIR)/colors.o \
+- $(OBJDIR)/main.o
++ $(OBJDIR)/main.o $(OBJDIR)/selinux.o
+ main_C_FLAGS = -DJED_ROOT='"$(JED_ROOT)"'
+ main_O_DEP = Makefile
+ jprocess_O_DEP = $(SRCDIR)/pty.c
+@@ -329,6 +329,9 @@
+ $(OBJDIR)/file.o : $(SRCDIR)/file.c $(DOT_O_DEPS) $(file_O_DEP)
+ cd $(OBJDIR); $(COMPILE_CMD) $(file_C_FLAGS) $(SRCDIR)/file.c
+
++$(OBJDIR)/selinux.o : $(SRCDIR)/selinux.c $(DOT_O_DEPS) $(file_O_DEP)
++ cd $(OBJDIR); $(COMPILE_CMD) $(file_C_FLAGS) $(SRCDIR)/selinux.c
++
+ $(OBJDIR)/main.o : $(SRCDIR)/main.c $(DOT_O_DEPS) $(main_O_DEP)
+ cd $(OBJDIR); $(COMPILE_CMD) $(main_C_FLAGS) $(SRCDIR)/main.c
+
Index: jed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jed/devel/jed.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- jed.spec 25 Jul 2009 03:59:14 -0000 1.22
+++ jed.spec 16 Jan 2010 08:44:38 -0000 1.23
@@ -1,19 +1,19 @@
Summary: Fast, compact editor based on the S-Lang screen library
Name: jed
-Version: 0.99.18
-Release: 10%{?dist}
+Version: 0.99.19
+Release: 1%{?dist}
License: GPL+
Group: Applications/Editors
-Source0: ftp://space.mit.edu/pub/davis/jed/v0.99/jed-0.99-18.tar.bz2
+Source0: ftp://space.mit.edu/pub/davis/jed/v0.99/jed-0.99-19.tar.bz2
Patch1: jed-0.99.12-xkeys.patch
URL: http://www.jedsoft.org/jed/
Patch2: jed-etc.patch
-Patch3: jed-multilib.patch
+Patch3: jed-multilib-newauto.patch
Patch4: jed-selinux.patch
-Patch5: jed-newauto.patch
+Source1: selinux.c
Obsoletes: jed-common jed-xjed
Provides: jed-common jed-xjed
-BuildRequires: slang-devel >= 2.0, autoconf, libselinux-devel
+BuildRequires: slang-devel >= 2.0, autoconf, libselinux-devel, procps
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
@@ -28,14 +28,14 @@ you haven't used any text editors before
what you'd like to use.
%prep
-%setup -q -n jed-0.99-18
+%setup -q -n jed-0.99-19
%patch1 -p1 -b .xkeys
%patch2 -p1
%if "%{_lib}" == "lib64"
%patch3 -p1
%endif
%patch4 -p1 -b .selinux
-%patch5 -p1
+cp -p %{SOURCE1} src/
find doc -type f -exec chmod a-x {} \;
@@ -55,6 +55,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
JED_ROOT=$RPM_BUILD_ROOT%{_datadir}/jed $RPM_BUILD_ROOT%{_bindir}/jed -batch -n -l preparse.sl </dev/null
+# wait till jed finishes
+while ps -C jed > /dev/null; do sleep 1; done
+
rm -f $RPM_BUILD_ROOT%{_mandir}/man*/rgrep*
rm -rf $RPM_BUILD_ROOT%{_datadir}/jed/doc/{txt,manual,README}
@@ -73,6 +76,12 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/jed
%changelog
+* Sat Jan 16 2010 Rakesh Pandit <rakesh at fedoraproject.org> - 0.99.19-1
+- Updated to latest 0.99.19
+- Rebased all patches
+- Included selinux.c in Makefile.in
+- Fixed %%install jed command failure
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99.18-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jed/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 18 Apr 2006 15:25:23 -0000 1.4
+++ sources 16 Jan 2010 08:44:38 -0000 1.5
@@ -1 +1 @@
-5378c8e7805854018d9ec5c3cfadf637 jed-0.99-18.tar.bz2
+c9b2f58a3defc6f61faa1ce7d6d629ea jed-0.99-19.tar.bz2
--- jed-multilib.patch DELETED ---
--- jed-newauto.patch DELETED ---
More information about the scm-commits
mailing list