diff --git a/.gitignore b/.gitignore index 2477ab4..1ff5cd5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /msgpack-0.5.11.gem +/msgpack-1.1.0.gem diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 8dada3e..0000000 --- a/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/msgpack-1.0.0-Unification-of-Fixnum-and-Bignum-into-Integer.patch b/msgpack-1.0.0-Unification-of-Fixnum-and-Bignum-into-Integer.patch deleted file mode 100644 index 9a3d9ec..0000000 --- a/msgpack-1.0.0-Unification-of-Fixnum-and-Bignum-into-Integer.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 4394c44563a6e2c6fd45e20b014436ed0d99fda0 Mon Sep 17 00:00:00 2001 -From: Sadayuki Furuhashi -Date: Wed, 25 May 2016 13:21:06 +0900 -Subject: [PATCH 2/2] fix SEGV that will happen with MRI 2.4.0 because of - unification of Fixnum and Bignum into Integer - ---- - ext/msgpack/core_ext.c | 21 +++++++++++++++++++-- - 1 file changed, 19 insertions(+), 2 deletions(-) - -diff --git a/ext/msgpack/core_ext.c b/ext/msgpack/core_ext.c -index 8574bf3..694b173 100644 ---- a/ext/msgpack/core_ext.c -+++ b/ext/msgpack/core_ext.c -@@ -64,6 +64,17 @@ static VALUE FalseClass_to_msgpack(int argc, VALUE* argv, VALUE self) - return packer; - } - -+static VALUE Integer_to_msgpack(int argc, VALUE* argv, VALUE self) -+{ -+ ENSURE_PACKER(argc, argv, packer, pk); -+ if (FIXNUM_P(self)) { -+ msgpack_packer_write_fixnum_value(pk, self); -+ } else { -+ msgpack_packer_write_bignum_value(pk, self); -+ } -+ return packer; -+} -+ - static VALUE Fixnum_to_msgpack(int argc, VALUE* argv, VALUE self) - { - ENSURE_PACKER(argc, argv, packer, pk); -@@ -118,8 +129,14 @@ void MessagePack_core_ext_module_init() - rb_define_method(rb_cNilClass, "to_msgpack", NilClass_to_msgpack, -1); - rb_define_method(rb_cTrueClass, "to_msgpack", TrueClass_to_msgpack, -1); - rb_define_method(rb_cFalseClass, "to_msgpack", FalseClass_to_msgpack, -1); -- rb_define_method(rb_cFixnum, "to_msgpack", Fixnum_to_msgpack, -1); -- rb_define_method(rb_cBignum, "to_msgpack", Bignum_to_msgpack, -1); -+ if (rb_cFixnum == rb_cBignum) { -+ // MRI Ruby >= 2.4 unified Fixnum and Bignum into Integer since Feature #12005 -+ // https://github.com/ruby/ruby/commit/f9727c12cc8fbc5f752f5983be1f14bb976e5a13 -+ rb_define_method(rb_cFixnum, "to_msgpack", Integer_to_msgpack, -1); -+ } else { -+ rb_define_method(rb_cFixnum, "to_msgpack", Fixnum_to_msgpack, -1); -+ rb_define_method(rb_cBignum, "to_msgpack", Bignum_to_msgpack, -1); -+ } - rb_define_method(rb_cFloat, "to_msgpack", Float_to_msgpack, -1); - rb_define_method(rb_cString, "to_msgpack", String_to_msgpack, -1); - rb_define_method(rb_cArray, "to_msgpack", Array_to_msgpack, -1); diff --git a/msgpack-1.0.0-Use-RUBY_INTEGER_UNIFICATION-macro.patch b/msgpack-1.0.0-Use-RUBY_INTEGER_UNIFICATION-macro.patch deleted file mode 100644 index f36af81..0000000 --- a/msgpack-1.0.0-Use-RUBY_INTEGER_UNIFICATION-macro.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3bb67ee63a0baba73fd534fbe16466377bfa2d4f Mon Sep 17 00:00:00 2001 -From: "NARUSE, Yui" -Date: Tue, 28 Jun 2016 14:25:03 +0900 -Subject: [PATCH] Use RUBY_INTEGER_UNIFICATION - ---- - ext/msgpack/core_ext.c | 14 ++++++-------- - 1 file changed, 6 insertions(+), 8 deletions(-) - -diff --git a/ext/msgpack/core_ext.c b/ext/msgpack/core_ext.c -index 694b173..3a14b2f 100644 ---- a/ext/msgpack/core_ext.c -+++ b/ext/msgpack/core_ext.c -@@ -129,14 +129,12 @@ void MessagePack_core_ext_module_init() - rb_define_method(rb_cNilClass, "to_msgpack", NilClass_to_msgpack, -1); - rb_define_method(rb_cTrueClass, "to_msgpack", TrueClass_to_msgpack, -1); - rb_define_method(rb_cFalseClass, "to_msgpack", FalseClass_to_msgpack, -1); -- if (rb_cFixnum == rb_cBignum) { -- // MRI Ruby >= 2.4 unified Fixnum and Bignum into Integer since Feature #12005 -- // https://github.com/ruby/ruby/commit/f9727c12cc8fbc5f752f5983be1f14bb976e5a13 -- rb_define_method(rb_cFixnum, "to_msgpack", Integer_to_msgpack, -1); -- } else { -- rb_define_method(rb_cFixnum, "to_msgpack", Fixnum_to_msgpack, -1); -- rb_define_method(rb_cBignum, "to_msgpack", Bignum_to_msgpack, -1); -- } -+#ifdef RUBY_INTEGER_UNIFICATION -+ rb_define_method(rb_cInteger, "to_msgpack", Integer_to_msgpack, -1); -+#else -+ rb_define_method(rb_cFixnum, "to_msgpack", Fixnum_to_msgpack, -1); -+ rb_define_method(rb_cBignum, "to_msgpack", Bignum_to_msgpack, -1); -+#endif - rb_define_method(rb_cFloat, "to_msgpack", Float_to_msgpack, -1); - rb_define_method(rb_cString, "to_msgpack", String_to_msgpack, -1); - rb_define_method(rb_cArray, "to_msgpack", Array_to_msgpack, -1); diff --git a/rubygem-msgpack.spec b/rubygem-msgpack.spec index b4dfc1a..42171dc 100644 --- a/rubygem-msgpack.spec +++ b/rubygem-msgpack.spec @@ -1,26 +1,27 @@ # Generated from msgpack-0.5.9.gem by gem2rpm -*- rpm-spec -*- %global gem_name msgpack -Name: rubygem-%{gem_name} -Version: 0.5.11 -Release: 5%{?dist} -Summary: MessagePack, a binary-based efficient data interchange format -Group: Development/Languages -License: ASL 2.0 -URL: https://msgpack.org -Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem -Source1: LICENSE -# Fix Ruby 2.4 compatibility. -# https://github.com/msgpack/msgpack-ruby/pull/115 -Patch0: msgpack-1.0.0-Unification-of-Fixnum-and-Bignum-into-Integer.patch -# https://github.com/msgpack/msgpack-ruby/pull/123 -Patch1: msgpack-1.0.0-Use-RUBY_INTEGER_UNIFICATION-macro.patch -BuildRequires: rubygems-devel -BuildRequires: ruby-devel -BuildRequires: rubygem-rspec -%if 0%{?fc20} || 0%{?el7} -Provides: rubygem(%{gem_name}) = %{version} -%endif +Name: rubygem-%{gem_name} +Version: 1.1.0 +Release: 2%{?dist} +Summary: MessagePack, a binary-based efficient data interchange format +Group: Development/Languages +License: ASL 2.0 +URL: http://msgpack.org/ +Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem +BuildRequires: ruby(release) +BuildRequires: rubygems-devel +BuildRequires: ruby-devel +BuildRequires: rubygem(rspec) +# BuildRequires: rubygem(rake-compiler) => 0.8.3 +# BuildRequires: rubygem(rake-compiler) < 0.9 +# BuildRequires: rubygem(rspec) => 2.11 +# BuildRequires: rubygem(rspec) < 3 +# BuildRequires: rubygem(json) => 1.7 +# BuildRequires: rubygem(json) < 2 +# BuildRequires: rubygem(yard) => 0.8.2 +# BuildRequires: rubygem(yard) < 0.9 +Provides: rubygem(%{gem_name}) = %{version} %description MessagePack is a binary-based efficient object serialization library. It @@ -29,10 +30,10 @@ unlike JSON, it is very fast and small. %package doc -Summary: Documentation for %{name} -Group: Documentation -Requires: %{name} = %{version}-%{release} -BuildArch: noarch +Summary: Documentation for %{name} +Group: Documentation +Requires: %{name} = %{version}-%{release} +BuildArch: noarch %description doc Documentation for %{name}. @@ -44,20 +45,18 @@ gem unpack %{SOURCE0} gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec -%patch0 -p1 -%patch1 -p1 - %build +# Create the gem as gem install only works on a gem file gem build %{gem_name}.gemspec +# %%gem_install compiles any C extensions and installs the gem into ./%%gem_dir +# by default, so that we can move it into the buildroot in %%install %gem_install - %install mkdir -p %{buildroot}%{gem_dir} cp -a .%{gem_dir}/* \ - %{buildroot}%{gem_dir}/ -install -m 0644 %{SOURCE1} %{buildroot}%{gem_instdir} + %{buildroot}%{gem_dir}/ %if 0%{?fedora} > 0 mkdir -p %{buildroot}%{gem_extdir_mri} @@ -83,37 +82,38 @@ popd %files %dir %{gem_instdir} -%{gem_libdir} %{gem_extdir_mri} -%exclude %{gem_extdir_mri}/gem.build_complete +%exclude %{gem_instdir}/.rubocop.yml +%license %{gem_instdir}/LICENSE +%{gem_instdir}/appveyor.yml +%{gem_instdir}/bench +%{gem_libdir} +%{gem_instdir}/msgpack.org.md %exclude %{gem_cache} %{gem_spec} -%doc %{gem_instdir}/ChangeLog -%doc %{gem_instdir}/Gemfile -%doc %{gem_instdir}/README.rdoc -%doc %{gem_instdir}/msgpack.org.md -%license %{gem_instdir}/LICENSE %files doc %doc %{gem_docdir} +%doc %{gem_instdir}/ChangeLog +%{gem_instdir}/Gemfile +%doc %{gem_instdir}/README.rdoc %{gem_instdir}/Rakefile -%{gem_instdir}/spec/ -%{gem_instdir}/%{gem_name}.gemspec -%{gem_instdir}/doclib/ - +%doc %{gem_instdir}/doclib +%{gem_instdir}/msgpack.gemspec +%{gem_instdir}/spec %changelog -* Thu Aug 03 2017 Fedora Release Engineering - 0.5.11-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild +* Fri Jul 21 2017 Sandro Bonazzola - 1.1.0-2 +- Re-applied changes lost during rebase -* Thu Jul 27 2017 Fedora Release Engineering - 0.5.11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild +* Thu Jun 29 2017 Rich Megginson - 1.1.0-1 +- version 1.1.0 -* Sat Feb 11 2017 Fedora Release Engineering - 0.5.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild +* Thu Jan 19 2017 Sandro Bonazzola - 0.5.12-2 +- Rebuilding adding ppc64le arch -* Wed Jan 11 2017 Vít Ondruch - 0.5.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.4 +* Fri Sep 16 2016 Rich Megginson - 0.5.12-1 +- update to 0.5.12 * Mon Jan 05 2015 Graeme Gillies - 0.5.11-1 - Initial package diff --git a/sources b/sources index 05794a2..2ce72fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7289b86b6fabf77809d89721a515688a msgpack-0.5.11.gem +SHA512 (msgpack-1.1.0.gem) = 0142c9a446a476a7b4f9212513dd7b1fbe107193a473873f4eb6f4321d5515c42ea3540ac4de17f37f9e833f19bb75594d14b84ccf70b16d2a3840e066c873da