remi pushed to php-mikey179-vfsstream (f22). "update to 1.5.0"

[notifications at fedoraproject.org]

>From fa0abf56f51a2564cd3a9b661dee2722fee2cb33 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi at fedoraproject.org>
Date: Mon, 30 Mar 2015 09:00:40 +0200
Subject: update to 1.5.0


diff --git a/.gitignore b/.gitignore
index ec88c8b..6321488 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /vfsStream-1.2.0.tar.gz
 /vfsStream-1.3.0.tar.gz
 /vfsStream-1.4.0.tar.gz
+/php-mikey179-vfsstream-1.5.0-4dc0d2f.tgz
diff --git a/makesrc.sh b/makesrc.sh
new file mode 100755
index 0000000..05a6054
--- /dev/null
+++ b/makesrc.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+NAME=$(sed    -n '/^Name:/{s/.* //;p}'                  *.spec)
+OWNER=$(sed   -n '/^%global gh_owner/{s/.* //;p}'   $NAME.spec)
+PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec)
+VERSION=$(sed -n '/^Version:/{s/.* //;p}'           $NAME.spec)
+COMMIT=$(sed  -n '/^%global gh_commit/{s/.* //;p}'  $NAME.spec)
+SHORT=${COMMIT:0:7}
+
+echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n"
+
+echo "Cloning..."
+git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
+
+echo "Getting commit..."
+pushd $PROJECT-$COMMIT
+git checkout $COMMIT
+popd
+
+echo "Archiving..."
+tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT
+
+echo "Cleaning..."
+rm -rf $PROJECT-$COMMIT
+
+echo "Done."
diff --git a/php-mikey179-vfsstream-test.patch b/php-mikey179-vfsstream-test.patch
deleted file mode 100644
index 38591ad..0000000
--- a/php-mikey179-vfsstream-test.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -up src/test/php/org/bovigo/vfs/vfsStreamWrapperTestCase.php.orig src/test/php/org/bovigo/vfs/vfsStreamWrapperTestCase.php
---- src/test/php/org/bovigo/vfs/vfsStreamWrapperTestCase.php.orig	2014-06-12 07:40:52.000000000 +0200
-+++ src/test/php/org/bovigo/vfs/vfsStreamWrapperTestCase.php	2014-06-12 07:41:11.000000000 +0200
-@@ -200,6 +200,9 @@ class vfsStreamWrapperTestCase extends v
-      */
-     public function is_executable()
-     {
-+        if (version_compare(PHP_VERSION, '5.4.0', '<')) {
-+            $this->markTestSkipped('Requires PHP 5.4');
-+        }
-         $this->assertFalse(is_executable($this->baz1URL));
-         $this->baz1->chmod(0766);
-         $this->assertTrue(is_executable($this->baz1URL));
-diff -up src/test/php/org/bovigo/vfs/DirectoryIterationTestCase.php.orig src/test/php/org/bovigo/vfs/DirectoryIterationTestCase.php
---- src/test/php/org/bovigo/vfs/DirectoryIterationTestCase.php.orig	2014-07-22 14:46:01.352140001 +0200
-+++ src/test/php/org/bovigo/vfs/DirectoryIterationTestCase.php	2014-07-22 14:46:21.902807651 +0200
-@@ -232,6 +232,9 @@ class DirectoryIterationTestCase extends
-      */
-     public function recursiveDirectoryIterationWithDotsEnabled()
-     {
-+        if (version_compare(PHP_VERSION, '5.4.0', '<')) {
-+            $this->markTestSkipped('Requires PHP 5.4');
-+        }
-         vfsStream::enableDotfiles();
-         vfsStream::setup();
-         $structure = array(
diff --git a/php-mikey179-vfsstream.spec b/php-mikey179-vfsstream.spec
index 5492072..3d21245 100644
--- a/php-mikey179-vfsstream.spec
+++ b/php-mikey179-vfsstream.spec
@@ -1,28 +1,29 @@
 # spec file for php-mikey179-vfsstream
 #
-# Copyright (c) 2014 Remi Collet
+# Copyright (c) 2014-2015 Remi Collet
 # License: CC-BY-SA
-# http://creativecommons.org/licenses/by-sa/3.0/
+# http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    61b12172292cf539685507aa65b076c1530e83c1
+%global gh_commit    4dc0d2f622412f561f5b242b19b98068bbbc883a
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     mikey179
 %global gh_project   vfsStream
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 
 Name:           php-mikey179-vfsstream
-Version:        1.4.0
+Version:        1.5.0
 Release:        1%{?dist}
 Summary:        PHP stream wrapper for a virtual file system
 
 Group:          Development/Libraries
 License:        BSD
 URL:            https://github.com/%{gh_owner}/%{gh_project}
-Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}.tar.gz
-
-Patch0:         %{name}-test.patch
+#Source0:       https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}.tar.gz
+# See https://github.com/mikey179/vfsStream/issues/108
+# run mksrc.sh to create the tarball from a git snapshot
+Source0:        %{name}-%{version}-%{gh_short}.tgz
 
 BuildArch:      noarch
 BuildRequires:  php(language) >= 5.3
@@ -54,8 +55,6 @@ It can be used with any unit test framework, like PHPUnit or SimpleTest.
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
 
-%patch0 -p0
-
 
 %build
 # Nothing
@@ -84,7 +83,7 @@ phpunit \
 %files
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
-%doc CHANGELOG.md readme.md composer.json
+%doc CHANGELOG.md README.md composer.json
 
 %dir %{_datadir}/php/org
 %dir %{_datadir}/php/org/bovigo
@@ -92,6 +91,11 @@ phpunit \
 
 
 %changelog
+* Sun Mar 29 2015 Remi Collet <remi at fedoraproject.org> - 1.5.0-1
+- update to 1.4.0
+- create source from git snapshot for test suite
+  see https://github.com/mikey179/vfsStream/issues/108
+
 * Sun Sep 14 2014 Remi Collet <remi at fedoraproject.org> - 1.4.0-1
 - update to 1.4.0
 
diff --git a/sources b/sources
index bce4e8a..9149f55 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-de45e4b4fae0a53764dfd26a0431e124  vfsStream-1.4.0.tar.gz
+75b5ba9a809ef1e0a6c47e0f5c7ffca4  php-mikey179-vfsstream-1.5.0-4dc0d2f.tgz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/php-mikey179-vfsstream.git/commit/?h=f22&id=fa0abf56f51a2564cd3a9b661dee2722fee2cb33