OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Jan-2007 08:47:58
Branch: HEAD Handle: 2007010507475500
Modified files:
openpkg-src/grzip grzip.patch grzip.spec
Log:
upgrading package: grzip 0.2.6 -> 0.2.7
Summary:
Revision Changes Path
1.3 +6 -17 openpkg-src/grzip/grzip.patch
1.3 +4 -3 openpkg-src/grzip/grzip.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/grzip/grzip.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 grzip.patch
--- openpkg-src/grzip/grzip.patch 3 Jan 2007 09:06:22 -0000 1.2
+++ openpkg-src/grzip/grzip.patch 5 Jan 2007 07:47:55 -0000 1.3
@@ -1,7 +1,7 @@
Index: Makefile
---- Makefile.orig 2007-01-02 21:50:16 +0100
-+++ Makefile 2007-01-03 10:04:43 +0100
-@@ -6,24 +6,16 @@
+--- Makefile.orig 2007-01-04 23:19:12 +0100
++++ Makefile 2007-01-05 08:46:31 +0100
+@@ -6,14 +6,12 @@
# Modified compressor client program par Jean-Pierre Demailly
# (command line options matching more closely those of gzip/bzip2)
@@ -15,23 +15,12 @@
-OPTFLAGS = -O2 -DENABLE_NLS -DLOCALEDIR=\"/usr/share/locale\"
-# CPUARCH = -march=pentium
+WARNING =
-+OPTFLAGS = -O2
++OPTFLAGS =
+CPUARCH =
CFLAGS = $(CPUARCH) $(OPTFLAGS) $(WARNING) -s -lm
--static: grzip_static
-- @echo "\nType 'make all' to generate shared library\n"
-- @echo "grzip has been reported to be 64-bit unsafe. Further
testing/correction"
-- @echo "is thus needed on 64-bit machines. Tests on smallendian machines"
-- @echo "(e.g. LinuxPPC) are equally welcome.\n"
--
--all: libgrzip.so GRZipII grzip grzip_static
-+all: libgrzip.a grzip
-
- install: static
- if [ -x grzip_static ] ; then install -c -s grzip_static /usr/bin/grzip
; fi
-@@ -37,21 +29,21 @@
+@@ -42,21 +40,21 @@
GRZipII: libGRZip.h CRC32.c BWT.c LZP.c ST4.c MTF_Ari.c WFC_Ari.c Rec_Flt.c
\
libgrzip.c GRZipII.c
@@ -51,7 +40,7 @@
-libgrzip.so: libGRZip.h CRC32.c BWT.c LZP.c ST4.c MTF_Ari.c WFC_Ari.c \
+libgrzip.a: libGRZip.h CRC32.c BWT.c LZP.c ST4.c MTF_Ari.c WFC_Ari.c \
Rec_Flt.c main.c libgrzip.c
- $(CC) $(CFLAGS) -c libgrzip.c -o libgrzip.o
+ $(CC) $(CPUARCH) $(OPTFLAGS) $(WARNING) -s -c libgrzip.c -o libgrzip.o
- $(CC) -shared -Wl,-soname,libgrzip.so libgrzip.o -o libgrzip.so
+ ar rc libgrzip.a libgrzip.o
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/grzip/grzip.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 grzip.spec
--- openpkg-src/grzip/grzip.spec 3 Jan 2007 09:06:22 -0000 1.2
+++ openpkg-src/grzip/grzip.spec 5 Jan 2007 07:47:55 -0000 1.3
@@ -32,8 +32,8 @@
Class: EVAL
Group: Compression
License: LGPL
-Version: 0.2.6
-Release: 20070103
+Version: 0.2.7
+Release: 20070105
# list of sources
Source0:
ftp://ftp.ac-grenoble.fr/ge/compression/grzip-%{version}.tar.bz2
@@ -70,7 +70,8 @@
%build
%{l_make} %{l_mflags} \
- CC="%{l_cc}" WARNING="%{l_cflags -O}"
+ CC="%{l_cc}" WARNING="%{l_cflags -O}" \
+ libgrzip.a grzip
%install
rm -rf $RPM_BUILD_ROOT
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
