[cmake-fedora] ;Fixed Bug 1040333, 1046213;-b;1040333,1046213
Ding-Yi Chen
dchen at fedoraproject.org
Fri Jan 10 00:01:32 UTC 2014
commit 910d9878ad86209ae0beb523e9a5851ff74f8c67
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date: Fri Jan 10 10:01:36 2014 +1000
;Fixed Bug 1040333, 1046213;-b;1040333,1046213
.gitignore | 1 +
cmake-fedora.spec | 122 ++++++++++++++++++++++++++++++++++++++--------------
sources | 2 +-
3 files changed, 91 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 33e9bab..56e4451 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,4 @@
/cmake-fedora-1.1.4-Source.tar.gz
/cmake-fedora-1.1.5-Source.tar.gz
/cmake-fedora-1.1.6-Source.tar.gz
+/cmake-fedora-1.2.3-Source.tar.gz
diff --git a/cmake-fedora.spec b/cmake-fedora.spec
index d2b4023..3f127d5 100644
--- a/cmake-fedora.spec
+++ b/cmake-fedora.spec
@@ -1,21 +1,19 @@
-Name: cmake-fedora
-Version: 1.1.6
-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
-
-Requires: cmake >= 2.6
+Name: cmake-fedora
+Version: 1.2.3
+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
+
+BuildRequires: cmake >= 2.6.2
+Requires: cmake >= 2.6.2
+Requires: koji
+Requires: fedpkg
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
%description
cmake-fedora consist a set of cmake modules that provides
@@ -23,36 +21,31 @@ helper macros and targets for fedora developers.
-
-
%prep
%setup -q -n %{name}-%{version}-Source
%build
# $RPM_OPT_FLAGS should be loaded from cmake macro.
-
-%cmake .
-%__make VERBOSE=1 %{?_smp_mflags}
-
+%cmake -DCMAKE_FEDORA_ENABLE_FEDORA_BUILD=1 .
+make VERBOSE=1 %{?_smp_mflags}
%install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
+%__rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
-# We install document using doc
-(cd $RPM_BUILD_ROOT/usr/share/doc/cmake-fedora-1.1.6
- rm -fr *
+# We install document using doc
+(cd %{buildroot}/usr/share/doc/%{name}-%{version}
+ rm -fr *
)
-
-
-
-
%clean
%files
+
+%defattr(-,root,root-)
%doc AUTHORS README ChangeLog COPYING TODO
+%{_bindir}/cmake-fedora-changelog
%{_bindir}/cmake-fedora-fedpkg
%{_bindir}/cmake-fedora-koji
%{_bindir}/cmake-fedora-newprj
@@ -75,6 +68,7 @@ helper macros and targets for fedora developers.
%{_datadir}/cmake/Modules/ManageReleaseFedora.cmake
%{_datadir}/cmake/Modules/ManageFile.cmake
%{_datadir}/cmake/Modules/ManageUpload.cmake
+%{_datadir}/cmake/Modules/ManageDependency.cmake
%{_datadir}/cmake/Modules/ManageAPIDoc.cmake
%{_datadir}/cmake/Modules/ManageMessage.cmake
%{_datadir}/cmake/Modules/cmake_uninstall.cmake.in
@@ -82,6 +76,68 @@ helper macros and targets for fedora developers.
%{_datadir}/cmake/Templates/fedora
%changelog
+* Thu Jan 09 2014 Ding-Yi Chen <dchen at redhat.com> - 1.2.3-1
+- Resolves Bug 1040333 - RFE: Suiport .gitignore file as
+ source of CPACK_SOURCE_IGNORE_FILES
+- Resolves Bug 1046213 - RFE: RPM ChangeLog should be generated by
+ newest build from koji
+- Enhancement:
+ + ChangeLog.prev is no longer required.
+ + RPM-ChangeLog.prev is provide by koji now.
+ + cmake-fedora-koji:
+ - new subcommand: newest-build and newest-changelog.
+ + cmake-fedora-changelog: new script.
+ + New targets:
+ - tag_push: Push to git.
+ + ManageFile:
+ - Add absolute file support
+ - MANAGE_FILE_INSTALL: Add TARGETS support.
+ - MANAGE_FILE_INSTALL: Add RENAME support.
+ - GIT_GLOB_TO_CMAKE_REGEX: Convert git glob to cmake regex
+ + ManageArchive:
+ - PACK_SOURCE_CPACK: Pack with CPack
+ - PACK_SOURCE_ARCHIVE: Now can specify OUTPUT_FILE.
+ - SOURCE_ARCHIVE_CONTENTS_ADD: Add file to source archive.
+ - SOURCE_ARCHIVE_CONTENTS_ADD_NO_CHECK:
+ Add file to source archive without checking.
+ + ManageDependency: Manage dependencies.
+ + ManageRPM:
+ - PACK_RPM: New options: SPEC_IN and SPEC.
+ - RPM_SPEC_STRING_ADD: Add a string to SPEC string.
+ - RPM_SPEC_STRING_ADD_DIRECTIVE: Add a directive to SPEC string.
+ - RPM_SPEC_STRING_ADD_TAG: Add a string to SPEC string.
+ + ManageString:
+ - STRING_APPEND: Append a string to a variable.
+ - STRING_PADDING: Padding the string to specified length
+ - STRING_PREPEND: Prepend a string to a variable.
+ + ManageTranslation:
+ - MANAGE_GETTEXT:
+ + Can specify MSGFMT_OPTIONS and MSGMERGE_OPTIONS
+ + Add gettext-devel to BUILD_REQUIRES.
+ + ManageVariable:
+ - VARIABLE_TO_ARGN: Merge the variable and options to
+ the form of ARGN.
+ + Cached variables:
+ - RPM_SPEC_CMAKE_FLAG: cmake flags in rpm build.
+ - RPM_SPEC_MAKE_FLAG: make flags in rpm build.
+ - Changed Modules:
+ + ManageArchive:
+ - PACK_SOURCE_ARCHIVE: Can now pass either
+ empty, outputDir, or source File.
+ + ManageGConf2: Fixed.
+ + ManageString: STRING_SPLIT: New Option: ALLOW_EMPTY
+ + ManageRPM
+ - Add support of pre, post, and preun
+ + ManageVariable:
+ - VARIABLE_PARSE_ARGN can now handle multiple-appeared options.
+- Changed:
+ + CMake policy no longer enforced by default.
+ + ManageString: STRING_SPLIT is changed from macro to function,
+ so no need to put excessive backslashes.
+- Removed:
+ + Target after_release_commit and related are no longer required
+ and thus removed.
+
* Tue Nov 26 2013 Ding-Yi Chen <dchen at redhat.com> - 1.1.6-1
- Enhancement:
+ Fedora version will now automatically updated.
diff --git a/sources b/sources
index 866679c..50ced14 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cdbb2bf3f9064d7e136fae7d8ee90ddb cmake-fedora-1.1.6-Source.tar.gz
+fb42bff697c04cedcf2634d54ef48887 cmake-fedora-1.2.3-Source.tar.gz
More information about the scm-commits
mailing list