[php-pear-Image-Graph/f14/master] update to SVN snapshot to fix PHP 5.3 issues (#547738)

Remi Collet remi at fedoraproject.org
Sun Aug 15 10:19:25 UTC 2010


commit 21a41ab1410ca2ceade617f877ebaf87a13af717
Author: remi <fedora at famillecollet.com>
Date:   Sun Aug 15 12:12:49 2010 +0200

    update to SVN snapshot to fix PHP 5.3 issues (#547738)

 .gitignore                |    1 +
 php-pear-Image-Graph.spec |   30 +++++++++++++++++++++---------
 sources                   |    2 +-
 3 files changed, 23 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b2053b1..4f1b0b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Image_Graph-0.7.2.tgz
+Image_Graph-0.7.3.tgz
diff --git a/php-pear-Image-Graph.spec b/php-pear-Image-Graph.spec
index 7bde7fc..b327a7c 100644
--- a/php-pear-Image-Graph.spec
+++ b/php-pear-Image-Graph.spec
@@ -1,15 +1,23 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Image_Graph
+%global pear_name Image_Graph
 
+%global svn 291756
 Name:           php-pear-Image-Graph
-Version:        0.7.2
+Version:        0.7.3
+%if 0%{?svn}
+Release:        0.1.svn%{svn}%{?dist}
+# svn export -r 291756 http://svn.php.net/repository/pear/packages/Image_Graph/trunk
+# cd trunk;  pear package package.xml
+Source0:        %{pear_name}-%{version}.tgz
+%else
 Release:        6%{?dist}
+Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
+%endif
 Summary:        Displays numerical data as a graph/chart/plot
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://pear.php.net/package/Image_Graph
-Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -45,8 +53,8 @@ PDF (using PDFLib), Scalable Vector Graphics (SVG).
 
 %prep
 %setup -qc
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+# Package.xml is V2
+mv package.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -58,7 +66,7 @@ cd %{pear_name}-%{version}
 %install
 cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Move documentation
 mkdir -p docdir
@@ -75,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
 install -d $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
 %clean
@@ -84,7 +92,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %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
@@ -96,12 +104,16 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc %{pear_name}-%{version}/docdir/%{pear_name}/docs/*
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_testdir}/%{pear_name}
 %{pear_phpdir}/Image/Graph*
 
 
 %changelog
+* Sun Aug 15 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.3-0.1.svn291756
+- update to SVN snapshot to fix PHP 5.3 issues (#547738)
+- rename Image_Graph.xml to php-pear-Image-Graph.xml
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 1084434..db416b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4e3f338314fe0754970a896686875a5e  Image_Graph-0.7.2.tgz
+effdb9de58e492822a9cb6fabfc6c39f  Image_Graph-0.7.3.tgz


More information about the scm-commits mailing list