- fix db version from bad commit, disable apidocs (no graphviz)

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index 21b6ed9a28755a00addc5b8b20d72b714f482512..c7232e03fa00b66e86032c3dee378703c6c11aba 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -16,7 +16,7 @@
 #
 # Conditional build:
 %bcond_with    static          # build static rpm+rpmi
-%bcond_without apidocs         # don't generate documentation with doxygen
+%bcond_with    apidocs         # don't generate documentation with doxygen
 %bcond_with    internal_db     # internal db (db 4.5.20)
 %bcond_with    autoreqdep      # autogenerate package name deps in addition to sonames/perl(X)
 %bcond_without nptl            # internal db: don't use process-shared POSIX mutexes (NPTL provides full interface)
@@ -28,7 +28,7 @@
 
 # versions of required libraries
 %define        reqdb_pkg       db4.5
-%define        reqdb_ver       4.5.20
+%define        reqdb_ver       4.5.20.2
 %define        reqpopt_ver     1.10.8
 %define        beecrypt_ver    2:4.1.2-4
 %define        sover           4.5
@@ -42,7 +42,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       4.5
-Release:       70
+Release:       77
 License:       LGPL
 Group:         Base
 Source0:       %{name}-%{version}.tar.gz
@@ -166,6 +166,8 @@ Patch105:   %{name}-am.patch
 Patch106:      %{name}-automake_1.12.patch
 Patch107:      %{name}-debugedit-dwarf4.patch
 Patch108:      %{name}-changelog_order_check_nonfatal.patch
+Patch109:      %{name}-installplatform.patch
+Patch110:      %{name}-xz.patch
 URL:           http://rpm5.org/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake >= 1.4
@@ -508,7 +510,7 @@ Summary(ru.UTF-8):  Скрипты и утилиты, необходимые дл
 Summary(uk.UTF-8):     Скрипти та утиліти, необхідні для побудови пакетів
 Group:         Applications/File
 Requires(pretrans):    findutils
-Requires:      %{name}-build-macros >= 1.636
+Requires:      %{name}-build-macros >= 1.656
 Requires:      %{name}-utils = %{version}-%{release}
 Requires:      /bin/id
 Requires:      awk
@@ -783,6 +785,8 @@ install %{SOURCE13} scripts/perl.prov
 %patch106 -p1
 %patch107 -p1
 %patch108 -p1
+%patch109 -p1
+%patch110 -p1
 
 mv -f po/{sr,sr@Latn}.po
 rm -rf sqlite zlib popt
@@ -1166,7 +1170,7 @@ rm -f $RPM_BUILD_ROOT%{py_sitedir}/rpm/*.{la,a,py}
 %{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
 %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/RPM.pm
 %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/RPM/.packlist
-%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/RPM/RPM.bs
+#%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/RPM/RPM.bs
 %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/RPM/RPM.so
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man3/RPM.3pm
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/{,ja,pl}/man8/rpm{cache,graph}.8