[cmake-fedora] "Fixed Bug 725615, 725617; Improved fedpkg_commit; Improved Zanata Support."
Ding-Yi Chen
dchen at fedoraproject.org
Fri Jan 10 14:23:29 UTC 2014
commit d7dbd828ba4d3bbe7fea9a13163eef53eb40d408
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date: Tue Aug 16 16:53:51 2011 +1000
"Fixed Bug 725615, 725617;Improved fedpkg_commit; Improved Zanata Support."
.gitignore | 26 +------
cmake-fedora.spec | 248 +++++-----------------------------------------------
sources | 3 +-
3 files changed, 27 insertions(+), 250 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 56e4451..cb74a73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,28 +37,4 @@
/cmake-fedora-0.7.0-Source.tar.gz
/cmake-fedora-0.7.1-Source.tar.gz
/cmake-fedora-0.7.994-Source.tar.gz
-/cmake-fedora-0.7.999-Source.tar.gz
-/cmake-fedora-0.8.0-Source.tar.gz
-/cmake-fedora-0.8.1-Source.tar.gz
-/cmake-fedora-0.8.3-Source.tar.gz
-/cmake-fedora-0.99.3-Source.tar.gz
-/cmake-fedora-0.99.4-Source.tar.gz
-/cmake-fedora-0.99.5-Source.tar.gz
-/cmake-fedora-0.99.6-Source.tar.gz
-/cmake-fedora-0.99.7-Source.tar.gz
-/cmake-fedora-0.99.8-Source.tar.gz
-/cmake-fedora-0.99.9-Source.tar.gz
-/cmake-fedora-0.99.10-Source.tar.gz
-/cmake-fedora-0.99.11-Source.tar.gz
-/cmake-fedora-1.0.0-Source.tar.gz
-/cmake-fedora-1.0.1-Source.tar.gz
-/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
-/cmake-fedora-1.1.2-Source.tar.gz
-/cmake-fedora-1.1.3-Source.tar.gz
-/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 3f127d5..a985af6 100644
--- a/cmake-fedora.spec
+++ b/cmake-fedora.spec
@@ -1,11 +1,11 @@
-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
+Name: cmake-fedora
+Version: 0.7.994
+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
@@ -30,30 +30,27 @@ helper macros and targets for fedora developers.
make VERBOSE=1 %{?_smp_mflags}
%install
-%__rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
-
-# We install document using doc
-(cd %{buildroot}/usr/share/doc/%{name}-%{version}
- rm -fr *
+%__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-0.7.994
+ %__rm -rf RELEASE-NOTES.txt AUTHORS README ChangeLog COPYING TODO
)
%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
-%{_bindir}/koji-build-scratch
-%{_libexecdir}/cmake-fedora-functions
-%config %{_sysconfdir}/cmake-fedora.conf
-%{_datadir}/cmake/Modules/ManageVersion.cmake
-%{_datadir}/cmake/Modules/ManageRPM.cmake
+%defattr(-,root,root,-)
+%doc RELEASE-NOTES.txt AUTHORS README ChangeLog COPYING TODO
+%{_bindir}/cmake-fedora-newprj.sh
+%{_datadir}/cmake/Modules/CMakeVersion.cmake
+%{_datadir}/cmake/Modules/DateTimeFormat.cmake
+%{_datadir}/cmake/Modules/ManageEnvironment.cmake
+%{_datadir}/cmake/Modules/ManageMaintainerTargets.cmake
+%{_datadir}/cmake/Modules/ManageMessage.cmake
+%{_datadir}/cmake/Modules/ManageRelease.cmake
+%{_datadir}/cmake/Modules/ManageReleaseOnFedora.cmake
%{_datadir}/cmake/Modules/ManageSourceVersionControl.cmake
%{_datadir}/cmake/Modules/ManageString.cmake
%{_datadir}/cmake/Modules/ManageArchive.cmake
@@ -76,204 +73,7 @@ make install DESTDIR=%{buildroot}
%{_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.
- + New macros:
- - VARIABLE_PARSE_ARGN: Parse the arguments.
- + 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
-- Changed Modules
- + ManageUpload:
- - New macros:
- + MANAGE_UPLOAD_TARGET
- - Changed macros:
- + MANAGE_UPLOAD_SCP: parameter fileAlias replaced with targetName
- + MANAGE_UPLOAD_SFTP: parameter fileAlias replaced with targetName
- + MANAGE_UPLOAD_FEDORAHOSTED: parameter fileAlias replaced with targetName
- + MANAGE_UPLOAD_SOURCEFORGE: parameter fileAlias replaced with targetName
- - Removed macros:
- + MANAGE_UPLOAD_MAKE_TARGET
- + MANAGE_UPLOAD_CMD
-- Removed Directory:
- + <PRJ_DOC_DIR>/examples: as the examples can be found in
- <CMAKE_ROOT>/Templates/fedora
-- Removed Variables:
- + FEDORA_AUTO_KARMA
-- Removed Macros:
- + MANAGE_UPLOAD_MAKE_TARGET
- + MANAGE_UPLOAD_CMD
-- 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
-
-* 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
- (which contains ChangeLog and projectName.pot) and tarball generation service from hosting site
- (which does not contain generated files)
-- koji-build-scratch: rawhide build target does not always have suffix -candidate.
-- README updated.
-- TODO updated.
-
-* Fri Aug 17 2012 Ding-Yi Chen <dchen at redhat.com> - 1.0.4-1
-- Source tarball filename is now name-version.tar.gz instead of name-version-Source.tar.gz
-- after_release_commit depends rpm_changelog_prev_update if RPM supported enabled.
-- Corrected the 'FORCE' of cmake CACHE
-- Update the error messages when cmake-fedora is not installed.
-- Fixed target: zanata_push_trans.
-- Fixed zanata arguments.
-- fedpkg clone is now triggered if the clone directory does not exist when doing the fedpkg_commit,
- it no longer the listed OUTPUT of an ADD_CUSTOM_COMMAND.
-- Add target: translations as an universal easy target to generate/update translation files.
-
-* Mon Jul 23 2012 Ding-Yi Chen <dchen at redhat.com> - 1.0.2-1
-- Fixed after_release_commit
-
-* Mon Jul 23 2012 Ding-Yi Chen <dchen at redhat.com> - 1.0.1-1
-- Greatly simplified the modules design and usage.
-- Release version are now defined in cmake-fedora.conf
- for easy maintenance.
-- Fix the MANAGE_MESSAGE_LEVEL
-- koji scratch builds are run only once before tagging.
-- CVS support is removed.
-- New command: koji-build-scratch for scratch build on all supported
- releases.
-- New module: ManageTarget
-- New function: SETTING_STRING_GET_VARIABLE
-- New macro:
- + ADD_CUSTOM_TARGET_COMMAND
- + STRING_ESCAPE_SEMICOLON
-- Macros changed behavior:
- MANAGE_ZANATA: Arguments are changed.
-- Target changed: changelog_update are now separate as:
- + changelog_prev_update: Update ChangeLog.prev
- + rpm_changelog_prev_update: Update RPM-ChangeLog.prev
-- Command renamed:
- + cmake-fedora-newprj.sh to cmake-fedora-newprj
-- Module renamed:
- + ManageReleaseOnFedora to ManageReleaseFedora
- + ManageMaintainerTargets to ManageUpload
- + PackSource to ManageArchive
- + PackRPM to ManageRPM
- + UseGConf to ManageGConf
- + UseDoxygen to ManageAPIDoc
-- Function renamed:
- + LOAD_RELEASE_FILE to RELEASE_NOTES_READ_FILE
-- Macro renamed:
- + PACK_SOURCE to PACK_SOURCE_ARCHIVE
- + USE_MOCK to RPM_MOCK_BUILD
- + USE_DOXYGEN to MANAGE_APIDOC_DOXYGEN
- + USE_GETTEXT to MANAGE_GETTEXT
- + USE_ZANATA to MANAGE_ZANATA
-- Variable renamed: PACK_SOURCE_IGNORE_FILES to SOURCE_ARCHIVE_IGNORE_FILES
-- RELEASE_ON_FEDORA: support new tags: "fedora" for current fedora,
- and "epel" for current epel.
-- ChangeLog generation rewritten, target version_check no longer need.
-- Removed target: version_check
-- Variable Removed:
- FEDORA_NEXT_RELEASE
- FEDORA_NEXT_RELEASE_TAGS
- FEDORA_LATEST_RELEASE
- FEDORA_PREVIOUS_RELEASE
-
-* Tue Sep 20 2011 Ding-Yi Chen <dchen at redhat.com> - 0.8.1-1
-- Fixed Bug 738958 - cmake-fedora: remove excessive quotation marks for Precompile definition
-- Fixed Bug 733540 - cmake-fedora: "" should be read as empty string
-- ManageEnvironment: Now defined cmake_policy won't get overridden.
-- ManageString: STRING_UNQUOTE is now merely remove quote marks in the beginning and
- end of string. The string will not be changed otherwise.
-- UseUninstall has renamed as ManageUninstall
-- ManageMaintainerTargets: Reveal MAINTAINER_UPLOAD_COMMAND
-- ManageTranslation: Adopt zanata python client 1.3, arguments are redesigned.
- + Change target: from "translations" to "gmo_files"
- + Add targets: zanata_push, zanata_push_trans, zanata_pull_trans
- + Add argument: ALL_FOR_PUSH, ALL_FOR_PUSH_TRANS and ALL_FOR_PULL
- + Add argument: OPTIONS for passing arguments.
-- ManageReleaseOnFedora: Now default to build against candidate repos,
- unless _CANDIDATE_PREFERRED is set to "0".
-
-* Thu Aug 18 2011 Ding-Yi Chen <dchen at redhat.com> - 0.7.994-1
+* Tue Aug 16 2011 Ding-Yi Chen <dchen at redhat.com> - 0.7.994-1
- Fixed Bug 725615 - cmake-fedora: Use UTC for changelog
- Fixed Bug 725617 - cmake-fedora: target 'tag' should stop when tag file exists.
- Module CompileEnv.cmake is obsoleted by ManageEnvironment.cmake
diff --git a/sources b/sources
index 50ced14..5c1fa2b 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-fb42bff697c04cedcf2634d54ef48887 cmake-fedora-1.2.3-Source.tar.gz
+e6d6506f0682570c0709fb5137c286dc cmake-fedora-0.7.994-Source.tar.gz
+
More information about the scm-commits
mailing list