SPECS: poldek.spec - keep multilib config in separate sourcefile

glen glen at pld-linux.org
Wed May 31 21:59:29 CEST 2006


Author: glen                         Date: Wed May 31 19:59:29 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- keep multilib config in separate sourcefile

---- Files affected:
SPECS:
   poldek.spec (1.231 -> 1.232) 

---- Diffs:

================================================================
Index: SPECS/poldek.spec
diff -u SPECS/poldek.spec:1.231 SPECS/poldek.spec:1.232
--- SPECS/poldek.spec:1.231	Wed May 31 21:49:22 2006
+++ SPECS/poldek.spec	Wed May 31 21:59:24 2006
@@ -32,6 +32,7 @@
 Patch4:		%{name}-cli-hist.patch
 Patch5:		%{name}-vserver-packages.patch
 Patch6:		%{name}-config.patch
+Patch7:		%{name}-multilib.patch
 URL:		http://poldek.pld-linux.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -143,6 +144,7 @@
 %patch4 -p2
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 %{__autopoint}
@@ -189,16 +191,14 @@
 
 %{?with_static:rm -f $RPM_BUILD_ROOT%{_bindir}/rpmvercmp}
 
-sed -e "s|%%ARCH%%|%{_ftp_arch}|g" \
-%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
+sed -e '
+	s|%%ARCH%%|%{_ftp_arch}|g
+' < %{SOURCE1} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/pld-source.conf
 
 %ifarch %{x8664}
-sed "s|%%ARCH%%|%{_ftp_alt_arch}|g" < %{SOURCE2} >> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/pld-source.conf
+sed '
+	s|%%ARCH%%|%{_ftp_alt_arch}|g
+' < %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/pld-multilib-source.conf
 %endif
 
 install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/aliases.conf
@@ -315,6 +315,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.232  2006/05/31 19:59:24  glen
+- keep multilib config in separate sourcefile
+
 Revision 1.231  2006/05/31 19:49:22  glen
 - add config patch (from AC-branch)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/poldek.spec?r1=1.231&r2=1.232&f=u



More information about the pld-cvs-commit mailing list