From 66164d8dbde16a49abf28aa223acea29d1d6ffc3 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Sep 17 2018 12:26:09 +0000
Subject: update to 1.0.7

sources from git snapshot

---

diff --git a/.gitignore b/.gitignore
index 37fec43..bb7ff15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
+clog
 /pear-Net-LDAP3-1.0.2.tar.gz
 /pear-Net-LDAP3-1.0.3.tar.gz
+/php-kolab-net-ldap3-1.0.7-373ff24.tgz
diff --git a/makesrc.sh b/makesrc.sh
new file mode 100755
index 0000000..5c1f453
--- /dev/null
+++ b/makesrc.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+NAME=$(basename $PWD)
+VERSION=$(sed -n '/^Version:/{s/.* //;p}'           $NAME.spec)
+COMMIT=$(sed  -n '/^%global git_commit/{s/.* //;p}' $NAME.spec)
+SHORT=${COMMIT:0:7}
+
+echo -e "\nCreate git snapshot\nName=$NAME, Version=$VERSION\n"
+
+echo "Cloning..."
+rm -rf $NAME-$COMMIT
+git clone https://git.kolab.org/diffusion/PNL/php-net_ldap.git $NAME-$COMMIT
+
+echo "Getting commit..."
+pushd $NAME-$COMMIT
+git checkout $COMMIT
+cp composer.json ../composer.json
+popd
+
+echo "Archiving..."
+tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs $NAME-$COMMIT
+
+echo "Cleaning..."
+rm -rf $NAME-$COMMIT
+
+echo "Done."
diff --git a/php-kolab-net-ldap3.spec b/php-kolab-net-ldap3.spec
index dd846d5..1d9418d 100644
--- a/php-kolab-net-ldap3.spec
+++ b/php-kolab-net-ldap3.spec
@@ -1,21 +1,25 @@
 # spec file for php-kolab-net-ldap3
 #
-# Copyright (c) 2015 Remi Collet
+# Copyright (c) 2015-2018 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 
+%global git_commit    373ff2401c13
+%global git_short     %(c=%{git_commit}; echo ${c:0:7})
+
 Name:           php-kolab-net-ldap3
-Version:        1.0.3
-Release:        7%{?dist}
+Version:        1.0.7
+Release:        1%{?dist}
 Summary:        Advanced functionality for accessing LDAP directories
 
 Group:          Development/Libraries
 License:        GPLv3+
 URL:            http://git.kolab.org/pear/Net_LDAP3/
-Source0:        http://git.kolab.org/pear/Net_LDAP3/snapshot/pear-Net-LDAP3-%{version}.tar.gz
+Source0:        %{name}-%{version}-%{git_short}.tgz
+Source1:        makesrc.sh
 
 BuildArch:      noarch
 
@@ -24,10 +28,11 @@ BuildArch:      noarch
 #               "pear-pear/Net_LDAP2": ">=2.0.12"
 Requires:       php(language) >= 5.3.3
 Requires:       php-pear-Net-LDAP2 >= 2.0.12
-# From phpcompatinfo report for version 1.0.2
+# From phpcompatinfo report for version 1.0.7
 Requires:       php-json
 Requires:       php-ldap
 Requires:       php-pcre
+Requires:       php-spl
 
 Provides:       php-composer(kolab/Net_LDAP3) = %{version}
 
@@ -38,7 +43,7 @@ for accessing LDAP directories.
 
 
 %prep
-%setup -q -n pear-Net-LDAP3-%{version}
+%setup -q -n %{name}-%{git_commit}
 
 
 %build
@@ -46,8 +51,8 @@ for accessing LDAP directories.
 
 
 %install
-mkdir -p     %{buildroot}%{_datadir}/php
-cp -pr lib/* %{buildroot}%{_datadir}/php
+mkdir -p       %{buildroot}%{_datadir}/php
+cp -pr lib/Net %{buildroot}%{_datadir}/php/Net
 
 
 %files
@@ -58,6 +63,10 @@ cp -pr lib/* %{buildroot}%{_datadir}/php
 
 
 %changelog
+* Mon Sep 17 2018 Remi Collet <remi@fedoraproject.org> - 1.0.7-1
+- update to 1.0.7
+- sources from git snapshot
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index e421585..00e18ab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-625c26f73f6fb9a18b6eb68b1a2e9a79  pear-Net-LDAP3-1.0.3.tar.gz
+SHA512 (php-kolab-net-ldap3-1.0.7-373ff24.tgz) = 6e5b36215b47ce8ae6245c2c3befbbf4b5583074bc1036ef7ad71a20b964680ac0402816ec5b8dd53ccbc96a1870cccfcb743c36f268e50e2ba8e28411d049a5