- don't do package names in autorequires

- depend on db4.3
- rel 0.2

Changed files:
    rpm.spec -> 1.632

diff --git a/rpm.spec b/rpm.spec
index a439f112c5da7fcb49923f3d1c92b37426c34a37..1f1408727f34dc961a7fd8eaa00c8ee33edf502c 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -10,7 +10,7 @@
 %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
+%bcond_with    pkgnameinautoreq        # don't put package name in autogenerated dependancy
 %bcond_without python  # don't build python bindings
 %bcond_without selinux # dont enable selinux support
 # force_cc             - force using __cc other than "%{_target_cpu}-pld-linux-gcc"
@@ -19,7 +19,7 @@
 
 %define        snap    20041121
 # versions of required libraries
-%define        reqdb_ver       4.2.50-1
+%define        reqdb_ver       4.3.27-1
 %define        reqpopt_ver     1.10.1
 %define        beecrypt_ver    2:4.1.0
 %define        rpm_macros_rev  1.188
@@ -33,7 +33,7 @@ Summary(uk):  
 Name:          rpm
 %define        sover   4.4
 Version:       4.4.1
-Release:       0.1
+Release:       0.2
 License:       GPL
 Group:         Base
 #Source0:      ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.2.x/%{name}-%{version}.%{snap}.tar.gz
@@ -106,7 +106,7 @@ BuildRequires:      autoconf >= 2.52
 BuildRequires: automake
 BuildRequires: beecrypt-devel >= %{beecrypt_ver}
 BuildRequires: bzip2-devel >= 1.0.1
-BuildRequires: db-devel >= %{reqdb_ver}
+BuildRequires: db4.3-devel >= %{reqdb_ver}
 %{?with_apidocs:BuildRequires: doxygen}
 BuildRequires: elfutils-devel
 BuildRequires: findutils
@@ -129,7 +129,7 @@ BuildRequires:      zlib-devel
 # Require static library only for static build
 BuildRequires: beecrypt-static >= %{beecrypt_ver}
 BuildRequires: bzip2-static >= 1.0.2-5
-BuildRequires: db-static >= %{reqdb_ver}
+BuildRequires: db4.3-static >= %{reqdb_ver}
 BuildRequires: glibc-static >= 2.2.94
 BuildRequires: elfutils-static
 #BuildRequires:        libmagic-static
@@ -213,7 +213,7 @@ RPM - 
 Summary:       RPMs library
 Summary(pl):   Biblioteki RPM-a
 Group:         Libraries
-Requires:      db >= %{reqdb_ver}
+Requires:      db4.3 >= %{reqdb_ver}
 %{?with_selinux:BuildRequires: libselinux >= 1.18}
 Requires:      popt >= %{reqpopt_ver}
 %{?with_distver:Provides:      rpm-lib(distver)}
@@ -238,7 +238,7 @@ Group:              Development/Libraries
 Requires:      %{name}-lib = %{version}-%{release}
 Requires:      beecrypt-devel >= %{beecrypt_ver}
 Requires:      bzip2-devel
-Requires:      db-devel >= %{reqdb_ver}
+Requires:      db4.3-devel >= %{reqdb_ver}
 Requires:      elfutils-devel
 %{?with_selinux:Requires:      libselinux-devel}
 Requires:      popt-devel >= %{reqpopt_ver}
@@ -300,7 +300,7 @@ Group:              Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 Requires:      beecrypt-static >= %{beecrypt_ver}
 Requires:      bzip2-static
-Requires:      db-static >= %{reqdb_ver}
+Requires:      db4.3-static >= %{reqdb_ver}
 Requires:      elfutils-static
 Requires:      popt-static >= %{reqpopt_ver}
 Requires:      zlib-static