- updated to 3.6.3

[packages/deltarpm.git] / deltarpm-rpm5.patch

diff --git a/deltarpm-rpm5.patch b/deltarpm-rpm5.patch
index 97abecee8798d4bb4cc6a0b95466875d7436f858..ca07db9ba7580d92c6b99da9ea38a4671ed61a4f 100644 (file)
--- a/deltarpm-rpm5.patch
+++ b/deltarpm-rpm5.patch
@@ -1,6 +1,6 @@
---- deltarpm-git-20110223/Makefile.orig        2012-08-28 14:36:04.972108891 -0300
-+++ deltarpm-git-20110223/Makefile     2012-08-28 14:36:45.929107787 -0300
-@@ -9,28 +9,33 @@ zlibldflags=$(zlibbundled)
+--- deltarpm-3.6.1/Makefile.orig       2018-05-12 13:26:28.431759384 +0200
++++ deltarpm-3.6.1/Makefile    2018-05-12 13:30:31.665089939 +0200
+@@ -9,9 +9,8 @@
  zlibcppflags=-I$(zlibdir)
  pylibprefix=/
  CFLAGS = -fPIC -O2 -Wall -g
@@ -9,9 +9,10 @@
 -LDFLAGS =
 +CPPFLAGS = -fPIC -DDELTARPM_64BIT -DBSDIFF_NO_SUF -DRPMDUMPHEADER=\"$(rpmdumpheader)\" $(zlibcppflags) $(shell pkg-config --cflags rpm)
 +LIBS = -lbz2 $(zlibldflags) $(shell pkg-config --libs rpm) $(shell pkg-config --libs liblzma)
+ PYTHONS = python python3
  
  all: makedeltarpm applydeltarpm rpmdumpheader makedeltaiso applydeltaiso combinedeltarpm fragiso
- 
+@@ -19,19 +18,25 @@
  python: _deltarpmmodule.so
  
  makedeltarpm: makedeltarpm.o writedeltarpm.o md5.o util.o rpml.o rpmhead.o cpio.o delta.o cfile.o $(zlibbundled)
@@ -37,24 +38,24 @@
 +      $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ $ -o $@ $(LIBS)
  
  _deltarpmmodule.so: readdeltarpm.o rpmhead.o util.o md5.o cfile.o $(zlibbundled)
-       for PY in python python3 ; do \
-@@ -41,13 +46,13 @@ _deltarpmmodule.so: readdeltarpm.o rpmhe
+       for PY in $(PYTHONS) ; do \
+@@ -41,13 +46,13 @@
                        if [ ! -f "python$$PYVER/$@" ]; then \
                                mkdir -p python$$PYVER ;\
-                               $(CC) $(CFLAGS) $$PYCFLAGS $(zlibcppflag) -fPIC -c -o python$$PYVER/deltarpmmodule.o deltarpmmodule.c ;\
--                              $(CC) -o python$$PYVER/$@ python$$PYVER/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so $(LDLIBS) $$PYLDFLAGS; \
-+                              $(CC) -o python$$PYVER/$@ python$$PYVER/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so $(LIBS) $$PYLDFLAGS; \
+                               $(CC) $(CFLAGS) $$PYCFLAGS $(zlibcppflags) -fPIC -c -o python$$PYVER/deltarpmmodule.o deltarpmmodule.c ;\
+-                              $(CC) $(LDFLAGS) -o python$$PYVER/$@ python$$PYVER/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so $(LDLIBS); \
++                              $(CC) $(LDFLAGS) -o python$$PYVER/$@ python$$PYVER/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so $(LIBS) $$PYLDFLAGS; \
                        fi; \
                fi; \
        done
  
  $(zlibbundled):
 -      cd $(zlibdir) ; make CFLAGS="-fPIC $(CFLAGS)" libz.a
-+      cd $(zlibdir) ; make CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" libz.a
++      cd $(zlibdir) ; make CPPFLAGS="$(CPPFLAGS)" CFLAGS="-fPIC $(CFLAGS)" LDFLAGS="$(LDFLAGS)" libz.a
  
  clean:
        rm -f *.o
-@@ -59,7 +64,7 @@ install:
+@@ -59,7 +64,7 @@
        install -m 755 makedeltarpm  $(DESTDIR)$(bindir)
        install -m 755 applydeltarpm $(DESTDIR)$(bindir)
        install -m 755 combinedeltarpm $(DESTDIR)$(bindir)