X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=564f2ac76659bda22786a5e9f2a606145a8ae57a;hb=ad1682b36c70ff8e1dd6c76b62e2d01a28110bad;hp=ba43cb013589a99167019e7c15080921fe8a5ba0;hpb=dcf91c25fee0ebfdab52a29fcf9600e19e338d90;p=packages%2Frpm.git diff --git a/rpm.spec b/rpm.spec index ba43cb0..564f2ac 100644 --- a/rpm.spec +++ b/rpm.spec @@ -47,7 +47,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 5.4.15 -Release: 42 +Release: 55 License: LGPL v2.1 Group: Base # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm @@ -59,35 +59,27 @@ Source101: README.cpu-os-macros Source1: %{name}.groups Source2: macros.pld.in Source3: %{name}-install-tree -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: 23914bb49fafe7153cee87126d966461 -Source17: %{name}-mimetypedeps Source18: macros.local Source19: %{name}.noautocompressdoc 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 @@ -95,7 +87,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 @@ -156,6 +147,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 @@ -181,6 +173,9 @@ 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 @@ -220,8 +215,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 @@ -666,7 +659,7 @@ Summary(uk.UTF-8): Скрипти та утиліти, необхідні для Group: Applications/File Requires(pretrans): coreutils Requires(pretrans): findutils -Requires: %{name}-build-macros >= 1.712 +Requires: %{name}-pld-macros-build >= 1.744-3 Requires: %{name}-utils = %{version}-%{release} Requires: /bin/id Requires: awk @@ -722,24 +715,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 @@ -778,39 +753,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 @@ -873,7 +815,6 @@ cd - %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 %patch8 -p1 %{?with_system_lua:%patch9 -p1} %patch10 -p1 @@ -939,6 +880,7 @@ cd - %patch65 -p1 %patch66 -p1 %patch67 -p1 +%patch68 -p1 %patch70 -p1 %patch71 -p1 %patch72 -p1 @@ -958,6 +900,7 @@ cd - %patch89 -p1 %patch90 -p1 %patch91 -p1 +%patch99 -p1 %patch1000 -p1 %patch1001 -p1 @@ -973,7 +916,6 @@ cd - %patch1011 -p1 %patch1012 -p1 %patch1013 -p1 -%patch1014 -p1 %patch1015 -p1 %patch1016 -p1 %patch1017 -p1 @@ -1013,15 +955,13 @@ cd - %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* @@ -1072,7 +1012,7 @@ sed -i \ --with-lua=%{!?with_system_lua:internal}%{?with_system_lua:external} \ --with-lzma=external \ --with-neon=%{?with_neon:external}%{!?with_neon:no} \ - --with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/macros.d/pld:%{_rpmlibdir}/%%{_target}/macros:%{_rpmlibdir}/macros.build:%{_sysconfdir}/rpm/macros.*:%{_sysconfdir}/rpm/macros:%{_sysconfdir}/rpm/%%{_target}/macros:%{_sysconfdir}/rpm/macros.d/*.macros:~/etc/.rpmmacros:~/.rpmmacros' \ + --with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/macros.d/pld:%{_rpmlibdir}/pld/macros:%{_rpmlibdir}/%%{_target}/macros:%{_rpmlibdir}/macros.build:%{_sysconfdir}/rpm/macros.*:%{_sysconfdir}/rpm/macros:%{_sysconfdir}/rpm/%%{_target}/macros:%{_sysconfdir}/rpm/macros.d/*.macros:~/etc/.rpmmacros:~/.rpmmacros' \ --without-path-versioned \ --with-pcre=%{!?with_system_pcre:internal}%{?with_system_pcre:external} \ --with-popt=external \ @@ -1087,7 +1027,7 @@ sed -i \ --with-xz=external \ --with-zlib=external -%{__make} -j1 +%{__make} %{?with_apidocs:%{__make} apidocs} @@ -1108,11 +1048,11 @@ fi %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{/bin,/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm} \ - $RPM_BUILD_ROOT{/var/lib/banner,/var/cache/hrmib,/etc/pki/rpm-gpg} + $RPM_BUILD_ROOT{/var/lib/banner,/var/cache/hrmib,/etc/pki/rpm-gpg,%{_rpmlibdir}/pld} install %{SOURCE16} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/PLD-3.0-Th-GPG-key.asc -%{__make} -j1 install \ +%{__make} install \ pkgconfigdir=%{_pkgconfigdir} \ DESTDIR=$RPM_BUILD_ROOT @@ -1262,13 +1202,7 @@ install scripts/rpmdiff scripts/rpmdiff.cgi $RPM_BUILD_ROOT%{_rpmlibdir} install %{SOURCE1} doc/manual/groups 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/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 @@ -1296,12 +1230,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 - echo "%%{load:%{_rpmlibdir}/macros.d/$m}" >$RPM_BUILD_ROOT%{_rpmlibdir}/macros.$m +for m in gstreamer libtool mono pkgconfig selinux; do + %{__mv} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.d/{$m,macros.$m} done -# moved to rpm-build-macros 1.699 +install %{SOURCE30} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.d/macros.prov-req + +# moved to rpm-pld-macros-macros 1.699 %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.d/kernel +# moved to rpm-pld-macros-build 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} @@ -1414,6 +1355,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %{_rpmlibdir}/macros %dir %{_rpmlibdir}/macros.d %{_rpmlibdir}/macros.d/pld +%dir %{_rpmlibdir}/pld %{_rpmlibdir}/cpuinfo.yaml %{_rpmlibdir}/noarch-* %ifarch %{ix86} %{x8664} x32 @@ -1546,15 +1488,12 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rpm/noauto* %attr(755,root,root) %{_rpmlibdir}/brp-* %attr(755,root,root) %{_rpmlibdir}/check-files -%attr(755,root,root) %{_rpmlibdir}/compress-doc %attr(755,root,root) %{_rpmlibdir}/cross-build -%attr(755,root,root) %{_rpmlibdir}/find-spec-bcond %attr(755,root,root) %{_rpmlibdir}/getpo.sh %attr(755,root,root) %{_rpmlibdir}/install-build-tree %attr(755,root,root) %{_rpmlibdir}/u_pkg.sh %attr(755,root,root) %{_rpmlibdir}/executabledeps.sh %attr(755,root,root) %{_rpmlibdir}/libtooldeps.sh -%attr(755,root,root) %{_rpmlibdir}/mimetypedeps.sh # needs hacked pkg-config to return anything %attr(755,root,root) %{_rpmlibdir}/pkgconfigdeps.sh %attr(755,root,root) %{_rpmlibdir}/bin/api-sanity-autotest.pl @@ -1575,27 +1514,13 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f #%attr(755,root,root) %{_rpmlibdir}/mono-find-requires %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/selinux -%{_rpmlibdir}/macros.d/tcl +%{_rpmlibdir}/macros.d/macros.gstreamer +%{_rpmlibdir}/macros.d/macros.libtool +%{_rpmlibdir}/macros.d/macros.mono +%{_rpmlibdir}/macros.d/macros.pkgconfig +%{_rpmlibdir}/macros.d/macros.prov-req +%{_rpmlibdir}/macros.d/macros.selinux %{_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 @@ -1612,17 +1537,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.* @@ -1634,12 +1548,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.prov -%attr(755,root,root) %{_rpmlibdir}/php.req -%attr(755,root,root) %{_rpmlibdir}/php.req.php - %if %{with python} %files -n python-rpm %defattr(644,root,root,755)