- -build R: macros r1.514 %addusertogroup with -q (MISSINGOK behaviour); rel 15

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index 8ee10c88e125649d92fa99d09ebd9fb3c1d30661..1d189c102a2bf1d6445308a2cb919069d08b6f27 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -51,7 +51,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       4.5
-Release:       9
+Release:       15
 License:       LGPL
 Group:         Base
 Source0:       %{name}-%{version}.tar.gz
@@ -77,6 +77,8 @@ Source16:     %{name}-macros.java
 Source17:      %{name}-java-requires
 # http://svn.pld-linux.org/banner.sh/
 Source18:      banner.sh
+Source19:      %{name}-macros.gstreamer
+Patch1000:     %{name}-new-debuginfo.patch
 Patch1067:     %{name}-disable-features.patch
 Patch1070:     %{name}-rpmrc-ac.patch
 #Patch0:       %{name}-pl.po.patch
@@ -156,6 +158,9 @@ Patch86:    %{name}-rpmv3-support.patch
 Patch87:       %{name}-mono.patch
 Patch88:       %{name}-poptexecpath.patch
 Patch89:       %{name}-lzma-compress-level.patch
+Patch90:       %{name}-gstreamer.patch
+Patch91:       %{name}-gendiff.patch
+Patch92:       %{name}-set-failed-on-reopen.patch
 URL:           http://rpm5.org/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake >= 1.4
@@ -173,7 +178,7 @@ BuildRequires:      libtool >= 1:1.4.2-9
 BuildRequires: libxml2-devel
 BuildRequires: neon-devel >= 0.25.5
 %endif
-BuildRequires: ossp-uuid-devel >= 1.6.2-4
+BuildRequires: ossp-uuid-devel >= 1.6.2-6
 BuildRequires: patch >= 2.2
 BuildRequires: popt-devel >= %{reqpopt_ver}
 %{?with_python:BuildRequires:  python-devel >= 1:2.3}
@@ -498,7 +503,7 @@ Summary(ru.UTF-8):  Скрипты и утилиты, необходимые дл
 Summary(uk.UTF-8):     Скрипти та утиліти, необхідні для побудови пакетів
 Group:         Applications/File
 Requires(pretrans):    findutils
-Requires:      %{name}-build-macros >= 1.486
+Requires:      %{name}-build-macros >= 1.514
 Requires:      %{name}-utils = %{version}-%{release}
 Requires:      /bin/id
 Requires:      awk
@@ -674,6 +679,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 
 %prep
 %setup -q
+%patch1000 -p1
 #%patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -766,6 +772,9 @@ install %{SOURCE13} scripts/perl.prov
 %patch87 -p1
 %patch88 -p1
 %patch89 -p1
+%patch90 -p1
+%patch91 -p1
+%patch92 -p1
 
 mv -f po/{sr,sr@Latn}.po
 rm -rf sqlite zlib popt
@@ -836,6 +845,7 @@ sed -i -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|' -e 's|@host_cpu
 
 # pass CC and CXX too in case of building with some older configure macro
 # disable perl-RPM2 build, we have it in separate spec
+CPPFLAGS=-I/usr/include/oosp-uuid
 %configure \
        CC="%{__newcc}" \
        CXX="%{__newcxx}" \
@@ -976,6 +986,7 @@ install macros.python       $RPM_BUILD_ROOT%{_rpmlibdir}/macros.python
 install macros.php     $RPM_BUILD_ROOT%{_rpmlibdir}/macros.php
 install macros.mono    $RPM_BUILD_ROOT%{_rpmlibdir}/macros.mono
 install %{SOURCE16}    $RPM_BUILD_ROOT%{_rpmlibdir}/macros.java
+install %{SOURCE19}    $RPM_BUILD_ROOT%{_rpmlibdir}/macros.gstreamer
 
 install %{SOURCE1} doc/manual/groups
 install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree
@@ -1348,6 +1359,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %{_rpmlibdir}/x86_64*
 %endif
 # must be here for "Requires: rpm-*prov" to work
+%{_rpmlibdir}/macros.gstreamer
 %{_rpmlibdir}/macros.java
 %{_rpmlibdir}/macros.mono
 %{_rpmlibdir}/macros.perl