rpms/jed/devel jed-etc.patch,NONE,1.1 jed.spec,1.10,1.11

[Bill Nottingham (notting)]

Author: notting

Update of /cvs/extras/rpms/jed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7957

Modified Files:
	jed.spec 
Added Files:
	jed-etc.patch 
Log Message:
cleanups:
- use make install
  - which fixes the built-in help
- make /etc/jed.rc work (#189374)
- get rid of JED_ROOT in man page (#189374)


jed-etc.patch:

--- NEW FILE jed-etc.patch ---
--- 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 @@
      $1 = getenv ("JED_CONF_DIR");
      if ($1 == NULL)
        {
-	  $1 = guess_jed_install_prefix ();
-	  if ($1 != NULL)
-	    {
-	       $1 = path_concat ($1, "etc");
-	       if (($1 == "/usr/etc") and (0 == file_status ($1)))
-		 $1 = "/etc";
-	    }
+          $1 = "/etc";
        }
      if ($1 != NULL)
        {


Index: jed.spec
===================================================================
RCS file: /cvs/extras/rpms/jed/devel/jed.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jed.spec	18 Apr 2006 15:25:23 -0000	1.10
+++ jed.spec	10 May 2006 03:18:48 -0000	1.11
@@ -1,18 +1,19 @@
 Summary: Fast, compact editor based on the S-Lang screen library
 Name: jed
 Version: 0.99.18
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Editors
 Source0: ftp://space.mit.edu/pub/davis/jed/v0.99/jed-0.99-18.tar.bz2
 Patch1: jed-0.99.12-xkeys.patch
 URL: http://www.jedsoft.org/jed/
+Patch2: jed-etc.patch
 Patch3: jed-multilib.patch
 Patch4: jed-selinux.patch
 Prereq: /sbin/install-info
 Obsoletes: jed-common jed-xjed
 BuildPrereq: slang-devel >= 2.0, autoconf, libselinux-devel
-BuildRoot: /var/tmp/jed-root
+BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root
 
 %description
 Jed is a fast, compact editor based on the S-lang screen library.  Jed
@@ -28,6 +29,7 @@
 %prep
 %setup -q -n jed-0.99-18
 %patch1 -p1 -b .xkeys
+%patch2 -p1
 #%patch3 -p1
 %patch4 -p1 -b .selinux
 cd autoconf
@@ -42,19 +44,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/jed
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+make install DESTDIR=$RPM_BUILD_ROOT
 
-cp -r lib $RPM_BUILD_ROOT%{_datadir}/jed
-
-cd src/objs
-install -m 0755 jed $RPM_BUILD_ROOT%{_bindir}
 JED_ROOT=$RPM_BUILD_ROOT%{_datadir}/jed $RPM_BUILD_ROOT%{_bindir}/jed -batch -n -l preparse.sl </dev/null
 
+rm -f $RPM_BUILD_ROOT%{_mandir}/man*/rgrep*
+
+rm -rf $RPM_BUILD_ROOT%{_datadir}/jed/doc/{txt,manual,README}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/jed/bin $RPM_BUILD_ROOT%{_datadir}/jed/info
 
-cd ../../doc
-install -m 644 manual/jed.1 $RPM_BUILD_ROOT%{_mandir}/man1
+sed -i "s|JED_ROOT|%{_datadir}/jed|g" $RPM_BUILD_ROOT/%{_mandir}/man1/jed.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -62,11 +61,17 @@
 %files
 %defattr(-,root,root)
 %doc COPYING COPYRIGHT doc INSTALL INSTALL.unx README changes.txt
-%{_bindir}/jed
+%{_bindir}/*
 %{_mandir}/man1/jed.*
 %{_datadir}/jed
 
 %changelog
+* Tue May  9 2006 Bill Nottingham <notting at redhat.com> - 0.99.18-2
+- don't do all the installation by hand
+- get help files installed
+- fix JED_ROOT references in man page
+- make /etc/jed.rc (as specified in man page) work
+
 * Tue Apr 18 2006 Bill Nottingham <notting at redhat.com> - 0.99.18-1
 - update to 0.99.18