rpms/ncompress/devel ncompress-4.2.4-make.patch, 1.1, 1.2 ncompress.spec, 1.29, 1.30

[Ondrej Vasik]

Author: ovasik

Update of /cvs/pkgs/rpms/ncompress/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31559

Modified Files:
	ncompress-4.2.4-make.patch ncompress.spec 
Log Message:
 do patch original Makefile.def instead of creating new Makefile

ncompress-4.2.4-make.patch:
 Makefile.def |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: ncompress-4.2.4-make.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ncompress/devel/ncompress-4.2.4-make.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ncompress-4.2.4-make.patch	9 Sep 2004 09:00:28 -0000	1.1
+++ ncompress-4.2.4-make.patch	23 Feb 2010 12:56:11 -0000	1.2
@@ -1,60 +1,37 @@
---- ncompress-4.2.4/Makefile.orig	Thu Oct 31 10:38:46 1996
-+++ ncompress-4.2.4/Makefile	Thu Oct 31 10:39:12 1996
-@@ -0,0 +1,57 @@
-+# Makefile generated by build.
-+
-+# C complier
+diff -urNp ncompress-4.2.4-orig/Makefile.def ncompress-4.2.4/Makefile.def
+--- ncompress-4.2.4-orig/Makefile.def	1992-10-28 12:10:52.000000000 +0100
++++ ncompress-4.2.4/Makefile.def	2010-02-23 13:38:39.000000000 +0100
+@@ -1,13 +1,13 @@
+ # Makefile generated by build.
+ 
+ # C complier
+-CC=cc
 +CC=cc $(RPM_OPT_FLAGS)
-+
-+# Install directory for binarys
+ 
+ # Install directory for binarys
+-BINDIR=/usr/local/bin
 +BINDIR=/usr/bin
-+
-+# Install directory for manual
+ 
+ # Install directory for manual
+-MANDIR=/usr/local/man/man1
 +MANDIR=/usr/man/man1
-+
-+# compiler options:
-+# options is a collection of:
-+#
-+#	-DAMIGA=1					Amiga support.
-+#	-DNOFUNCDEF=1				Disable libary function definitions in
-+#								compress42.c
-+#	-DDIRENT=1					Use dirent.h
-+#	-DSYSDIR=1					Use sys/dir.h
-+#	-DLSTAT=1					Use lstat for finding symlinks.
-+#	-DUTIME_H=1					Use utime.h
-+#	-DUSERMEM=<size>			Availble memory for compress (default 800k).
-+#	-DREGISTERS=<nbr>			Number of registers (default 2).
-+#	-DIBUFSIZ=<size>			Input buffer size (default BUFSIZ).
-+#	-DOBUFSIZ=<size>			Output buffer size (default BUFSIZ)
-+#	-DBYTEORDER=<order>			Byte order (default: unknown).
-+#	-DNOALLIGN=1				Data word allignment (default: yes).
-+#	-DDEF_ERRNO=1				Define error (not defined in errno.h).
-+#	-DMAXSEG_64K=1 -BITS=16		Support segment processsor like 80286.
-+#
+ 
+ # compiler options:
+ # options is a collection of:
+@@ -28,14 +28,14 @@ MANDIR=/usr/local/man/man1
+ #	-DDEF_ERRNO=1				Define error (not defined in errno.h).
+ #	-DMAXSEG_64K=1 -BITS=16		Support segment processsor like 80286.
+ #
+-options= -DDIRENT=1 -DUSERMEM=800000 -DREGISTERS=3
 +options= -DDIRENT=1 -DSYSDIR=1 -DUTIME_H=1 -DUSERMEM=800000 -DREGISTERS=20 -DIBUFSIZ=1024 -DOBUFSIZ=1024 -DBYTEORDER=$(ENDIAN)
-+
-+# libary options
-+LBOPT=
-+
-+
-+compress:	Makefile compress42.c patchlevel.h
+ 
+ # libary options
+ LBOPT=
+ 
+ 
+ compress:	Makefile compress42.c patchlevel.h
+-	$(CC) -o compress $(options) "-DCOMPILE_DATE=\"`date`\"" compress42.c $(LBOPT)
 +	 $(CC) -o compress  $(options) "-DCOMPILE_DATE=\"`date`\"" compress42.c 
-+
-+install:	compress
-+		[ -f $(BINDIR)/compress ] && \
-+			{ rm -f $(BINDIR)/compress.old ; \
-+	  		mv $(BINDIR)/compress $(BINDIR)/compress.old ; }
-+		rm -f $(BINDIR)/uncompress $(BINDIR)/zcat
-+		cp compress $(BINDIR)/compress
-+		strip $(BINDIR)/compress
-+		rm -f $(BINDIR)/uncompress
-+		ln $(BINDIR)/compress $(BINDIR)/uncompress
-+		rm -f $(BINDIR)/zcat
-+		ln -f $(BINDIR)/compress $(BINDIR)/zcat
-+		cp zcmp zdiff zmore $(BINDIR)/.
-+		chmod 0755 $(BINDIR)/compress $(BINDIR)/zcmp $(BINDIR)/zdiff $(BINDIR)/zmore
-+		cp compress.1 zcmp.1 zmore.1 $(MANDIR)/.
-+		chmod 0644 $(MANDIR)/compress.1 $(MANDIR)/zcmp.1 $(MANDIR)/zmore.1
-+
-+cleanup:
-+		rm -f compress compress.def comp.log
+ 
+ install:	compress
+ 		[ -f $(BINDIR)/compress ] && \


Index: ncompress.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncompress/devel/ncompress.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- ncompress.spec	25 Jul 2009 15:52:31 -0000	1.29
+++ ncompress.spec	23 Feb 2010 12:56:11 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: Fast compression and decompression utilities
 Name: ncompress
 Version: 4.2.4
-Release: 53%{?dist}
+Release: 54%{?dist}
 License: Public Domain
 Group: Applications/File
 URL:    http://ncompress.sourceforge.net/
@@ -37,6 +37,7 @@ which are compatible with the original U
 %patch5 -p1 -b .bssUnderflow
 %patch6 -p1 -b .endians
 %patch7 -p1 -b .malloccheck
+mv Makefile.def Makefile
 
 %build
 
@@ -73,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc LZW.INFO README
 
 %changelog
+* Tue Feb 23 2010 Ondrej Vasik <ovasik at redhat.com> - 4.2.4-54
+- do patch original Makefile.def instead of creating new Makefile
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.4-53
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild