[cmake-fedora] Fedora version will now automatically updated; Fixed 879141; Fixed 992069

Ding-Yi Chen dchen at fedoraproject.org
Mon Nov 25 05:39:15 UTC 2013


commit d0ffa0ef28f5d15b44fb5c1993d49ad7bbb302d9
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Mon Nov 25 15:14:44 2013 +1000

    Fedora version will now automatically updated;Fixed 879141; Fixed 992069

 .gitignore        |    1 +
 cmake-fedora.spec |   85 ++++++++++++++++++++++++++++++++++++++++++++--------
 sources           |    2 +-
 3 files changed, 74 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8c337da..ec94a54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,4 @@
 /cmake-fedora-1.0.2-Source.tar.gz
 /cmake-fedora-1.0.4.tar.gz
 /cmake-fedora-1.0.5-Source.tar.gz
+/cmake-fedora-1.1.1-Source.tar.gz
diff --git a/cmake-fedora.spec b/cmake-fedora.spec
index 01a1816..8e893a9 100644
--- a/cmake-fedora.spec
+++ b/cmake-fedora.spec
@@ -1,60 +1,119 @@
 Name:       cmake-fedora
-Version:    1.0.5
-Release:    3%{?dist}
+Version:    1.1.1
+Release:    1%{?dist}
 Summary:    CMake helper modules for fedora developers
+
 License:    BSD
 Group:      System Environment/Libraries
 URL:        https://fedorahosted.org/%{name}/
 Source0:    https://fedorahosted.org/releases/c/m/%{name}/%{name}-%{version}-Source.tar.gz
 
+
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildArch:  noarch
 
-BuildRequires:  cmake >= 2.6
+BuildRequires: cmake >= 2.6
 
-Requires:   cmake >= 2.6
+Requires:      cmake >= 2.6
 
 %description
 cmake-fedora consist a set of cmake modules that provides
 helper macros and targets for fedora developers.
 
+
+
+
+
 %prep
 %setup -q -n %{name}-%{version}-Source
 
 %build
-# $RPM_OPT_FLAGS should be  loaded from cmake macro.
+# $RPM_OPT_FLAGS should be loaded from cmake macro.
+
 %cmake .
 %__make VERBOSE=1  %{?_smp_mflags}
 
+
 %install
 %__rm -rf $RPM_BUILD_ROOT
 %__make install DESTDIR=$RPM_BUILD_ROOT
+
 # We install document using doc
-(cd $RPM_BUILD_ROOT//usr/share/doc/cmake-fedora-1.0.5
-    %__rm -rf RELEASE-NOTES.txt AUTHORS README ChangeLog COPYING TODO
+(cd $RPM_BUILD_ROOT/usr/share/doc/cmake-fedora-1.1.1
+    rm -fr *
 )
 
+
+
+
+
+
 %clean
-%__rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root,-)
-%doc RELEASE-NOTES.txt AUTHORS README ChangeLog COPYING TODO
+%doc AUTHORS README ChangeLog COPYING TODO
+%{_bindir}/cmake-fedora-fedpkg
+%{_bindir}/cmake-fedora-koji
 %{_bindir}/cmake-fedora-newprj
 %{_bindir}/koji-build-scratch
-%{_datadir}/cmake/Modules/*.cmake
+%{_libexecdir}/cmake-fedora-functions
+%config %{_sysconfdir}/cmake-fedora.conf
+%{_datadir}/cmake/Modules/ManageVersion.cmake
+%{_datadir}/cmake/Modules/ManageRPM.cmake
+%{_datadir}/cmake/Modules/ManageSourceVersionControl.cmake
+%{_datadir}/cmake/Modules/ManageString.cmake
+%{_datadir}/cmake/Modules/ManageArchive.cmake
+%{_datadir}/cmake/Modules/ManageRelease.cmake
+%{_datadir}/cmake/Modules/ManageEnvironment.cmake
+%{_datadir}/cmake/Modules/ManageTarget.cmake
+%{_datadir}/cmake/Modules/ManageTranslation.cmake
+%{_datadir}/cmake/Modules/ManageInstall.cmake
+%{_datadir}/cmake/Modules/ManageVariable.cmake
+%{_datadir}/cmake/Modules/ManageGConf.cmake
+%{_datadir}/cmake/Modules/ManageUninstall.cmake
+%{_datadir}/cmake/Modules/ManageReleaseFedora.cmake
+%{_datadir}/cmake/Modules/ManageFile.cmake
+%{_datadir}/cmake/Modules/ManageUpload.cmake
+%{_datadir}/cmake/Modules/ManageAPIDoc.cmake
+%{_datadir}/cmake/Modules/ManageMessage.cmake
 %{_datadir}/cmake/Modules/cmake_uninstall.cmake.in
+%{_datadir}/cmake/Modules/DateTimeFormat.cmake
 %{_datadir}/cmake/Templates/fedora
-%config %{_sysconfdir}/cmake-fedora.conf
 
 %changelog
+* Mon Nov 25 2013 Ding-Yi Chen <dchen at redhat.com> - 1.1.1-1
+- Enhancement:
+  + Fedora version will now automatically updated.
+  + New scripts: 
+    cmake-fedora-koji: Koji utilities.
+    cmake-fedora-fedpkg: Fedpkg utilities.
+  + Changed scripts:
+    koji-build-scratch: fedora_1, fedora_2, 
+    epel_1, epel_2 can now be used as build scopes.
+  + BODHI_UPDATE_TYPE is no longer required.
+  + No need to manual edit project.spec.in
+  + ADD_CUSTOM_TARGET_COMMAND now allow "ALL"
+- Bug Fixes:
+  Resolves: Bug 879141 - Excessive quotation mark for target tag_pre
+  Resolves: Bug 992069 - cmake-fedora: FTBFS in rawhide
+- Removed Directory: 
+  + <PRJ_DOC_DIR>/examples: as the examples can be found in
+    <CMAKE_ROOT>/Templates/fedora
+- Removed Variables: 
+  + FEDORA_AUTO_KARMA
+- Removed Targets:
+  + bodhi_new: Submit the package to bodhi
+  + fedpkg_<tag>_build: Build for tag
+  + fedpkg_<tag>_commit: Import, commit and push
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
-* Tue Aug 21 2012 Ding-Yi Chen <dchen at redhat.com> - 1.0.5-1
+* Thu Nov 22 2012 Ding-Yi Chen <dchen at redhat.com> - 1.0.5-1
 - Fedora 18 support.
 - Source tarball filename is changed back to name-version-Source.tar.gz
   to avoid confusion between source generate by cmake-fedora
diff --git a/sources b/sources
index 628a285..69085bf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-58b0fd93985184e1ee92910c87e338d3  cmake-fedora-1.0.5-Source.tar.gz
+4a7454452c564e3d38dfabd9ec4cb356  cmake-fedora-1.1.1-Source.tar.gz


More information about the scm-commits mailing list