X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=fbe1b0cb7e65365933316e92ed9971b4d104e08c;hp=8d25e05553dc4154493f6ad3631978577aa0c302;hb=479ed081b430db0d6981233fd628faeca639b675;hpb=8e159d4265800b9966fc9d3d7d74be5dadd24ae7 diff --git a/rpm.spec b/rpm.spec index 8d25e05..fbe1b0c 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,5 +1,7 @@ # # TODO: +# - detected Requires lists are not printed at the end of build (Provides etc. are) +# - fix pythondeps detection (*.py[co] should belong to python class; autodetect P(abi)) # - consider using system libmagic not internal libfmagic # (but internal has different method of passing output) # - after ac drop amd64 patch and make x86_64 generic arch + subarchs amd64 and ia32e @@ -8,7 +10,7 @@ %bcond_with distver # build with distversion field %bcond_with static # build static rpmi (not supported at the moment) %bcond_without apidocs # don't generate documentation with doxygen -%bcond_without pkgnameinautoreq # don't put package name in autogenerated dependancy +%bcond_with pkgnameinautoreq # don't put package name in autogenerated dependancy %bcond_without python # don't build python bindings %bcond_without selinux # dont enable selinux support # force_cc - force using __cc other than "%{_target_cpu}-pld-linux-gcc" @@ -17,10 +19,10 @@ %define snap 20041121 # versions of required libraries -%define reqdb_ver 4.2.50-1 -%define reqpopt_ver 1.9 +%define reqdb_ver 4.3.27-1 +%define reqpopt_ver 1.10.1 %define beecrypt_ver 2:4.1.0 -%define rpm_macros_rev 1.183 +%define rpm_macros_rev 1.196 Summary: RPM Package Manager Summary(de): RPM Packet-Manager Summary(es): Gestor de paquetes RPM @@ -29,16 +31,15 @@ Summary(pt_BR): Gerenciador de pacotes RPM Summary(ru): íÅÎÅÄÖÅÒ ÐÁËÅÔÏ× ÏÔ RPM Summary(uk): íÅÎÅÄÖÅÒ ÐÁËÅÔ¦× ×¦Ä RPM Name: rpm -%define ver 4.4 %define sover 4.4 -Version: %{ver} -Release: 0.%{snap}.0.7 +Version: 4.4.1 +Release: 0.6 License: GPL Group: Base #Source0: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.2.x/%{name}-%{version}.%{snap}.tar.gz # Snap tarball is generated from rpm-4_4 branch -Source0: ftp://distfiles.pld-linux.org/src/%{name}-%{version}.%{snap}.tar.bz2 -# Source0-md5: 9960ab3e3023b49b42c1e85acef33de5 +Source0: ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz +# Source0-md5: 90ded9047b1b69d918c6c7c7b56fd7a9 Source1: %{name}.groups Source2: %{name}.platform Source3: %{name}-install-tree @@ -98,6 +99,7 @@ Patch36: %{name}-debuginfo.patch Patch37: %{name}-doxygen_hack.patch Patch38: %{name}-distver.patch Patch39: %{name}-gcc4.patch +Patch40: %{name}-pythondeps.patch URL: http://www.rpm.org/ Icon: rpm.gif BuildRequires: autoconf >= 2.52 @@ -122,7 +124,6 @@ BuildRequires: popt-devel >= %{reqpopt_ver} BuildRequires: python-modules >= 2.2 BuildRequires: readline-devel BuildRequires: rpm-perlprov -BuildRequires: rpm-pythonprov BuildRequires: zlib-devel %if %{with static} # Require static library only for static build @@ -208,6 +209,23 @@ RPM - ÓÌÕÖÂÏ×ϧ ¦ÎÆÏÒÍÁæ§, ÝÏ Í¦ÓÔÉÔØ ÎÁÚ×Õ, ×ÅÒÓ¦À, ÏÐÉÓ ÔÁ ¦ÎÛÕ ¦ÎÆÏÒÍÁæÀ ÐÒÏ ÐÁËÅÔ. +%package lib +Summary: RPMs library +Summary(pl): Biblioteki RPM-a +Group: Libraries +Requires: db >= %{reqdb_ver} +%{?with_selinux:BuildRequires: libselinux >= 1.18} +Requires: popt >= %{reqpopt_ver} +%{?with_distver:Provides: rpm-lib(distver)} +# avoid SEGV caused by mixed db versions +Conflicts: poldek < 0.18.1-16 + +%description lib +RPMs library. + +%description lib -l pl +Biblioteki RPM-a. + %package devel Summary: Header files for rpm libraries Summary(de): Header-Dateien für rpm Libraries @@ -362,103 +380,6 @@ Aktualnie pakiet zawiera binark uaktualniania lub usuwania pakietów bez udzia³u bibliotek statycznych (z wyj±tkiem modu³ów NSS). -%package perlprov -Summary: Additional utilities for checking perl provides/requires in rpm packages -Summary(de): Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen -Summary(pl): Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów perla w pakietach rpm -Group: Applications/File -Requires: %{name} = %{version}-%{release} -Requires: perl-devel -Requires: perl-modules - -%description perlprov -Additional utilities for checking perl provides/requires in rpm -packages. - -%description perlprov -l de -Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen. - -%description perlprov -l pl -Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów perla w -pakietach rpm. - -%package pythonprov -Summary: Python macros, which simplifies creation of rpm packages with Python software -Summary(pl): Makra u³atwiaj±ce tworzenie pakietów rpm z programami napisanymi w Pythonie -Group: Applications/File -Requires: %{name} = %{version}-%{release} -Requires: python-modules - -%description pythonprov -Python macros, which simplifies creation of rpm packages with Python -software. - -%description pythonprov -l pl -Makra u³atwiaj±ce tworzenie pakietów rpm z programami napisanymi w -Pythonie. - -%package php-pearprov -Summary: Additional utilities for managing rpm packages and database -Summary(pl): Dodatkowe narzêdzia do sprawdzania zale¿no¶ci skryptów php w rpm -Group: Applications/File -Requires: %{name} = %{version}-%{release} - -%description php-pearprov -Additional utilities for checking php pear provides/requires in rpm -packages. - -%description php-pearprov -l pl -Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów php pear w -pakietach rpm. - -%package -n python-rpm -Summary: Python interface to RPM library -Summary(pl): Pythonowy interfejs do biblioteki RPM-a -Summary(pt_BR): Módulo Python para aplicativos que manipulam pacotes RPM -Group: Development/Languages/Python -Requires: %{name} = %{version}-%{release} -%pyrequires_eq python -Obsoletes: rpm-python - -%description -n python-rpm -The rpm-python package contains a module which permits applications -written in the Python programming language to use the interface -supplied by RPM (RPM Package Manager) libraries. - -This package should be installed if you want to develop Python -programs that will manipulate RPM packages and databases. - -%description -n python-rpm -l pl -Pakiet rpm-python zawiera modu³, który pozwala aplikacjom napisanym w -Pythonie na u¿ywanie interfejsu dostarczanego przez biblioteki RPM-a. - -Pakiet ten powinien zostaæ zainstalowany, je¶li chcesz pisaæ w -Pythonie programy manipuluj±ce pakietami i bazami danych rpm. - -%description -n python-rpm -l pt_BR -O pacote rpm-python contém um módulo que permite que aplicações -escritas em Python utilizem a interface fornecida pelas bibliotecas -RPM (RPM Package Manager). - -Esse pacote deve ser instalado se você quiser desenvolver programas em -Python para manipular pacotes e bancos de dados RPM. - -%package lib -Summary: RPMs library -Summary(pl): Biblioteki RPM-a -Group: Libraries -Requires: db >= %{reqdb_ver} -Requires: popt >= %{reqpopt_ver} -%{?with_distver:Provides: rpm-lib(distver)} -# avoid SEGV caused by mixed db versions -Conflicts: poldek < 0.18.1-16 - -%description lib -RPMs library. - -%description lib -l pl -Biblioteki RPM-a. - %package build Summary: Scripts for building binary RPM packages Summary(de): Scripts fürs Bauen binärer RPM-Pakete @@ -564,6 +485,87 @@ construir pacotes usando o RPM. ò¦ÚÎÏÍÁΦÔΦ ÄÏÐÏͦÖΦ ÓËÒÉÐÔÉ ÔÁ ÕÔÉ̦ÔÉ, Ñ˦ ×ÉËÏÒÉÓÔÏ×ÕÀÔØÓÑ ÄÌÑ ÐÏÂÕÄÏ×É RPM'¦×. +%package perlprov +Summary: Additional utilities for checking perl provides/requires in rpm packages +Summary(de): Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen +Summary(pl): Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów perla w pakietach rpm +Group: Applications/File +Requires: %{name} = %{version}-%{release} +Requires: perl-devel +Requires: perl-modules + +%description perlprov +Additional utilities for checking perl provides/requires in rpm +packages. + +%description perlprov -l de +Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen. + +%description perlprov -l pl +Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów perla w +pakietach rpm. + +%package pythonprov +Summary: Python macros, which simplifies creation of rpm packages with Python software +Summary(pl): Makra u³atwiaj±ce tworzenie pakietów rpm z programami napisanymi w Pythonie +Group: Applications/File +Requires: %{name} = %{version}-%{release} +Requires: python-modules + +%description pythonprov +Python macros, which simplifies creation of rpm packages with Python +software. + +%description pythonprov -l pl +Makra u³atwiaj±ce tworzenie pakietów rpm z programami napisanymi w +Pythonie. + +%package php-pearprov +Summary: Additional utilities for managing rpm packages and database +Summary(pl): Dodatkowe narzêdzia do sprawdzania zale¿no¶ci skryptów php w rpm +Group: Applications/File +Requires: %{name} = %{version}-%{release} + +%description php-pearprov +Additional utilities for checking php pear provides/requires in rpm +packages. + +%description php-pearprov -l pl +Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów php pear w +pakietach rpm. + +%package -n python-rpm +Summary: Python interface to RPM library +Summary(pl): Pythonowy interfejs do biblioteki RPM-a +Summary(pt_BR): Módulo Python para aplicativos que manipulam pacotes RPM +Group: Development/Languages/Python +Requires: %{name} = %{version}-%{release} +%pyrequires_eq python +Obsoletes: rpm-python + +%description -n python-rpm +The rpm-python package contains a module which permits applications +written in the Python programming language to use the interface +supplied by RPM (RPM Package Manager) libraries. + +This package should be installed if you want to develop Python +programs that will manipulate RPM packages and databases. + +%description -n python-rpm -l pl +Pakiet rpm-python zawiera modu³, który pozwala aplikacjom napisanym w +Pythonie na u¿ywanie interfejsu dostarczanego przez biblioteki RPM-a. + +Pakiet ten powinien zostaæ zainstalowany, je¶li chcesz pisaæ w +Pythonie programy manipuluj±ce pakietami i bazami danych rpm. + +%description -n python-rpm -l pt_BR +O pacote rpm-python contém um módulo que permite que aplicações +escritas em Python utilizem a interface fornecida pelas bibliotecas +RPM (RPM Package Manager). + +Esse pacote deve ser instalado se você quiser desenvolver programas em +Python para manipular pacotes e bancos de dados RPM. + %package apidocs Summary: RPM API documentation and guides Summary(pl): Documentacja API RPM-a i przewodniki @@ -578,7 +580,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze ¼rode³ RPM-a przez doxygen. %prep -%setup -q -n %{name} +%setup -q %patch1 -p1 %patch2 -p1 # temporarily moved after patch0 - messes too much in pl.po @@ -632,6 +634,7 @@ cat %{SOURCE11} >> macros.in %patch37 -p1 %{?with_distver:%patch38 -p1} %patch39 -p1 +%patch40 -p1 %patch0 -p1 %patch3 -p1 @@ -777,15 +780,15 @@ cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqdep <