[svn] r3126 - in trunk/rpms: php-pear-excel php-pear-ole

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Fri Apr 15 16:23:57 CEST 2005


Author: thias
Date: 2005-04-15 16:23:55 +0200 (Fri, 15 Apr 2005)
New Revision: 3126

Modified:
   trunk/rpms/php-pear-excel/php-pear-excel.spec
   trunk/rpms/php-pear-ole/php-pear-ole.spec
Log:
Update php-pear-excel to 0.8 and fix eval setting of php_dir that triggers a nasty build failure.


Modified: trunk/rpms/php-pear-excel/php-pear-excel.spec
===================================================================
--- trunk/rpms/php-pear-excel/php-pear-excel.spec	2005-04-15 13:31:01 UTC (rev 3125)
+++ trunk/rpms/php-pear-excel/php-pear-excel.spec	2005-04-15 14:23:55 UTC (rev 3126)
@@ -1,16 +1,16 @@
 # $Id$
 # Authority: matthias
 
-%define php_dir %(eval "`pear config-get php_dir`"; echo $php_dir)
+%define pear_dir %{_datadir}/pear
 
 Summary: PEAR package for generating Excel spreadsheets
 Name: php-pear-excel
-Version: 0.7
-Release: 2
+Version: 0.8
+Release: 1
 License: LGPL
 Group: Development/Languages
 URL: http://pear.php.net/package/Spreadsheet_Excel_Writer/
-Source1: http://pear.php.net/get/Spreadsheet_Excel_Writer-%{version}.tgz
+Source0: http://pear.php.net/get/Spreadsheet_Excel_Writer-%{version}.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 Requires: php, php-pear-ole >= 0.5
@@ -30,9 +30,9 @@
 
 %install
 %{__rm} -rf %{buildroot}
-pear install -R %{buildroot} -n %{SOURCE1}
+pear install -R %{buildroot} -n %{SOURCE0}
 # Remove .filemap and .lock, we don't want to include those
-%{__rm} -f %{buildroot}%{php_dir}/{.filemap,.lock}
+%{__rm} -f %{buildroot}%{pear_dir}/{.filemap,.lock}
 
 
 %clean
@@ -41,10 +41,16 @@
 
 %files
 %defattr(0644, root, root, 0755)
-%{php_dir}
+%{pear_dir}
 
 
 %changelog
+* Fri Apr 15 2005 Matthias Saou <http://freshrpms.net/> 0.8-1
+- Update to 0.8.
+- Change single source from 1 to 0.
+- Use %%{_datadir}/pear instead of the eval method, as it's triggering a
+  nasty side-effect that prevents building.
+
 * Fri May 21 2004 Matthias Saou <http://freshrpms.net/> 0.7-2
 - Rebuild for Fedora Core 2.
 

Modified: trunk/rpms/php-pear-ole/php-pear-ole.spec
===================================================================
--- trunk/rpms/php-pear-ole/php-pear-ole.spec	2005-04-15 13:31:01 UTC (rev 3125)
+++ trunk/rpms/php-pear-ole/php-pear-ole.spec	2005-04-15 14:23:55 UTC (rev 3126)
@@ -1,7 +1,7 @@
 # $Id$
 # Authority: matthias
 
-%define php_dir %(eval "`pear config-get php_dir`"; echo $php_dir)
+%define pear_dir %{_datadir}/pear
 
 Summary: PEAR package for reading and writing OLE containers
 Name: php-pear-ole
@@ -10,7 +10,7 @@
 License: PHP
 Group: Development/Languages
 URL: http://pear.php.net/package/OLE/
-Source1: http://pear.php.net/get/OLE-%{version}.tgz
+Source0: http://pear.php.net/get/OLE-%{version}.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 Requires: php
@@ -28,9 +28,9 @@
 
 %install
 %{__rm} -rf %{buildroot}
-pear install -R %{buildroot} -n %{SOURCE1}
+pear install -R %{buildroot} -n %{SOURCE0}
 # Remove .filemap and .lock, we don't want to include those
-%{__rm} -f %{buildroot}%{php_dir}/{.filemap,.lock}
+%{__rm} -f %{buildroot}%{pear_dir}/{.filemap,.lock}
 
 
 %clean
@@ -39,10 +39,15 @@
 
 %files
 %defattr(0644, root, root, 0755)
-%{php_dir}
+%{pear_dir}/
 
 
 %changelog
+* Fri Apr 15 2005 Matthias Saou <http://freshrpms.net/> 0.5-3
+- Change single source from 1 to 0.
+- Use %%{_datadir}/pear instead of the eval method, as it's triggering a
+  nasty side-effect that prevents building.
+
 * Fri May 21 2004 Matthias Saou <http://freshrpms.net/> 0.5-2
 - Rebuilt for Fedora Core 2.
 




More information about the commits mailing list