Author: glen Date: Fri Feb 29 18:32:58 2008 GMT
Module: SPECS Tag: AC-DEVEL
---- Log message:
- try 0.30 from HEAD
---- Files affected:
SPECS:
poldek.spec (1.315 -> 1.315.2.1)
---- Diffs:
================================================================
Index: SPECS/poldek.spec
diff -u SPECS/poldek.spec:1.315 SPECS/poldek.spec:1.315.2.1
--- SPECS/poldek.spec:1.315 Tue Feb 26 21:03:25 2008
+++ SPECS/poldek.spec Fri Feb 29 19:32:53 2008
@@ -1,5 +1,4 @@
# $Revision$, $Date$
-#
# Conditional build:
%bcond_with static # don't use shared libraries
%bcond_without imode # don't build interactive mode
@@ -8,9 +7,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
@@ -25,9 +23,11 @@
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
@@ -46,6 +46,7 @@
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}
@@ -66,6 +67,7 @@
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
@@ -151,11 +153,13 @@
%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
@@ -190,15 +194,15 @@
%{?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
@@ -348,6 +352,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.315.2.1 2008-02-29 18:32:53 glen
+- try 0.30 from HEAD
+
Revision 1.315 2008-02-26 20:03:25 mis
- source is available
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/poldek.spec?r1=1.315&r2=1.315.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
