From 1f28bc088fda760f5dba28959e3521fd80b407d1 Mon Sep 17 00:00:00 2001
From: Thibault Cohen <thibault.cohen@savoirfairelinux.com>
Date: Wed, 8 Apr 2015 16:19:09 -0400
Subject: [PATCH] Fix(3) rpm get orig source

Change-Id: If8d5f5d4e09af6f660011f2c4f399e9b2c00cdba
---
 ring-daemon.spec | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ring-daemon.spec b/ring-daemon.spec
index d62e3c774e..8c992a0739 100644
--- a/ring-daemon.spec
+++ b/ring-daemon.spec
@@ -33,10 +33,12 @@ This is the daemon headers.
 %prep
 %setup -q
 git init
-git remote add origin https://gerrit-ring.savoirfairelinux.com/ring`
+git remote add origin https://gerrit-ring.savoirfairelinux.com/ring
 git fetch --all
-git git checkout packaging
-git merge origin master --no-edit
+git checkout packaging -f
+git config user.name "joulupukki"
+git config user.email "joulupukki@localhost"
+git merge origin/master --no-edit
 # Apply all patches
 for patch_file in $(cat debian/patches/series | grep -v "^#")
 do
-- 
GitLab