summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-05-27 07:17:34 +0200
committerRemi Collet <remi@remirepo.net>2017-05-27 07:17:34 +0200
commitf8e8f750d36cc44149d1511a1db1a8c43109bf27 (patch)
treedff0e6b27961781840df84f6a81374ff0384a115
parent4760f1849db24c4526e0a4302daef3da94d047eb (diff)
update to 4.7.1 (2017-05-26, regular maintenance release)
-rw-r--r--composer.json32
-rw-r--r--phpMyAdmin.spec12
2 files changed, 20 insertions, 24 deletions
diff --git a/composer.json b/composer.json
index 362f08f..572247d 100644
--- a/composer.json
+++ b/composer.json
@@ -1,17 +1,9 @@
{
"name": "phpmyadmin/phpmyadmin",
- "type": "application",
+ "type": "project",
"description": "MySQL web administration tool",
"keywords": ["phpmyadmin","mysql","web"],
"homepage": "https://www.phpmyadmin.net/",
- "license": "GPL-2.0+",
- "authors": [
- {
- "name": "The phpMyAdmin Team",
- "email": "developers@phpmyadmin.net",
- "homepage": "https://www.phpmyadmin.net/team/"
- }
- ],
"support": {
"forum": "https://www.phpmyadmin.net/support/",
"issues": "https://github.com/phpmyadmin/phpmyadmin/issues",
@@ -19,12 +11,26 @@
"docs": "https://docs.phpmyadmin.net/",
"source": "https://github.com/phpmyadmin/phpmyadmin"
},
+ "license": "GPL-2.0",
+ "authors": [
+ {
+ "name": "The phpMyAdmin Team",
+ "email": "developers@phpmyadmin.net",
+ "homepage": "https://www.phpmyadmin.net/team/"
+ }
+ ],
"non-feature-branches": ["RELEASE_.*"],
"autoload": {
"psr-4": {
"PMA\\": "./"
}
},
+ "repositories": [
+ {
+ "type": "composer",
+ "url": "https://www.phpmyadmin.net"
+ }
+ ],
"require": {
"php": ">=5.5.0",
"ext-mbstring": "*",
@@ -56,11 +62,5 @@
"phpunit/phpunit-selenium": "~1.2",
"squizlabs/php_codesniffer": "2.*",
"phpmyadmin/coding-standard": ">=0.1.0"
- },
- "repositories": [
- {
- "type": "composer",
- "url": "https://www.phpmyadmin.net"
- }
- ]
+ }
}
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 9a59b62..40c9435 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -22,7 +22,7 @@
%endif
Name: phpMyAdmin
-Version: 4.7.0
+Version: 4.7.1
Release: 1%{?dist}
Summary: Web based MySQL browser written in php
@@ -37,7 +37,6 @@ Source1: https://files.phpmyadmin.net/%{name}/%{version}%{?prever:-%prever}/%{na
Source2: phpMyAdmin.htaccess
Source3: phpMyAdmin.nginx
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires(post): coreutils sed
@@ -176,7 +175,6 @@ EOF
%install
-rm -rf %{buildroot}
mkdir -p %{buildroot}/%{_datadir}/%{name}
cp -ad ./* %{buildroot}/%{_datadir}/%{name}
install -Dpm 0640 CONFIG %{buildroot}/%{_sysconfdir}/%{name}/config.inc.php
@@ -208,10 +206,6 @@ mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/js/jquery/MIT-LICENSE.txt LICENSE-jquer
mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/js/codemirror/LICENSE LICENSE-codemirror
-%clean
-rm -rf %{buildroot}
-
-
%pretrans
# allow dir to link upgrade
if [ -d %{_datadir}/%{name}/doc/html ]; then
@@ -226,7 +220,6 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \
%files
-%defattr(-,root,root,-)
%{!?_licensedir:%global license %%doc}
%license LICENSE*
%doc ChangeLog README CONTRIBUTING.md DCO config.sample.inc.php
@@ -247,6 +240,9 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \
%changelog
+* Sat May 27 2017 Remi Collet <remi@remirepo.net> 4.7.1-1
+- update to 4.7.1 (2017-05-26, regular maintenance release)
+
* Wed Mar 29 2017 Remi Collet <remi@remirepo.net> 4.7.0-1
- update to 4.7.0 (2017-03-29, features release)