[packages/poldek/AC-DEVEL: 6/38] - merge from AC-branch

[glen]

commit 6a4633419778e3eeeeaba35aa3c083ba8f28628e
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Wed Apr 23 18:25:21 2008 +0000

    - merge from AC-branch
    
    Changed files:
        poldek.spec -> 1.315.2.5

 poldek.spec | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/poldek.spec b/poldek.spec
index eb545ea..024fffb 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -207,24 +207,20 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d
 
 %ifarch i386 i586 i686 ppc sparc alpha athlon
 %define		_ftp_arch	%{_target_cpu}
-%else
+%endif
 %ifarch %{x8664}
 %define		_ftp_arch	amd64
 %define		_ftp_alt_arch	i686
-%else
+%endif
 %ifarch i486
 %define		_ftp_arch	i386
-%else
+%endif
 %ifarch pentium2 pentium3 pentium4
 %define		_ftp_arch	i686
-%else
+%endif
 %ifarch sparcv9 sparc64
 %define		_ftp_arch	sparc
 %endif
-%endif
-%endif
-%endif
-%endif
 
 %{?with_static:rm -f $RPM_BUILD_ROOT%{_bindir}/rpmvercmp}
 
@@ -332,12 +328,16 @@ fi
 if [ -f %{_sysconfdir}/%{name}/pld-source.conf.rpmsave ]; then
 	cp -f %{_sysconfdir}/%{name}/repos.d/pld.conf{,.rpmnew}
 	mv -f %{_sysconfdir}/%{name}/pld-source.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/pld.conf
+	%{__sed} -i -e 's,_pld_arch,_arch,g;s,_ac_idxtype,_type,g;s,_pld_prefix,_prefix,g' \
+		 %{_sysconfdir}/%{name}/repos.d/pld.conf
 fi
 
 %ifarch %{x8664}
 if [ -f %{_sysconfdir}/%{name}/pld-multilib-source.conf.rpmsave ]; then
 	cp -f %{_sysconfdir}/%{name}/repos.d/pld-multilib.conf{,.rpmnew}
 	mv -f %{_sysconfdir}/%{name}/pld-multilib-source.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
+	%{__sed} -i -e 's,_pld_arch,_arch,g;s,_ac_idxtype,_type,g;s,_pld_prefix,_prefix,g' \
+		 %{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
 fi
 %endif
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/poldek.git/commitdiff/a9509223080f5faa486ee17dce055a07aff2da0e