rpms/clamav/devel clamav.spec,1.67,1.68
Enrico Scholz (ensc)
fedora-extras-commits at redhat.com
Wed Mar 5 07:31:44 UTC 2008
Author: ensc
Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4594
Modified Files:
clamav.spec
Log Message:
- updated to 0.93rc1
- fixed rpath issues
Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- clamav.spec 11 Feb 2008 22:30:35 -0000 1.67
+++ clamav.spec 5 Mar 2008 07:30:58 -0000 1.68
@@ -1,5 +1,7 @@
## $Id$
+%global snapshot rc1
+
## Fedora Extras specific customization below...
%bcond_without fedora
%bcond_with unrar
@@ -18,26 +20,21 @@
Summary: End-user tools for the Clam Antivirus scanner
Name: clamav
-Version: 0.92.1
-Release: %release_func 1
+Version: 0.93
+Release: %release_func 0.0%{?snapshot:.%snapshot}
License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
Group: Applications/File
URL: http://www.clamav.net
%if 0%{?with_unrar:1}
-Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz
-Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig
+Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapshot}.tar.gz
+Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapshot}.tar.gz.sig
%else
# Unfortunately, clamav includes support for RAR v3, derived from GPL
# incompatible unrar from RARlabs. We have to pull this code out.
# tarball was created by
-#
-# zcat clamav-$V.tar.gz | tar --delete -f - '*/libclamunrar/*' | bzip2 -c > clamav-$V-norar.tar.bz2
-#
-# or
-#
-# make clean-sources [TARBALL=<original-tarball>]
-Source0: %name-%version-norar.tar.bz2
+# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>]
+Source0: %name-%version%{?snapshot}-norar.tar.bz2
%endif
Source1: clamd-wrapper
Source2: clamd.sysconfig
@@ -253,7 +250,7 @@
## ------------------------------------------------------------
%prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?snapshot}
%patch21 -p1 -b .path
%patch22 -p1 -b .initoff
@@ -284,12 +281,13 @@
export LIBS='-lmilter -lpthread'
%configure --disable-clamav --with-dbdir=/var/lib/clamav \
--enable-milter --disable-static \
+ --disable-rpath \
%{!?with_unrar:--disable-unrar}
# build with --as-needed and disable rpath
sed -i \
-e 's! -shared ! -Wl,--as-needed\0!g' \
- -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!/lib!/%_lib!g' \
+ -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \
libtool
@@ -555,6 +553,10 @@
%changelog
+* Tue Mar 4 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.93-0.0.rc1
+- updated to 0.93rc1
+- fixed rpath issues
+
* Mon Feb 11 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.92.1-1
- updated to 0.92.1
More information about the fedora-extras-commits
mailing list