packages: zip/zip-multilib.patch, zip/zip-zmem.patch, zip/zip.spec - upgrad...
gotar
gotar at pld-linux.org
Sun Nov 1 13:31:26 CET 2009
Author: gotar Date: Sun Nov 1 12:31:26 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- upgraded to 3.0;
- added bzip2 support,
- zcrypt29 already in sources,
- zip-zmem.patch: no need to remove ZMEM ifed code, what's <strings.h> for?
---- Files affected:
packages/zip:
zip-multilib.patch (1.2 -> 1.3) , zip-zmem.patch (1.1 -> 1.2) , zip.spec (1.55 -> 1.56)
---- Diffs:
================================================================
Index: packages/zip/zip-multilib.patch
diff -u packages/zip/zip-multilib.patch:1.2 packages/zip/zip-multilib.patch:1.3
--- packages/zip/zip-multilib.patch:1.2 Sun Jul 1 20:09:21 2007
+++ packages/zip/zip-multilib.patch Sun Nov 1 13:31:20 2009
@@ -1,11 +1,11 @@
---- zip-2.31/unix/configure.orig 2007-02-10 20:53:12.000000000 +0100
-+++ zip-2.31/unix/configure 2007-02-10 20:53:30.000000000 +0100
-@@ -13,7 +13,7 @@
+--- zip30/unix/configure.orig 2008-06-20 05:32:20.000000000 +0200
++++ zip30/unix/configure 2009-11-01 13:19:07.000000000 +0100
+@@ -18,7 +18,7 @@
CC=${1-cc}
CFLAGS=${2-"-I. -DUNIX"}
--LFLAGS1=""
+-LFLAGS1=''
+LFLAGS1="${CFLAGS}"
+ LFLAGS2=''
LN="ln -s"
- echo Check for the C preprocessor
================================================================
Index: packages/zip/zip-zmem.patch
diff -u packages/zip/zip-zmem.patch:1.1 packages/zip/zip-zmem.patch:1.2
--- packages/zip/zip-zmem.patch:1.1 Tue May 9 17:32:07 2000
+++ packages/zip/zip-zmem.patch Sun Nov 1 13:31:20 2009
@@ -1,73 +1,3 @@
-diff -urN zip-2.3.orig/fileio.c zip-2.3/fileio.c
---- zip-2.3.orig/fileio.c Sun Nov 7 11:29:03 1999
-+++ zip-2.3/fileio.c Sat May 6 00:56:35 2000
-@@ -919,66 +919,3 @@
-
- #endif /* NO_RENAME */
-
--
--#ifdef ZMEM
--
--/************************/
--/* Function memset() */
--/************************/
--
--/*
-- * memset - for systems without it
-- * bill davidsen - March 1990
-- */
--
--char *
--memset(buf, init, len)
--register char *buf; /* buffer loc */
--register int init; /* initializer */
--register unsigned int len; /* length of the buffer */
--{
-- char *start;
--
-- start = buf;
-- while (len--) *(buf++) = init;
-- return(start);
--}
--
--
--/************************/
--/* Function memcpy() */
--/************************/
--
--char *
--memcpy(dst,src,len) /* v2.0f */
--register char *dst, *src;
--register unsigned int len;
--{
-- char *start;
--
-- start = dst;
-- while (len--)
-- *dst++ = *src++;
-- return(start);
--}
--
--
--/************************/
--/* Function memcmp() */
--/************************/
--
--int
--memcmp(b1,b2,len) /* jpd at usl.edu -- 11/16/90 */
--register char *b1, *b2;
--register unsigned int len;
--{
--
-- if (len) do { /* examine each byte (if any) */
-- if (*b1++ != *b2++)
-- return (*((uch *)b1-1) - *((uch *)b2-1)); /* exit when miscompare */
-- } while (--len);
--
-- return(0); /* no miscompares, yield 0 result */
--}
--
--#endif /* ZMEM */
diff -urN zip-2.3.orig/zip.h zip-2.3/zip.h
--- zip-2.3.orig/zip.h Mon Nov 8 20:36:51 1999
+++ zip-2.3/zip.h Sat May 6 00:55:56 2000
@@ -79,16 +9,3 @@
#ifdef USE_ZLIB
# include "zlib.h"
-@@ -433,12 +434,6 @@
- int setfileattr OF((char *, int));
- char *tempname OF((char *));
- int fcopy OF((FILE *, FILE *, ulg));
--
--#ifdef ZMEM
-- char *memset OF((char *, int, unsigned int));
-- char *memcpy OF((char *, char *, unsigned int));
-- int memcmp OF((char *, char *, unsigned int));
--#endif /* ZMEM */
-
- /* in system dependent fileio code (<system>.c) */
- #ifndef UTIL
================================================================
Index: packages/zip/zip.spec
diff -u packages/zip/zip.spec:1.55 packages/zip/zip.spec:1.56
--- packages/zip/zip.spec:1.55 Sun Jul 1 20:32:43 2007
+++ packages/zip/zip.spec Sun Nov 1 13:31:20 2009
@@ -9,24 +9,20 @@
Summary(tr.UTF-8): PKZIP(tm)-uyumlu .zip dosyaları yaratır
Summary(uk.UTF-8): Утиліта для компресування та упаковки файлів, сумісна з PKZIP
Name: zip
-Version: 2.32
+Version: 3.0
Release: 1
License: distributable
Group: Applications/Archiving
Source0: ftp://ftp.info-zip.org/pub/infozip/src/%{name}%(echo %{version} | tr -d .).tgz
-# Source0-md5: 8a4da4460386e324debe97f3b7fe4d96
-Source1: ftp://ftp.icce.rug.nl/infozip/src/zcrypt29.zip
-# Source1-md5: 0c969ba1661183b041a142945ed2710e
+# Source0-md5: 7b74551e63f8ee6aab6fbc86676c0d37
Source2: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source2-md5: 72d619b4f70c06c34e5244125b62fdce
Patch0: %{name}-zmem.patch
Patch1: %{name}-multilib.patch
+BuildRequires: bzip2-devel
BuildRequires: unzip
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define __unzip /usr/bin/unzip -o -q
-%define _unzipbin /usr/bin/unzip -o -q
-
%description
The zip program is a compression and file packaging utility. Zip is
analogous to a combination of the UNIX tar and compress commands and
@@ -83,7 +79,7 @@
(утиліта для компресування та упаковки файлів для MS-DOS).
%prep
-%setup -q -a1
+%setup -q -n %{name}30
%patch0 -p1
%patch1 -p1
@@ -110,8 +106,7 @@
%files
%defattr(644,root,root,755)
-%doc README WHERE proginfo/*.txt proginfo/3rdparty.bug
-%doc TODO proginfo/infozip.who CHANGES
+%doc BUGS CHANGES LICENSE README* TODO USexport.msg WHERE WHATSNEW file_id.diz *.ann *.txt proginfo
%attr(755,root,root) %{_bindir}/*
%{_mandir}/man1/*
%lang(fi) %{_mandir}/fi/man1/*
@@ -123,6 +118,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.56 2009/11/01 12:31:20 gotar
+- upgraded to 3.0;
+ - added bzip2 support,
+ - zcrypt29 already in sources,
+ - zip-zmem.patch: no need to remove ZMEM ifed code, what's <strings.h> for?
+
Revision 1.55 2007/07/01 18:32:43 qboosh
- use optflags
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/zip/zip-multilib.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/zip/zip-zmem.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/zip/zip.spec?r1=1.55&r2=1.56&f=u
More information about the pld-cvs-commit
mailing list