X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=poldek.spec;h=731afa2d9825e9ec802f62f2c497a5c8dd16fcd8;hb=9adc5e16bde78408e7d4444f7a308075c620a997;hp=e7656eb37132bf542f469527d14f6633aa65c58d;hpb=59d16d72b99a0a5c6eef1e7c6b05686d9c07aafe;p=packages%2Fpoldek.git

diff --git a/poldek.spec b/poldek.spec
index e7656eb..731afa2 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -5,31 +5,23 @@
 %bcond_with	curl	# link with curl
 #
 # required versions (forced to avoid SEGV with mixed db used by rpm and poldek)
-%define	ver_db	4.2.50-1
-%define	ver_rpm	4.3-0.20030610.29
+%define	ver_db	4.3.27-1
+%define	ver_rpm	4.3-0.20040107.34
 Summary:	RPM packages management helper tool
 Summary(pl):	Pomocnicze narzêdzie do zarz±dzania pakietami RPM
 Name:		poldek
-Version:	0.18.6
-Release:	15
+Version:	0.18.8
+Release:	6
 License:	GPL v2
 Group:		Applications/System
 Source0:	http://team.pld.org.pl/~mis/poldek/download/%{name}-%{version}.tar.bz2
-# Source0-md5:	21e4b2fa1695d95479e01fe82a4d84da
+# Source0-md5:	f7e2978c7f8b35b0b07d0278dd299881
 Source1:	%{name}.conf
 Patch0:		%{name}-etc_dir.patch
 Patch1:		%{name}-retr_term.patch
 Patch2:		%{name}-simplestatic.patch
-Patch3:		%{name}-pkgorder.patch
-Patch4:		%{name}-sigsegv.patch
-Patch5:		%{name}-caplookup.patch
-Patch6:		%{name}-progress2.patch
-Patch7:		%{name}-po.patch
-Patch8:		%{name}-deps-fix.patch
-Patch9:		%{name}-obsoletes_provides.patch
-Patch10:	%{name}-rev-promote.patch
-Patch11:	%{name}-sigsegv2.patch
-Patch12:	%{name}-distver.patch
+Patch3:		%{name}-gcc4.patch
+Patch4:		%{name}-cookie.patch
 URL:		http://team.pld.org.pl/~mis/poldek/
 BuildRequires:	automake
 BuildRequires:	autoconf
@@ -98,21 +90,14 @@ modu
 %patch0 -p1
 %patch1 -p1
 %patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch6 -p1
-%patch7 -p1
-%patch8 -p0
-%patch9 -p0
-%patch10 -p0
-%patch11 -p1
-%patch12 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 %{__autopoint}
 %{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 cp -f config.sub trurlib
 %configure \
@@ -129,7 +114,27 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}
 	DESTDIR=$RPM_BUILD_ROOT
 
 %{?with_static:rm -f $RPM_BUILD_ROOT%{_bindir}/rpmvercmp}
-sed "s|/i686/|/%{_target_cpu}/|g" < %{SOURCE1} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
+
+#
+# CHANGE IT WHEN SWITCHING poldek.conf FROM AC TO TH !!!
+#
+%ifarch i386 i586 i686 ppc sparc alpha amd64 athlon
+%define		_ftp_arch	%{_target_cpu}
+%else
+%ifarch i486
+%define		_ftp_arch	i386
+%else
+%ifarch pentium2 pentium3 pentium4
+%define		_ftp_arch	i686
+%else
+%ifarch sparcv9 sparc64
+%define		_ftp_arch	sparc
+%endif
+%endif
+%endif
+%endif
+
+sed "s|%%ARCH%%|%{_ftp_arch}|g" < %{SOURCE1} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
 
 %find_lang %{name}
 
@@ -137,14 +142,21 @@ sed "s|/i686/|/%{_target_cpu}/|g" < %{SOURCE1} > $RPM_BUILD_ROOT%{_sysconfdir}/%
 rm -rf $RPM_BUILD_ROOT
 
 %triggerpostun -- poldek <= 0.18.3-5
-if grep -q '^promoteepoch.*yes' /etc/poldek.conf ; then
-	echo -e ',s:^promoteepoch:# promoteepoch:g\n,w' | ed -s /etc/poldek.conf
+if grep -q '^promoteepoch.*yes' %{_sysconfdir}/poldek.conf ; then
+	echo -e ',s:^promoteepoch:# promoteepoch:g\n,w' | ed -s %{_sysconfdir}/poldek.conf
 fi
 
+# otherwise don't touch
+%ifarch i386 i586 i686 ppc sparc alpha amd64 athlon
+%triggerpostun -- poldek <= 0.18.7-1
+echo -e ',s://ftp.pld-linux.org://ftp.%{_target_cpu}.ac.pld-linux.org:g\n,w' |\
+	ed -s /etc/poldek.conf ||:
+%endif
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README* NEWS TODO *sample* conf/poldekrc*
-%attr(644,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/%{name}.conf
+%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man1/%{name}*
 %lang(pl) %{_mandir}/pl/man1/%{name}*