Request 2598 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 2598 (accepted)

Update to 2.2.0 and add Debian package. This is needed for Debian 10.

Created by sicherha over 4 years ago
In state accepted
Open review for Admin
Open review for kolab-developers

Submit php-pear-Net-LDAP2

Submit package home:siche...:Kolab:16 / php-pear-Net-LDAP2 to package Kolab:Winterfell / php-pear-Net-LDAP2

php-pear-Net-LDAP2.spec Changed

@@ -1,4 +1,13 @@
-%{!?__pear:         %{expand: %%global __pear %{_bindir}/pear}}
+# remirepo/fedora spec file for php-pear-Net-LDAP2
+#
+# Copyright (c) 2015 Remi Collet
+# License: CC-BY-SA
+# http://creativecommons.org/licenses/by-sa/4.0/
+#
+# Please, preserve the changelog entries
+#
+%{!?__pear:       %global __pear       %{_bindir}/pear}
+%global pear_name Net_LDAP2
 
 # Needed for openSUSE
 %if 0%{?suse_version}
@@ -12,47 +21,63 @@
 %{!?pear_xmldir:    %global pear_xmldir %{_localstatedir}/lib/pear/pkgxml}
 %endif
 
-%global pear_name Net_LDAP2
+# Test suite requires a LDAP server, so are not run during build
 
 %if 0%{?suse_version}
 Name:               php5-pear-Net_LDAP2
 %else
 Name:               php-pear-Net-LDAP2
 %endif
-Version:            2.0.12
-Release:            1%{?dist}
-Summary:            Object oriented interface for searching and manipulating LDAP-entries
-Group:              Development/Libraries
-License:            LGPLv3
-URL:                http://pear.php.net/package/Net_LDAP2
-Source0:            http://pear.php.net/get/%{pear_name}-%{version}.tgz
-BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:          noarch
+Version:        2.2.0
+Release:        2%{?dist}
+Summary:        Object oriented interface for searching and manipulating LDAP-entries
+
+# LGPL doesn't require license file, but ask for it
+# https://pear.php.net/bugs/bug.php?id=20504 - please include License file
+License:        LGPLv3
+URL:            http://pear.php.net/package/%{pear_name}
+Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 
-BuildRequires:      php-pear
+Patch1: lower-min-required-pear-version.patch
 
-Requires(post):     %{__pear}
-Requires(postun):   %{__pear}
-Requires:           php-pear
+BuildArch:      noarch
+BuildRequires:  php-pear(PEAR) >= 1.9.4
+
+Requires(post): %{__pear}
+Requires(postun): %{__pear}
+# From package.xml
+Requires:       php(language)  >= 5.4
+Requires:       php-pear(PEAR) >= 1.9.4
+Requires:       php-ldap
+# From phpcompatinfo report
+Requires:       php-date
+Requires:       php-pcre
+Requires:       php-spl
+
+Provides:       php-pear(%{pear_name}) = %{version}
+Provides:       php-composer(pear/net_ldap2) = %{version}
 
-Provides:           php-pear(%{pear_name}) = %{version}-%{release}
 
 %description
-Net_LDAP2 is the successor of Net_LDAP which is a clone of Perls Net::LDAP
+Net_LDAP2 is the successor of Net_LDAP (which is a clone of Perls Net::LDAP)
 object interface to directory servers. It does contain most of Net::LDAPs
 features but has some own too.
+
 With Net_LDAP2 you have:
-* A simple object-oriented interface to connections, searches entries and filters.
-* Support for tls and ldap v3.
-* Simple modification, deletion and creation of ldap entries.
+* A simple object-oriented interface to connections,
+  searches entries and filters.
+* Support for TLS and LDAP v3.
+* Simple modification, deletion and creation of LDAP entries.
 * Support for schema handling.
 
 Net_LDAP2 layers itself on top of PHP's existing ldap extensions.
 
+
 %prep
 %setup -q -c
-
-mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
+%patch1 -p1
+cd %{pear_name}-%{version}
+mv ../package.xml %{name}.xml
 
 
 %build
@@ -61,62 +86,51 @@
 
 
 %install
-rm -rf %{buildroot} docdir
-
-pushd %{pear_name}-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} %{pear_name}.xml
+cd %{pear_name}-%{version}
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+rm -rf %{buildroot}%{pear_metadir}/.??*
 
 # Install XML package description
