From: twittner <twittner@pld-linux.org>
Date: Sat, 18 Sep 2004 21:14:07 +0000 (+0000)
Subject: - bconded distver patch (default off, agreed with author)
X-Git-Tag: auto/ac/rpm-4_4-0_20040614_0_7~6
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=91eb535c92b382b34cb3058088e3a7c113c11650;hp=3c6f29b639746fdb4174c0649b37670fa7cd2eca

- bconded distver patch (default off, agreed with author)

Changed files:
    rpm.spec -> 1.592
---

diff --git a/rpm.spec b/rpm.spec
index 9d1d296..5c32536 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -5,6 +5,7 @@
 # - after ac drop amd64 patch and make x86_64 generic arch + subarchs amd64 and ia32e
 # 
 # Conditional build:
+%bcond_with	distver # build with distversion field
 %bcond_with	static	# build static rpmi (not supported at the moment)
 %bcond_without	apidocs	# don't generate documentation with doxygen
 %bcond_without	pkgnameinautoreq	# don't put package name in autogenerated dependancy
@@ -449,7 +450,7 @@ Summary(pl):	Biblioteki RPM-a
 Group:		Libraries
 Requires:	db >= %{reqdb_ver}
 Requires:	popt >= %{reqpopt_ver}
-Provides:	rpm-lib(distver)
+%{?with_distver:Provides:	rpm-lib(distver)}
 # avoid SEGV caused by mixed db versions
 Conflicts:	poldek < 0.18.1-16
 
@@ -630,7 +631,7 @@ cat %{SOURCE11} >> macros.in
 %patch44 -p1
 %patch45 -p1
 %patch46 -p1
-%patch47 -p1
+%{?with_distver:%patch47 -p1}
 %patch100 -p1
 %patch3 -p1