From e66ae36d44becf206c52b02d57948b4c32428122 Mon Sep 17 00:00:00 2001
From: Ding-Yi Chen <dingyichen@gmail.com>
Date: Aug 26 2014 08:19:30 +0000
Subject: Merge branch 'master' into f21


---

diff --git a/.gitignore b/.gitignore
index f34b1c0..05d9bf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /cmake-fedora-2.1.0-Source.tar.gz
 /cmake-fedora-2.2.1-Source.tar.gz
 /cmake-fedora-2.2.2-Source.tar.gz
+/cmake-fedora-2.3.0-Source.tar.gz
diff --git a/cmake-fedora.spec b/cmake-fedora.spec
index eb45947..7acf368 100644
--- a/cmake-fedora.spec
+++ b/cmake-fedora.spec
@@ -1,5 +1,5 @@
 Name:           cmake-fedora
-Version:        2.2.2
+Version:        2.3.0
 Release:        1%{?dist}
 Summary:        CMake helper modules for fedora developers
 License:        BSD
@@ -92,8 +92,9 @@ make test
 %{_datadir}/cmake/Templates/fedora/project.spec.in
 
 %changelog
-* Tue Aug 26 2014 Ding-Yi Chen <dchen at redhat.com> - 2.2.2-1
-- cmake-fedora-fedpkg: Fail-fast if error is discovered.
+* Tue Aug 26 2014 Ding-Yi Chen <dchen at redhat.com> - 2.3.0-1
+- cmake-fedora-fedpkg: fix try_command
+- ManageChangeLogScript: New command "make"
 
 * Mon Aug 25 2014 Ding-Yi Chen <dchen at redhat.com> - 2.2.1-1
 - ManageEnvironmentCommon: Module of variable for both normal and script mode.
diff --git a/sources b/sources
index abaa931..eaab49a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fe014f4cfe7b67c5839498c563f0d7ab  cmake-fedora-2.2.2-Source.tar.gz
+ab8475494efeb7a2256d8ce15cf8bab5  cmake-fedora-2.3.0-Source.tar.gz