rpms/ksplice/devel ksplice-0.9.2-config.patch, NONE, 1.1 ksplice.spec, 1.5, 1.6 ksplice-0.9.1-config.patch, 1.2, NONE

[Jochen Schmitt]

Author: s4504kr

Update of /cvs/extras/rpms/ksplice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10040

Modified Files:
	ksplice.spec 
Added Files:
	ksplice-0.9.2-config.patch 
Removed Files:
	ksplice-0.9.1-config.patch 
Log Message:
Rebasing config patch

ksplice-0.9.2-config.patch:

--- NEW FILE ksplice-0.9.2-config.patch ---
diff -up ksplice-0.9.2/configure.ac.auto ksplice-0.9.2/configure.ac
--- ksplice-0.9.2/configure.ac.auto	2008-10-18 03:49:13.000000000 +0200
+++ ksplice-0.9.2/configure.ac	2008-10-29 18:09:44.000000000 +0100
@@ -1,17 +1,17 @@
 AC_INIT([Ksplice], [0.9.2], [devel at ksplice.com])
 
 AC_ARG_WITH([libbfd],
-  [  --with-libbfd=FILE      path to libbfd.a],
+  [  --with-libbfd=PATH      path to libbfd.a],
   [ac_libbfd=$withval],
-  [ac_libbfd=NONE])
+  [ac_libbfd=yes])
 
 AC_ARG_WITH([libiberty],
-  [  --with-libiberty=FILE   path to libiberty.a],
+  [  --with-libiberty=PATH   path to libiberty.a],
   [ac_libiberty=$withval],
-  [ac_libiberty=NONE])
+  [ac_libiberty=yes])
 
 AC_ARG_WITH([libz],
-  [  --with-libz=FILE        path to libz.a],
+  [  --with-libz=PATH        path to libz.a],
   [ac_libz=$withval],
   [ac_libz=NONE])
 
@@ -23,21 +23,23 @@ AC_ARG_WITH([bfd-include-dir],
 
 AC_PROG_CC
 
-if test "$ac_libz" = "NONE"; then
+if test "$ac_libz" = "yes"; then
+  AC_CHECK_LIB([z], [zlibVersion])
+elif test "$ac_libz" != "NONE"; then
+  LIBS="-L$ac_libz $LIBS"
   AC_CHECK_LIB([z], [zlibVersion])
-else
-  LIBS="$ac_libz $LIBS"
 fi
-if test "$ac_libiberty" = "NONE"; then
+if test "$ac_libiberty" = "yes"; then
   AC_CHECK_LIB([iberty], [objalloc_create])
-else
-  LIBS="$ac_libiberty $LIBS"
+elif test "$ac_libiberty" != "NONE"; then 
+  LIBS="-L$ac_libiberty $LIBS"
+  AC_CHECK_LIB([iberty], [objectalloc_create])
 fi
-if test "$ac_libbfd" = "NONE"; then
-  ac_libbfd=auto
+if test "$ac_libbfd" = "yes"; then
+  AC_CHECK_LIB([bfd], [bfd_openr], , [ac_libbfd=NONE])
+elif test "$ac_libbfd" != "NONE"; then
+  LIBS="-L$ac_libbfd $LIBS"
   AC_CHECK_LIB([bfd], [bfd_openr], , [ac_libbfd=NONE])
-else
-  LIBS="$ac_libbfd $LIBS"
 fi
 
 if test "$ac_bfd_include_dir" != "NONE"; then
@@ -64,11 +66,11 @@ if ! test -e "objmanip-static"; then
     echo "If these libraries are already installed on your system, then you need"
     echo "to tell Ksplice where to find them by running configure again:"
     echo
-    echo "  ./configure --with-libbfd=<libbfd.a> --with-libiberty=<libiberty.a>"
+    echo "  ./configure --with-libbfd=<libbfd-path> --with-libiberty=<libiberty-path>"
     echo
     echo "Depending on the host system you may also need to provide zlib:"
     echo
-    echo "  ./configure ... --with-libz=<libz.a>"
+    echo "  ./configure ... --with-libz=<libz-path>"
     echo
     exit 1
   fi


Index: ksplice.spec
===================================================================
RCS file: /cvs/extras/rpms/ksplice/devel/ksplice.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ksplice.spec	29 Oct 2008 17:02:10 -0000	1.5
+++ ksplice.spec	29 Oct 2008 17:16:48 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		ksplice
 Version:	0.9.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Patching a Linux kernel without reboot
 
 Group:		System Environment/Kernel
@@ -9,7 +9,7 @@
 Source0:	http://web.mit.edu/ksplice/dist/ksplice-%{version}-src.tar.gz
 
 # Sent to upstream via email
-Patch0:		ksplice-0.9.1-config.patch
+Patch0:		ksplice-0.9.2-config.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -84,7 +84,8 @@
 %doc COPYING README
 
 %changelog
-* Wed Oct 29 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.9.2-1
+* Wed Oct 29 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.9.2-2
+- Rebase config patch
 - New upstream release
 
 * Mon Oct  6 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.9.1-2


--- ksplice-0.9.1-config.patch DELETED ---