X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=poldek.spec;h=83c4345943eee4daf038b43a96867eb345616dd5;hb=8e908d0148d06abec3f920fda9c2d05d72f83a45;hp=3148c7b39f80f42586a673c8460c6eadeba0f894;hpb=aa3b63c540a066c161846bbe7d63712197e23f04;p=packages%2Fpoldek.git

diff --git a/poldek.spec b/poldek.spec
index 3148c7b..83c4345 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -5,22 +5,22 @@
 %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.3
-Release:	4
+Version:	0.18.9
+Release:	1.1
 License:	GPL v2
 Group:		Applications/System
-Source0:	http://team.pld.org.pl/~mis/poldek/download/%{name}-%{version}.tar.gz
-# Source0-md5:	339c54b86bfd733851c0f7125057f446
+Source0:	http://team.pld.org.pl/~mis/poldek/download/%{name}-%{version}.tar.bz2
+# Source0-md5:	c49eb9086a7ee77e50c527f9c95e41aa
 Source1:	%{name}.conf
-Patch1:		%{name}-etc_dir.patch
-Patch2:		%{name}-retr_term.patch
-Patch3:		%{name}-ldb4.patch
-Patch4:		%{name}-be-nice-for-proxy.patch
+Patch0:		%{name}-etc_dir.patch
+Patch1:		%{name}-retr_term.patch
+Patch2:		%{name}-simplestatic.patch
+Patch3:		%{name}-prereq.patch
 URL:		http://team.pld.org.pl/~mis/poldek/
 BuildRequires:	automake
 BuildRequires:	autoconf
@@ -28,17 +28,19 @@ BuildRequires:	bzip2-devel
 %{?with_curl:BuildRequires:	curl-devel >= 7.8}
 BuildRequires:	db-devel >= %{ver_db}
 BuildRequires:	gettext-autopoint
-BuildRequires:	openssl-devel >= 0.9.7c
+BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pcre-devel
+BuildRequires:	perl-tools-pod
 BuildRequires:	popt-devel
 BuildRequires:	readline-devel
 BuildRequires:	rpm-devel >= %{ver_rpm}
 BuildRequires:	zlib-devel
-BuildRequires:	perl-tools-pod
 %if %{with static}
 BuildRequires:	bzip2-static
 %{?with_curl:BuildRequires:	curl-static}
 BuildRequires:	db-static >= %{ver_db}
+BuildRequires:	glibc-static
+BuildRequires:	libselinux-static
 BuildRequires:	ncurses-static
 BuildRequires:	openssl-static
 BuildRequires:	pcre-static
@@ -46,10 +48,9 @@ BuildRequires:	popt-static
 BuildRequires:	readline-static
 BuildRequires:	rpm-static
 BuildRequires:	zlib-static
-BuildRequires:	glibc-static
 %endif
+Requires(triggerpostun):	sed >= 4.0
 Requires:	db >= %{ver_db}
-Requires:	ed
 Requires:	rpm >= %{ver_rpm}
 Requires:	sed
 Requires:	openssl >= 0.9.7c
@@ -69,6 +70,8 @@ shell mode of Perl's CPAN.
 
 %{!?with_imode:This version hasn't got interactive mode.}
 
+#' vim
+
 %description -l pl
 poldek jest narzêdziem linii poleceñ s³u¿±cym do weryfikacji,
 instalacji (w³±czaj±c instalacjê systemu od zera), aktualizacji i
@@ -85,13 +88,16 @@ modu
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
-%patch2 -p1
+%patch2 -p0
+%patch3 -p1
 
 %build
 %{__autopoint}
 %{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 cp -f config.sub trurlib
 %configure \
@@ -108,22 +114,52 @@ 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}
 
+# no poldek-{devel,static}
+rm -rf $RPM_BUILD_ROOT%{_includedir}
+rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.a
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libtrurl.so.0.4.0
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libtrurl.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%triggerpostun -- poldek <= 0.18.3-3
-if ! grep -q '^promoteepoch.*yes' /etc/poldek.conf ; then
-	echo -e ',s:^promoteepoch:# promoteepoch:g\n,w' | ed /etc/poldek.conf
-fi
+%triggerpostun -- poldek <= 0.18.3-5
+sed -i -e '/^promoteepoch:.*yes/s/^/#/' %{_sysconfdir}/poldek.conf
+
+# otherwise don't touch
+%ifarch i386 i586 i686 ppc sparc alpha amd64 athlon
+%triggerpostun -- poldek <= 0.18.7-1
+sed -i -e 's://ftp.pld-linux.org://ftp.%{_target_cpu}.ac.pld-linux.org:g' /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
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man1/%{name}*
 %lang(pl) %{_mandir}/pl/man1/%{name}*