X-Git-Url: https://git.tld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=b3ae86e5a0db9dfe8d898063dd430288f3233e9d;hp=6a36f275e12832fc2143044ab32cf7afcf8c92a6;hb=51da5f32a8ba2fd2557459cc6bf048525be5872c;hpb=485bd119065fc121065fa0b9c9986b1e9a3b44c0 diff --git a/rpm.spec b/rpm.spec index 6a36f27..b3ae86e 100644 --- a/rpm.spec +++ b/rpm.spec @@ -42,7 +42,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 4.5 -Release: 89 +Release: 90 License: LGPL Group: Base Source0: %{name}-%{version}.tar.gz @@ -50,25 +50,15 @@ Source0: %{name}-%{version}.tar.gz Source1: %{name}.groups Source2: %{name}.platform Source3: %{name}-install-tree -Source4: %{name}-find-spec-bcond Source5: %{name}-hrmib-cache Source6: %{name}-groups-po.awk -Source7: %{name}-compress-doc -Source10: %{name}-php-provides -Source11: %{name}-php-requires Source12: %{name}.sysinfo Source13: perl.prov Source14: %{name}-user_group.sh Source15: %{name}.sysconfig -Source16: %{name}-macros.java -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 -Source22: rubygems.rb -Source23: gem_helper.rb Patch1000: %{name}-new-debuginfo.patch #Patch0: %{name}-pl.po.patch Patch1: %{name}-rpmrc.patch @@ -180,6 +170,7 @@ Patch117: %{name}-rpm2cpio-xz.patch Patch118: %{name}-noarch-subpackages.patch Patch119: %{name}-div0.patch Patch120: %{name}-pythondeps.patch +Patch121: %{name}-tld-macros.patch URL: http://rpm5.org/ BuildRequires: autoconf >= 2.57 BuildRequires: automake >= 1.4 @@ -523,7 +514,7 @@ Summary(ru.UTF-8): Скрипты и утилиты, необходимые дл Summary(uk.UTF-8): Скрипти та утиліти, необхідні для побудови пакетів Group: Applications/File Requires(pretrans): findutils -Requires: %{name}-build-macros >= 1.656 +Requires: %{name}-tld-macros-build >= 1.744-3 Requires: %{name}-utils = %{version}-%{release} Requires: /bin/id Requires: awk @@ -575,24 +566,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 @@ -629,38 +602,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 - -%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 @@ -730,11 +671,8 @@ 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 -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 -install %{SOURCE11} scripts/php.req install %{SOURCE13} scripts/perl.prov %patch21 -p1 %patch22 -p1 @@ -827,6 +765,7 @@ install %{SOURCE13} scripts/perl.prov %patch118 -p1 %patch119 -p1 %patch120 -p1 +%patch121 -p1 mv -f po/{sr,sr@Latn}.po rm -rf sqlite zlib popt @@ -842,9 +781,6 @@ sed -i -e 's,AM_PTHREADS_SHARED("POSIX/.*,:,' db/dist/aclocal/mutex.ac rm -rf db3 db rpmdb/db.h %endif -cp -p %{SOURCE22} scripts/rubygems.rb -cp -p %{SOURCE23} scripts/gem_helper.rb - # generate Group translations to *.po awk -f %{SOURCE6} %{SOURCE1} @@ -1044,18 +980,11 @@ install -p scripts/rpmdiff scripts/rpmdiff.cgi $RPM_BUILD_ROOT%{_rpmlibdir} cp -a macros.perl $RPM_BUILD_ROOT%{_rpmlibdir}/macros.perl cp -a macros.python $RPM_BUILD_ROOT%{_rpmlibdir}/macros.python -cp -a macros.php $RPM_BUILD_ROOT%{_rpmlibdir}/macros.php cp -a macros.mono $RPM_BUILD_ROOT%{_rpmlibdir}/macros.mono -cp -a %{SOURCE16} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.java cp -a %{SOURCE19} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.gstreamer install -p %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree -install -p %{SOURCE4} $RPM_BUILD_ROOT%{_rpmlibdir}/find-spec-bcond -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 -p %{name}.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/rpm @@ -1203,7 +1132,7 @@ done rm -f $RPM_BUILD_ROOT%{py_sitedir}/rpm/*.{la,a,py} -# (currently) not used or supported in PLD +# (currently) not used or supported in TLD %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/{http.req,perldeps.pl} # wrong location, not used anyway %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/rpm.{daily,log,xinetd} @@ -1373,9 +1302,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{_rpmlibdir}/brp-* %attr(755,root,root) %{_rpmlibdir}/check-files # %attr(755,root,root) %{_rpmlibdir}/check-prereqs -%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}/config.* @@ -1383,7 +1310,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %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}/rpmb @@ -1419,10 +1345,8 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %endif # must be here for "Requires: rpm-*prov" to work %{_rpmlibdir}/macros.gstreamer -%{_rpmlibdir}/macros.java %{_rpmlibdir}/macros.mono %{_rpmlibdir}/macros.perl -%{_rpmlibdir}/macros.php # not used yet ... these six depend on perl #%attr(755,root,root) %{_rpmlibdir}/http.req #%attr(755,root,root) %{_rpmlibdir}/magic.prov @@ -1440,12 +1364,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 perlprov %defattr(644,root,root,755) %attr(755,root,root) %{_rpmlibdir}/perl.* @@ -1462,15 +1380,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{_rpmlibdir}/pythondeps.sh %attr(755,root,root) %{_rpmlibdir}/pythoneggs.py -%files php-pearprov -%defattr(644,root,root,755) -%attr(755,root,root) %{_rpmlibdir}/php* - -%files rubyprov -%defattr(644,root,root,755) -%attr(755,root,root) %{_rpmlibdir}/gem_helper.rb -%attr(755,root,root) %{_rpmlibdir}/rubygems.rb - %if %{with python} %files -n python-rpm %defattr(644,root,root,755)