rpms/freeze/EL-4 freeze-2.5.0-deffile.patch, NONE, 1.1 freeze-2.5.0-printf.patch, NONE, 1.1 freeze-2.5.patch, 1.1, 1.2 freeze.spec, 1.5, 1.6

Robert Scheck (robert) fedora-extras-commits at redhat.com
Sun Aug 12 00:21:04 UTC 2007


Author: robert

Update of /cvs/pkgs/rpms/freeze/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5579

Modified Files:
	freeze-2.5.patch freeze.spec 
Added Files:
	freeze-2.5.0-deffile.patch freeze-2.5.0-printf.patch 
Log Message:
Rebuilt for EPEL branches

freeze-2.5.0-deffile.patch:

--- NEW FILE freeze-2.5.0-deffile.patch ---
diff -Nur freeze-2.5.0-orig/freeze.1 freeze-2.5.0/freeze.1
--- freeze-2.5.0-orig/freeze.1	1999-05-20 11:07:51.000000000 +0200
+++ freeze-2.5.0/freeze.1	2005-07-23 20:21:06.000000000 +0200
@@ -109,7 +109,7 @@
 of following files in the command string. An explicite definition
 of the file's type can give up to 2% of additional compression.
 The list of types is stored in file
-.IR /usr/local/lib/freeze.cnf .
+.IR /usr/lib/freeze.cnf .
 Types may be abbreviated while not ambigious. You can also determine
 values for the static Huffman table by using a list of 8 numbers
 separated by commas instead of
diff -Nur freeze-2.5.0-orig/README freeze-2.5.0/README
--- freeze-2.5.0-orig/README	1999-05-20 11:07:51.000000000 +0200
+++ freeze-2.5.0/README	2005-07-23 20:23:28.000000000 +0200
@@ -160,7 +160,7 @@
 Note: If you use "gensample | statist", remember that INTR influence BOTH
 processes !!
 
