rpms/deltarpm/devel .cvsignore, 1.8, 1.9 deltarpm-system-zlib.patch, 1.3, 1.4 deltarpm.spec, 1.35, 1.36 import.log, 1.6, 1.7 sources, 1.9, 1.10
Jonathan Dieter
jdieter at fedoraproject.org
Thu Jan 21 13:10:40 UTC 2010
Author: jdieter
Update of /cvs/pkgs/rpms/deltarpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8246/devel
Modified Files:
.cvsignore deltarpm-system-zlib.patch deltarpm.spec import.log
sources
Log Message:
Make rpmio link explicit
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deltarpm/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore 13 Sep 2009 14:32:52 -0000 1.8
+++ .cvsignore 21 Jan 2010 13:10:40 -0000 1.9
@@ -1 +1 @@
-deltarpm-git-20090913.tar.bz2
+deltarpm-git-20100121.tar.bz2
deltarpm-system-zlib.patch:
Makefile | 27 +++++++++++++++------------
cfile.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++------------
2 files changed, 63 insertions(+), 24 deletions(-)
Index: deltarpm-system-zlib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/deltarpm/devel/deltarpm-system-zlib.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- deltarpm-system-zlib.patch 1 Oct 2009 04:57:27 -0000 1.3
+++ deltarpm-system-zlib.patch 21 Jan 2010 13:10:40 -0000 1.4
@@ -1,69 +1,7 @@
-Index: deltarpm-git-20090913/Makefile
-===================================================================
---- deltarpm-git-20090913.orig/Makefile
-+++ deltarpm-git-20090913/Makefile
-@@ -4,9 +4,12 @@ libdir=$(prefix)/lib
- mandir=$(prefix)/man
- rpmdumpheader=$(bindir)/rpmdumpheader
- zlibdir=zlib-1.2.2.f-rsyncable
-+zlibbundled=$(zlibdir)/libz.a
-+zlibldflags=$(zlibbundled)
-+zlibcppflags=-I$(zlibdir)
- 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)\" $(zlibcppflags)
-+LDLIBS = -lbz2 $(zlibldflags) -llzma
- LDFLAGS =
- PYTHONVERS = $(shell ls /usr/include/python*/Python.h | sed "s|/usr/include/||g"| sed "s|/Python.h||g")
-
-@@ -14,31 +17,31 @@ 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 $(zlibbundled)
-
--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 $(zlibbundled)
-
--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 $(zlibbundled)
-
- 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 $(zlibbundled)
-
--applydeltaiso: applydeltaiso.o util.o md5.o cfile.o $(zlibdir)/libz.a
-+applydeltaiso: applydeltaiso.o util.o md5.o cfile.o $(zlibbundled)
-
--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 $(zlibbundled)
-
--_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 $(zlibbundled)
- 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 $(zlibcppflag) -fPIC -c -o $$ver/deltarpmmodule.o deltarpmmodule.c ;\
-+ $(CC) -o $$ver/$@ $$ver/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so $(LDLIBS); \
- fi; \
- done
-
--$(zlibdir)/libz.a:
-+$(zlibbundled):
- cd $(zlibdir) ; make CFLAGS="-fPIC $(CFLAGS)" libz.a
-
- clean:
-Index: deltarpm-git-20090913/cfile.c
-===================================================================
---- deltarpm-git-20090913.orig/cfile.c
-+++ deltarpm-git-20090913/cfile.c
-@@ -888,8 +888,6 @@ crunread_un(struct cfile *f, void *buf,
+diff -urb deltarpm-git-20100121/cfile.c deltarpm-git-20100121b/cfile.c
+--- deltarpm-git-20100121/cfile.c 2010-01-21 10:20:46.000000000 +0200
++++ deltarpm-git-20100121b/cfile.c 2010-01-21 14:56:45.901755387 +0200
+@@ -888,8 +888,6 @@
}
@@ -72,7 +10,7 @@ Index: deltarpm-git-20090913/cfile.c
int
cfile_detect_rsync(struct cfile *f)
{
-@@ -919,10 +917,22 @@ cfile_detect_rsync(struct cfile *f)
+@@ -919,10 +917,22 @@
}
for (i = 0; i < 2; i++)
{
@@ -95,7 +33,7 @@ Index: deltarpm-git-20090913/cfile.c
{
if (i)
deflateEnd(&cstrm[0]);
-@@ -964,6 +974,23 @@ cfile_detect_rsync(struct cfile *f)
+@@ -964,6 +974,23 @@
{
for (i = 0; i < 2 && !done; i++)
{
@@ -119,7 +57,7 @@ Index: deltarpm-git-20090913/cfile.c
cstrm[i].avail_in = sizeof(dbuf) - dstrm.avail_out;
cstrm[i].next_in = dbuf;
while (cstrm[i].avail_in)
-@@ -971,14 +998,23 @@ cfile_detect_rsync(struct cfile *f)
+@@ -971,14 +998,23 @@
cstrm[i].avail_out = sizeof(cbuf);
cstrm[i].next_out = cbuf;
ret = deflate(&cstrm[i], dret == Z_STREAM_END ? Z_FINISH : Z_NO_FLUSH);
@@ -143,7 +81,7 @@ Index: deltarpm-git-20090913/cfile.c
if (memcmp(b + p[i], cbuf, sizeof(cbuf) - cstrm[i].avail_out))
{
comp = i ? CFILE_COMP_GZ: CFILE_COMP_GZ_RSYNC;
-@@ -987,6 +1023,14 @@ cfile_detect_rsync(struct cfile *f)
+@@ -987,6 +1023,14 @@
}
p[i] += sizeof(cbuf) - cstrm[i].avail_out;
}
@@ -158,7 +96,7 @@ Index: deltarpm-git-20090913/cfile.c
if (cstrm[i].avail_in && ret == BZ_STREAM_END)
{
comp = i ? CFILE_COMP_GZ: CFILE_COMP_GZ_RSYNC;
-@@ -1011,7 +1055,9 @@ cfile_detect_rsync(struct cfile *f)
+@@ -1011,7 +1055,9 @@
b = b2;
}
deflateEnd(&cstrm[0]);
@@ -168,7 +106,7 @@ Index: deltarpm-git-20090913/cfile.c
inflateEnd(&dstrm);
f->bufN = -1;
f->strm.gz.avail_in = 0;
-@@ -1053,16 +1099,6 @@ cfile_detect_rsync(struct cfile *f)
+@@ -1053,16 +1099,6 @@
return comp == -1 ? -1 : 0;
}
@@ -185,3 +123,63 @@ Index: deltarpm-git-20090913/cfile.c
/*****************************************************************
* our open function
*/
+diff -urb deltarpm-git-20100121/Makefile deltarpm-git-20100121b/Makefile
+--- deltarpm-git-20100121/Makefile 2010-01-21 10:20:46.000000000 +0200
++++ deltarpm-git-20100121b/Makefile 2010-01-21 14:56:55.906756549 +0200
+@@ -4,9 +4,12 @@
+ mandir=$(prefix)/man
+ rpmdumpheader=$(bindir)/rpmdumpheader
+ zlibdir=zlib-1.2.2.f-rsyncable
++zlibbundled=$(zlibdir)/libz.a
++zlibldflags=$(zlibbundled)
++zlibcppflags=-I$(zlibdir)
+ 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)\" $(zlibcppflags)
++LDLIBS = -lbz2 $(zlibldflags) -llzma
+ LDFLAGS =
+ PYTHONVERS = $(shell ls /usr/include/python*/Python.h | sed "s|/usr/include/||g"| sed "s|/Python.h||g")
+
+@@ -14,31 +17,31 @@
+
+ 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 $(zlibbundled)
+
+-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 $(zlibbundled)
+
+-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 $(zlibbundled)
+
+ rpmdumpheader: rpmdumpheader.o
+ $(CC) $(LDFLAGS) $^ -lrpm -lrpmio -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 $(zlibbundled)
+
+-applydeltaiso: applydeltaiso.o util.o md5.o cfile.o $(zlibdir)/libz.a
++applydeltaiso: applydeltaiso.o util.o md5.o cfile.o $(zlibbundled)
+
+-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 $(zlibbundled)
+
+-_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 $(zlibbundled)
+ 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 $(zlibcppflag) -fPIC -c -o $$ver/deltarpmmodule.o deltarpmmodule.c ;\
++ $(CC) -o $$ver/$@ $$ver/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so $(LDLIBS); \
+ fi; \
+ done
+
+-$(zlibdir)/libz.a:
++$(zlibbundled):
+ cd $(zlibdir) ; make CFLAGS="-fPIC $(CFLAGS)" libz.a
+
+ clean:
Index: deltarpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deltarpm/devel/deltarpm.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- deltarpm.spec 9 Dec 2009 03:46:39 -0000 1.35
+++ deltarpm.spec 21 Jan 2010 13:10:40 -0000 1.36
@@ -3,16 +3,16 @@
Summary: Create deltas between rpms
Name: deltarpm
Version: 3.5
-Release: 0.5.20090913git%{?dist}
+Release: 0.6.20100121git%{?dist}
License: BSD
Group: System Environment/Base
URL: http://gitorious.org/deltarpm/deltarpm
# Generate source by doing:
# git clone git://gitorious.org/deltarpm/deltarpm
# cd deltarpm
-# git archive --format=tar --prefix="deltarpm-git-20090913" f716bb7 | \
-# bzip2 > deltarpm-git-20090831.1.tar.bz2
-Source: %{name}-git-20090913.tar.bz2
+# git archive --format=tar --prefix="deltarpm-git-20100121/" f716bb7 | \
+# bzip2 > deltarpm-git-20100121.tar.bz2
+Source: %{name}-git-20100121.tar.bz2
# Build with system zlib
Patch0: deltarpm-system-zlib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,7 +52,7 @@ Requires: deltarpm = %{version}-%{releas
This package contains python bindings for deltarpm.
%prep
-%setup -q -n %{name}-git-20090913
+%setup -q -n %{name}-git-20100121
# Build with system zlib
%patch0 -p1 -b .zlib
@@ -104,6 +104,9 @@ This package contains python bindings fo
%{python_sitearch}/*
%changelog
+* Thu Jan 21 2010 Jonathan Dieter <jdieter at lesbg.com> - 3.5-0.6.20100121git
+- Make rpmio link explicit
+
* Tue Dec 08 2009 Jesse Keating <jkeating at redhat.com> - 3.5-0.5.20090913git
- Rebuild for new rpm
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/deltarpm/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log 13 Sep 2009 14:32:53 -0000 1.6
+++ import.log 21 Jan 2010 13:10:40 -0000 1.7
@@ -4,3 +4,4 @@ deltarpm-3_5-0_git_20090729_fc11:HEAD:de
deltarpm-3_5-0_git_20090831_fc11:HEAD:deltarpm-3.5-0.git.20090831.fc11.src.rpm:1251726064
deltarpm-3_5-0_git_20090831_1_fc11:HEAD:deltarpm-3.5-0.git.20090831.1.fc11.src.rpm:1251728709
deltarpm-3_5-0_git_20090913_fc11:HEAD:deltarpm-3.5-0.git.20090913.fc11.src.rpm:1252852324
+deltarpm-3_5-0_6_20100121git_fc12:HEAD:deltarpm-3.5-0.6.20100121git.fc12.src.rpm:1264079353
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deltarpm/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources 13 Sep 2009 14:32:53 -0000 1.9
+++ sources 21 Jan 2010 13:10:40 -0000 1.10
@@ -1 +1 @@
-d83662fbd6745b3eab85543d2ac7b6b4 deltarpm-git-20090913.tar.bz2
+d2a6fddaecb66503afdd18e8e6f7d4c9 deltarpm-git-20100121.tar.bz2
More information about the scm-commits
mailing list