X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=2db85595fd087de5ccf14747dc1d6e8ac3a8a048;hp=d3b73da9b220ee396dc80b2c3937add690367753;hb=12158148e77b5b2b9a08affab5152640ed104000;hpb=eaa26f56e0b2b562fe4540611586bc867e801732 diff --git a/rpm.spec b/rpm.spec index d3b73da..2db8559 100644 --- a/rpm.spec +++ b/rpm.spec @@ -18,10 +18,6 @@ %bcond_with system_lua # use system lua %bcond_without system_pcre # use system pcre %bcond_with keyutils # build with keyutils support -# force_cc - force using __cc other than "%{_target_cpu}-pld-linux-gcc" -# force_cxx - force using __cxx other than "%{_target_cpu}-pld-linux-g++" -# force_cpp - force using __cpp other than "%{_target_cpu}-pld-linux-gcc -E" -# %if %{with sqlite} # Error: /lib64/librpmio-5.4.so: undefined symbol: sqlite3_enable_load_extension @@ -51,7 +47,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 5.4.15 -Release: 17 +Release: 51 License: LGPL v2.1 Group: Base # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm @@ -67,17 +63,14 @@ Source4: %{name}-find-spec-bcond Source5: %{name}-hrmib-cache Source6: %{name}-groups-po.awk Source7: %{name}-compress-doc -Source8: %{name}-php-provides -Source9: %{name}-php-requires Source10: %{name}.sysinfo Source11: perl.prov Source12: %{name}-user_group.sh Source13: %{name}.sysconfig -Source14: %{name}-java-requires # http://svn.pld-linux.org/banner.sh/ Source15: banner.sh Source16: ftp://ftp.pld-linux.org/dists/th/PLD-3.0-Th-GPG-key.asc -# Source16-md5: 08b29584dd349aac9caa7610131a0a88 +# Source16-md5: 23914bb49fafe7153cee87126d966461 Source17: %{name}-mimetypedeps Source18: macros.local Source19: %{name}.noautocompressdoc @@ -85,13 +78,11 @@ Source20: %{name}.noautoprov Source21: %{name}.noautoprovfiles Source22: %{name}.noautoreq Source24: %{name}.noautoreqfiles -Source25: %{name}-php-requires.php Source26: %{name}db_checkversion.c Source27: macros.lang Source28: %{name}db_reset.c Source29: dbupgrade.sh -Source30: rubygems.rb -Source31: gem_helper.rb +Source30: prov-req-macros Patch0: %{name}-branch.patch Patch1: %{name}-man_pl.patch Patch2: %{name}-popt-aliases.patch @@ -99,7 +90,6 @@ Patch3: %{name}-nosetproctitle.patch Patch4: %{name}-perl-macros.patch Patch5: %{name}-perl-req-perlfile.patch Patch6: %{name}-scripts-closefds.patch -Patch7: %{name}-php-macros.patch Patch8: %{name}-gettext-in-header.patch Patch9: %{name}-lua.patch Patch10: %{name}-php-deps.patch @@ -118,6 +108,7 @@ Patch22: %{name}-sparc64.patch Patch23: %{name}-gendiff.patch Patch24: openmp.patch Patch25: %{name}-URPM-build-fix.patch +Patch26: %{name}-semanage.patch Patch27: %{name}-helperEVR-noassert.patch Patch28: %{name}-unglobal.patch Patch29: %{name}-builddir-readlink.patch @@ -150,6 +141,7 @@ Patch55: %{name}-disable-hmac-verify.patch Patch56: %{name}-macros.patch Patch57: %{name}-db5.2.patch Patch58: %{name}-preserve-iterator.patch +Patch59: gcc6-stdlib.patch Patch60: %{name}-python-sitescriptdir.patch Patch61: %{name}-clean-docdir.patch Patch62: %{name}-DB_CONFIG.patch @@ -158,6 +150,7 @@ Patch64: %{name}-fix-compress-doc.patch Patch65: %{name}-parseSpec-skip-empty-tags.patch Patch66: %{name}-payload-use-hashed-inode.patch Patch67: %{name}-repackage-dont-force-max-compression.patch +Patch68: rpm-bug-420.patch Patch70: python-%{name}sense-missingok.patch Patch71: %{name}-changelog-encoding.patch Patch72: %{name}-preserve-tag-type.patch @@ -177,6 +170,15 @@ Patch87: %{name}-file-output-for-ELF.patch Patch88: %{name}-rpmtdnext.patch Patch89: disable-header-verification.patch Patch90: %{name}-cppcompat.patch +Patch91: py-disable-fetch.patch +Patch92: fast_python_deps.patch +Patch93: python2_explicit.patch +Patch94: do_not_write_before_macro_buffer.patch +Patch95: rpm-python-spec-header.patch +Patch96: skip-ldconfig-optimization.patch +Patch97: glibc.patch +Patch98: extension-based-compression-detection.patch +Patch99: %{name}-gpg-pinentry.patch # Patches imported from Mandriva @@ -216,8 +218,6 @@ Patch1011: %{name}-5.4.4-fix-rpmconstant-to-always-use-LC_CTYPE-C-for-case-conve Patch1012: %{name}-5.4.4-pass-_builddir-properly-to-find-debuginfo.patch # status: probably okay to merge, but discuss on rpm-devel first Patch1013: %{name}-5.4.10-files-listed-twice-terminates-build.patch -# status: probably okay to merge -Patch1014: %{name}-5.4.9-ruby1.9-fixes.patch # status: keep locally Patch1015: %{name}-5.4.9-keep-loading-script-macros.patch # status: same as for other dep gen patches @@ -358,6 +358,7 @@ BuildRequires: popt-static >= %{reqpopt_ver} BuildRequires: zlib-static %endif Requires(posttrans): coreutils +Requires: FHS >= 3.0-2 Requires: %{name}-base = %{version}-%{release} Requires: %{name}-lib = %{version}-%{release} Requires: beecrypt >= %{beecrypt_ver} @@ -382,18 +383,6 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define ppc ppc ppc7400 ppc7450 %define x8664 amd64 ia32e x86_64 -# stabilize new build environment -%ifnarch x32 -%define __newcc %{?force_cc}%{!?force_cc:%{_target_cpu}-pld-linux-gcc} -%define __newcxx %{?force_cxx}%{!?force_cxx:%{_target_cpu}-pld-linux-g++} -%define __newcpp %{?force_cpp}%{!?force_cpp:%{_target_cpu}-pld-linux-gcc -E} -%else -# x32 is a very special case -%define __newcc %{?force_cc}%{!?force_cc:x86_64-pld-linux-gnux32-gcc} -%define __newcxx %{?force_cxx}%{!?force_cxx:x86_64-pld-linux-gnux32-g++} -%define __newcpp %{?force_cpp}%{!?force_cpp:x86_64-pld-linux-gnux32-gcc -E} -%endif - %define _rpmlibdir /usr/lib/rpm %define _noautocompressdoc RPM-GPG-KEY @@ -673,7 +662,7 @@ Summary(uk.UTF-8): Скрипти та утиліти, необхідні для Group: Applications/File Requires(pretrans): coreutils Requires(pretrans): findutils -Requires: %{name}-build-macros >= 1.699 +Requires: %{name}-build-macros >= 1.744-3 Requires: %{name}-utils = %{version}-%{release} Requires: /bin/id Requires: awk @@ -729,24 +718,6 @@ construir pacotes usando o RPM. Різноманітні допоміжні скрипти та утиліти, які використовуються для побудови RPM'ів. -%package javaprov -Summary: Additional utilities for checking Java provides/requires in RPM packages -Summary(pl.UTF-8): Dodatkowe narzędzia do sprawdzania zależności kodu w Javie w pakietach RPM -Group: Applications/File -Requires: %{name} = %{version}-%{release} -Requires: file -Requires: findutils >= 1:4.2.26 -Requires: mktemp -Requires: unzip - -%description javaprov -Additional utilities for checking Java provides/requires in RPM -packages. - -%description javaprov -l pl.UTF-8 -Dodatkowe narzędzia do sprawdzania zależności kodu w Javie w pakietach -RPM. - %package perlprov Summary: Additional utilities for checking Perl provides/requires in RPM packages Summary(de.UTF-8): Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen @@ -774,7 +745,7 @@ Summary(pl.UTF-8): Makra ułatwiające tworzenie pakietów RPM z programami napi Group: Applications/File Requires: %{name} = %{version}-%{release} Requires: python -Requires: python-distribute +Requires: python-setuptools Requires: python-modules %description pythonprov @@ -785,39 +756,6 @@ software. Makra ułatwiające tworzenie pakietów RPM z programami napisanymi w Pythonie. -%package php-pearprov -Summary: Additional utilities for checking PHP PEAR provides/requires in RPM packages -Summary(pl.UTF-8): Dodatkowe narzędzia do sprawdzania zależności skryptów php w RPM -Group: Applications/File -Requires: %{name} = %{version}-%{release} -Requires: sed >= 4.0 -Suggests: php-pear-PHP_CompatInfo - -%description php-pearprov -Additional utilities for checking PHP PEAR provides/requires in RPM -packages. - -%description php-pearprov -l pl.UTF-8 -Dodatkowe narzędzia do sprawdzenia zależności skryptów PHP PEAR w -pakietach RPM. - -%package rubyprov -Summary: Ruby tools, which simplify creation of RPM packages with Ruby software -Summary(pl.UTF-8): Makra ułatwiające tworzenie pakietów RPM z programami napisanymi w Ruby -Group: Applications/File -Requires: %{name} = %{version}-%{release} -Requires: ruby -Requires: ruby-modules -Requires: ruby-rubygems - -%description rubyprov -Ruby tools, which simplifies creation of RPM packages with Ruby -software. - -%description rubyprov -l pl.UTF-8 -Makra ułatwiające tworzenie pakietów RPM z programami napisanymi w -Ruby. - %package -n python-rpm Summary: Python interface to RPM library Summary(pl.UTF-8): Pythonowy interfejs do biblioteki RPM-a @@ -880,7 +818,6 @@ cd - %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 %patch8 -p1 %{?with_system_lua:%patch9 -p1} %patch10 -p1 @@ -904,6 +841,7 @@ cd - %patch23 -p1 %patch24 -p1 %patch25 -p1 +%patch26 -p1 %patch27 -p1 %patch28 -p1 %patch29 -p1 @@ -936,6 +874,7 @@ cd - %patch56 -p1 %{!?with_db61:%patch57 -p1} %patch58 -p1 +%patch59 -p1 %patch60 -p1 %patch61 -p1 %patch62 -p1 @@ -944,6 +883,7 @@ cd - %patch65 -p1 %patch66 -p1 %patch67 -p1 +%patch68 -p1 %patch70 -p1 %patch71 -p1 %patch72 -p1 @@ -962,6 +902,8 @@ cd - %patch88 -p1 %patch89 -p1 %patch90 -p1 +%patch91 -p1 +%patch99 -p1 %patch1000 -p1 %patch1001 -p1 @@ -977,7 +919,6 @@ cd - %patch1011 -p1 %patch1012 -p1 %patch1013 -p1 -%patch1014 -p1 %patch1015 -p1 %patch1016 -p1 %patch1017 -p1 @@ -1012,15 +953,20 @@ cd - %patch1049 -p1 %patch83 -p1 +%patch92 -p1 +%patch93 -p1 +%patch94 -p1 +%patch95 -p1 +%patch96 -p1 +%patch97 -p1 +%patch98 -p1 %patch1050 -p1 install %{SOURCE2} macros/pld.in -install %{SOURCE8} scripts/php.prov.in -install %{SOURCE9} scripts/php.req.in install %{SOURCE11} scripts/perl.prov.in -cp -p %{SOURCE30} scripts/rubygems.rb -cp -p %{SOURCE31} scripts/gem_helper.rb + +rm scripts/find-php* %{__mv} -f scripts/perl.req{,.in} @@ -1050,13 +996,10 @@ sed -i \ macros/macros.in %{?with_system_lua:CPPFLAGS="-I/usr/include/lua51 %{rpmcppflags}"} -# pass CC and CXX too in case of building with some older configure macro %configure \ - CC="%{__newcc}" \ - CXX="%{__newcxx}" \ - CPP="%{__newcpp}" \ WITH_PERL_VERSION=no \ __GST_INSPECT=%{_bindir}/gst-inspect-1.0 \ + __GPG=%{_bindir}/gpg \ --disable-silent-rules \ --enable-shared \ --enable-static \ @@ -1087,10 +1030,7 @@ sed -i \ --with-xz=external \ --with-zlib=external -%{__make} -j1 \ - CC="%{__cc}" \ - CXX="%{__cxx}" \ - CPP="%{__cpp}" +%{__make} -j1 %{?with_apidocs:%{__make} apidocs} @@ -1268,10 +1208,6 @@ install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree install %{SOURCE4} $RPM_BUILD_ROOT%{_rpmlibdir}/find-spec-bcond install %{SOURCE7} $RPM_BUILD_ROOT%{_rpmlibdir}/compress-doc install %{SOURCE12} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh -install %{SOURCE14} $RPM_BUILD_ROOT%{_rpmlibdir}/java-find-requires -install scripts/find-php* $RPM_BUILD_ROOT%{_rpmlibdir} -install scripts/php.{prov,req} $RPM_BUILD_ROOT%{_rpmlibdir} -cp -p %{SOURCE25} $RPM_BUILD_ROOT%{_rpmlibdir}/php.req.php install %{SOURCE17} $RPM_BUILD_ROOT%{_rpmlibdir}/mimetypedeps.sh install %{SOURCE5} $RPM_BUILD_ROOT%{_rpmlibdir}/hrmib-cache install %{SOURCE13} $RPM_BUILD_ROOT/etc/sysconfig/rpm @@ -1300,12 +1236,19 @@ install tools/rpmdb_reset $RPM_BUILD_ROOT%{_rpmlibdir}/bin install %{SOURCE29} $RPM_BUILD_ROOT%{_rpmlibdir}/bin/dbupgrade.sh # create macro loading wrappers for backward compatibility -for m in gstreamer java mono perl php python; do +for m in gstreamer mono; do echo "%%{load:%{_rpmlibdir}/macros.d/$m}" >$RPM_BUILD_ROOT%{_rpmlibdir}/macros.$m done +install %{SOURCE30} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.d/prov-req + # moved to rpm-build-macros 1.699 %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.d/kernel +# moved to rpm-build-macros 1.744 +%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/javadeps.sh +%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/{gem_helper,rubygems}.rb +%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/php.{prov,req} +%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.d/{cmake,java,perl,php,python,ruby,tcl} # for rpm -e|-U --repackage install -d $RPM_BUILD_ROOT/var/{spool/repackage,lock/rpm} @@ -1580,26 +1523,16 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{_rpmlibdir}/fontconfig.prov # must be here for "Requires: rpm-*prov" to work -%{_rpmlibdir}/macros.d/cmake %{_rpmlibdir}/macros.d/gstreamer -%{_rpmlibdir}/macros.d/java %{_rpmlibdir}/macros.d/libtool %{_rpmlibdir}/macros.d/mono -%{_rpmlibdir}/macros.d/perl -%{_rpmlibdir}/macros.d/php %{_rpmlibdir}/macros.d/pkgconfig -%{_rpmlibdir}/macros.d/python -%{_rpmlibdir}/macros.d/ruby +%{_rpmlibdir}/macros.d/prov-req %{_rpmlibdir}/macros.d/selinux -%{_rpmlibdir}/macros.d/tcl %{_rpmlibdir}/macros.rpmbuild # compat wrappers %{_rpmlibdir}/macros.gstreamer -%{_rpmlibdir}/macros.java %{_rpmlibdir}/macros.mono -%{_rpmlibdir}/macros.perl -%{_rpmlibdir}/macros.php -%{_rpmlibdir}/macros.python %attr(755,root,root) %{_rpmlibdir}/gstreamer.sh %attr(755,root,root) %{_rpmlibdir}/kmod-deps.sh @@ -1616,17 +1549,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %lang(pl) %{_mandir}/pl/man1/gendiff.1* %lang(pl) %{_mandir}/pl/man8/rpmbuild.8* -%files javaprov -%defattr(644,root,root,755) -%attr(755,root,root) %{_rpmlibdir}/java-find-requires -# needs jar (any jdk), jcf-dump (gcc-java) to work -%attr(755,root,root) %{_rpmlibdir}/javadeps.sh - -%files rubyprov -%defattr(644,root,root,755) -%attr(755,root,root) %{_rpmlibdir}/gem_helper.rb -%attr(755,root,root) %{_rpmlibdir}/rubygems.rb - %files perlprov %defattr(644,root,root,755) %attr(755,root,root) %{_rpmlibdir}/perl.* @@ -1638,11 +1560,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{_rpmlibdir}/pythoneggs.py %attr(755,root,root) %{_rpmlibdir}/pythondeps.sh -%files php-pearprov -%defattr(644,root,root,755) -%attr(755,root,root) %{_rpmlibdir}/php* -%attr(755,root,root) %{_rpmlibdir}/find-php* - %if %{with python} %files -n python-rpm %defattr(644,root,root,755)