rpms/clamav/devel clamav.spec,1.63,1.64

[Enrico Scholz (ensc)]

Author: ensc

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

Modified Files:
	clamav.spec 
Log Message:
use a better way to disable RPATH-generation (needed for '--with
unrar' builds)



Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- clamav.spec	1 Jan 2008 13:19:16 -0000	1.63
+++ clamav.spec	1 Jan 2008 14:59:15 -0000	1.64
@@ -19,7 +19,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.92
-Release:	%release_func 4
+Release:	%release_func 5
 
 License:	%{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
 Group:		Applications/File
@@ -248,14 +248,13 @@
 # HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check
 export LIBS='-lmilter -lpthread'
 %configure --disable-clamav --with-dbdir=/var/lib/clamav	\
-	--enable-milter --disable-static --disable-rpath	\
+	--enable-milter --disable-static			\
 	%{!?with_unrar:--disable-unrar}
 
 # build with --as-needed and disable rpath
 sed -i \
 	-e 's! -shared ! -Wl,--as-needed\0!g' 					\
-	-e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g'	\
-	-e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' 		\
+	-e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!/lib!/%_lib!g'	\
 	libtool
 
 
@@ -515,6 +514,10 @@
 
 
 %changelog
+* Tue Jan  1 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.92-5
+- use a better way to disable RPATH-generation (needed for '--with
+  unrar' builds)
+
 * Mon Dec 31 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.92-4
 - added a README.fedora to the milter package (#240610)
 - ship original sources again; unrar is now licensed correctly (no more