X-Git-Url: https://git.tld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=dc7d79af8b4e015ef17908af9244fb255cc3c9df;hp=d5fa02c3e33c4db24f5d3b747ebecbc4a7ce7733;hb=84075475222d896bc30bf83aaa7caeee19bedaea;hpb=95ea8050ba8f39459c4bb98cdd818e3c03eb2a68 diff --git a/rpm.spec b/rpm.spec index d5fa02c..dc7d79a 100644 --- a/rpm.spec +++ b/rpm.spec @@ -34,6 +34,7 @@ #%%define force_cpp '%{_target_cpu}-tld-linux-gcc -E' # versions of required libraries +%define reqdb_pkg db4.5 %define reqdb_ver 4.5.20 %define reqpopt_ver 1.10.8 %define beecrypt_ver 2:4.1.2-4 @@ -48,7 +49,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 4.5 -Release: 61 +Release: 62 License: LGPL Group: Base Source0: %{name}-%{version}.tar.gz @@ -71,6 +72,8 @@ Source17: %{name}-java-requires # http://svn.pld-linux.org/banner.sh/ Source18: banner.sh Source19: %{name}-macros.gstreamer +Source20: macros.php +Source21: %{name}-php-requires.php Patch1000: %{name}-new-debuginfo.patch #Patch1067: %{name}-disable-features.patch #Patch1070: %{name}-rpmrc-ac.patch @@ -109,6 +112,7 @@ Patch35: %{name}-disable-features-ti.patch Patch36: %{name}-debuginfo.patch Patch37: %{name}-doxygen_hack.patch Patch39: %{name}-popt-coreutils.patch +Patch40: %{name}-helperEVR-noassert.patch Patch42: %{name}-old-fileconflicts-behaviour.patch Patch43: %{name}-rpm5-patchset-8637.patch Patch44: %{name}-no-neon.patch @@ -167,6 +171,10 @@ Patch101: %{name}-builddir-readlink.patch Patch102: pythondeps-speedup.patch Patch103: %{name}-lua-exit-chroot-correctly.patch Patch104: %{name}-glob.patch +Patch105: %{name}-am.patch +Patch106: %{name}-automake_1.12.patch +Patch107: %{name}-debugedit-dwarf4.patch +Patch108: %{name}-changelog_order_check_nonfatal.patch URL: http://rpm5.org/ BuildRequires: autoconf >= 2.57 BuildRequires: automake >= 1.4 @@ -205,7 +213,7 @@ BuildRequires: tetex-pdftex # Require static library only for static build BuildRequires: beecrypt-static >= %{beecrypt_ver} BuildRequires: bzip2-static >= 1.0.2-17 -%{!?with_internal_db:BuildRequires: db-static >= %{reqdb_ver}} +%{!?with_internal_db:BuildRequires: %{reqdb_pkg}-static >= %{reqdb_ver}} BuildRequires: elfutils-static BuildRequires: glibc-static >= 2.2.94 %{?with_system_libmagic:BuildRequires: libmagic-static} @@ -323,7 +331,7 @@ Summary: RPMs library Summary(pl.UTF-8): Biblioteki RPM-a Group: Libraries Requires: beecrypt >= %{beecrypt_ver} -%{!?with_internal_db:Requires: db >= %{reqdb_ver}} +%{!?with_internal_db:Requires: %{reqdb_pkg} >= %{reqdb_ver}} %{?with_system_libmagic:Requires: libmagic >= 1.15-2} %{?with_selinux:Requires: libselinux >= 1.18} Requires: ossp-uuid >= 1.6.2-4 @@ -356,7 +364,7 @@ Group: Development/Libraries Requires: %{name}-lib = %{version}-%{release} Requires: beecrypt-devel >= %{beecrypt_ver} Requires: bzip2-devel -%{!?with_internal_db:Requires: db-devel >= %{reqdb_ver}} +%{!?with_internal_db:Requires: %{reqdb_pkg}-devel >= %{reqdb_ver}} Requires: elfutils-devel Requires: keyutils-devel %{?with_system_libmagic:Requires: libmagic-devel} @@ -421,7 +429,7 @@ Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: beecrypt-static >= %{beecrypt_ver} Requires: bzip2-static -%{!?with_internal_db:Requires: db-static >= %{reqdb_ver}} +%{!?with_internal_db:Requires: %{reqdb_pkg}-static >= %{reqdb_ver}} Requires: elfutils-static Requires: keyutils-static %{?with_system_libmagic:Requires: libmagic-static} @@ -513,7 +521,7 @@ Summary(ru.UTF-8): Скрипты и утилиты, необходимые дл Summary(uk.UTF-8): Скрипти та утиліти, необхідні для побудови пакетів Group: Applications/File Requires(pretrans): findutils -Requires: %{name}-build-macros >= 1.514 +Requires: %{name}-build-macros >= 1.636 Requires: %{name}-utils = %{version}-%{release} Requires: /bin/id Requires: awk @@ -702,8 +710,7 @@ sed -e 's/^/@tld@/' %{SOURCE2} >>platform.in echo '%%define __perl_provides %%{__perl} /usr/lib/rpm/perl.prov' > macros.perl echo '%%define __perl_requires %%{__perl} /usr/lib/rpm/perl.req' >> macros.perl echo '# obsoleted file' > macros.python -echo '%%define __php_provides /usr/lib/rpm/php.prov' > macros.php -echo '%%define __php_requires /usr/lib/rpm/php.req' >> macros.php +cp -p %{SOURCE20} macros.php echo '%%define __mono_provides /usr/lib/rpm/mono-find-provides' > macros.mono echo '%%define __mono_requires /usr/lib/rpm/mono-find-requires' >> macros.mono install %{SOURCE10} scripts/php.prov @@ -725,6 +732,7 @@ install %{SOURCE13} scripts/perl.prov %patch36 -p1 %patch37 -p1 %patch39 -p1 +%patch40 -p1 %patch42 -p1 %patch43 -p1 %patch82 -p1 @@ -783,6 +791,10 @@ install %{SOURCE13} scripts/perl.prov %patch102 -p1 %patch103 -p1 %patch104 -p1 +%patch105 -p1 +%patch106 -p1 +%patch107 -p1 +%patch108 -p1 mv -f po/{sr,sr@Latn}.po rm -rf sqlite zlib popt @@ -851,7 +863,7 @@ sed -i \ # 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="%{rpmcppflags} -I/usr/include/ossp-uuid" +CPPFLAGS="%{rpmcppflags} -I/usr/include/ossp-uuid -I/usr/include/%{reqdb_pkg}" %configure \ CC="%{__newcc}" \ CXX="%{__newcxx}" \ @@ -871,7 +883,7 @@ CPPFLAGS="%{rpmcppflags} -I/usr/include/ossp-uuid" CC="%{__cc}" \ CXX="%{__cxx}" \ CPP="%{__cpp}" \ - libdb_la=%{_libdir}/libdb.la \ + libdb_la=%{_libdir}/libdb-%(echo %{reqdb_pkg} | sed -e 's/^db//').la \ pylibdir=%{py_libdir} \ myLDFLAGS="%{rpmldflags}" \ staticLDFLAGS=%{?with_static:-all-static} @@ -883,8 +895,7 @@ install -d $RPM_BUILD_ROOT{/%{_lib},/etc/{sysconfig,tmpwatch},%{_sysconfdir}/rpm %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ staticLDFLAGS=%{?with_static:-all-static} \ - pylibdir=%{py_libdir} \ - pkgbindir="%{_bindir}" + pylibdir=%{py_libdir} cat <<'EOF' > $RPM_BUILD_ROOT/etc/tmpwatch/rpm.conf # Cleanup 90-days old repackage files. @@ -965,6 +976,9 @@ sparcv9-[^-]*-[Ll]inux(-gnu)? %ifarch sparc sparcv9 sparc64 sparc-[^-]*-[Ll]inux(-gnu)? %endif +%ifarch armv6l +armv6l-[^-]*-[Ll]inux(-gnu)? +%endif %ifarch armv5tel armv5tel-[^-]*-[Ll]inux(-gnu)? %endif @@ -1006,6 +1020,7 @@ install -p %{SOURCE7} $RPM_BUILD_ROOT%{_rpmlibdir}/compress-doc install -p %{SOURCE14} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh install -p %{SOURCE17} $RPM_BUILD_ROOT%{_rpmlibdir}/java-find-requires install -p scripts/php.{prov,req} $RPM_BUILD_ROOT%{_rpmlibdir} +cp -p %{SOURCE21} $RPM_BUILD_ROOT%{_rpmlibdir}/php.req.php install -p %{SOURCE5} $RPM_BUILD_ROOT%{_rpmlibdir}/hrmib-cache install -p %{SOURCE18} $RPM_BUILD_ROOT%{_bindir}/banner.sh cp -a %{SOURCE15} $RPM_BUILD_ROOT/etc/sysconfig/rpm @@ -1037,6 +1052,9 @@ cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros < $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.lang <