Author: cactus Date: Mon Oct 26 00:02:24 2009 GMT Module: packages Tag: HEAD ---- Log message: - up to 3.5 - disabled rpmdumpheader bin - problems with rpm headers - BR: zlib-static - dont build just use system one
---- Files affected: packages/deltarpm: deltarpm.spec (1.5 -> 1.6) , deltarpm-3.4-pld.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: packages/deltarpm/deltarpm.spec diff -u packages/deltarpm/deltarpm.spec:1.5 packages/deltarpm/deltarpm.spec:1.6 --- packages/deltarpm/deltarpm.spec:1.5 Thu Jan 10 21:20:59 2008 +++ packages/deltarpm/deltarpm.spec Mon Oct 26 01:02:18 2009 @@ -2,20 +2,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 @@ -32,15 +30,13 @@ %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 @@ -64,6 +60,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.6 2009/10/26 00:02:18 cactus +- up to 3.5 +- disabled rpmdumpheader bin - problems with rpm headers +- BR: zlib-static - dont build just use system one + Revision 1.5 2008/01/10 20:20:59 qboosh - typos ================================================================ Index: packages/deltarpm/deltarpm-3.4-pld.patch diff -u packages/deltarpm/deltarpm-3.4-pld.patch:1.1 packages/deltarpm/deltarpm-3.4-pld.patch:1.2 --- packages/deltarpm/deltarpm-3.4-pld.patch:1.1 Sun Sep 9 17:08:11 2007 +++ packages/deltarpm/deltarpm-3.4-pld.patch Mon Oct 26 01:02:18 2009 @@ -10,3 +10,13 @@ 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) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/deltarpm/deltarpm.spec?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/deltarpm/deltarpm-3.4-pld.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
