From: Marcin Krol Date: Sat, 10 Sep 2011 22:38:08 +0000 (+0200) Subject: - s/pld/tld X-Git-Url: https://git.tld-linux.org/?p=packages%2Fpoldek.git;a=commitdiff_plain;h=d61c300be9792398bff724436eb23da5c5778210;ds=sidebyside - s/pld/tld --- diff --git a/poldek.spec b/poldek.spec index fec193d..fa58482 100644 --- a/poldek.spec +++ b/poldek.spec @@ -250,15 +250,15 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d %define _ftp_arch i686 %endif -%define pld_conf %{SOURCE1} +%define tld_conf %{SOURCE1} %ifarch %{x8664} - %define pld_multilib_conf %{SOURCE2} + %define tld_multilib_conf %{SOURCE2} %endif -sed -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{pld_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf +sed -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{tld_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/tld.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 +%if 0%{?tld_multilib_conf:1} + sed 's|%%ARCH%%|%{_ftp_alt_arch}|g' < %{tld_multilib_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/tld-multilib.conf %endif cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/cli.conf @@ -368,15 +368,15 @@ fi %{__sed} -i -e '/%%include %%{_distro}-source.conf/d' %{_sysconfdir}/%{name}/poldek.conf %{__sed} -i -e '/%%include %%{_distro}-multilib-source.conf/d' %{_sysconfdir}/%{name}/poldek.conf -if [ -f %{_sysconfdir}/%{name}/pld-source.conf.rpmsave ]; then - cp -f %{_sysconfdir}/%{name}/repos.d/pld.conf{,.rpmnew} - cp -f %{_sysconfdir}/%{name}/pld-source.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/pld.conf +if [ -f %{_sysconfdir}/%{name}/tld-source.conf.rpmsave ]; then + cp -f %{_sysconfdir}/%{name}/repos.d/tld.conf{,.rpmnew} + cp -f %{_sysconfdir}/%{name}/tld-source.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/tld.conf fi %ifarch %{x8664} -if [ -f %{_sysconfdir}/%{name}/pld-multilib-source.conf.rpmsave ]; then - cp -f %{_sysconfdir}/%{name}/repos.d/pld-multilib.conf{,.rpmnew} - cp -f %{_sysconfdir}/%{name}/pld-multilib-source.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/pld-multilib.conf +if [ -f %{_sysconfdir}/%{name}/tld-multilib-source.conf.rpmsave ]; then + cp -f %{_sysconfdir}/%{name}/repos.d/tld-multilib.conf{,.rpmnew} + cp -f %{_sysconfdir}/%{name}/tld-multilib-source.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/tld-multilib.conf fi %endif