rpms/jed/FC-5 jed-etc.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 jed-multilib.patch, 1.1, 1.2 jed.spec, 1.10, 1.11
Bill Nottingham (notting)
fedora-extras-commits at redhat.com
Tue Jun 6 14:29:52 UTC 2006
Author: notting
Update of /cvs/extras/rpms/jed/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4624
Modified Files:
.cvsignore jed-multilib.patch jed.spec
Added Files:
jed-etc.patch
Log Message:
backport changes to FC-5
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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jed/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 30 Nov 2005 21:54:31 -0000 1.3
+++ .cvsignore 6 Jun 2006 14:29:52 -0000 1.4
@@ -1 +1 @@
-jed-B0.99-17.135.tar.bz2
+jed-0.99-18.tar.bz2
jed-multilib.patch:
Index: jed-multilib.patch
===================================================================
RCS file: /cvs/extras/rpms/jed/FC-5/jed-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jed-multilib.patch 4 Mar 2005 22:37:55 -0000 1.1
+++ jed-multilib.patch 6 Jun 2006 14:29:52 -0000 1.2
@@ -1,18 +1,91 @@
---- jed-B0.99-15/autoconf/aclocal.m4.sopwith 2003-01-10 15:20:04.000000000 -0500
-+++ jed-B0.99-15/autoconf/aclocal.m4 2003-01-10 15:21:24.000000000 -0500
-@@ -158,6 +158,7 @@
- $JD_Above_Dir/$1/libsrc,$JD_Above_Dir/$1/libsrc/"$ARCH"objs \
- $JD_Above_Dir2/$1/src,$JD_Above_Dir2/$1/src/"$ARCH"objs \
- $JD_Above_Dir/$1/src,$JD_Above_Dir/$1/src/"$ARCH"objs \
-+ $HOME/include,$HOME/lib64 \
- $HOME/include,$HOME/lib"
+--- jed-0.99-18/autoconf/aclocal.m4.moo 2006-06-05 17:10:49.000000000 -0400
++++ jed-0.99-18/autoconf/aclocal.m4 2006-06-05 17:11:45.000000000 -0400
+@@ -195,7 +195,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"
-@@ -174,6 +175,7 @@
- test "x$exec_prefix" = "xNONE" && exec_prefix="$prefix"
+ then
+@@ -208,10 +208,10 @@
+ # version.
+
JD_Search_Dirs="$JD_Search_Dirs \
- $includedir,$libdir \
-+ $includedir/$1,$libdir \
- /usr/local/include,/usr/local/lib \
- /usr/include,/usr/lib \
- /usr/include/$1,/usr/lib \
+- /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
+
+@@ -267,7 +267,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=""
+@@ -707,7 +707,7 @@
+ jd_with_$1_library=""
+
+ 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
+@@ -723,7 +723,7 @@
+ ;;
+ *)
+ 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
+
+@@ -815,15 +815,15 @@
+ then
+ lib_library_dirs="\
+ $jd_prefix_libdir \
+- /usr/local/lib \
+- /usr/local/lib/$1 \
+- /usr/local/$1/lib \
+- /usr/lib \
+- /usr/lib/$1 \
+- /usr/$1/lib \
+- /opt/lib \
+- /opt/lib/$1 \
+- /opt/$1/lib"
++ /usr/local/lib64 \
++ /usr/local/lib64/$1 \
++ /usr/local/$1/lib64 \
++ /usr/lib64 \
++ /usr/lib64/$1 \
++ /usr/$1/lib64 \
++ /opt/lib64 \
++ /opt/lib64/$1 \
++ /opt/$1/lib64"
+
+ for X in $lib_library_dirs
+ do
+@@ -843,10 +843,10 @@
+ if test "$jd_with_$1_library" = "yes"
+ then
+ AC_MSG_RESULT(yes: $jd_$1_library_dir and $jd_$1_include_dir)
+- 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
Index: jed.spec
===================================================================
RCS file: /cvs/extras/rpms/jed/FC-5/jed.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jed.spec 18 Apr 2006 15:26:38 -0000 1.10
+++ jed.spec 6 Jun 2006 14:29:52 -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: 0.fc5
+Release: 4%{?dist}
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
+Provides: jed-common jed-xjed
+BuildRequires: slang-devel >= 2.0, autoconf, libselinux-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
Jed is a fast, compact editor based on the S-lang screen library. Jed
@@ -28,8 +29,14 @@
%prep
%setup -q -n jed-0.99-18
%patch1 -p1 -b .xkeys
-#%patch3 -p1
+%patch2 -p1
+%if "%{_lib}" == "lib64"
+%patch3 -p1
+%endif
%patch4 -p1 -b .selinux
+
+find doc -type f -exec chmod a-x {} \;
+
cd autoconf
autoconf
mv configure ..
@@ -38,23 +45,20 @@
%build
export JED_ROOT="%{_datadir}/jed"
%configure
-make
+make %{?_smp_mflags}
%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
-
-cp -r lib $RPM_BUILD_ROOT%{_datadir}/jed
+make install DESTDIR=$RPM_BUILD_ROOT
-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*
-cd ../../doc
-install -m 644 manual/jed.1 $RPM_BUILD_ROOT%{_mandir}/man1
+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
+
+sed -i "s|JED_ROOT|%{_datadir}/jed|g" $RPM_BUILD_ROOT/%{_mandir}/man1/jed.1
%clean
rm -rf $RPM_BUILD_ROOT
@@ -62,12 +66,26 @@
%files
%defattr(-,root,root)
%doc COPYING COPYRIGHT doc INSTALL INSTALL.unx README changes.txt
-%{_bindir}/jed
+%{_bindir}/*
%{_mandir}/man1/jed.*
%{_datadir}/jed
%changelog
-* Tue Apr 18 2006 Bill Nottingham <notting at redhat.com> - 0.99.18-0.fc5
+* Mon Jun 5 2006 Bill Nottingham <notting at redhat.com> - 0.99.18-4
+- get rid of rpath on x86_64
+- remove install-info prereq
+- add provides for things obsoleted
+
+* Fri Jun 2 2006 Bill Nottingham <notting at redhat.com> - 0.99.18-3
+- various spec cleanups (#189374)
+
+* 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
* Mon Feb 13 2006 Bill Nottingham <notting at redhat.com> - 0.99.17-0.pre135.3
More information about the fedora-extras-commits
mailing list