X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=46866f95c79c305c6c67499706f64e92476a74ac;hb=000793b8790f12d832e8032f19ff1ed3faaffc7b;hp=242b4d20cbaf072bd2fa9f115487cfc49370847d;hpb=f0190526e611252ad14478726ad4de2c407200cc;p=packages%2Frpm.git diff --git a/rpm.spec b/rpm.spec index 242b4d2..46866f9 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: 45 +Release: 51 License: LGPL v2.1 Group: Base # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm @@ -69,7 +69,6 @@ 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 @@ -86,8 +85,6 @@ Source26: %{name}db_checkversion.c Source27: macros.lang Source28: %{name}db_reset.c Source29: dbupgrade.sh -Source30: rubygems.rb -Source31: gem_helper.rb Patch0: %{name}-branch.patch Patch1: %{name}-man_pl.patch Patch2: %{name}-popt-aliases.patch @@ -156,6 +153,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 @@ -669,7 +667,7 @@ Summary(uk.UTF-8): Скрипти та утиліти, необхідні для Group: Applications/File Requires(pretrans): coreutils Requires(pretrans): findutils -Requires: %{name}-build-macros >= 1.712 +Requires: %{name}-build-macros >= 1.744-3 Requires: %{name}-utils = %{version}-%{release} Requires: /bin/id Requires: awk @@ -725,24 +723,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 @@ -797,23 +777,6 @@ packages. 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 @@ -942,6 +905,7 @@ cd - %patch65 -p1 %patch66 -p1 %patch67 -p1 +%patch68 -p1 %patch70 -p1 %patch71 -p1 %patch72 -p1 @@ -1026,8 +990,6 @@ 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* @@ -1271,7 +1233,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/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 @@ -1302,12 +1263,15 @@ 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 perl php python; do echo "%%{load:%{_rpmlibdir}/macros.d/$m}" >$RPM_BUILD_ROOT%{_rpmlibdir}/macros.$m done # 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}/{macros.d/java,javadeps.sh} +%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.d/ruby # for rpm -e|-U --repackage install -d $RPM_BUILD_ROOT/var/{spool/repackage,lock/rpm} @@ -1584,20 +1548,17 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f # 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.rpmbuild # compat wrappers %{_rpmlibdir}/macros.gstreamer -%{_rpmlibdir}/macros.java %{_rpmlibdir}/macros.mono %{_rpmlibdir}/macros.perl %{_rpmlibdir}/macros.php @@ -1618,17 +1579,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.*