Hello community,
here is the log from the commit of package php5-pear-Net_LDAP2 for
openSUSE:Factory checked in at 2016-01-12 16:13:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/php5-pear-Net_LDAP2 (Old)
and /work/SRC/openSUSE:Factory/.php5-pear-Net_LDAP2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php5-pear-Net_LDAP2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/php5-pear-Net_LDAP2/php5-pear-Net_LDAP2.changes
2014-03-05 15:38:02.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.php5-pear-Net_LDAP2.new/php5-pear-Net_LDAP2.changes
2016-01-12 16:13:35.000000000 +0100
@@ -1,0 +2,17 @@
+Mon Jan 11 10:52:09 UTC 2016 - [email protected]
+
+- Updated spec
+- Updated dependencies
+- Added php5-pear-Net_LDAP2-2.2.0-package.xml.patch to allow
+ installing with php5-pear < 1.10.1
+
+-------------------------------------------------------------------
+Sat Jan 9 16:14:46 UTC 2016 - [email protected]
+
+- update to 2.2.0
+ * Fix bug #20969: Fatal error with PEAR 1.10.0 / constructor
+ visiblity
+ * Add support for PHP 7
+ * Improve unit tests
+
+-------------------------------------------------------------------
Old:
----
Net_LDAP2-2.1.0.tgz
New:
----
Net_LDAP2-2.2.0.tgz
php5-pear-Net_LDAP2-2.2.0-package.xml.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ php5-pear-Net_LDAP2.spec ++++++
--- /var/tmp/diff_new_pack.XTckUT/_old 2016-01-12 16:13:36.000000000 +0100
+++ /var/tmp/diff_new_pack.XTckUT/_new 2016-01-12 16:13:36.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package php5-pear-Net_LDAP2
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -18,39 +18,30 @@
Name: php5-pear-Net_LDAP2
%define pear_name Net_LDAP2
-%define pear_sname net_ldap2
Summary: Object oriented interface for searching and manipulating
LDAP-entries
License: LGPL-3.0
-Group: Productivity/Networking/Web/Servers
-Version: 2.1.0
+Group: Development/Libraries/PHP
+Version: 2.2.0
Release: 0
-BuildArch: noarch
Url: http://pear.php.net/package/%{pear_name}
-Source0: %{pear_name}-%{version}.tgz
+Source:
http://download.pear.php.net/package/%{pear_name}-%{version}.tgz
Source1: LICENSE
-Provides: php-pear-Net_LDAP2 = %{version}-%{release}
+# PATCH-FIX-OPENSUSE -- lower the pear version requirement
+Patch1: php5-pear-Net_LDAP2-2.2.0-package.xml.patch
+
+BuildArch: noarch
+BuildRequires: php-devel >= 5.4
+BuildRequires: php-pear >= 1.9.4
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: php >= 5.0
-%if 0%{?sles_version} == 10
-BuildRequires: php-macros
-%else
-BuildRequires: php-devel >= 5.0
-%endif
-BuildRequires: php-pear >= 1.5.0
-Requires: php >= 5.0
+
+Requires: php >= 5.4
Requires: php-ldap
-Requires: php-pear >= 1.5.0
-#pecl extension. No separate project, comes with php5 project
+Requires: php-pear >= 1.9.4
-Provides: pear-%{pear_name}
-Provides: php-pear-%{pear_name}
-# Fix for renaming (package convention)
-Provides: pear-%{pear_sname} = %{version}
-Provides: php-pear-%{pear_sname} = %{version}
-Provides: php5-pear-%{pear_sname} = %{version}
-Obsoletes: pear-%{pear_sname} < %{version}
-Obsoletes: php-pear-%{pear_sname} < %{version}
-Obsoletes: php5-pear-%{pear_sname} < %{version}
+Provides: php-pear-%{pear_name} = %{version}
+Provides: php-pear(%{pear_name}) = %{version}
+Obsoletes: php-pear-%{pear_name} < %{version}
+Obsoletes: php-pear(%{pear_name}) < %{version}
%description
Net_LDAP2 is the successor of Net_LDAP which is a clone of Perls
Net::LDAPobject interface to directory servers.
@@ -63,9 +54,10 @@
Net_LDAP2 layers itself on top of PHP's existing ldap extensions.
-%prep
+%prep
%setup -c
+%patch1 -p0
%{__cp} %{SOURCE1} .
%build
@@ -73,43 +65,45 @@
%install
%{__mv} package*.xml %{pear_name}-%{version}
cd %{pear_name}-%{version}
+
PHP_PEAR_PHP_BIN="$(which php) -d memory_limit=50m"
%{__pear} -v \
- -d doc_dir=/doc \
-d bin_dir=%{_bindir} \
+ -d doc_dir=%{php_peardir}/doc \
-d data_dir=%{php_peardir}/data \
- install --force --offline --nodeps -R "%{buildroot}" package.xml
+ -d test_dir=%{php_peardir}/tests \
+ install --offline --nodeps -P "%{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}
-
cd ..
+# We don't pack tests, remove cruft, move docs into %%_docdir
+%{__mkdir_p} doc/
+%{__mv} %{buildroot}%{php_peardir}/doc/%{pear_name}/* doc/
+%{__rm} -rf %{buildroot}%{php_peardir}/{doc,tests}
+%{__rm} -rf
%{buildroot}%{php_peardir}/.{filemap,lock,registry,channels,depdb,depdblock}
+
%php_pear_gen_filelist
%post
-# on `rpm -ivh` PARAM is 1
-# on `rpm -Uvh` PARAM is 2
+# install: $1 = 1
if [ "$1" = "1" ]; then
%{__pear} install --nodeps --soft --force --register-only
%{php_pearxmldir}/%{pear_name}.xml
fi
+# upgrade: $1 = 1
if [ "$1" = "2" ]; then
%{__pear} upgrade --offline --register-only
%{php_pearxmldir}/%{pear_name}.xml
fi
%postun
-# on `rpm -e` PARAM is 0
+# uninstall: $1 = 0
if [ "$1" = "0" ]; then
%{__pear} uninstall --nodeps --ignore-errors --register-only
pear.php.net/%{pear_name}
fi
-%clean
-%{__rm} -rf %{buildroot}
-
%files -f %{name}.files
%defattr(-, root, root)
-%doc LICENSE
+%doc LICENSE doc/*
%changelog
++++++ LICENSE ++++++
--- /var/tmp/diff_new_pack.XTckUT/_old 2016-01-12 16:13:36.000000000 +0100
+++ /var/tmp/diff_new_pack.XTckUT/_new 2016-01-12 16:13:36.000000000 +0100
@@ -1,4 +1,4 @@
- GNU LESSER GENERAL PUBLIC LICENSE
+ GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
@@ -163,4 +163,3 @@
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the
Library.
-
++++++ Net_LDAP2-2.1.0.tgz -> Net_LDAP2-2.2.0.tgz ++++++
++++ 23392 lines of diff (skipped)
++++++ php5-pear-Net_LDAP2-2.2.0-package.xml.patch ++++++
--- package.xml.orig 2015-10-30 21:33:00.000000000 +0100
+++ package.xml 2016-01-11 11:50:45.877266944 +0100
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<package packagerversion="1.10.1" version="2.0"
xmlns="http://pear.php.net/dtd/package-2.0";
xmlns:tasks="http://pear.php.net/dtd/tasks-1.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0
http://pear.php.net/dtd/package-2.0.xsd";>
+<package packagerversion="1.9.4" version="2.0"
xmlns="http://pear.php.net/dtd/package-2.0";
xmlns:tasks="http://pear.php.net/dtd/tasks-1.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0
http://pear.php.net/dtd/package-2.0.xsd";>
<name>Net_LDAP2</name>
<channel>pear.php.net</channel>
<extends>Net_LDAP</extends>
@@ -90,7 +90,7 @@
<min>5.4</min>
</php>
<pearinstaller>
- <min>1.10.1</min>
+ <min>1.9.4</min>
</pearinstaller>
<extension>
<name>ldap</name>
