commit 803d1305bed1f893762c2f6e7de6b3c47c3328f9
Author: Elan Ruusamäe <[email protected]>
Date: Sun Feb 1 13:31:40 2015 +0200
up to 3.6 release
deltarpm-rpm5.patch | 19 ++++++++++---------
deltarpm.spec | 11 +++++------
2 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/deltarpm.spec b/deltarpm.spec
index 5ccdd72..55dea26 100644
--- a/deltarpm.spec
+++ b/deltarpm.spec
@@ -1,14 +1,12 @@
-%define subver 20110223
-%define rel 5
Summary: Create deltas between rpms
Summary(pl.UTF-8): Generowanie różnic między pakietami rpm
Name: deltarpm
Version: 3.6
-Release: 0.%{subver}git.%{rel}
+Release: 1
License: BSD
Group: Base
-Source0:
http://pkgs.fedoraproject.org/repo/pkgs/deltarpm/%{name}-git-%{subver}.tar.bz2/70f8884be63614ca7c3fc888cf20ebc8/deltarpm-git-%{subver}.tar.bz2
-# Source0-md5: 70f8884be63614ca7c3fc888cf20ebc8
+Source0:
ftp://ftp.suse.com/pub/projects/deltarpm/%{name}-%{version}.tar.bz2
+# Source0-md5: 2cc2690bd1088cfc3238c25e59aaaec1
Patch0: %{name}-3.4-no-skip-doc.patch
Patch1: %{name}-3.4-pld.patch
Patch2: %{name}-rpm5.patch
@@ -62,7 +60,7 @@ Group: Base
This package contains python bindings for deltarpm.
%prep
-%setup -q -n %{name}-git-%{subver}
+%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -108,6 +106,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/fragiso
%attr(755,root,root) %{_bindir}/makedeltaiso
%{_mandir}/man8/applydeltaiso*
+%{_mandir}/man8/fragiso.8*
%{_mandir}/man8/makedeltaiso*
%files -n drpmsync
diff --git a/deltarpm-rpm5.patch b/deltarpm-rpm5.patch
index 97abece..e7a1d61 100644
--- 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/Makefile 2015-02-01 13:27:11.084208113 +0200
++++ deltarpm-3.6/Makefile 2015-02-01 13:26:31.965516931 +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,13 +38,13 @@
+ $(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) $(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
@@ -54,7 +55,7 @@
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)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/deltarpm.git/commitdiff/803d1305bed1f893762c2f6e7de6b3c47c3328f9
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
