[mock] modified %post logic to set default config correctly
John Clark Williams
jcwillia at fedoraproject.org
Tue Nov 5 05:14:31 UTC 2013
commit 971cfa75532f5dc1849f994187719891ebbafb47
Author: Clark Williams <clark.williams at gmail.com>
Date: Mon Nov 4 23:14:42 2013 -0600
modified %post logic to set default config correctly
.gitignore | 1 +
mock.spec | 21 ++++++++++++++++++++-
sources | 2 +-
3 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8df9b39..b5417a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@ mock-1.1.4.tar.gz
/mock-1.1.32.tar.gz
/mock-1.1.33.tar.gz
/mock-1.1.34.tar.gz
+/mock-1.1.35.tar.gz
diff --git a/mock.spec b/mock.spec
index c1d45b5..d89dea5 100644
--- a/mock.spec
+++ b/mock.spec
@@ -1,7 +1,7 @@
# next four lines substituted by autoconf
%define major 1
%define minor 1
-%define sub 34
+%define sub 35
%define extralevel %{nil}
%define release_name mock
%define release_version %{major}.%{minor}.%{sub}%{extralevel}
@@ -88,8 +88,24 @@ exit 0
# fix cache permissions from old installs
chmod 2775 /var/cache/mock
+if [ -e /etc/fedora-release ]
+then
+ if grep -i rawhide /etc/fedora-release > /dev/null 2>&1
+ then
+ # Fedora release XX (Rawhide)
+ ver=rawhide
+ else
+ # Fedora release XX (name)
+ ver=$(cat /etc/fedora-release | awk '{print $3;}')
+ fi
+else
+ # Red Hat Enterprise Linux Server Release X.YY (name)
+ ver=$(cat /etc/redhat-release | awk '{print $7;}' | sed -e 's/\..*$//')
+fi
+
rm -f %{_sysconfdir}/%{name}/default.cfg
cfg=%{?fedora:fedora}%{?rhel:epel}-$ver-$(uname -i).cfg
+[ -e %{_sysconfdir}/%{name}/$cfg ] || exit -2
ln -s -f $cfg %{_sysconfdir}/%{name}/default.cfg
:
@@ -128,6 +144,9 @@ ln -s -f $cfg %{_sysconfdir}/%{name}/default.cfg
%{python_sitelib}/mockbuild/scm.py*
%changelog
+* Tue Nov 5 2013 Clark Williams <williams at redhat.com> - 1.1.35-1
+- modified %%post logic to set default config correctly
+
* Tue Oct 29 2013 Clark Williams <williams at redhat.com> - 1.1.34-1
- fixed specfile to include mass rebuild changelog entry
- package_state: drop privs when writing available_packages data [BZ# 916685]
diff --git a/sources b/sources
index 3ea7780..e7a74fb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b3b4fe834d21782ccde2e010bbe315ca mock-1.1.34.tar.gz
+acaf7c9030f20900b124c02951c37782 mock-1.1.35.tar.gz
More information about the scm-commits
mailing list