rpms/clamav/F-8 sources, 1.34, 1.35 lastver, 1.2, 1.3 clamav.spec, 1.66, 1.67 Makefile, 1.2, 1.3 .cvsignore, 1.6, 1.7

[Enrico Scholz (ensc)]

Author: ensc

Update of /cvs/extras/rpms/clamav/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv330/F-8

Modified Files:
	sources lastver clamav.spec Makefile .cvsignore 
Log Message:
updated to 0.92.1



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-8/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	1 Jan 2008 17:07:44 -0000	1.34
+++ sources	11 Feb 2008 22:30:51 -0000	1.35
@@ -1 +1 @@
-554d44a5b2265808750553d2e4d0d6fb  clamav-0.92.clean.tar.gz
+aecbcc39bf5b85e8967ddfa2bef4eb90  clamav-0.92.1-norar.tar.bz2


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-8/lastver,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lastver	1 Jan 2008 13:08:10 -0000	1.2
+++ lastver	11 Feb 2008 22:30:51 -0000	1.3
@@ -1 +1 @@
-0.92
+0.92.1


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-8/clamav.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- clamav.spec	1 Jan 2008 17:33:18 -0000	1.66
+++ clamav.spec	11 Feb 2008 22:30:51 -0000	1.67
@@ -18,8 +18,8 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.92
-Release:	%release_func 6
+Version:	0.92.1
+Release:	%release_func 1
 
 License:	%{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
 Group:		Applications/File
@@ -30,8 +30,14 @@
 %else
 # Unfortunately, clamav includes support for RAR v3, derived from GPL 
 # incompatible unrar from RARlabs. We have to pull this code out.
-# All that is needed to make the clean tarball is: rm -rf libclamunrar*
-Source0:	%name-%version.clean.tar.gz
+# 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
 %endif
 Source1:	clamd-wrapper
 Source2:	clamd.sysconfig
@@ -237,7 +243,7 @@
 install -p -m0644 %SOURCE300 clamav-milter/
 
 mkdir -p libclamunrar{,_iface}
-%{!?with_unrar:touch libclamunrar{,_iface}/{Makefile.in,all,install}}
+%{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}}
 
 perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g;
 	     s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g;
@@ -523,6 +529,9 @@
 
 
 %changelog
+* Mon Feb 11 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.92.1-1
+- updated to 0.92.1
+
 * Tue Jan  1 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.92-6
 - redisabled unrar stuff completely by using clean sources
 


Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-8/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	24 Nov 2004 03:10:01 -0000	1.2
+++ Makefile	11 Feb 2008 22:30:51 -0000	1.3
@@ -19,3 +19,16 @@
 endif
 
 include $(MAKEFILE_COMMON)
+
+
+# can not use final tarball name here as it will conflict with rules
+# within Makefile.common
+TARBALL_CLEAN =	${NAME}-${VERSION}-norar.tar.bz2.tmp
+TARBALL =	${NAME}-${VERSION}.tar.gz
+
+clean-sources:	${TARBALL_CLEAN}
+
+${TARBALL_CLEAN}:	${TARBALL}
+	rm -f $@.tmp
+	zcat $< | tar --delete -f - '*/libclamunrar/*' | bzip2 -c > $@.tmp
+	mv $@.tmp $@


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-8/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 May 2005 17:16:39 -0000	1.6
+++ .cvsignore	11 Feb 2008 22:30:51 -0000	1.7
@@ -1,2 +1,3 @@
 clamav-*.tar.gz*
+clamav-*.tar.bz2*
 clamav-*.*.rpm