X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=f67bfd23e73be38507c2f0dafff40c2b7984e4b3;hb=5220c38990dbb6385095a593e8b625ca804cf1ae;hp=dc7d79af8b4e015ef17908af9244fb255cc3c9df;hpb=84075475222d896bc30bf83aaa7caeee19bedaea;p=packages%2Frpm.git diff --git a/rpm.spec b/rpm.spec index dc7d79a..f67bfd2 100644 --- a/rpm.spec +++ b/rpm.spec @@ -16,7 +16,7 @@ # # Conditional build: %bcond_with static # build static rpm+rpmi -%bcond_without apidocs # don't generate documentation with doxygen +%bcond_with apidocs # don't generate documentation with doxygen %bcond_with internal_db # internal db (db 4.5.20) %bcond_with autoreqdep # autogenerate package name deps in addition to sonames/perl(X) %bcond_without nptl # internal db: don't use process-shared POSIX mutexes (NPTL provides full interface) @@ -25,17 +25,10 @@ %bcond_without system_libmagic # don't use system libmagic %bcond_without suggest_tags # build without Suggest tag (bootstrapping) %bcond_with neon # build with HTTP/WebDAV support (neon library). NOTE: neon libs are in /usr! -# force_cc - force using __cc other than "%{_target_cpu}-tld-linux-gcc" -# force_cxx - force using __cxx other than "%{_target_cpu}-tld-linux-g++" -# force_cpp - force using __cpp other than "%{_target_cpu}-tld-linux-gcc -E" - -#%%define force_cc "%{_target_cpu}-tld-linux-gcc" -#%%define force_cxx "%{_target_cpu}-tld-linux-g++" -#%%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 reqdb_pkg db4.7 +%define reqdb_ver 4.7.25 %define reqpopt_ver 1.10.8 %define beecrypt_ver 2:4.1.2-4 %define sover 4.5 @@ -49,7 +42,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 4.5 -Release: 62 +Release: 83 License: LGPL Group: Base Source0: %{name}-%{version}.tar.gz @@ -74,9 +67,9 @@ 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 -#Patch1067: %{name}-disable-features.patch -#Patch1070: %{name}-rpmrc-ac.patch #Patch0: %{name}-pl.po.patch Patch1: %{name}-rpmrc.patch Patch2: %{name}-arch.patch @@ -175,12 +168,18 @@ Patch105: %{name}-am.patch Patch106: %{name}-automake_1.12.patch Patch107: %{name}-debugedit-dwarf4.patch Patch108: %{name}-changelog_order_check_nonfatal.patch +Patch109: %{name}-installplatform.patch +Patch110: %{name}-xz.patch +Patch111: %{name}-shrink.patch +Patch112: notrans.patch +Patch113: %{name}-rubyprov.patch +Patch114: %{name}-ruby-gem-build.patch URL: http://rpm5.org/ BuildRequires: autoconf >= 2.57 BuildRequires: automake >= 1.4 BuildRequires: beecrypt-devel >= %{beecrypt_ver} BuildRequires: bzip2-devel >= 1.0.2-17 -%{!?with_internal_db:BuildRequires: db-devel >= %{reqdb_ver}} +%{!?with_internal_db:BuildRequires: %{reqdb_pkg}-devel >= %{reqdb_ver}} BuildRequires: elfutils-devel >= 0.108 BuildRequires: gettext-devel >= 0.11.4-2 BuildRequires: keyutils-devel @@ -218,6 +217,7 @@ BuildRequires: elfutils-static BuildRequires: glibc-static >= 2.2.94 %{?with_system_libmagic:BuildRequires: libmagic-static} %{?with_selinux:BuildRequires: libselinux-static >= 1.18} +BuildRequires: ossp-uuid-static >= 1.6.2-8 BuildRequires: popt-static >= %{reqpopt_ver} BuildRequires: zlib-static >= 1.2.3.3 %endif @@ -252,10 +252,6 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define specflags -fno-strict-aliasing -#%%define _host_alias %{_target_cpu}-tld-linux%{nil} -#%%define _host_vendor tld -#%%define _vendor tld - %description RPM is a powerful package manager, which can be used to build, install, query, verify, update, and uninstall individual software @@ -521,7 +517,7 @@ Summary(ru.UTF-8): Скрипты и утилиты, необходимые дл Summary(uk.UTF-8): Скрипти та утиліти, необхідні для побудови пакетів Group: Applications/File Requires(pretrans): findutils -Requires: %{name}-build-macros >= 1.636 +Requires: %{name}-build-macros >= 1.656 Requires: %{name}-utils = %{version}-%{release} Requires: /bin/id Requires: awk @@ -533,8 +529,8 @@ Requires: elfutils Requires: file >= 4.17 Requires: fileutils Requires: findutils -# rpmrc patch adds flags specific to gcc >= 3.4 -Requires: gcc >= 5:3.4 +# rpmrc patch adds flags specific to gcc >= 4.7 +Requires: gcc >= 6:4.7.0 Requires: glibc-devel Requires: grep Requires: gzip @@ -642,6 +638,23 @@ 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 @@ -689,10 +702,11 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %prep %setup -q +cp -p %{SOURCE15} . %patch1000 -p1 #%patch0 -p1 -%patch1 -p1 %patch2 -p1 +%patch1 -p1 %patch3 -p1 %patch4 -p1 %patch6 -p1 @@ -795,6 +809,12 @@ install %{SOURCE13} scripts/perl.prov %patch106 -p1 %patch107 -p1 %patch108 -p1 +%patch109 -p1 +%patch110 -p1 +%patch111 -p1 +%patch112 -p1 +%patch113 -p1 +%patch114 -p1 mv -f po/{sr,sr@Latn}.po rm -rf sqlite zlib popt @@ -810,6 +830,9 @@ 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} @@ -1023,7 +1046,7 @@ 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 +cp -p %{name}.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/rpm install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Conflictname @@ -1178,7 +1201,7 @@ rm -f $RPM_BUILD_ROOT%{py_sitedir}/rpm/*.{la,a,py} %{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/RPM.pm %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/RPM/.packlist -%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/RPM/RPM.bs +%{__rm} -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/RPM/RPM.bs %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/RPM/RPM.so %{__rm} $RPM_BUILD_ROOT%{_mandir}/man3/RPM.3pm %{__rm} $RPM_BUILD_ROOT%{_mandir}/{,ja,pl}/man8/rpm{cache,graph}.8 @@ -1430,6 +1453,11 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %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)