This commit was manufactured by cvs2git to create tag 'auto-ac-poldek-

[packages/poldek.git] / poldek.spec

diff --git a/poldek.spec b/poldek.spec
index cf4fa4c122ada1ca02b600fb845b4f0d718f344c..3661fb8c572a6cbb03063e6457033eb31c082dc3 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -3,7 +3,6 @@
 %bcond_with    static  # don't use shared libraries
 %bcond_without imode   # don't build interactive mode
 %bcond_with    curl    # link with curl
-%bcond_with    distver # enable distversion patch
 #
 # required versions (forced to avoid SEGV with mixed db used by rpm and poldek)
 %define        ver_db  4.2.50-1
@@ -11,18 +10,18 @@
 Summary:       RPM packages management helper tool
 Summary(pl):   Pomocnicze narzêdzie do zarz±dzania pakietami RPM
 Name:          poldek
-Version:       0.18.7
-Release:       1%{?with_distver:+distver}
+Version:       0.18.8
+Release:       7
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://team.pld.org.pl/~mis/poldek/download/%{name}-%{version}.tar.bz2
-# Source0-md5: 42830ed55809e41059771b87131a84fd
+# Source0-md5: f7e2978c7f8b35b0b07d0278dd299881
 Source1:       %{name}.conf
 Patch0:                %{name}-etc_dir.patch
 Patch1:                %{name}-retr_term.patch
 Patch2:                %{name}-simplestatic.patch
-Patch3:                %{name}-po.patch
-Patch12:       %{name}-distver.patch
+Patch3:                %{name}-cookie.patch
+Patch4:                %{name}-rpmcmd.patch
 URL:           http://team.pld.org.pl/~mis/poldek/
 BuildRequires: automake
 BuildRequires: autoconf
@@ -54,7 +53,6 @@ BuildRequires:        zlib-static
 Requires:      db >= %{ver_db}
 Requires:      ed
 Requires:      rpm >= %{ver_rpm}
-%{?with_distver:Requires:      rpm-lib(distver)}
 Requires:      sed
 Requires:      openssl >= 0.9.7c
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -93,12 +91,13 @@ modu
 %patch1 -p1
 %patch2 -p0
 %patch3 -p1
-%{?with_distver:%patch12 -p1}
+%patch4 -p1
 
 %build
 %{__autopoint}
 %{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 cp -f config.sub trurlib
 %configure \
@@ -115,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}
 
@@ -123,10 +142,17 @@ 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*