commit php7-pear-MDB2_Driver_mysqli for openSUSE:Factory

2019-12-04 Thread root
Hello community,

here is the log from the commit of package php7-pear-MDB2_Driver_mysqli for 
openSUSE:Factory checked in at 2019-12-04 13:55:41

Comparing /work/SRC/openSUSE:Factory/php7-pear-MDB2_Driver_mysqli (Old)
 and  /work/SRC/openSUSE:Factory/.php7-pear-MDB2_Driver_mysqli.new.4691 
(New)


Package is "php7-pear-MDB2_Driver_mysqli"

Wed Dec  4 13:55:41 2019 rev:3 rq:753905 version:1.5.0b4

Changes:

--- 
/work/SRC/openSUSE:Factory/php7-pear-MDB2_Driver_mysqli/php7-pear-MDB2_Driver_mysqli.changes
2019-12-02 11:38:39.934464776 +0100
+++ 
/work/SRC/openSUSE:Factory/.php7-pear-MDB2_Driver_mysqli.new.4691/php7-pear-MDB2_Driver_mysqli.changes
  2019-12-04 14:21:03.098472102 +0100
@@ -1,0 +2,5 @@
+Tue Dec  3 22:37:32 UTC 2019 - suse+bu...@de-korte.org 
+ 
+- Restore php5 obsoletes
+ 
+---



Other differences:
--
++ php7-pear-MDB2_Driver_mysqli.spec ++
--- /var/tmp/diff_new_pack.ftE63H/_old  2019-12-04 14:21:03.594472521 +0100
+++ /var/tmp/diff_new_pack.ftE63H/_new  2019-12-04 14:21:03.598472524 +0100
@@ -32,6 +32,7 @@
 Requires:   %{php_name}-pear
 Requires:   php-pear(MDB2) >= 2.5.0b4
 Provides:   php-pear(%{pear_name}) = %{version}
+Obsoletes:  php5-pear-%{pear_name}
 BuildArch:  noarch
 
 %description




commit php7-pear-MDB2_Driver_mysqli for openSUSE:Factory

2019-12-02 Thread root
Hello community,

here is the log from the commit of package php7-pear-MDB2_Driver_mysqli for 
openSUSE:Factory checked in at 2019-12-02 11:36:47

Comparing /work/SRC/openSUSE:Factory/php7-pear-MDB2_Driver_mysqli (Old)
 and  /work/SRC/openSUSE:Factory/.php7-pear-MDB2_Driver_mysqli.new.4691 
(New)


Package is "php7-pear-MDB2_Driver_mysqli"

Mon Dec  2 11:36:47 2019 rev:2 rq:752847 version:1.5.0b4

Changes:

--- 
/work/SRC/openSUSE:Factory/php7-pear-MDB2_Driver_mysqli/php7-pear-MDB2_Driver_mysqli.changes
2017-11-15 16:51:35.985663992 +0100
+++ 
/work/SRC/openSUSE:Factory/.php7-pear-MDB2_Driver_mysqli.new.4691/php7-pear-MDB2_Driver_mysqli.changes
  2019-12-02 11:38:39.934464776 +0100
@@ -1,0 +2,6 @@
+Fri Nov 29 21:13:40 UTC 2019 - suse+bu...@de-korte.org
+
+- Use correct macro to reference metadata (boo#1158112)
+- Clean-up spec, use https for downloading
+
+---



Other differences:
--
++ php7-pear-MDB2_Driver_mysqli.spec ++
--- /var/tmp/diff_new_pack.ixnUMj/_old  2019-12-02 11:38:40.294464851 +0100
+++ /var/tmp/diff_new_pack.ixnUMj/_new  2019-12-02 11:38:40.298464852 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package php7-pear-MDB2_Driver_mysqli
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -24,64 +24,51 @@
 Summary:MySQLi MDB2 driver
 License:BSD-3-Clause
 Group:  Productivity/Networking/Web/Servers
-Url:http://pear.php.net/package/%{pear_name}
-Source: http://pear.php.net/get/%{pear_name}-%{version}.tgz
+URL:https://pear.php.net/package/%{pear_name}
+Source: https://pear.php.net/get/%{pear_name}-%{version}.tgz
 BuildRequires:  %{php_name}-devel
 BuildRequires:  %{php_name}-pear
-Requires:   %{php_name}
 Requires:   %{php_name}-mysql
 Requires:   %{php_name}-pear
 Requires:   php-pear(MDB2) >= 2.5.0b4
-Provides:   php-pear-%{pear_name} = %{version}
 Provides:   php-pear(%{pear_name}) = %{version}
-Obsoletes:  php5-pear-%{pear_name}
 BuildArch:  noarch
-%if 0%{?suse_version} < 1330
-BuildRequires:  %{php_name}-macros
-%endif
 
 %description
 This is the MySQLi MDB2 driver.
 
 %prep
-%setup -q -c
+%setup -q -n %{pear_name}-%{version}
+# move package.xml when needed
+[ -f ../package.xml ] &&  mv ../package.xml .
 
 %build
 
 %install
-mv package*.xml %{pear_name}-%{version}
-cd %{pear_name}-%{version}
-%{__pear} -v \
--d doc_dir=/doc \
--d bin_dir=%{_bindir} \
--d data_dir=%{php_peardir}/data \
-install --offline --nodeps -R %{buildroot} package.xml
-
+%{__pear} install --nodeps --offline --packagingroot %{buildroot} package.xml
 install -D -m 0644 package.xml %{buildroot}%{php_pearxmldir}/%{pear_name}.xml
 
-rm -rf %{buildroot}/{tmp}
-rm -rf 
%{buildroot}%{php_peardir}/.{filemap,lock,registry,channels,depdb,depdblock}
-
-cd ..
-
 %{php_pear_gen_filelist}
 
 %post
-# on `rpm -ivh` PARAM is 1
-# on `rpm -Uvh` PARAM is 2
 if [ "$1" = "1" ]; then
-  %{__pear} install --nodeps --soft --force --register-only 
%{php_pearxmldir}/%{pear_name}.xml
+  # on "rpm -ivh"
+  %{__pear} install --nodeps --soft --force --register-only 
%{php_pearxmldir}/%{pear_name}.xml || :
 fi
 if [ "$1" = "2" ]; then
-  %{__pear} upgrade --offline --register-only 
%{php_pearxmldir}/%{pear_name}.xml
+  # on "rpm -Uvh"
+  %{__pear} upgrade --offline --register-only 
%{php_pearxmldir}/%{pear_name}.xml || :
 fi
 
 %postun
-# on `rpm -e` PARAM is 0
 if [ "$1" = "0" ]; then
-  %{__pear} uninstall --nodeps --ignore-errors --register-only 
pear.php.net/%{pear_name}
+  # on "rpm -e"
+  %{__pear} uninstall --nodeps --ignore-errors --register-only 
pear.php.net/%{pear_name} || :
 fi
 
 %files -f %{name}.files
+%docdir  %{pear_docdir}
+%exclude %{pear_metadir}/.??*
+%exclude %{pear_testdir}
 
 %changelog