[cmake-fedora] Suitable for more generic build

Ding-Yi Chen dchen at fedoraproject.org
Mon Aug 25 23:48:20 UTC 2014


commit b80085de13c2fe377338fe83eefe023e6eef327a
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Aug 26 09:43:59 2014 +1000

    Suitable for more generic build

 .gitignore        |    1 +
 cmake-fedora.spec |   19 +++++++++++++++++--
 sources           |    2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3f24c42..84cc4b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /cmake-fedora-1.2.7-Source.tar.gz
 /cmake-fedora-1.3.0-Source.tar.gz
 /cmake-fedora-2.1.0-Source.tar.gz
+/cmake-fedora-2.2.1-Source.tar.gz
diff --git a/cmake-fedora.spec b/cmake-fedora.spec
index 7be631c..7ddbeb6 100644
--- a/cmake-fedora.spec
+++ b/cmake-fedora.spec
@@ -1,6 +1,6 @@
 Name:           cmake-fedora
-Version:        2.1.0
-Release:        3%{?dist}
+Version:        2.2.1
+Release:        1%{?dist}
 Summary:        CMake helper modules for fedora developers
 License:        BSD
 Group:          System Environment/Libraries
@@ -8,6 +8,7 @@ URL:            https://fedorahosted.org/%{name}/
 Source0:        https://fedorahosted.org/releases/c/m/%{name}/%{name}-%{version}-Source.tar.gz
 
 BuildRequires:  cmake >= 2.6.2
+BuildRequires:  koji
 Requires:       cmake >= 2.6.2
 Requires:       git
 Requires:       bodhi-client
@@ -42,6 +43,8 @@ make install DESTDIR=%{buildroot}
 # We install document using doc 
 rm -fr %{buildroot}%{_docdir}/*
 
+%check
+make test
 
 
 %files
@@ -58,6 +61,7 @@ rm -fr %{buildroot}%{_docdir}/*
 %{_datadir}/cmake/Modules/ManageChangeLogScript.cmake
 %{_datadir}/cmake/Modules/ManageDependency.cmake
 %{_datadir}/cmake/Modules/ManageEnvironment.cmake
+%{_datadir}/cmake/Modules/ManageEnvironmentCommon.cmake
 %{_datadir}/cmake/Modules/ManageFile.cmake
 %{_datadir}/cmake/Modules/ManageGConf.cmake
 %{_datadir}/cmake/Modules/ManageGettextScript.cmake
@@ -76,6 +80,7 @@ rm -fr %{buildroot}%{_docdir}/*
 %{_datadir}/cmake/Modules/ManageVersion.cmake
 %{_datadir}/cmake/Modules/ManageZanata.cmake
 %{_datadir}/cmake/Modules/ManageZanataScript.cmake
+%{_datadir}/cmake/Modules/ManageZanataSuggest.cmake
 %{_datadir}/cmake/Modules/cmake_uninstall.cmake.in
 %{_datadir}/cmake/Templates/fedora/CMakeLists.txt.template
 %{_datadir}/cmake/Templates/fedora/RELEASE-NOTES.txt.template
@@ -87,6 +92,16 @@ rm -fr %{buildroot}%{_docdir}/*
 %{_datadir}/cmake/Templates/fedora/project.spec.in
 
 %changelog
+* 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.
+- ManageDependency: Make changes suitable for more generic *nix build.
+    e.g. FEDORA_NAME -> PACKAGE_NAME
+- ManageZanata: MANAGE_ZANATA: New option CLEAN_ZANATA_XML.
+- Workaround for Bug 1115136, otherwise el7 won't work.
+
+* Fri Aug 15 2014 Ding-Yi Chen <dchen at redhat.com> - 2.1.3-1
+- Fixed cmake-fedora-fedpkg
+
 * Thu Aug 14 2014 Ding-Yi Chen <dchen at redhat.com> - 2.1.0-3
 - Fix long changelog
 
diff --git a/sources b/sources
index a8cd2d9..72aa890 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6053b46454a2a3b68de446377db38758  cmake-fedora-2.1.0-Source.tar.gz
+09a18da02fbbc2b326292618cd6981b7  cmake-fedora-2.2.1-Source.tar.gz


More information about the scm-commits mailing list