commit 1bacc3e04a489902fc5475762fa8dcea7b010068
Author: Jan Rękorajski <[email protected]>
Date: Sun Feb 22 10:23:12 2015 +0100
- renamed multilib configs to arch names
poldek.spec | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/poldek.spec b/poldek.spec
index c9aee19..8d9540e 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -321,11 +321,11 @@ install -d
$RPM_BUILD_ROOT{%{_sysconfdir}/%{name}/repos.d,/var/cache/%{name}}
%{__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
+ %{__sed} 's|%%ARCH%%|%{_ftp_alt_arch}|g' < %{pld_multilib_conf} >
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-%{_ftp_alt_arch}.conf
%endif
%if 0%{?pld_multilib2_conf:1}
- %{__sed} 's|%%ARCH%%|%{_ftp_alt2_arch}|g' < %{pld_multilib_conf} >
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-multilib2.conf
+ %{__sed} 's|%%ARCH%%|%{_ftp_alt2_arch}|g' < %{pld_multilib_conf} >
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-%{_ftp_alt2_arch}.conf
%endif
%if 0%{?pld_debuginfo_conf:1}
@@ -343,9 +343,9 @@ install -d
$RPM_BUILD_ROOT{%{_sysconfdir}/%{name}/repos.d,/var/cache/%{name}}
-e 's|%%SNAP%%|%{SNAP}|g' < %{SOURCE102} >
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-debuginfo.conf
%ifarch %{x8664} x32
%{__sed} -e 's|%%ARCH%%|%{_ftp_alt_arch}|g' \
- -e 's|%%SNAP%%|%{SNAP}|g' < %{SOURCE101} >
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-multilib.conf
+ -e 's|%%SNAP%%|%{SNAP}|g' < %{SOURCE101} >
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-%{_ftp_alt_arch}.conf
%{__sed} -e 's|%%ARCH%%|%{_ftp_alt2_arch}|g' \
- -e 's|%%SNAP%%|%{SNAP}|g' < %{SOURCE101} >
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-multilib2.conf
+ -e 's|%%SNAP%%|%{SNAP}|g' < %{SOURCE101} >
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-%{_ftp_alt2_arch}.conf
%endif
%if %{with snap}
@@ -475,6 +475,16 @@ if [ -f
%{_sysconfdir}/%{name}/pld-multilib-source.conf.rpmsave ]; then
fi
%endif
+%triggerpostun -- poldek < 0.30.1-3
+if [ -f %{_sysconfdir}/%{name}/repos.d/pld-multilib.conf.rpmsave ]; then
+ cp -f %{_sysconfdir}/%{name}/repos.d/pld-%{_ftp_alt_arch}.conf{,.rpmnew}
+ cp -f %{_sysconfdir}/%{name}/repos.d/pld-multilib.conf.rpmsave
%{_sysconfdir}/%{name}/repos.d/pld-%{_ftp_alt_arch}.conf
+fi
+if [ -f %{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-multilib.conf.rpmsave ];
then
+ cp -f
%{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-%{_ftp_alt_arch}.conf{,.rpmnew}
+ cp -f %{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-multilib.conf.rpmsave
%{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-%{_ftp_alt_arch}.conf
+fi
+
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc ChangeLog README* NEWS TODO configs
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/poldek.git/commitdiff/c7f4d3746e07c43b2dcd2c5cbd5e47f44097ce84
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
