[php-bartlett-PHP-Reflect] update to 1.1.0
Remi Collet
remi at fedoraproject.org
Sat Nov 12 06:07:43 UTC 2011
commit 41447a4130f5add71b9ca0dddc230692d7788832
Author: remi <fedora at famillecollet.com>
Date: Sat Nov 12 07:07:36 2011 +0100
update to 1.1.0
.gitignore | 3 ++
PHP_Reflect-addhtml.patch | 9 +++--
PHP_Reflect-docs.patch | 71 -----------------------------------------
php-bartlett-PHP-Reflect.spec | 15 +++-----
sources | 2 +-
5 files changed, 15 insertions(+), 85 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2cfab8f..146a0c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
+*spec~
+package-*.xml
/PHP_Reflect-1.0.2.tgz
+/PHP_Reflect-1.1.0.tgz
diff --git a/PHP_Reflect-addhtml.patch b/PHP_Reflect-addhtml.patch
index ae9a230..0fa7bd1 100644
--- a/PHP_Reflect-addhtml.patch
+++ b/PHP_Reflect-addhtml.patch
@@ -1,7 +1,7 @@
-diff -up PHP_Reflect-1.0.2/php-bartlett-PHP-Reflect.xml.inst2 PHP_Reflect-1.0.2/php-bartlett-PHP-Reflect.xml
---- PHP_Reflect-1.0.2/php-bartlett-PHP-Reflect.xml.inst2 2011-09-19 18:13:52.630592571 +0200
-+++ PHP_Reflect-1.0.2/php-bartlett-PHP-Reflect.xml 2011-09-19 18:13:57.232589618 +0200
-@@ -238,6 +238,15 @@ Bug fixes:
+diff -up PHP_Reflect-1.1.0/php-bartlett-PHP-Reflect.xml.addhtml PHP_Reflect-1.1.0/php-bartlett-PHP-Reflect.xml
+--- PHP_Reflect-1.1.0/php-bartlett-PHP-Reflect.xml.addhtml 2011-11-11 19:30:07.000000000 +0100
++++ PHP_Reflect-1.1.0/php-bartlett-PHP-Reflect.xml 2011-11-11 19:31:26.000000000 +0100
+@@ -254,6 +254,16 @@ Bug fixes:
<file baseinstalldir="Bartlett" md5sum="13e7cd0079e1cdf3283ba099e0f87f9f" name="LICENSE" role="doc">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
@@ -11,6 +11,7 @@ diff -up PHP_Reflect-1.0.2/php-bartlett-PHP-Reflect.xml.inst2 PHP_Reflect-1.0.2/
+ <file baseinstalldir="Bartlett" name="docs/INSTALL.html" role="doc" />
+ <file baseinstalldir="Bartlett" name="docs/LICENSE.html" role="doc" />
+ <file baseinstalldir="Bartlett" name="docs/sources/scanFile.html" role="doc" />
++ <file baseinstalldir="Bartlett" name="docs/sources/scanFunctionArguments.html" role="doc" />
+ <file baseinstalldir="Bartlett" name="docs/sources/Token.html" role="doc" />
+ <file baseinstalldir="Bartlett" name="docs/sources/Autoload.html" role="doc" />
+ <file baseinstalldir="Bartlett" name="docs/sources/Reflect.html" role="doc" />
diff --git a/php-bartlett-PHP-Reflect.spec b/php-bartlett-PHP-Reflect.spec
index 44a49e4..b2c6f64 100644
--- a/php-bartlett-PHP-Reflect.spec
+++ b/php-bartlett-PHP-Reflect.spec
@@ -10,8 +10,8 @@
Name: php-bartlett-PHP-Reflect
-Version: 1.0.2
-Release: 2%{?dist}
+Version: 1.1.0
+Release: 1%{?dist}
Summary: Adds the ability to reverse-engineer PHP
Group: Development/Libraries
@@ -19,8 +19,6 @@ License: BSD
URL: http://bartlett.laurent-laville.org/
Source0: http://%{channel}/get/%{pear_name}-%{version}%{?prever}.tgz
-# for old asciidoc version https://bugzilla.redhat.com/556171
-Patch0: PHP_Reflect-docs.patch
# Don't install .js (unused)
Patch1: PHP_Reflect-deljs.patch
# Install generated doc using pear command
@@ -62,7 +60,6 @@ HTML Documentation: %{pear_docdir}/%{pear_name}/docs/index.html
cd %{pear_name}-%{version}%{?prever}
mv -f ../package.xml %{name}.xml
-%patch0 -p0 -b .fix
%patch1 -p1 -b .deljs
%if %{withhtmldoc}
%patch2 -p1 -b .addhtml
@@ -83,12 +80,9 @@ phing -f docs/build-phing.xml \
# Check that our patch for installed doc is ok
cpt=$(find docs -name \*.html | wc -l)
echo "File generated:$cpt, expected:9"
-[ $cpt -eq 9 ] || exit 1
+[ $cpt -eq 10 ] || exit 1
%endif
-# restore unpatched docs (for install and checksum)
-mv docs/index.txt.fix docs/index.txt
-
%install
rm -rf %{buildroot}
@@ -139,6 +133,9 @@ fi
%changelog
+* Fri Nov 11 2011 Remi Collet <Fedora at FamilleCollet.com> - 1.1.0-1
+- Version 1.1.0 (stable) - API 1.1.0 (stable)
+
* Mon Sep 19 2011 Remi Collet <Fedora at FamilleCollet.com> - 1.0.2-2
- remove unused .js and improve installation of generated doc
- use buildroot macro
diff --git a/sources b/sources
index 82e21e5..3180a2c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-beb4912241aa4af4faf1b0cb9f574992 PHP_Reflect-1.0.2.tgz
+d98f32e0da6d8c542c1d706326b779c8 PHP_Reflect-1.1.0.tgz
More information about the scm-commits
mailing list