rpms/deltarpm/devel deltarpm-system-zlib.patch, NONE, 1.1 deltarpm.spec, 1.31, 1.32

[Toshio くらとみ]

Author: toshio

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

Modified Files:
	deltarpm.spec 
Added Files:
	deltarpm-system-zlib.patch 
Log Message:

* Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.5-0.2.20090913git
- Correct prerelease rlease numbering.
- Build against the system zlib, not the bundled library.  This remedies the
  fact that the included zlib is affected by CAN-2005-1849.


deltarpm-system-zlib.patch:
 Makefile |   27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

--- NEW FILE deltarpm-system-zlib.patch ---
Index: deltarpm-git-20090913/Makefile
===================================================================
--- deltarpm-git-20090913.orig/Makefile
+++ deltarpm-git-20090913/Makefile
@@ -3,10 +3,9 @@ bindir=$(prefix)/bin
 libdir=$(prefix)/lib
 mandir=$(prefix)/man
 rpmdumpheader=$(bindir)/rpmdumpheader
-zlibdir=zlib-1.2.2.f-rsyncable
 CFLAGS = -fPIC -O2 -Wall -g
-CPPFLAGS = -fPIC -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\" -I$(zlibdir)
-LDLIBS = -lbz2 $(zlibdir)/libz.a -llzma
+CPPFLAGS = -fPIC -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\" -I.
+LDLIBS = -lbz2 -lz -llzma
 LDFLAGS =
 PYTHONVERS = $(shell ls /usr/include/python*/Python.h | sed "s|/usr/include/||g"| sed "s|/Python.h||g")
 
@@ -14,37 +13,33 @@ all: makedeltarpm applydeltarpm rpmdumph
 
 python: _deltarpmmodule.so
 
-makedeltarpm: makedeltarpm.o writedeltarpm.o md5.o util.o rpml.o rpmhead.o cpio.o delta.o cfile.o $(zlibdir)/libz.a
+makedeltarpm: makedeltarpm.o writedeltarpm.o md5.o util.o rpml.o rpmhead.o cpio.o delta.o cfile.o
 
-applydeltarpm: applydeltarpm.o readdeltarpm.o md5.o sha256.o util.o rpmhead.o cpio.o cfile.o prelink.o $(zlibdir)/libz.a
+applydeltarpm: applydeltarpm.o readdeltarpm.o md5.o sha256.o util.o rpmhead.o cpio.o cfile.o prelink.o
 
-combinedeltarpm: combinedeltarpm.o md5.o util.o rpmhead.o cfile.o readdeltarpm.o writedeltarpm.o $(zlibdir)/libz.a
+combinedeltarpm: combinedeltarpm.o md5.o util.o rpmhead.o cfile.o readdeltarpm.o writedeltarpm.o
 
 rpmdumpheader: rpmdumpheader.o
 	$(CC) $(LDFLAGS) $^ -lrpm -o $@
 
-makedeltaiso: makedeltaiso.o delta.o rpmoffs.o rpmhead.o util.o md5.o cfile.o $(zlibdir)/libz.a
+makedeltaiso: makedeltaiso.o delta.o rpmoffs.o rpmhead.o util.o md5.o cfile.o
 
-applydeltaiso: applydeltaiso.o util.o md5.o cfile.o $(zlibdir)/libz.a
+applydeltaiso: applydeltaiso.o util.o md5.o cfile.o
 
-fragiso: fragiso.o util.o md5.o rpmhead.o cfile.o $(zlibdir)/libz.a
+fragiso: fragiso.o util.o md5.o rpmhead.o cfile.o
 
-_deltarpmmodule.so: readdeltarpm.o rpmhead.o util.o md5.o cfile.o $(zlibdir)/libz.a
+_deltarpmmodule.so: readdeltarpm.o rpmhead.o util.o md5.o cfile.o
 	for ver in $(PYTHONVERS) ; do \
 		if [ ! -f "$$ver/$@" ]; then \
 			mkdir -p $$ver ;\
-			$(CC) $(CFLAGS) -I/usr/include/$$ver -I$(zlibdir) -fPIC -c -o $$ver/deltarpmmodule.o deltarpmmodule.c ;\
-			$(CC) -o $$ver/$@ $$ver/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so $(zlibdir)/libz.a -llzma -lbz2; \
+			$(CC) $(CFLAGS) -I/usr/include/$$ver -fPIC -c -o $$ver/deltarpmmodule.o deltarpmmodule.c ;\
+			$(CC) -o $$ver/$@ $$ver/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so -lz -llzma -lbz2; \
 		fi; \
 	done
 
-$(zlibdir)/libz.a:
-	cd $(zlibdir) ; make CFLAGS="-fPIC $(CFLAGS)" libz.a
-
 clean:
 	rm -f *.o
 	rm -f makedeltarpm applydeltarpm combinedeltarpm rpmdumpheader makedeltaiso applydeltaiso fragiso
-	cd $(zlibdir) ; make clean
 
 install:
 	mkdir -p $(DESTDIR)$(bindir)


Index: deltarpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deltarpm/devel/deltarpm.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- deltarpm.spec	13 Sep 2009 14:32:52 -0000	1.31
+++ deltarpm.spec	30 Sep 2009 16:59:30 -0000	1.32
@@ -3,7 +3,7 @@
 Summary: Create deltas between rpms
 Name: deltarpm
 Version: 3.5
-Release: 0.git.20090913%{?dist}
+Release: 0.2.20090913git%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://gitorious.org/deltarpm/deltarpm
@@ -13,9 +13,12 @@ URL: http://gitorious.org/deltarpm/delta
 # git archive --format=tar --prefix="deltarpm-git-20090913" f716bb7 | \
 # bzip2 > deltarpm-git-20090831.1.tar.bz2
 Source: %{name}-git-20090913.tar.bz2
+# Build with system zlib
+Patch0: deltarpm-system-zlib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: bzip2-devel, xz-devel, rpm-devel, popt-devel
+BuildRequires: zlib-devel
 BuildRequires: python-devel
 
 %description
@@ -50,6 +53,9 @@ This package contains python bindings fo
 
 %prep
 %setup -q -n %{name}-git-20090913
+# Build with system zlib
+%patch0 -p1 -b .zlib
+%{__rm} -rf zlib-1.2.2.f-rsyncable
 
 %build
 %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
@@ -96,6 +102,11 @@ This package contains python bindings fo
 %{python_sitearch}/*
 
 %changelog
+* Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.5-0.2.20090913git
+- Correct prerelease rlease numbering.
+- Build against the system zlib, not the bundled library.  This remedies the
+  fact that the included zlib is affected by CAN-2005-1849.
+
 * Sun Sep 13 2009 Jonathan Dieter <jdieter at lesbg.com> - 3.5-0.git.20090913
 - Merge python error patch upstream