From 3b804ca1f385bb08a05f81224cad29915c72b0d3 Mon Sep 17 00:00:00 2001 From: "Joshua A. Anderson" Date: Tue, 9 Sep 2014 08:07:30 -0400 Subject: [PATCH] Tagging v1.0.1 --- CMake_version_options.cmake | 2 +- doc/user/compile_guide_linux_generic.dox | 4 ++-- packaging/SPECS/hoomd.spec | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMake_version_options.cmake b/CMake_version_options.cmake index 7525f3ec..b93820f9 100644 --- a/CMake_version_options.cmake +++ b/CMake_version_options.cmake @@ -4,7 +4,7 @@ ## Version information set(HOOMD_VERSION_MAJOR "1") set(HOOMD_VERSION_MINOR "0") -set(HOOMD_VERSION_PATCH "0") +set(HOOMD_VERSION_PATCH "1") set(HOOMD_VERSION "${HOOMD_VERSION_MAJOR}.${HOOMD_VERSION_MINOR}.${HOOMD_VERSION_PATCH}") # users may not have git installed, or this may be a tarball build - set a dummy version if that is the case diff --git a/doc/user/compile_guide_linux_generic.dox b/doc/user/compile_guide_linux_generic.dox index 7c18b0fd..d6bd6406 100644 --- a/doc/user/compile_guide_linux_generic.dox +++ b/doc/user/compile_guide_linux_generic.dox @@ -289,15 +289,15 @@ Use `git checkout name` to switch to a different branch or tag. Valid names: - *maint* - includes bugfixes since the last release +- *v1.0.1* - Release version 1.0.1 - *v1.0.0* - Release version 1.0.0 -- *v0.11.3* - Release version 0.11.3 - *etc...* You can verify that a tagged release is exactly as it appeared to the developers when it was created if you have GPG installed. ~~~~ $ git cat-file blob 175bf6edfc8ac23c067df1d9bd7b5dd41982be3c | gpg --import -$ git tag -v v1.0.0 +$ git tag -v v1.0.1 ~~~~ **Compile and install HOOMD-blue with makefiles:* diff --git a/packaging/SPECS/hoomd.spec b/packaging/SPECS/hoomd.spec index dccc88fc..42b74228 100644 --- a/packaging/SPECS/hoomd.spec +++ b/packaging/SPECS/hoomd.spec @@ -3,8 +3,8 @@ # The version number to tag the build with is %{version}. # Both should be specified, as we cannot determine the version until we have checked out the code # - if they are not speicified, then the most recent tag is built -%global version %{?version}%{!?version:1.0.0} -%global refspec %{?refspec}%{!?refspec:v1.0.0} +%global version %{?version}%{!?version:1.0.1} +%global refspec %{?refspec}%{!?refspec:v1.0.1} %global release %{?release}%{!?release:0} # the Red Hat convention is to put 64-bit libs in lib64 @@ -20,7 +20,7 @@ Name: hoomd Version: %{version} Release: %{release} # sources will be retrieved with subversion -# Source: http://codeblue.umich.edu/hoomd-blue/downloads/1.0/hoomd-1.0.0.tar.bz2 +# Source: http://codeblue.umich.edu/hoomd-blue/downloads/1.0/hoomd-1.0.1.tar.bz2 URL: http://codeblue.umich.edu/hoomd-blue/ Prefix: /usr Group: Applications -- 2.11.4.GIT