- up to 3.5

- disabled rpmdumpheader bin - problems with rpm headers
- BR: zlib-static - dont build just use system one

Changed files:
    deltarpm-3.4-pld.patch -> 1.2
    deltarpm.spec -> 1.6

diff --git a/deltarpm-3.4-pld.patch b/deltarpm-3.4-pld.patch
index 2b827caa0040978c1a78e75497abfa78de31ac14..a9e87bf059902b39680b428d6712567ecc44120c 100644 (file)
--- a/deltarpm-3.4-pld.patch
+++ b/deltarpm-3.4-pld.patch
@@ -10,3 +10,13 @@ diff -ruN deltarpm-3.4/Makefile deltarpm-3.4.new/Makefile
  rpmdumpheader=$(bindir)/rpmdumpheader
  zlibdir=zlib-1.2.2.f-rsyncable
  CFLAGS = -O2 -Wall -g
+--- deltarpm-3.5/Makefile.orig 2009-10-26 00:53:55.000000000 +0100
++++ deltarpm-3.5/Makefile      2009-10-26 00:54:50.000000000 +0100
+@@ -38,7 +38,6 @@
+       install -m 755 makedeltarpm  $(DESTDIR)$(bindir)
+       install -m 755 applydeltarpm $(DESTDIR)$(bindir)
+       install -m 755 combinedeltarpm $(DESTDIR)$(bindir)
+-      install -m 755 rpmdumpheader $(DESTDIR)$(rpmdumpheader)
+       install -m 755 makedeltaiso $(DESTDIR)$(bindir)
+       install -m 755 applydeltaiso $(DESTDIR)$(bindir)
+       install -m 755 fragiso $(DESTDIR)$(bindir)

diff --git a/deltarpm.spec b/deltarpm.spec
index 02a74d69b26318156234ded8ff9cce4a22339c13..f9b7c95adf420e88d9822c22e761e2bd90623b3e 100644 (file)
--- a/deltarpm.spec
+++ b/deltarpm.spec
@@ -1,20 +1,18 @@
 Summary:       Create deltas between rpms
 Summary(pl.UTF-8):     Generowanie różnic między pakietami rpm
 Name:          deltarpm
-Version:       3.4
+Version:       3.5
 Release:       1
 License:       BSD
 Group:         Base
 Source0:       ftp://ftp.suse.com/pub/projects/deltarpm/%{name}-%{version}.tar.bz2
-# Source0-md5:  cac779a18a1bc256fb6497526a83ac82
-Patch0:                %{name}-3.4-multilib-workaround.patch
-Patch1:                %{name}-3.4-multilib-include-colored.patch
-Patch2:                %{name}-3.4-prelink-bugfix.patch
-Patch3:                %{name}-3.4-no-skip-doc.patch
-Patch4:                %{name}-3.4-pld.patch
+# Source0-md5: df656d5cbba98e4cc1fc8e18a31f1f3b
+Patch0:                %{name}-3.4-no-skip-doc.patch
+Patch1:                %{name}-3.4-pld.patch
 URL:           http://www.novell.com/products/linuxpackages/professional/deltarpm.html
 BuildRequires: bzip2-devel
 BuildRequires: rpm-devel
+BuildRequires: zlib-static
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -31,15 +29,13 @@ deltarpm obsługuje także już zainstalowane pakiety.
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
-%{__make} \
-       CFLAGS="%{rpmcflags} -I/usr/include/rpm" \
+# fix rpmdumpheader
+%{__make} makedeltarpm applydeltarpm makedeltaiso applydeltaiso combinedeltarpm fragiso \
+       CFLAGS="%{rpmcflags} -I/usr/include/rpm" zlibdir=%{_libdir}\
        CC="%{__cc}"
 
 %install