Index: /trunk/server/fedora/specs/python-hesiod.spec
===================================================================
--- /trunk/server/fedora/specs/python-hesiod.spec	(revision 2479)
+++ /trunk/server/fedora/specs/python-hesiod.spec	(revision 2480)
@@ -1,6 +1,6 @@
 Name:           python-hesiod
 Version:        0.2.10
-%define commit_hash 2b11f727fe934efe8935ac3543fe538d14b8fafe
-%define tag_hash 004e69f
+%define commit 2b11f727fe934efe8935ac3543fe538d14b8fafe
+%define shortcommit %(c=%{commit}; echo ${c:0:7})
 Release:        0.%{scriptsversion}%{?dist}
 Summary:        Python access to zephyr library
@@ -8,6 +8,6 @@
 Group:          Development/Languages
 License:        MIT
-URL:            http://github.com/ebroder/python-hesiod
-Source0:        http://github.com/ebroder/python-hesiod/tarball/%{version}/ebroder-%{name}-%{version}-0-g%{commit_hash}.tar.gz
+URL:            https://github.com/ebroder/python-hesiod
+Source0:        https://github.com/ebroder/python-hesiod/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -19,5 +19,5 @@
 
 %prep
-%setup -q -n ebroder-%{name}-%{tag_hash}
+%setup -q -n %{name}-%{commit}
 
 
Index: /trunk/server/fedora/specs/python-moira.spec
===================================================================
--- /trunk/server/fedora/specs/python-moira.spec	(revision 2479)
+++ /trunk/server/fedora/specs/python-moira.spec	(revision 2480)
@@ -1,6 +1,6 @@
 Name:           python-moira
 Version:        4.3.0
-%define commit_hash dd03ce70d348d6f569729fcc9173429a5ec8a84d
-%define tag_hash f62c0db
+%define commit dd03ce70d348d6f569729fcc9173429a5ec8a84d
+%define shortcommit %(c=%{commit}; echo ${c:0:7})
 Release:        0.%{scriptsversion}%{?dist}
 Summary:        Python access to zephyr library
@@ -8,6 +8,6 @@
 Group:          Development/Languages
 License:        MIT
-URL:            http://github.com/ebroder/python-moira
-Source0:        http://github.com/ebroder/python-moira/tarball/%{version}/ebroder-%{name}-%{version}-0-g%{commit_hash}.tar.gz
+URL:            https://github.com/ebroder/python-moira
+Source0:        https://github.com/ebroder/python-moira/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -19,5 +19,5 @@
 
 %prep
-%setup -q -n ebroder-%{name}-%{tag_hash}
+%setup -q -n %{name}-%{commit}