From 1893199dad80af98b9ba1ef1e89d06f086cab58f Mon Sep 17 00:00:00 2001 From: Simon John Date: Sat, 1 Feb 2014 00:41:00 +0000 Subject: BUNDLED_AVR_TOOLS_DIR is now set correctly using := instead of ?=, so that installations using only the arduino-core packages that don't have the $(ARDUINO_DIR)/hardware/tools/avr directory can still use the avr-g++ tools found in the $PATH (/usr/bin) Previously BUNDLED_AVR_TOOLS_DIR was set to an empty string as the directory doesn't exist, which meant that "ifdef BUNDLED_AVR_TOOLS_DIR..." was set rather than skipping to "else SYSTEMPATH_AVR_TOOLS_DIR...." No user would set BUNDLED_AVR_TOOLS_DIR so the assignment operator := should be used not ?= Updated the version info/changes in various locations. --- packaging/fedora/README.md | 4 ++-- packaging/fedora/arduino-mk.spec | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'packaging/fedora') diff --git a/packaging/fedora/README.md b/packaging/fedora/README.md index 3cf6161..989937a 100644 --- a/packaging/fedora/README.md +++ b/packaging/fedora/README.md @@ -6,7 +6,7 @@ First install the dependencies as root: From the top-level Arduino-Makefile directory you've checked out of github, run the following (as unprivileged user) to create a compressed tarball using the naming conventions required by rpmbuild: - git archive HEAD --prefix=arduino-mk-1.3.0/ -o ../arduino-mk-1.3.0.tar.gz + git archive HEAD --prefix=arduino-mk-1.3.1/ -o ../arduino-mk-1.3.1.tar.gz If you don't already have a rpmbuild setup (e.g. you've not installed the SRPM) you will need to create the directories: @@ -14,7 +14,7 @@ If you don't already have a rpmbuild setup (e.g. you've not installed the SRPM) Then copy the tarball and specfile into those directories: - cp ../arduino-mk-1.3.0.tar.gz ~/rpmbuild/SOURCES/ + cp ../arduino-mk-1.3.1.tar.gz ~/rpmbuild/SOURCES/ cp packaging/fedora/arduino-mk.spec ~/rpmbuild/SPECS/ Then compile. This will create a binary and source RPM: diff --git a/packaging/fedora/arduino-mk.spec b/packaging/fedora/arduino-mk.spec index 4cc10d3..36c58a5 100644 --- a/packaging/fedora/arduino-mk.spec +++ b/packaging/fedora/arduino-mk.spec @@ -1,5 +1,5 @@ Name: arduino-mk -Version: 1.3.0 +Version: 1.3.1 Release: 1%{dist} Summary: Program your Arduino from the command line Packager: Simon John @@ -51,6 +51,8 @@ rm -rf %{buildroot} %{_docdir}/%{name}/examples %changelog +* Sat Feb 01 2014 Simon John +- Updated version. * Mon Jan 13 2014 Simon John - Removed arduino-mk subdirectory * Mon Dec 30 2013 Simon John -- cgit v1.2.3