-You may create the /etc/default/freeze (or rather /usr/local/lib/freeze.cnf,
+You may create the /etc/default/freeze (or rather /usr/lib/freeze.cnf,
 which is now the default, NOTE IT!) file (in MS-DOS it is FREEZE.CNF in
 the directory of FREEZE.EXE), which has the following format:  name =
 ``statist's output (8 numbers)'', e.g.:

freeze-2.5.0-printf.patch:

--- NEW FILE freeze-2.5.0-printf.patch ---
diff -Nur freeze-2.5.0-orig/freeze.c freeze-2.5.0/freeze.c
--- freeze-2.5.0-orig/freeze.c	1999-05-20 11:07:51.000000000 +0200
+++ freeze-2.5.0/freeze.c	2005-07-23 20:25:42.000000000 +0200
@@ -76,7 +76,7 @@
     fprintf(stderr, "\n\
       -c         Write output on stdout, don't remove original.\n\
       -d         If given, melting is done instead.\n\
-      -g         Use \"greedy\" parsing (1.5% worse, 40% faster).\n\
+      -g         Use \"greedy\" parsing (1.5%% worse, 40%% faster).\n\
       -f         Forces output file to be generated, even if one already\n\
                  exists, and even if no space is saved by freezeing.\n\
       -i         Image mode.\n\
diff -Nur freeze-2.5.0-orig/statist.c freeze-2.5.0/statist.c
--- freeze-2.5.0-orig/statist.c	1999-05-20 11:07:51.000000000 +0200
+++ freeze-2.5.0/statist.c	2005-07-23 20:25:42.000000000 +0200
@@ -261,7 +261,7 @@
 		}
 		in_count += i;
 		if ((in_count > indc_count)) {
-			fprintf(stderr, "%5dK\b\b\b\b\b\b", in_count / 1024);
+			fprintf(stderr, "%5ldK\b\b\b\b\b\b", in_count / 1024);
 			fflush (stderr);
 			indc_count += 4096;
 		}

freeze-2.5.patch:

Index: freeze-2.5.patch
===================================================================
RCS file: /cvs/pkgs/rpms/freeze/EL-4/freeze-2.5.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freeze-2.5.patch	8 Nov 2004 04:20:29 -0000	1.1
+++ freeze-2.5.patch	12 Aug 2007 00:21:01 -0000	1.2
@@ -1,6 +1,6 @@
-diff -uNr freeze-2.5.orig/Makefile.in freeze-2.5/Makefile.in
---- Makefile.in.in	Wed Sep 11 09:54:37 1996
-+++ Makefile.in	Wed Sep 11 10:14:28 1996
+diff -Nur freeze-2.5.0-orig/Makefile.in freeze-2.5.0/Makefile.in
+--- freeze-2.5.0-orig/Makefile.in	1999-05-20 11:07:51.000000000 +0200
++++ freeze-2.5.0/Makefile.in	2005-07-23 19:44:41.000000000 +0200
 @@ -18,7 +18,7 @@
  default:        prog
  
@@ -10,7 +10,23 @@
  DEST          = $(prefix)/bin
  MANDEST       = $(prefix)/man/man1
  SEC           = 1
-@@ -101,18 +101,18 @@
+@@ -79,15 +79,12 @@
+ 
+ freeze$(EXE):   $(OBJS)
+ 		$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+-		-strip $@
+ 
+ statist$(EXE):  statist.$(OBJ) lz.$(OBJ)
+ 		$(CC) $(LDFLAGS) -o $@ statist.$(OBJ) lz.$(OBJ) $(LIBS)
+-		-strip $@
+ 
+ showhuf$(EXE):  showhuf.$(OBJ)
+ 		$(CC) $(LDFLAGS) -o $@ showhuf.$(OBJ) $(LIBS)
+-		-strip $@
+ 
+ clobber:        clean
+ 		rm -f freeze$(EXE) statist$(EXE) showhuf$(EXE) *.man \#* *~ config.h Makefile
+@@ -101,18 +98,18 @@
  
  $(DEST)/freeze: freeze
  		$(INSTALL_PROGRAM) freeze $@


Index: freeze.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeze/EL-4/freeze.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- freeze.spec	10 Dec 2004 22:03:02 -0000	1.5
+++ freeze.spec	12 Aug 2007 00:21:01 -0000	1.6
@@ -1,12 +1,15 @@
 Name:    freeze
 Version: 2.5.0
-Release: 2
+Release: 7%{?dist}
 Summary: freeze/melt/fcat compression utilities
 
 Group:     Applications/Archiving
 License:   Distributable
+# No one agrees on the canonical download site, everyone uses the same version
 Source:    http://www.ibiblio.org/pub/Linux/utils/compress/freeze-2.5.0.tar.gz
-Patch:     freeze-2.5.patch
+Patch0:    freeze-2.5.patch
+Patch1:    freeze-2.5.0-printf.patch
+Patch2:    freeze-2.5.0-deffile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -15,8 +18,10 @@
 dearchive files compressed with it.
 
 %prep
-%setup
-%patch
+%setup -q
+%patch0 -p1 -b .Makefile
+%patch1 -p1 -b .printf
+%patch2 -p1 -b .deffile
 
 %build
 chmod u+x configure
@@ -47,14 +52,42 @@
 %attr(0755,root,root) %{_bindir}/*
 
 %changelog
-* Thu Nov 11 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 2.5.0-0.fdr.2
+* Sun Aug 12 2007 Robert Scheck <robert at fedoraproject.org> 2.5.0-7
+- Rebuilt for EPEL branches
+
+* Sat Sep 02 2006  Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 2.5.0-7
+- FE6 Rebuild
+
+* Mon Feb 13 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 2.5.0-6
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Mon Jan 26 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 2.5.0-5
+- rebuild with gcc 4.1
+
+* Sat Jul 23 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- 2.5.0-4
+- Fix bad printf string (#149613).
+- Fix default cnf file location in readme and man page.
+- Don't strip.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
+* Thu Nov 11 2004 Michael Schwendt <mschwendt[AT]users.sf.net>
+- 2.5.0-0.fdr.2
 - Build with rpm opt flags.
 
-* Sun Apr 18 2004 Nicolas Mailhot <Nicolas.Mailhot at laPoste.net> 0:2.5.0-0.fdr.1
+* Sun Apr 18 2004 Nicolas Mailhot <Nicolas.Mailhot at laPoste.net> 
+- 0:2.5.0-0.fdr.1
 - Fedorization
 
-* Wed Mar 31 2004 Dag Wieers <dag at wieers.com> - 2.5-2
+* Wed Mar 31 2004 Dag Wieers <dag at wieers.com>
+- 2.5-2
 - Cosmetic rebuild for Group-tag.
 
-* Tue Mar 09 2004 Dag Wieers <dag at wieers.com> - 2.5-1
+* Tue Mar 09 2004 Dag Wieers <dag at wieers.com>
+- 2.5-1
 - Initial package. (using DAR)




More information about the fedora-extras-commits mailing list