From 612ba42c9749f4a2cacfbb494acd1688ef836cba Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 21 Dec 2018 14:48:36 +0100 Subject: update to 0.4.1 drop patches merged upstream --- php-snuffleupagus.spec | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'php-snuffleupagus.spec') diff --git a/php-snuffleupagus.spec b/php-snuffleupagus.spec index 0a3e139..3d313b0 100644 --- a/php-snuffleupagus.spec +++ b/php-snuffleupagus.spec @@ -18,7 +18,7 @@ %global pkg_name %{name} %endif -%global gh_commit 721adb907fa4636693695024d3ed7ca8602db261 +%global gh_commit bdc2d866c1c55826383c0b203a0702bc58cefe76 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner nbs-system %global gh_project snuffleupagus @@ -31,20 +31,17 @@ Summary: Security module for php7 Name: %{?sub_prefix}php-snuffleupagus -Version: 0.4.0 +Version: 0.4.1 %if 0%{?gh_date} Release: 1%{gh_date}.%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %else -Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %endif License: LGPLv3 Group: Development/Languages URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pkg_name}-%{version}-%{gh_short}.tar.gz -Patch0: https://patch-diff.githubusercontent.com/raw/nbs-system/snuffleupagus/pull/242.patch -Patch1: https://patch-diff.githubusercontent.com/raw/nbs-system/snuffleupagus/pull/266.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: pcre-devel @@ -94,8 +91,6 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 -b .pr242 -%patch1 -p1 -b .pr266 cd src # Sanity check, really often broken @@ -221,6 +216,10 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Fri Dec 21 2018 Remi Collet - 0.4.1-1 +- update to 0.4.1 +- drop patches merged upstream + * Thu Dec 13 2018 Remi Collet - 0.4.0-4 - drop dependency on python, test build for https://github.com/nbs-system/snuffleupagus/pull/266 -- cgit