SPECS: poldek.spec - Titanium has different configs

hawk hawk at pld-linux.org
Mon May 26 09:59:26 CEST 2008


Author: hawk                         Date: Mon May 26 07:59:26 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Titanium has different configs

---- Files affected:
SPECS:
   poldek.spec (1.335 -> 1.336) 

---- Diffs:

================================================================
Index: SPECS/poldek.spec
diff -u SPECS/poldek.spec:1.335 SPECS/poldek.spec:1.336
--- SPECS/poldek.spec:1.335	Mon May 26 09:42:54 2008
+++ SPECS/poldek.spec	Mon May 26 09:59:20 2008
@@ -23,9 +23,11 @@
 # Source0-md5:	41c50bb17f8ac2b50d8838c8a346d0ec
 Source1:	%{name}.conf
 Source2:	%{name}-multilib.conf
-Source3:	%{name}-aliases.conf
-Source4:	%{name}.desktop
-Source5:	%{name}.png
+Source3:	%{name}-ti.conf
+Source4:	%{name}-multilib-ti.conf
+Source5:	%{name}-aliases.conf
+Source6:	%{name}.desktop
+Source7:	%{name}.png
 Patch0:		%{name}-vserver-packages.patch
 Patch1:		%{name}-config.patch
 Patch2:		%{name}-abort-on-upgrade.patch
@@ -212,6 +214,17 @@
 
 %{?with_static:rm -f $RPM_BUILD_ROOT%{_bindir}/rpmvercmp}
 
+%if "%{pld_release}" == "ti"
+sed -e '
+	s|%%ARCH%%|%{_ftp_arch}|g
+' < %{SOURCE3} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
+
+%ifarch %{x8664}
+sed '
+	s|%%ARCH%%|%{_ftp_alt_arch}|g
+' < %{SOURCE4} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
+%endif
+%else
 sed -e '
 	s|%%ARCH%%|%{_ftp_arch}|g
 ' < %{SOURCE1} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
@@ -221,14 +234,15 @@
 	s|%%ARCH%%|%{_ftp_alt_arch}|g
 ' < %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
 %endif
+%endif
 
-install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/aliases.conf
+install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/aliases.conf
 
 %if %{with imode}
 # add desktop file and icon
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
-install %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
-install %{SOURCE5} $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+install %{SOURCE6} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
+install %{SOURCE7} $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 %endif
 
 # sources we don't package
@@ -382,6 +396,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.336  2008-05-26 07:59:20  hawk
+- Titanium has different configs
+
 Revision 1.335  2008-05-26 07:42:54  hawk
 - use %pld_release macro for Titanium specific changes
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/poldek.spec?r1=1.335&r2=1.336&f=u



More information about the pld-cvs-commit mailing list