- cosmetics

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index dda8a547a7ffff22a68c82283c5c49afe887d218..df189f91f19ad22bfd5d1fc6f4b16a4410fa9aa7 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -52,7 +52,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       5.4.10
-Release:       18
+Release:       24
 License:       LGPL
 Group:         Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
@@ -88,6 +88,7 @@ Source23:     rpm.noautoreqdep
 Source24:      rpm.noautoreqfiles
 Source25:      %{name}-php-requires.php
 Source26:      rpmdb_checkversion.c
+Source27:      macros.lang
 Patch0:                %{name}-branch.patch
 Patch1:                %{name}-man_pl.patch
 Patch2:                %{name}-popt-aliases.patch
@@ -142,6 +143,8 @@ Patch50:    %{name}-dont-treat-gstreamer-modules-as-font.patch
 Patch51:       %{name}-gst-inspect-typo.patch
 Patch52:       %{name}-null-term-ascii-digest.patch
 Patch53:       %{name}-lua-enable-extra-libs.patch
+Patch54:       %{name}-fix-filedigests-verify.patch
+Patch55:       %{name}-disable-hmac-verify.patch
 
 # Patches imported from Mandriva
 
@@ -259,7 +262,11 @@ BuildRequires:     elfutils-devel >= 0.108
 BuildRequires: gettext-devel >= 0.11.4-2
 %{?with_keyutils:BuildRequires:        keyutils-devel}
 BuildRequires: libmagic-devel
-%{?with_selinux:BuildRequires: libselinux-devel >= 1.18}
+%if %{with selinux}
+BuildRequires: libselinux-devel >= 2.1.0
+BuildRequires: libsepol-devel >= 2.1.0
+BuildRequires: libsemanage-devel >= 2.1.0
+%endif
 # needed only for AM_PROG_CXX used for CXX substitution in rpm.macros
 BuildRequires: libstdc++-devel
 BuildRequires: libtool >= 1:1.4.2-9
@@ -292,7 +299,11 @@ BuildRequires:     bzip2-static >= 1.0.2-17
 BuildRequires: elfutils-static
 BuildRequires: glibc-static >= 2.2.94
 BuildRequires: libmagic-static
-%{?with_selinux:BuildRequires: libselinux-static >= 1.18}
+%if %{with selinux}
+BuildRequires: libselinux-static >= 2.1.0
+BuildRequires: libsepol-static >= 2.1.0
+BuildRequires: libsemanage-static >= 2.1.0
+%endif
 BuildRequires: popt-static >= %{reqpopt_ver}
 BuildRequires: zlib-static
 %endif
@@ -406,7 +417,7 @@ Group:              Libraries
 Requires:      beecrypt >= %{beecrypt_ver}
 %{?with_db:Requires:   %{reqdb_pkg} >= %{reqdb_ver}}
 Requires:      libmagic >= 1.15-2
-%{?with_selinux:Requires:      libselinux >= 1.18}
+%{?with_selinux:Requires:      libselinux >= 2.1.0}
 Requires:      popt >= %{reqpopt_ver}
 %{?with_sqlite:Requires:       sqlite3 >= %{sqlite_build_version}}
 Obsoletes:     rpm-libs
@@ -821,6 +832,8 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch51 -p1
 %patch52 -p0
 %patch53 -p1
+%patch54 -p1
+%patch55 -p1
 
 %patch1000 -p1
 %patch1001 -p1
@@ -904,7 +917,9 @@ sed -i \
        %{!?with_apidocs:--without-apidocs} \
        %{?with_python:--with-python=%{py_ver} --with-python-lib-dir=%{py_sitedir}} \
        %{!?with_python:--without-python} \
-       --with%{!?with_selinux:out}-selinux \
+       --with-selinux=%{!?with_selinux:no}%{?with_selinux:external} \
+       --with-sepol=%{!?with_selinux:not}%{?with_selinux:external} \
+       --with-semanage=%{!?with_selinux:no}%{?with_selinux:external} \
        --with-libelf \
        --with-zlib=external \
        --with-bzip2=external \
@@ -1081,6 +1096,7 @@ install %{SOURCE15} $RPM_BUILD_ROOT%{_bindir}/banner.sh
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo
 
 install %{SOURCE18} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros
+install %{SOURCE27} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.lang
 install %{SOURCE19} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautocompressdoc
 install %{SOURCE20} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprov
 install %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprovfiles
@@ -1186,6 +1202,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %attr(755,root,root) /bin/rpm
 
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rpm/macros
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rpm/macros.lang
 %dir %{_sysconfdir}/rpm/sysinfo
 # these are ok to be replaced
 %config %verify(not md5 mtime size) %{_sysconfdir}/rpm/sysinfo/*
@@ -1283,6 +1300,10 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %attr(755,root,root) %{_rpmlibdir}/bin/rpmcmp
 %attr(755,root,root) %{_rpmlibdir}/bin/rpmdeps
 %attr(755,root,root) %{_rpmlibdir}/bin/rpmdigest
+%if %{with selinux}
+%attr(755,root,root) %{_rpmlibdir}/bin/semodule
+%attr(755,root,root) %{_rpmlibdir}/bin/spooktool
+%endif
 %if %{without system_lua}
 %attr(755,root,root) %{_rpmlibdir}/bin/lua
 %attr(755,root,root) %{_rpmlibdir}/bin/luac