summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-04-14 10:34:14 +0200
committerRemi Collet <remi@remirepo.net>2021-04-14 10:34:14 +0200
commitd4b4c0fb13ff04d77e502c7a8d1b42d82e55077f (patch)
treeebe1ec40eeb63cf7d7c6e9d9cad6c39a484cfc85
parent51078eed2efe943e70238087bb700a8868d2a54b (diff)
update to 1.1.1HEADmaster
raise dependency on PHP 7.2
-rw-r--r--.gitignore9
-rw-r--r--Makefile2
-rw-r--r--composer.json9
-rw-r--r--php-psr-container.spec25
4 files changed, 23 insertions, 22 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..01f0400
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+clog
+package-*.xml
+*.tgz
+*.tar.bz2
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/Makefile b/Makefile
index 91b0fd5..13af741 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
SRCDIR := $(shell pwd)
NAME := $(shell basename $(SRCDIR))
-include ../../common/Makefile
+include ../../../common/Makefile
diff --git a/composer.json b/composer.json
index b8ee012..3797a25 100644
--- a/composer.json
+++ b/composer.json
@@ -8,20 +8,15 @@
"authors": [
{
"name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
+ "homepage": "https://www.php-fig.org/"
}
],
"require": {
- "php": ">=5.3.0"
+ "php": ">=7.2.0"
},
"autoload": {
"psr-4": {
"Psr\\Container\\": "src/"
}
- },
- "extra": {
- "branch-alias": {
- "dev-master": "1.0.x-dev"
- }
}
}
diff --git a/php-psr-container.spec b/php-psr-container.spec
index 4e1a2e8..431e1b6 100644
--- a/php-psr-container.spec
+++ b/php-psr-container.spec
@@ -1,13 +1,13 @@
# remirepo/fedora spec file for php-psr-container
#
-# Copyright (c) 2017 Remi Collet
+# Copyright (c) 2017-2021 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
-%global gh_commit b7ce3b176482dbbc1245ebf52b181af44c2cf55f
+%global gh_commit 8622567409010282b7aeebe4bb841fe98b58dcaf
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner php-fig
%global gh_project container
@@ -18,25 +18,23 @@
%{!?phpdir: %global phpdir %{_datadir}/php}
Name: php-%{pk_vendor}-%{pk_project}
-Version: 1.0.0
+Version: 1.1.1
Release: 1%{?dist}
Summary: Common Container Interface
-Group: Development/Libraries
License: MIT
URL: https://github.com/%{gh_owner}/%{gh_project}
Source0: %{url}/archive/%{gh_commit}/%{name}-%{version}-%{gh_commit}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
# For tests
-BuildRequires: php(language) >= 5.3.0
+BuildRequires: php(language) >= 7.2.0
BuildRequires: php-cli
BuildRequires: php-composer(fedora/autoloader)
# From composer.json, "require": {
-# "php": ">=5.3.0"
-Requires: php(language) >= 5.3.0
+# "php": ">=7.2.0"
+Requires: php(language) >= 7.2.0
# phpcompatinfo (computed from version 1.0.0)
# <none>
# Autoloader
@@ -73,7 +71,6 @@ AUTOLOAD
%install
-rm -rf %{buildroot}
mkdir -p %{buildroot}%{_datadir}/php/Psr
cp -rp src %{buildroot}%{_datadir}/php/Psr/Container
@@ -86,12 +83,8 @@ exit (interface_exists("Psr\\Container\\ContainerInterface") ? 0 : 1);
'
-%clean
-rm -rf %{buildroot}
-
-
%files
-%defattr(-,root,root,-)
+# remirepo:1
%{!?_licensedir:%global license %%doc}
%license LICENSE
%doc *.md
@@ -101,6 +94,10 @@ rm -rf %{buildroot}
%changelog
+* Wed Apr 14 2021 Remi Collet <remi@remirepo.net> - 1.1.1-1
+- update to 1.1.1
+- raise dependency on PHP 7.2
+
* Mon Feb 27 2017 Remi Collet <remi@remirepo.net> - 1.0.0-1
- Initial package, version 1.0.0