-%{__mkdir_p} %{buildroot}%{pear_xmldir}
-%{__install} -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir}
+mkdir -p %{buildroot}%{pear_xmldir}
+install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
-popd
-
-# For troubleshooting macros:
-
-echo "pear_metadir: '%{pear_metadir}'"
-
-%check
-# Sanity check
-lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
-[ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
-
-%clean
-rm -rf %{buildroot}
 
 %post
 %{__pear} install --nodeps --soft --force --register-only \
-    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+    %{pear_xmldir}/%{name}.xml >/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
     %{__pear} uninstall --nodeps --ignore-errors --register-only \
-        %{pear_name} >/dev/null || :
+        pear.php.net/%{pear_name} >/dev/null || :
 fi
 
+
 %files
-%defattr(-,root,root,-)
 %doc %{pear_docdir}/%{pear_name}
-%dir %{pear_phpdir}/Net
-%{pear_phpdir}/Net/LDAP2
-%{pear_phpdir}/Net/LDAP2.php
-%{pear_testdir}/%{pear_name}
 %if 0%{?suse_version}
 %dir %{pear_xmldir}
 %endif
-%{pear_xmldir}/%{pear_name}.xml
-%if 0%{?rhel} > 6 || 0%{?fedora} > 18
-%{pear_metadir}/.registry/net_ldap2.reg
-%exclude %{pear_metadir}
-%endif
+%{pear_xmldir}/%{name}.xml
+%{pear_phpdir}/Net
+%{pear_testdir}/%{pear_name}
+
 
 %changelog
-* Sat Jun 05 2010 Christoph Wickert <wickert@kolabsys.com> - 2.0.9-3
-- Adjust requirements for php-channel(pear.horde.org)
+* Sat Oct 05 2019 Christoph Erhardt <kolab@sicherha.de> - 2.2.0-2
+- Package for Kolab
+- Fix the build on CentOS/RHEL 7
+
+* Sat Oct 31 2015 Remi Collet <remi@fedoraproject.org> - 2.2.0-1
+- Update to 2.2.0
+- provide php-composer(pear/net_ldap2)
+- raise dependency on PEAR 1.10.1
 
-* Sun May  9 2010 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.0.9-2
-- Package for Fedora/EPEL
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
+* Sun Feb 22 2015 Remi Collet <remi@fedoraproject.org> - 2.1.0-1
+- Version 2.1.0 (stable), API 2.0.0 (stable)
+- Initial package

lower-min-required-pear-version.patch Added

Net_LDAP2-2.0.12.tgz -> Net_LDAP2-2.2.0.tgz Changed

debian.changelog Added

@@ -0,0 +1,91 @@
+php-net-ldap2 (2.2.0-3~kolab1) unstable; urgency=medium
+
+  * Package for Kolab
+  * Disable failing tests
+
+ -- Christoph Erhardt <kolab@sicherha.de>  Sat, 05 Oct 2019 12:01:05 +0200
+
+php-net-ldap2 (2.2.0-3) unstable; urgency=medium
+
+  [ Nishanth Aravamudan ]
+  * Add missing dependency on php-pear (Closes: #827496)
+
+  [ Prach Pongpanich ]
+  * Update Standards-Version to 3.9.8
+
+ -- Prach Pongpanich <prach@debian.org>  Fri, 24 Jun 2016 13:41:21 +0700
+
+php-net-ldap2 (2.2.0-2) unstable; urgency=medium
+
+  * Add Build-Depends on php-pear (>= 1.10.1) (Closes: #809771)
+  * Bump standards version to 3.9.7
+  * Update Build-depends on pkg-php-tools (>= 1.32) for PHP 7
+
+ -- Prach Pongpanich <prach@debian.org>  Fri, 04 Mar 2016 19:25:40 +0700
+
+php-net-ldap2 (2.2.0-1) unstable; urgency=medium
+
+  * Imported Upstream version 2.2.0
+    - Fix bug #20969: Fatal error with PEAR 1.10.0
+
+ -- Prach Pongpanich <prach@debian.org>  Sun, 15 Nov 2015 22:23:48 +0700
+
+php-net-ldap2 (2.1.0-2) unstable; urgency=medium
+
+  * Team upload, to unstable since Jessie has been released
+
+ -- David Prévot <taffit@debian.org>  Tue, 02 Jun 2015 19:13:53 -0400
+
+php-net-ldap2 (2.1.0-1) experimental; urgency=medium
+
+  * Team upload, to experimental to respect the freeze
+  * Imported Upstream version 2.1.0
+  * Let pkg-php-tools take care of description
+  * Run test during package build
+  * Add DEP-8 tests
+  * Bump standards version to 3.9.6
+
+ -- David Prévot <taffit@debian.org>  Mon, 23 Mar 2015 13:37:20 -0400
+
+php-net-ldap2 (2.0.12-1) unstable; urgency=low
+
+  [ Prach Pongpanich ]
+  * New upstream release (Closes: #635827)
+  * Switch to pkg-php-tools and dh-sequencer
+  * Change section to php
+  * Switch VCS to Git
+  * Convert copyright to format 1.0
+  * Update long description (Closes: #599540)
+  * Add myself as uploader
+  * Switch to dpkg-source 3.0 (quilt) format
+  * Bump debhelper compat to 9
+  * Bump Standards-Version to 3.9.4
+
+  [ Benoit Mortier ]
+  * Update maintainer to pkg-php-pear (Closes: #656992)
+
+ -- Prach Pongpanich <prachpub@gmail.com>  Thu, 18 Jul 2013 22:07:32 +0700
+
+php-net-ldap2 (2.0.9-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Benoit Mortier <benoit.mortier@opensides.be>  Tue, 23 Mar 2010 00:19:36 +0100
+
+php-net-ldap2 (2.0.7-1) unstable; urgency=low
+
+  * New Upstream Version
+
+ -- Benoit Mortier <benoit.mortier@opensides.be>  Sat, 21 Nov 2009 15:01:17 +0100
+
+php-net-ldap2 (2.0.6-2) unstable; urgency=low
+
+  * unsatisfiable Depends: pear (>= 5.2.0-8) (Closes: #551127)
+
+ -- Benoit Mortier <benoit.mortier@opensides.be>  Sun, 18 Oct 2009 23:47:36 +0200
+
+php-net-ldap2 (2.0.6-1) unstable; urgency=low
+
+  * Initial Release (Closes: #539916).
+
+ -- Benoit Mortier <benoit.mortier@opensides.be>  Wed, 07 Oct 2009 09:15:24 +0200

debian.control Added

debian.rules Added

debian.tar.gz Added

php-net-ldap2.dsc Added

Build Results
RPM Lint

Refresh

Comments for request 2598 1

sicherha wrote over 4 years ago

2.2.0 is the only version to officially support PHP 7, hence the update. The package.xml file is patched to fix building with PEAR 1.9.4 on CentOS/RHEL 7.

Request History

sicherha created request over 4 years ago

Update to 2.2.0 and add Debian package. This is needed for Debian 10.

sicherha accepted request over 4 years ago

Accepting.