update to 1.0.7

sources from git snapshot

4 files changed, 84 insertions, 15 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fc9aa8c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+clog
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..14090c0
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,33 @@
+{
+	"name": "kolab/net_ldap3",
+	"description": "A successor of the PEAR:Net_LDAP2 module providing advanced functionality for accessing LDAP directories",
+	"type": "library",
+	"version": "1.0.7",
+	"keywords": ["pear", "ldap", "vlv"],
+	"homepage": "http://git.kolab.org/pear/Net_LDAP3/",
+	"license": "GPL-3.0+",
+	"authors": [
+		{
+			"name": "Jeroen van Meeuwen",
+			"email": "vanmeeuwen@kolabsys.com",
+			"role": "Lead"
+		},
+		{
+			"name": "Aleksander Machniak",
+			"email": "machniak@kolabsys.com",
+			"role": "Developer"
+		},
+		{
+			"name": "Thomas Bruederli",
+			"email": "roundcube@gmail.com",
+			"role": "Developer"
+		}
+	],
+	"require": {
+		"php": ">=5.3.3",
+		"pear/net_ldap2": ">=2.0.12"
+	},
+	"autoload": {
+		"classmap": ["lib/"]
+	}
+}
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 210e788..8c5f31e 100644
--- a/php-kolab-net-ldap3.spec
+++ b/php-kolab-net-ldap3.spec
@@ -1,23 +1,26 @@
 # spec file for php-kolab-net-ldap3
 #
-# Copyright (c) 2015-2017 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
+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
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 # From composer.json
@@ -25,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}
 
@@ -39,7 +43,7 @@ for accessing LDAP directories.
 
 
 %prep
-%setup -q -n pear-Net-LDAP3-%{version}
+%setup -q -n %{name}-%{git_commit}
 
 
 %build
@@ -47,17 +51,11 @@ for accessing LDAP directories.
 
 
 %install
-rm -rf       %{buildroot}
-mkdir -p     %{buildroot}%{_datadir}/php
-cp -pr lib/* %{buildroot}%{_datadir}/php
-
-
-%clean
-rm -rf %{buildroot}
+mkdir -p       %{buildroot}%{_datadir}/php
+cp -pr lib/Net %{buildroot}%{_datadir}/php/Net
 
 
 %files
-%defattr(-,root,root,-)
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc composer.json
@@ -65,6 +63,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep 17 2018 Remi Collet <remi@fedoraproject.org> - 1.0.7-1
+- update to 1.0.7
+- sources from git snapshot
+
 * Fri Mar 27 2015 Remi Collet <remi@fedoraproject.org> - 1.0.3-1
 - update to 1.0.3
 
@@ -72,4 +74,4 @@ rm -rf %{buildroot}
 - add upstream patch for License clarification
 
 * Sun Feb 22 2015 Remi Collet <remi@fedoraproject.org> - 1.0.2-1
-- initial package, version 1.0.2
\ No newline at end of file
+- initial package, version 1.0.2