mavit pushed to arduino (f22). "Passing the --directory argument to `git apply` is no longer required."

notifications at fedoraproject.org notifications at fedoraproject.org
Thu Apr 9 20:07:58 UTC 2015


>From f3039f7b3d740f00846d93a26d4c7c190fff8e99 Mon Sep 17 00:00:00 2001
From: Peter Oliver <git at mavit.org.uk>
Date: Thu, 9 Apr 2015 20:08:32 +0100
Subject: Passing the --directory argument to `git apply` is no longer
 required.


diff --git a/arduino.spec b/arduino.spec
index 1e7a9b4..79d4021 100644
--- a/arduino.spec
+++ b/arduino.spec
@@ -1,7 +1,7 @@
 Name:		arduino
 Epoch:		1
 Version:	1.0.6
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	An IDE for Arduino-compatible electronics prototyping platforms
 Group:		Development/Tools
 License:	GPLv2+ and LGPLv2+ and CC-BY-SA
@@ -99,11 +99,7 @@ echo -e "\n# By default, don't notify the user of a new upstream version." \
         "\nupdate.check=false" \
     >> build/shared/lib/preferences.txt
 
-# "git apply" fails silently if pwd is git-controlled.
-pwd=`pwd`
-cd /
-git apply --directory=$pwd %{PATCH4}
-cd $pwd
+git apply %{PATCH4}
 
 %patch10 -p1
 
@@ -238,6 +234,9 @@ fi
 
 
 %changelog
+* Thu Apr  9 2015 Peter Oliver <rpm at mavit.org.uk> - 1:1.0.6-2
+- Passing the --directory argument to `git apply` is no longer required.
+
 * Mon Apr  6 2015 Peter Oliver <rpm at mavit.org.uk> - 1:1.0.6-1
 - Update to 1.0.6.
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/arduino.git/commit/?h=f22&id=f3039f7b3d740f00846d93a26d4c7c190fff8e99


More information about the scm-commits mailing list