commit 7e5296f4ab36994dc6a6c0a561256b8908f093f7
Author: Jan Rękorajski <[email protected]>
Date: Mon Aug 20 12:51:32 2012 +0200
Always install snapshot repo configs
poldek-snap.conf | 8 ++++++++
poldek.spec | 9 ++++++---
2 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/poldek.spec b/poldek.spec
index 9cc5ecc..3734102 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -5,9 +5,8 @@
%bcond_without python # don't build python bindings
%bcond_with snap # install configs for official Th snapshot
-%if %{with snap}
+# corrent snapshot name
%define SNAP 2012
-%endif
# required versions (forced to avoid SEGV with mixed db used by rpm and poldek)
%define ver_db 4.7.25
@@ -314,7 +313,7 @@ install -d
$RPM_BUILD_ROOT{%{_sysconfdir}/%{name}/repos.d,/var/cache/%{name}}
%{__sed} -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{pld_archive_conf} >
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-archive.conf
%endif
-%if %{with snap}
+# Always install snapshot configs
%{__sed} -e 's|%%ARCH%%|%{_ftp_arch}|g' \
-e 's|%%SNAP%%|%{SNAP}|g' < %{SOURCE100} >
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}.conf
%{__sed} -e 's|%%ARCH%%|%{_ftp_arch}|g' \
@@ -323,8 +322,12 @@ install -d
$RPM_BUILD_ROOT{%{_sysconfdir}/%{name}/repos.d,/var/cache/%{name}}
%{__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
%endif
+
+%if %{with snap}
%{__sed} -i -e 's|@@SNAP@@||g'
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
+%{__sed} -i '/@@SNAP@@.*/d'
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}.conf
%else
+%{__sed} -i -e 's|@@SNAP@@||g'
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}.conf
%{__sed} -i '/@@SNAP@@.*/d'
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
%endif
diff --git a/poldek-snap.conf b/poldek-snap.conf
index cfb321b..80e5398 100644
--- a/poldek-snap.conf
+++ b/poldek-snap.conf
@@ -22,19 +22,27 @@ _prefix = %{_pld_main_prefix}
type = pndir
name = th-%{_snap}
path = %{_prefix}/PLD/%{_arch}/RPMS/
+@@SNAP@@auto = no
+@@SNAP@@autoup = no
[source]
type = pndir
name = th-%{_snap}
path = %{_prefix}/PLD/noarch/RPMS/
+@@SNAP@@auto = no
+@@SNAP@@autoup = no
# PLD Linux 3.0 (Th) %SNAP%: updates
[source]
type = pndir
name = th-%{_snap}-updates
path = %{_pld_main_prefix}/updates/%{_arch}/RPMS/
+@@SNAP@@auto = no
+@@SNAP@@autoup = no
[source]
type = pndir
name = th-%{_snap}-updates
path = %{_pld_main_prefix}/updates/noarch/RPMS/
+@@SNAP@@auto = no
+@@SNAP@@autoup = no
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
