SPECS (AC-branch): poldek.spec - keep multilib config in separate ...

glen glen at pld-linux.org
Wed May 31 21:28:26 CEST 2006


Author: glen                         Date: Wed May 31 19:28:26 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- keep multilib config in separate sourcefile; rel 9

---- Files affected:
SPECS:
   poldek.spec (1.197.2.74 -> 1.197.2.75) 

---- Diffs:

================================================================
Index: SPECS/poldek.spec
diff -u SPECS/poldek.spec:1.197.2.74 SPECS/poldek.spec:1.197.2.75
--- SPECS/poldek.spec:1.197.2.74	Mon May 15 15:41:57 2006
+++ SPECS/poldek.spec	Wed May 31 21:28:20 2006
@@ -11,7 +11,7 @@
 Summary(pl):	Pomocnicze narzędzie do zarządzania pakietami RPM
 Name:		poldek
 Version:	0.20
-Release:	8
+Release:	9
 License:	GPL v2
 Group:		Applications/System
 Source0:	http://poldek.pld-linux.org/download/%{name}-%{version}.tar.bz2
@@ -29,6 +29,7 @@
 Patch7:		%{name}-bug-5774.patch
 Patch8:		%{name}-cli-hist.patch
 Patch9:		%{name}-vserver-packages.patch
+Patch10:	%{name}-multilib.patch
 URL:		http://poldek.pld-linux.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -145,6 +146,9 @@
 %patch7 -p2
 %patch8 -p2
 %patch9 -p1
+%ifarch %{x8664}
+%patch10 -p1
+%endif
 
 %build
 %{__autopoint}
@@ -194,16 +198,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
@@ -320,6 +322,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.197.2.75  2006/05/31 19:28:20  glen
+- keep multilib config in separate sourcefile; rel 9
+
 Revision 1.197.2.74  2006/05/15 13:41:57  glen
 - ignore vserver-packages, rel 8
 
================================================================

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



More information about the pld-cvs-commit mailing list