packages: poldek/poldek.spec - more: use macros for pathnames

glen glen at pld-linux.org
Mon Aug 30 13:04:14 CEST 2010


Author: glen                         Date: Mon Aug 30 11:04:14 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- more: use macros for pathnames

---- Files affected:
packages/poldek:
   poldek.spec (1.411 -> 1.412) 

---- Diffs:

================================================================
Index: packages/poldek/poldek.spec
diff -u packages/poldek/poldek.spec:1.411 packages/poldek/poldek.spec:1.412
--- packages/poldek/poldek.spec:1.411	Mon Aug 30 12:55:39 2010
+++ packages/poldek/poldek.spec	Mon Aug 30 13:04:06 2010
@@ -271,29 +271,37 @@
 %endif
 
 %if "%{pld_release}" == "ti"
-	sed -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{SOURCE3} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
-
+	%define	pld_conf %{SOURCE3}
 	%ifarch %{x8664}
-		sed 's|%%ARCH%%|%{_ftp_alt_arch}|g' < %{SOURCE4} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
+		%define	pld_multilib_conf %{SOURCE4}
 	%endif
 %endif
+
 %if "%{pld_release}" == "th"
+	%define	pld_conf %{SOURCE1}
+	%define	pld_debuginfo_conf %{SOURCE8}
+
+	%ifarch %{x8664}
+		%define	pld_multilib_conf %{SOURCE2}
+	%endif
+
 	# aidath
 	%ifarch sparcv9 sparc64
-		sed -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{SOURCE9} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
-
-		%ifarch sparc64
-		sed 's|%%ARCH%%|%{_ftp_alt_arch}|g' < %{SOURCE10} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
-		%endif
-	%else
-		# th
-		sed -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{SOURCE1} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
-		sed -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{SOURCE8} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-debuginfo.conf
-
-		%ifarch %{x8664}
-			sed 's|%%ARCH%%|%{_ftp_alt_arch}|g' < %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
-		%endif
+		%define	pld_conf %{SOURCE9}
 	%endif
+	%ifarch sparc64
+		%define pld_multilib_conf %{SOURCE10}
+	%endif
+%endif
+
+sed -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{pld_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
+
+%if 0%{?pld_multilib_conf:1}
+	sed 's|%%ARCH%%|%{_ftp_alt_arch}|g' < %{pld_multilib_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
+%endif
+
+%if 0%{?pld_debuginfo_conf:1}
+sed -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{pld_debuginfo_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-debuginfo.conf
 %endif
 
 cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/cli.conf
@@ -472,6 +480,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.412  2010/08/30 11:04:06  glen
+- more: use macros for pathnames
+
 Revision 1.411  2010/08/30 10:55:39  glen
 - reformat sources hacking to get some readability
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/poldek/poldek.spec?r1=1.411&r2=1.412&f=u



More information about the pld-cvs-commit mailing list