Hello community,
here is the log from the commit of package php7-pear-MDB2 for openSUSE:Factory
checked in at 2018-02-12 10:15:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/php7-pear-MDB2 (Old)
and /work/SRC/openSUSE:Factory/.php7-pear-MDB2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php7-pear-MDB2"
Mon Feb 12 10:15:34 2018 rev:2 rq:575370 version:2.5.0b5
Changes:
--------
--- /work/SRC/openSUSE:Factory/php7-pear-MDB2/php7-pear-MDB2.changes
2017-11-15 16:51:48.509205128 +0100
+++ /work/SRC/openSUSE:Factory/.php7-pear-MDB2.new/php7-pear-MDB2.changes
2018-02-12 10:15:38.700575456 +0100
@@ -1,0 +2,7 @@
+Sun Feb 11 08:33:11 UTC 2018 - jweberho...@weberhofer.at
+
+- Cleaned up spec
+- Fixed building error
+- Do no longer package tests
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ php7-pear-MDB2.spec ++++++
--- /var/tmp/diff_new_pack.qJweXh/_old 2018-02-12 10:15:39.420549511 +0100
+++ /var/tmp/diff_new_pack.qJweXh/_new 2018-02-12 10:15:39.424549367 +0100
@@ -1,7 +1,7 @@
#
# spec file for package php7-pear-MDB2
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,7 @@
#
-%define php_name php7
+%define peardir %(pear config-get php_dir 2> /dev/null || echo
%{_datadir}/pear)
%define pear_name MDB2
Name: php7-pear-MDB2
Version: 2.5.0b5
@@ -26,16 +26,16 @@
Group: Productivity/Networking/Web/Servers
Url: http://pear.php.net/package/%{pear_name}
Source:
http://download.pear.php.net/package/%{pear_name}-%{version}.tgz
-BuildRequires: %{php_name}-devel
-BuildRequires: %{php_name}-pear >= 1.9.1
-Requires: %{php_name}
-Requires: %{php_name}-pear >= 1.9.1
+BuildRequires: php7-devel
+BuildRequires: php7-pear >= 1.9.1
+Requires: php7
+Requires: php7-pear >= 1.9.1
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
+BuildRequires: php7-macros
%endif
%description
@@ -73,31 +73,27 @@
%prep
%setup -q -c
-# patch autoload.inc to not include buildroot
-sed -i -e '17s/@php_dir@/\/usr\/share\/%{php_name}\/PEAR/'
MDB2-2.5.0b5/tests/autoload.inc
-sed -i -e '21s/@php_dir@/\/usr\/share\/%{php_name}\/PEAR/'
MDB2-2.5.0b5/tests/autoload.inc
-
%build
%install
mv package*.xml %{pear_name}-%{version}
cd %{pear_name}-%{version}
%{__pear} -v \
- -d doc_dir=/doc \
+ -d doc_dir=%{pear_docdir} \
-d bin_dir=%{_bindir} \
-d data_dir=%{php_peardir}/data \
install --offline --nodeps -R %{buildroot} package.xml
install -D -m 0644 package.xml %{buildroot}%{php_pearxmldir}/%{pear_name}.xml
-rm -rf %{buildroot}/{doc,tmp}
-rm -rf
%{buildroot}%{php_peardir}/.{filemap,lock,registry,channels,depdb,depdblock}
-# remove data, LICENSE to docdir
-rm -rf %{buildroot}/%{php_peardir}/data
+# patch autoload.inc to not include buildroot
+sed -i -e '17s/@php_dir@/\/usr\/share\/php7\/PEAR/'
%{buildroot}%{pear_testdir}/%{pear_name}/tests/autoload.inc
+sed -i -e '21s/@php_dir@/\/usr\/share\/php7\/PEAR/'
%{buildroot}%{pear_testdir}/%{pear_name}/tests/autoload.inc
-cd ..
+rm -rf
%{buildroot}%{php_peardir}/.{filemap,lock,registry,channels,depdb,depdblock}
-%{php_pear_gen_filelist}
+%check
+# up-to date phpunit can not be run
%post
# on `rpm -ivh` PARAM is 1
@@ -115,8 +111,11 @@
%{__pear} uninstall --nodeps --ignore-errors --register-only
pear.php.net/%{pear_name}
fi
-%files -f %{name}.files
-%doc %{pear_name}-%{version}/LICENSE
-%doc %{pear_name}-%{version}/docs/*
+%files
+%{pear_phpdir}/*
+%{php_pearxmldir}/*
+%exclude %{pear_testdir}
+%exclude %{pear_phpdir}/tmp
+%doc %{pear_docdir}
%changelog
