rpms/nessus-libraries/F-7 nessus-config-multi.patch, NONE, 1.1 nessus-libraries.spec, 1.8, 1.9

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/pkgs/rpms/nessus-libraries/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14695/F-7

Modified Files:
	nessus-libraries.spec 
Added Files:
	nessus-config-multi.patch 
Log Message:
- fix #342671


nessus-config-multi.patch:

--- NEW FILE nessus-config-multi.patch ---
--- nessus-config.pre.in.orig	2007-12-08 12:44:14.000000000 +0100
+++ nessus-config.pre.in	2007-12-08 12:47:16.000000000 +0100
@@ -12,7 +12,6 @@
 
 
 PREFIX=@prefix@
-LIBDIR=@libdir@
 INCLUDEDIR=@includedir@
 DEFS="@syspcap@"
 VERSION=@version@
@@ -48,7 +47,7 @@
 		;;
 	--libs)
 	
-		echo $Xn "-L$DESTDIR$LIBDIR -lnessus -lhosts_gatherer @pcap_flag@ $CIPHER $EXTRA $Xc"
+		echo $Xn "-lnessus -lhosts_gatherer @pcap_flag@ $CIPHER $EXTRA $Xc"
 		;;
 	--cflags)
 		echo $Xn "$DEFS -I$DESTDIR$INCLUDEDIR/nessus $CIPHER_CFLAGS $SSL_CFLAGS $Xc"


Index: nessus-libraries.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nessus-libraries/F-7/nessus-libraries.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nessus-libraries.spec	22 Aug 2007 13:19:42 -0000	1.8
+++ nessus-libraries.spec	8 Dec 2007 12:07:41 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           nessus-libraries
 Version:        2.2.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Support libraries for nessus
 
 Group:          System Environment/Libraries
@@ -10,6 +10,7 @@
 Source0:        nessus-libraries-2.2.10.tar.gz
 Patch0:         nessus-libraries-config.patch
 Patch1:         nessus-libraries-2.2.4.Makefile.patch
+Patch2:         nessus-config-multi.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bison
@@ -35,6 +36,7 @@
 %setup -q -n %{name}
 %patch0
 %patch1 -p1
+%patch2
 
 %build
 %configure  --enable-chiper --disable-nessuspcap --enable-shared \
@@ -48,7 +50,8 @@
 
 # generate ghost service.* files
 mkdir -m 0755 -p %{buildroot}%{_localstatedir}/lib/nessus
-touch %{buildroot}%{_localstatedir}/lib/nessus/services.{tcp,udp,txt}
+touch -r VERSION %{buildroot}%{_localstatedir}/lib/nessus/services.{tcp,udp,txt}
+touch -r VERSION %{buildroot}%{_bindir}/nessus-config
 
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*la
 
@@ -77,6 +80,10 @@
 %{_bindir}/nessus-config
 
 %changelog
+* Sat Dec 08 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.2.10-2
+- fix multilib #342671
+
 * Wed Aug 22 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.2.10-1
 - version upgrade