[crda/f20] Accomodate relative pathnames in the symlink for /etc/localtime

[John W. Linville]

commit 2bc6fb8ffd9c775c025319a0950bbadb8381965a
Author: John W. Linville <linville at tuxdriver.com>
Date:   Fri Feb 28 15:23:22 2014 -0500

    Accomodate relative pathnames in the symlink for /etc/localtime
    
    Conflicts:
    	crda.spec

 crda.spec    |    5 ++++-
 setregdomain |    1 +
 2 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/crda.spec b/crda.spec
index 8e32088..385bb0f 100644
--- a/crda.spec
+++ b/crda.spec
@@ -3,7 +3,7 @@
 
 Name:           crda
 Version:        %{crda_version}_%{regdb_version}
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Regulatory compliance daemon for 802.11 wireless networking
 
 Group:          System Environment/Base
@@ -99,6 +99,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Feb 28 2014 John W. Linville <linville at redhat.com> - 1.1.3_2013.11.27-4
+- Accomodate relative pathnames in the symlink for /etc/localtime
+
 * Thu Jan 23 2014 John W. Linville <linville at redhat.com> - 1.1.3_2013.11.27-3
 - Correct a typo in setregdomain
 
diff --git a/setregdomain b/setregdomain
index 1e846e6..f6f0d1a 100755
--- a/setregdomain
+++ b/setregdomain
@@ -44,6 +44,7 @@ if [ -f "$LOCALTIME" ]
 then
 	ZONE=$(readlink $LOCALTIME)
 	ZONE=${ZONE#/usr/share/zoneinfo/}
+	ZONE=${ZONE#../usr/share/zoneinfo/}
 else
 	echo "Timezone information not found!  Unable to set regulatory domain."
 	exit