diff options
| -rw-r--r-- | 3.patch | 47 | ||||
| -rw-r--r-- | php-phplang-scope-exit.spec | 10 |
2 files changed, 5 insertions, 52 deletions
diff --git a/3.patch b/3.patch deleted file mode 100644 index 7208fb9..0000000 --- a/3.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 26815e9d3f0169d7d16327f8e034eb64cf6914fc Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Thu, 12 Sep 2019 11:25:07 +0200 -Subject: [PATCH] Fix #2 add a BSD license file - ---- - LICENSE | 31 +++++++++++++++++++++++++++++++ - 1 file changed, 31 insertions(+) - create mode 100644 LICENSE - -diff --git a/LICENSE b/LICENSE -new file mode 100644 -index 0000000..fdbb5b7 ---- /dev/null -+++ b/LICENSE -@@ -0,0 +1,31 @@ -+Copyright (c) 2016 by Sara Golemon -+ -+Some rights reserved. -+ -+Redistribution and use in source and binary forms, with or without -+modification, are permitted provided that the following conditions are -+met: -+ -+ * Redistributions of source code must retain the above copyright -+ notice, this list of conditions and the following disclaimer. -+ -+ * Redistributions in binary form must reproduce the above -+ copyright notice, this list of conditions and the following -+ disclaimer in the documentation and/or other materials provided -+ with the distribution. -+ -+ * The names of the contributors may not be used to endorse or -+ promote products derived from this software without specific -+ prior written permission. -+ -+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/php-phplang-scope-exit.spec b/php-phplang-scope-exit.spec index 674e0b8..5c0973c 100644 --- a/php-phplang-scope-exit.spec +++ b/php-phplang-scope-exit.spec @@ -9,7 +9,7 @@ %global with_tests 0%{!?_without_tests:1} # Github -%global gh_commit 239b73abe89f9414aa85a7ca075ec9445629192b +%global gh_commit 8b5a1cbc54df7c1d14916711fb339e67d08cb3dd %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phplang %global gh_project scope-exit @@ -23,15 +23,13 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 1.0.0 -Release: 1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} +Release: 2%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} Summary: Emulation of SCOPE_EXIT construct from C++ License: BSD URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{?gh_short}.tar.gz -Patch0: https://patch-diff.githubusercontent.com/raw/phplang/scope-exit/pull/3.patch - BuildArch: noarch %if %{with_tests} BuildRequires: php(language) @@ -67,7 +65,6 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{pk_project}-autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 -b .pr3 %build @@ -110,6 +107,9 @@ exit $ret %changelog +* Thu Sep 19 2019 Remi Collet <remi@remirepo.net> - 1.0.0-2 +- add commit to include LICENSE file (no change) + * Thu Sep 12 2019 Remi Collet <remi@remirepo.net> - 1.0.0-1 - initial package - open https://github.com/phplang/scope-exit/issues/2 missing LICENSE |