- rel 4

[packages/poldek.git] / poldek.spec

diff --git a/poldek.spec b/poldek.spec
index 85444c022c5c93b5339eabe96e1742ac55fda1d1..0493f706e54c9121cb4b767a754705c62d14323d 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -10,7 +10,7 @@ Summary:      RPM packages management helper tool
 Summary(pl):   Pomocnicze narzêdzie do zarz±dzania pakietami RPM
 Name:          poldek
 Version:       0.20
-Release:       2.2
+Release:       4
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://team.pld.org.pl/~mis/poldek/download/%{name}-%{version}.tar.bz2
@@ -58,8 +58,8 @@ BuildRequires:        readline-static
 BuildRequires: rpm-static
 BuildRequires: zlib-static
 %endif
-Requires(triggerpostun):       sed >= 4.0
 Requires(triggerpostun):       awk
+Requires(triggerpostun):       sed >= 4.0
 Requires:       %{name}-libs = %{version}-%{release}
 Requires:      db >= %{ver_db}
 Requires:      rpm >= %{ver_rpm}
@@ -95,9 +95,9 @@ modu
 %{!?with_imode:Ta wersja nie posiada trybu interaktywnego.}
 
 %package libs
-Summary:        poldek libraries
-Summary(pl):    Biblioteki poldka
-Group:          Libraries
+Summary:       poldek libraries
+Summary(pl):   Biblioteki poldka
+Group:         Libraries
 
 %description libs
 poldek libraries.
@@ -106,9 +106,9 @@ poldek libraries.
 Biblioteki poldka.
 
 %package devel
-Summary:        Header files for poldek libraries
-Summary(pl):    Pliki nag³ówkowe bibliotek poldka
-Group:          Development/Libraries
+Summary:       Header files for poldek libraries
+Summary(pl):   Pliki nag³ówkowe bibliotek poldka
+Group:         Development/Libraries
 Requires:       %{name}-libs = %{version}-%{release}
 
 %description devel
@@ -118,9 +118,9 @@ Header files for poldek libraries.
 Pliki nag³ówkowe bibliotek poldka.
 
 %package static
-Summary:        poldek static libraries
-Summary(pl):    Biblioteki statyczne poldka
-Group:          Development/Libraries
+Summary:       poldek static libraries
+Summary(pl):   Biblioteki statyczne poldka
+Group:         Development/Libraries
 Requires:       %{name}-devel = %{version}-%{release}
 
 %description static
@@ -158,18 +158,15 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}
 
 %{?with_static:rm -f $RPM_BUILD_ROOT%{_bindir}/rpmvercmp}
 
-#
-# CHANGE IT WHEN SWITCHING poldek.conf FROM AC TO TH !!!
-#
-%ifarch i386 i586 i686 ppc sparc alpha athlon
+%ifarch i486 i686 ppc sparc alpha athlon
 %define                _ftp_arch       %{_target_cpu}
 %else
-%ifarch amd64
-%define                _ftp_arch       %{_target_cpu}
+%ifarch %{x8664}
+%define                _ftp_arch       x86_64
 %define                _ftp_alt_arch   i686
 %else
-%ifarch i486
-%define                _ftp_arch       i386
+%ifarch i586
+%define                _ftp_arch       i486
 %else
 %ifarch pentium2 pentium3 pentium4
 %define                _ftp_arch       i686
@@ -185,14 +182,14 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}
 %{?with_static:rm -f $RPM_BUILD_ROOT%{_bindir}/rpmvercmp}
 
 sed -e "s|%%ARCH%%|%{_ftp_arch}|g" \
-%ifarch amd64
+%ifarch %{x8664}
        -e "s|%%ALT_ARCH%%|%{_ftp_alt_arch}|g" \
 %else
        -e '/%%ALT_ARCH%%/d' \
 %endif
        < %{SOURCE1} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/pld-source.conf
 
-%ifarch amd64
+%ifarch %{x8664}
 sed "s|%%ARCH%%|%{_ftp_alt_arch}|g" < %{SOURCE2} >> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/pld-source.conf
 %endif
 
@@ -257,12 +254,7 @@ if [ -f /etc/poldek.conf.rpmsave ]; then
        }
 
        }' < /etc/poldek.conf.rpmsave >> /etc/poldek/source.conf
-       echo "Converted old custom sources (non-ac dist ones) from /etc/poldek.conf.rpmsave to new poldek format in /etc/poldek/source.conf"
-
-       # propagate use_sudo to new config. only works for untouched poldek.conf and that's intentional.
-       if grep -q '^use_sudo.*=.*yes' /etc/poldek.conf.rpmsave; then
-               sed -i -e '/^#use sudo = no/s/^.*/use sudo = yes/' /etc/poldek/poldek.conf
-       fi
+       echo "Converted old custom sources from /etc/poldek.conf.rpmsave to new poldek format in /etc/poldek/source.conf"
 
        # copy hold=
        hold=$(grep ^hold /etc/poldek.conf.rpmsave)
@@ -275,7 +267,7 @@ fi
 %defattr(644,root,root,755)
 %doc README* NEWS TODO configs/
 %dir %{_sysconfdir}/%{name}
-%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}/*
 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/*