From d4e0a383ae6ad13615e1c82a48646886cf175d2f Mon Sep 17 00:00:00 2001 From: Simon John Date: Mon, 13 Jan 2014 12:14:31 +0000 Subject: Simplify package vs git checkout detection Fix #147 Fix #151 Fix #153 The following are the detailed changes - Remove ARDMK_PATH, ARDMK_FILE and arduino-mk subdirectory - Looks for ard-reset-arduino in $PATH or ARDMK_DIR/bin - Fix git-archive command in RPM SPEC file - Remove some whitespace - Remove arduino-mk dir from debian package's arduino-mk.install - Update docs to reflect the above changes - Bump Up version to 1.2.0 --- packaging/fedora/README.md | 4 ++-- packaging/fedora/arduino-mk.spec | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'packaging/fedora') diff --git a/packaging/fedora/README.md b/packaging/fedora/README.md index dbd6334..58ef666 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 --prefix=arduino-mk-1.1.0/ --format=tar -o ../arduino-mk-1.1.0.tar.gz -v HEAD | gzip + git archive HEAD --prefix=arduino-mk-1.2.0/ -o ../arduino-mk-1.2.0.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.1.0.tar.gz ~/rpmbuild/SOURCES/ + cp ../arduino-mk-1.2.0.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 1a7f3d3..a12ed55 100644 --- a/packaging/fedora/arduino-mk.spec +++ b/packaging/fedora/arduino-mk.spec @@ -1,5 +1,5 @@ Name: arduino-mk -Version: 1.1.0 +Version: 1.2.0 Release: 1%{dist} Summary: Program your Arduino from the command line Packager: Simon John @@ -33,8 +33,8 @@ install -m 755 -d %{buildroot}/%{_docdir}/%{name} install -m 755 -d %{buildroot}/%{_docdir}/%{name}/examples for dir in `find examples -type d` ; do install -m 755 -d %{buildroot}/%{_docdir}/%{name}/$dir ; done for file in `find examples -type f ! -name .gitignore` ; do install -m 644 $file %{buildroot}/%{_docdir}/%{name}/$file ; done -install -m 644 %{name}/*.mk %{buildroot}/%{_datadir}/arduino -install -m 644 %{name}/licence.txt %{buildroot}/%{_docdir}/%{name} +install -m 644 *.mk %{buildroot}/%{_datadir}/arduino +install -m 644 licence.txt %{buildroot}/%{_docdir}/%{name} install -m 755 bin/ard-reset-arduino %{buildroot}/%{_bindir}/ard-reset-arduino help2man %{buildroot}/%{_bindir}/ard-reset-arduino -n "Reset Arduino board" -s 1 -m "Arduino CLI Reset" --version-string=%{version} -N -o %{buildroot}/%{_mandir}/man1/ard-reset-arduino.1 @@ -51,5 +51,7 @@ rm -rf %{buildroot} %{_docdir}/%{name}/examples %changelog +* Mon Jan 13 2014 Simon John +- Removed arduino-mk subdirectory * Mon Dec 30 2013 Simon John - Initial release. -- cgit v1.2.3