SPECS (RA-branch): zoo.spec - merged changes from HEAD - release 6...

[hawk]

Author: hawk                         Date: Thu Mar 16 22:21:11 2006 GMT
Module: SPECS                         Tag: RA-branch
---- Log message:
- merged changes from HEAD
- release 6.1 for Ra security

---- Files affected:
SPECS:
   zoo.spec (1.8.2.2 -> 1.8.2.3) 

---- Diffs:

================================================================
Index: SPECS/zoo.spec
diff -u SPECS/zoo.spec:1.8.2.2 SPECS/zoo.spec:1.8.2.3
--- SPECS/zoo.spec:1.8.2.2	Fri Mar 19 20:54:43 2004
+++ SPECS/zoo.spec	Thu Mar 16 23:21:05 2006
@@ -5,14 +5,21 @@
 Summary(uk):	őÔÉĚŚÔÁ ÁŇČÉ×ÁĂŚ§ ÔÁ ËĎÍĐŇĹÓŚ§ ÄĚŃ ÁŇČŚ×Ś× ĆĎŇÍÁÔŐ ZOO
 Name:		zoo
 Version:	2.10
-Release:	6
+Release:	6.1
 License:	Copyrighted, freely distributable if unmodified
 Group:		Applications/Archiving
-#Source0:	ftp://sunsite.unc.edu:/pub/Linux/utils/compress/%{name}-%{PACKAGE_VERSION}.tar.gz
+# ftp://sunsite.unc.edu/pub/Linux/utils/compress/%{name}-%{version}-3.src.rpm
 Source0:	ftp://ftp.slackware.org/pub/slackware/source/a/bin/%{name}-%{version}.tar.gz
 # Source0-md5:	f5d3ffdd65cc8a511c83e3c3f108c27e
+# I hope these patches don't violete license...
+# (source tarball is still unmodified, patches only make thing build,
+# without any changes in behaviour of produced binary)
 Patch0:		ftp://sunsite.unc.edu/pub/Linux/utils/compress/%{name}-2.10.linux.diff.gz
-Buildroot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Patch1:		%{name}-morelinux.patch
+Patch2:		%{name}-CAN-2005-2349.patch
+Patch3:		%{name}-febz-183426.patch
+Patch4:		%{name}-security_pathsize.patch
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 zoo is a file archiving utility for maintaining collections of files.
@@ -37,10 +44,16 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p0
+%patch3 -p1
+%patch4 -p0
 
 %build
-%{__make} CC="%{__cc}" OPTIM="%{rpmcflags}" linux
+%{__make} linux \
+	CC="%{__cc}" \
+	OPTIM="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -64,6 +77,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8.2.3  2006/03/16 22:21:05  hawk
+- merged changes from HEAD
+- release 6.1 for Ra security
+
 Revision 1.8.2.2  2004/03/19 19:54:43  twittner
 - md5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/zoo.spec?r1=1.8.2.2&r2=1.8.2.3&f=u