Author: baggins Date: Wed Aug 17 22:41:24 2005 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- release 5
- added multilib source config
---- Files affected:
SPECS:
poldek.spec (1.197.2.23 -> 1.197.2.24)
---- Diffs:
================================================================
Index: SPECS/poldek.spec
diff -u SPECS/poldek.spec:1.197.2.23 SPECS/poldek.spec:1.197.2.24
--- SPECS/poldek.spec:1.197.2.23 Tue Aug 9 14:54:02 2005
+++ SPECS/poldek.spec Thu Aug 18 00:41:18 2005
@@ -12,12 +12,13 @@
Summary(pl): Pomocnicze narzędzie do zarządzania pakietami RPM
Name: poldek
Version: 0.19.0
-Release: 1.%{snap}.4
+Release: 1.%{snap}.5
License: GPL v2
Group: Applications/System
Source0:
http://team.pld.org.pl/~mis/poldek/download/snapshots/%{name}-%{version}-cvs%{snap}.tar.bz2
# Source0-md5: d529239d781c3d9e36577305d46d1a37
Source1: %{name}.conf
+Source2: %{name}-multilib.conf
Patch0: %{name}-prereq.patch
URL: http://team.pld.org.pl/~mis/poldek/
BuildRequires: automake
@@ -151,8 +152,12 @@
#
# CHANGE IT WHEN SWITCHING poldek.conf FROM AC TO TH !!!
#
-%ifarch i386 i586 i686 ppc sparc alpha amd64 athlon
+%ifarch i386 i586 i686 ppc sparc alpha athlon
+%define _ftp_arch %{_target_cpu}
+%else
+%ifarch amd64
%define _ftp_arch %{_target_cpu}
+%define _ftp_alt_arch athlon
%else
%ifarch i486
%define _ftp_arch i386
@@ -166,10 +171,15 @@
%endif
%endif
%endif
+%endif
%{?with_static:rm -f $RPM_BUILD_ROOT%{_bindir}/rpmvercmp}
sed "s|%%ARCH%%|%{_ftp_arch}|g" < %{SOURCE1} >
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/pld-source.conf
+%ifarch amd64
+sed "s|%%ARCH%%|%{_ftp_alt_arch}|g" < %{SOURCE2} >>
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/pld-source.conf
+%endif
+
# get rid of non-pld sources
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{rh,fedora}-source.conf
# include them in %doc
@@ -269,6 +279,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.197.2.24 2005/08/17 22:41:18 baggins
+- release 5
+- added multilib source config
+
Revision 1.197.2.23 2005/08/09 12:54:02 glen
- remove non-pld configs from /etc/poldek
- propagate use_sudo from old config to new one
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/poldek.spec?r1=1.197.2.23&r2=1.197.2.24&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
