commit 107643f3e6e22eda9d009eb7a9e3f176433c6d7b
Author: Elan Ruusamäe <[email protected]>
Date: Fri Feb 29 18:32:53 2008 +0000
- try 0.30 from HEAD
Changed files:
poldek.spec -> 1.315.2.1
poldek.spec | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/poldek.spec b/poldek.spec
index 5e1f87a..b99880c 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -1,4 +1,3 @@
-#
# Conditional build:
%bcond_with static # don't use shared libraries
%bcond_without imode # don't build interactive mode
@@ -7,9 +6,8 @@
# required versions (forced to avoid SEGV with mixed db used by rpm and poldek)
%define ver_db 4.3.27-1
%define ver_rpm 4.4.9-1
-#
-%define snap 20080225.00
-%define rel 0.1
+%define snap 20080225.00
+%define rel 0.1
Summary: RPM packages management helper tool
Summary(pl.UTF-8): Pomocnicze narzędzie do zarządzania pakietami RPM
Name: poldek
@@ -24,9 +22,11 @@ Source2: %{name}-multilib.conf
Source3: %{name}-aliases.conf
Source4: %{name}.desktop
Source5: %{name}.png
+Patch0: %{name}-dirdeps.patch
Patch1: %{name}-vserver-packages.patch
Patch2: %{name}-config.patch
Patch3: %{name}-multilib.patch
+Patch4: %{name}-abort-on-upgrade.patch
URL: http://poldek.pld-linux.org/
BuildRequires: autoconf
BuildRequires: automake
@@ -45,6 +45,7 @@ BuildRequires: popt-devel
BuildRequires: readline-devel >= 5.0
BuildRequires: rpm-devel >= %{ver_rpm}
%{?with_python:BuildRequires: rpm-pythonprov}
+BuildRequires: sed >= 4.0
BuildRequires: xmlto
BuildRequires: zlib-devel
%if %{with static}
@@ -65,6 +66,7 @@ Requires(triggerpostun): awk
Requires(triggerpostun): sed >= 4.0
Requires: %{name}-libs = %{version}-%{release}
Requires: db >= %{ver_db}
+Requires: openssl >= 0.9.7d
Requires: rpm >= %{ver_rpm}
Requires: rpm-lib = %(rpm -q --qf '%{V}' rpm-lib)
# vf* scripts use sed
@@ -150,11 +152,13 @@ Moduły języka Python dla poldka.
%prep
%setup -q -n %{name}-%{version}%{?snap:-cvs%{snap}}
+%patch0 -p1
%patch1 -p1
%patch2 -p1
%ifarch %{x8664}
%patch3 -p1
%endif
+%patch4 -p1
# cleanup backups after patching
find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -189,15 +193,15 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}
%{?with_static:rm -f $RPM_BUILD_ROOT%{_bindir}/rpmvercmp}
-%ifarch i486 i686 ppc sparc alpha athlon
+%ifarch i386 i586 i686 ppc sparc alpha athlon
%define _ftp_arch %{_target_cpu}
%else
%ifarch %{x8664}
-%define _ftp_arch x86_64
+%define _ftp_arch amd64
%define _ftp_alt_arch i686
%else
-%ifarch i586
-%define _ftp_arch i486
+%ifarch i486
+%define _ftp_arch i386
%else
%ifarch pentium2 pentium3 pentium4
%define _ftp_arch i686
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/poldek.git/commitdiff/a9509223080f5faa486ee17dce055a07aff2da0e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
