[packages/dpkg] - updated to 1.17.1 - added md5 patch (fixes build in presence of libmd5-rfc)

qboosh qboosh at pld-linux.org
Sat Aug 24 09:48:57 CEST 2013


commit 42d55ea9914236530ce243ce9fc2a7f74f130597
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Aug 24 09:47:52 2013 +0200

    - updated to 1.17.1
    - added md5 patch (fixes build in presence of libmd5-rfc)

 dpkg-md5.patch | 11 +++++++++++
 dpkg.spec      | 16 +++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)
---
diff --git a/dpkg.spec b/dpkg.spec
index c3a1cb8..171cea2 100644
--- a/dpkg.spec
+++ b/dpkg.spec
@@ -2,18 +2,20 @@
 Summary:	Package maintenance system for Debian Linux
 Summary(pl.UTF-8):	Program do obsługi pakietów Debiana
 Name:		dpkg
-Version:	1.16.10
-Release:	2
+Version:	1.17.1
+Release:	1
 License:	GPL v2+
 Group:		Applications/File
 Source0:	ftp://ftp.debian.org/debian/pool/main/d/dpkg/%{name}_%{version}.tar.xz
-# Source0-md5:	a20a06a5272717274a8b009368f237da
+# Source0-md5:	ece3ae87a099158c17bde95c0036c575
+Patch0:		%{name}-md5.patch
 URL:		http://packages.debian.org/search?keywords=dpkg
 BuildRequires:	bzip2-devel
-BuildRequires:	gettext-devel >= 0.18
+BuildRequires:	gettext-devel >= 0.18.2
 BuildRequires:	libselinux-devel
 BuildRequires:	perl-tools-pod
 BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 1.654
 BuildRequires:	rpm-perlprov
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
@@ -49,12 +51,12 @@ Biblioteka i pliki nagłówkowe dpkg.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \
 	PO4A="true" \
 	--disable-dselect \
-	--disable-install-info \
 	--disable-silent-rules \
 	--disable-start-stop-daemon \
 	--with-admindir=/var/lib/%{name}
@@ -128,6 +130,10 @@ rm -rf $RPM_BUILD_ROOT
 %lang(fr) %{_mandir}/fr/man8/dpkg-*.8*
 %lang(fr) %{_mandir}/fr/man8/update-alternatives.8*
 %lang(hu) %{_mandir}/hu/man5/dpkg.cfg.5*
+%lang(it) %{_mandir}/it/man1/dpkg*.1*
+%lang(it) %{_mandir}/it/man5/deb*.5*
+%lang(it) %{_mandir}/it/man5/dpkg.cfg.5*
+%lang(it) %{_mandir}/it/man8/update-alternatives.8*
 %lang(ja) %{_mandir}/ja/man1/dpkg*.1*
 %lang(ja) %{_mandir}/ja/man5/deb*.5*
 %lang(ja) %{_mandir}/ja/man5/dpkg.cfg.5*
diff --git a/dpkg-md5.patch b/dpkg-md5.patch
new file mode 100644
index 0000000..1bb3f4f
--- /dev/null
+++ b/dpkg-md5.patch
@@ -0,0 +1,11 @@
+--- dpkg-1.17.1/lib/dpkg/buffer.c.orig	2013-07-28 11:59:57.000000000 +0200
++++ dpkg-1.17.1/lib/dpkg/buffer.c	2013-08-24 09:31:12.908038975 +0200
+@@ -26,7 +26,7 @@
+ #include <sys/types.h>
+ 
+ #include <errno.h>
+-#include <md5.h>
++#include "../compat/md5.h"
+ #include <string.h>
+ #include <unistd.h>
+ #include <stdlib.h>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dpkg.git/commitdiff/42d55ea9914236530ce243ce9fc2a7f74f130597



More information about the pld-cvs-commit mailing list