rpms/libnasl/F-8 libnasl-nasl-config-multi.patch, NONE, 1.1 libnasl.spec, 1.10, 1.11

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/pkgs/rpms/libnasl/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15820/F-8

Modified Files:
	libnasl.spec 
Added Files:
	libnasl-nasl-config-multi.patch 
Log Message:
- fix #342241


libnasl-nasl-config-multi.patch:

--- NEW FILE libnasl-nasl-config-multi.patch ---
--- nasl-config.in.orig	2007-12-08 13:16:31.000000000 +0100
+++ nasl-config.in	2007-12-08 13:17:00.000000000 +0100
@@ -12,7 +12,6 @@
 
 
 PREFIX=@prefix@
-LIBDIR=@libdir@
 INCLUDEDIR=@includedir@
 VERSION=@version@
 
@@ -40,7 +39,7 @@
 		exit 0
 		;;
 	--libs)
-		echo $Xn "-L$DESTDIR$LIBDIR -lnasl $Xc"
+		echo $Xn "-lnasl $Xc"
 		;;
 	--cflags)
 		echo $Xn "-I$DESTDIR$INCLUDEDIR/nessus $Xc"


Index: libnasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnasl/F-8/libnasl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libnasl.spec	22 Aug 2007 19:51:30 -0000	1.10
+++ libnasl.spec	8 Dec 2007 12:24:59 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           libnasl
 Version:        2.2.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Nessus Attack Scripting Language
 
 Group:          System Environment/Libraries
@@ -10,6 +10,7 @@
 Source0:        libnasl-2.2.10.tar.gz
 Patch0:         libnasl-config.patch
 Patch1:         libnasl-2.2.4.pki.patch
+Patch2:         libnasl-nasl-config-multi.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bison
@@ -53,6 +54,7 @@
 %setup -q -n %{name}
 %patch0
 %patch1 -p1
+%patch2
 
 %build
 %configure --enable-shared --disable-static --with-pic
@@ -70,6 +72,8 @@
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/libnasl/doc/
 cp doc/nasl_guide.{ps,dvi} $RPM_BUILD_ROOT/%{_datadir}/libnasl/doc/
 
+touch -r VERSION %{buildroot}%{_bindir}/nasl-config
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -99,6 +103,10 @@
 %{_datadir}/libnasl/doc/*
 
 %changelog
+* Sat Dec 08 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.2.10-2
+- fix #342241
+
 * Wed Aug 22 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.2.10-1
 - version upgrade