summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore7
-rw-r--r--php-pear-crypt-gpg.spec32
2 files changed, 16 insertions, 23 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1ab5c4f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/php-pear-crypt-gpg.spec b/php-pear-crypt-gpg.spec
index f1b8c37..4eb39ab 100644
--- a/php-pear-crypt-gpg.spec
+++ b/php-pear-crypt-gpg.spec
@@ -12,7 +12,7 @@
%global with_tests 0%{!?_without_tests:1}
Name: php-pear-crypt-gpg
-Version: 1.6.0
+Version: 1.6.1
Release: 1%{?dist}
Summary: GNU Privacy Guard (GnuPG)
@@ -24,7 +24,6 @@ Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz
# Use /usr/bin/gpg1 if available, only in #remirepo
Patch0: %{pear_name}-gpg1.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: php-pear(PEAR)
%if %{with_tests}
@@ -86,8 +85,6 @@ cd %{pear_name}-%{version}
%install
-rm -rf %{buildroot}
-
cd %{pear_name}-%{version}
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
@@ -99,30 +96,17 @@ mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
-%clean
-rm -rf %{buildroot}
-
-
%if %{with_tests}
%check
cd %{pear_name}-%{version}/tests
: Upstream test suite
-# remirepo:11
-run=0
ret=0
-if which php56; then
- php56 %{_bindir}/phpunit . || ret=1
- run=1
-fi
-if which php71; then
- php71 %{_bindir}/phpunit . || ret=1
- run=1
-fi
-if [ $run -eq 0 ]; then
-%{_bindir}/phpunit --verbose .
-# remirepo:2
-fi
+for cmd in php php56 php70 php71 php72; do
+ if which $cmd; then
+ $cmd %{_bindir}/phpunit --verbose . || ret=1
+ fi
+done
exit $ret
%endif
@@ -139,7 +123,6 @@ fi
%files
-%defattr(-,root,root,-)
%{?_licensedir:%license %{pear_name}-%{version}/LICENSE}
%doc %{pear_docdir}/%{pear_name}
%{pear_xmldir}/%{name}.xml
@@ -151,6 +134,9 @@ fi
%changelog
+* Sun Aug 27 2017 Remi Collet <remi@remirepo.net> - 1.6.1-1
+- Update to 1.6.1
+
* Mon Feb 27 2017 Remi Collet <remi@fedoraproject.org> - 1.6.0-1
- Update to 1.6.0