SPECS: php-pear-HTTP_Upload.spec, php-pear-HTTP_WebDAV_Client.spec...

glen glen at pld-linux.org
Tue Sep 27 23:57:48 CEST 2005


Author: glen                         Date: Tue Sep 27 21:57:48 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- new pear packaging

---- Files affected:
SPECS:
   php-pear-HTTP_Upload.spec (1.20 -> 1.21) , php-pear-HTTP_WebDAV_Client.spec (1.6 -> 1.7) , php-pear-HTTP_WebDAV_Server.spec (1.10 -> 1.11) , php-pear-I18N.spec (1.14 -> 1.15) , php-pear-Image_Barcode.spec (1.11 -> 1.12) , php-pear-Image_Canvas.spec (1.2 -> 1.3) , php-pear-Image_Color.spec (1.9 -> 1.10) , php-pear-Image_GIS.spec (1.10 -> 1.11) , php-pear-Image_Graph.spec (1.16 -> 1.17) , php-pear-Image_GraphViz.spec (1.17 -> 1.18) , php-pear-Image_IPTC.spec (1.8 -> 1.9) , php-pear-Image_Text.spec (1.14 -> 1.15) , php-pear-Image_Tools.spec (1.5 -> 1.6) , php-pear-Image_Transform.spec (1.14 -> 1.15) , php-pear-Image_XBM.spec (1.1 -> 1.2) , php-pear-LiveUser.spec (1.18 -> 1.19) , php-pear-MDB2.spec (1.9 -> 1.10) , php-pear-MDB2_Schema.spec (1.2 -> 1.3) , php-pear-XML_DTD.spec (1.9 -> 1.10) , php-pear-XML_SVG.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/php-pear-HTTP_Upload.spec
diff -u SPECS/php-pear-HTTP_Upload.spec:1.20 SPECS/php-pear-HTTP_Upload.spec:1.21
--- SPECS/php-pear-HTTP_Upload.spec:1.20	Mon Jun  6 16:31:07 2005
+++ SPECS/php-pear-HTTP_Upload.spec	Tue Sep 27 23:57:40 2005
@@ -9,7 +9,7 @@
 Summary(pl):	%{_pearname} - Proste i łatwe zarządzanie plikami przesyłanymi przez formularze HTML
 Name:		php-pear-%{_pearname}
 Version:	0.9.1
-Release:	2.4
+Release:	2.5
 License:	PHP 2.02
 Group:		Development/Languages/PHP
 Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tgz
@@ -18,8 +18,7 @@
 Patch1:		http://glen.alkohol.ee/pld/%{name}-et.patch
 Patch2:		%{name}-bug-4318.patch
 URL:		http://pear.php.net/package/HTTP_Upload/
-BuildRequires:	rpm-php-pearprov >= 4.0.2-98
-BuildRequires:	sed >= 4.0
+BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 Requires:	php-pear
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -57,27 +56,25 @@
 Ta klasa ma w PEAR status: %{_status}.
 
 %prep
-%setup -q -c
-cd %{_pearname}-%{version}
-# undos the source
-sed -i -e 's,
$,,' *.php docs/*.php
-
+%pear_package_setup
+cd ./%{php_pear_dir}/%{_class}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}
-
-install %{_pearname}-%{version}/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/
+install -d $RPM_BUILD_ROOT%{php_pear_dir}
+%pear_package_install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc %{_pearname}-%{version}/docs/*
+%doc install.log
+%doc docs/%{_pearname}/docs/*
+%{php_pear_dir}/.registry/*.reg
 %{php_pear_dir}/%{_class}/*.php
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -86,6 +83,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2005/09/27 21:57:40  glen
+- new pear packaging
+
 Revision 1.20  2005/06/06 14:31:07  glen
 - rel 2.4
 

================================================================
Index: SPECS/php-pear-HTTP_WebDAV_Client.spec
diff -u SPECS/php-pear-HTTP_WebDAV_Client.spec:1.6 SPECS/php-pear-HTTP_WebDAV_Client.spec:1.7
--- SPECS/php-pear-HTTP_WebDAV_Client.spec:1.6	Mon Jan 10 09:36:35 2005
+++ SPECS/php-pear-HTTP_WebDAV_Client.spec	Tue Sep 27 23:57:40 2005
@@ -9,13 +9,13 @@
 Summary(pl):	%{_pearname} - wrapper dla strumienia WebDAV
 Name:		php-pear-%{_pearname}
 Version:	0.9.7
-Release:	1
+Release:	1.1
 License:	PHP
 Group:		Development/Languages/PHP
 Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tgz
 # Source0-md5:	cbeaaaf935de86fc036d51fa29e437bc
 URL:		http://pear.php.net/package/HTTP_WebDAV_Client/
-BuildRequires:	rpm-php-pearprov >= 4.0.2-98
+BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 Requires:	php-pear
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -33,21 +33,20 @@
 Ta klasa ma w PEAR status: %{_status}.
 
 %prep
-%setup -q -c
+%pear_package_setup
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/%{_subclass}/{Client,Tools}
-
-install %{_pearname}-%{version}/*.php 		$RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/%{_subclass}
-install %{_pearname}-%{version}/Client/*.php 	$RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/%{_subclass}/Client
-install %{_pearname}-%{version}/Tools/*.php 	$RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/%{_subclass}/Tools
+install -d $RPM_BUILD_ROOT%{php_pear_dir}
+%pear_package_install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc install.log
+%{php_pear_dir}/.registry/*.reg
 %{php_pear_dir}/%{_class}/%{_subclass}/*.php
 %{php_pear_dir}/%{_class}/%{_subclass}/Client
 %{php_pear_dir}/%{_class}/%{_subclass}/Tools
@@ -58,6 +57,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2005/09/27 21:57:40  glen
+- new pear packaging
+
 Revision 1.6  2005/01/10 08:36:35  adamg
 - updated to 0.9.7
 

================================================================
Index: SPECS/php-pear-HTTP_WebDAV_Server.spec
diff -u SPECS/php-pear-HTTP_WebDAV_Server.spec:1.10 SPECS/php-pear-HTTP_WebDAV_Server.spec:1.11
--- SPECS/php-pear-HTTP_WebDAV_Server.spec:1.10	Fri Dec  3 23:12:57 2004
+++ SPECS/php-pear-HTTP_WebDAV_Server.spec	Tue Sep 27 23:57:40 2005
@@ -9,13 +9,13 @@
 Summary(pl):	%{_pearname} - podstawowa klasa serwera WebDAV
 Name:		php-pear-%{_pearname}
 Version:	0.99.1
-Release:	2
+Release:	2.1
 License:	PHP 2.02
 Group:		Development/Languages/PHP
 Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tgz
 # Source0-md5:	54c5211c696b7e7a02a8ad6efa807091
 URL:		http://pear.php.net/package/HTTP_WebDAV_Server/
-BuildRequires:	rpm-php-pearprov >= 4.0.2-98
+BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 Requires:	php-pear
 Requires:	php-pear-HTTP >= 1.0
 BuildArch:	noarch
@@ -34,23 +34,21 @@
 Ta klasa ma w PEAR status: %{_status}.
 
 %prep
-%setup -q -c
+%pear_package_setup
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/%{_subclass}/{db,Server,Tools}
-
-install %{_pearname}-%{version}/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/%{_subclass}
-install %{_pearname}-%{version}/Server/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/%{_subclass}/Server
-install %{_pearname}-%{version}/db/*.sql $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/%{_subclass}/db
-install %{_pearname}-%{version}/Tools/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/%{_subclass}/Tools
+install -d $RPM_BUILD_ROOT%{php_pear_dir}
+%pear_package_install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{php_pear_dir}/%{_class}/%{_subclass}/*.php
+%doc install.log
+%doc docs/%{_pearname}/*
+%{php_pear_dir}/.registry/*.reg
 %{php_pear_dir}/%{_class}/%{_subclass}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -59,6 +57,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2005/09/27 21:57:40  glen
+- new pear packaging
+
 Revision 1.10  2004/12/03 22:12:57  adamg
 - rebuild with new PEAR provides/requires scripts
 - release 2

================================================================
Index: SPECS/php-pear-I18N.spec
diff -u SPECS/php-pear-I18N.spec:1.14 SPECS/php-pear-I18N.spec:1.15
--- SPECS/php-pear-I18N.spec:1.14	Sat Dec  4 23:13:33 2004
+++ SPECS/php-pear-I18N.spec	Tue Sep 27 23:57:40 2005
@@ -8,14 +8,14 @@
 Summary(pl):	%{_pearname} - pakiet wspomagający umiędzynarodowienie
 Name:		php-pear-%{_pearname}
 Version:	0.8.6
-Release:	3
+Release:	3.1
 License:	PHP 2.02
 Group:		Development/Languages/PHP
 Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tgz
 # Source0-md5:	8cc7870da2844ac08abf7e6a77685054
 Patch0:		%{name}-path_fix.patch
 URL:		http://pear.php.net/package/I18N/
-BuildRequires:	rpm-php-pearprov >= 4.0.2-98
+BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 Requires:	php-pear
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -37,23 +37,23 @@
 Ta klasa ma w PEAR status: %{_status}.
 
 %prep
-%setup -q -c
-%patch0 -p1
+%pear_package_setup
+cd ./%{php_pear_dir}/%{_class}
+%patch0 -p2
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/{Messages,Common}
-
-install %{_pearname}-%{version}/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}
-install %{_pearname}-%{version}/Messages/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/Messages
-install %{_pearname}-%{version}/Common/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/Common
+install -d $RPM_BUILD_ROOT%{php_pear_dir}
+%pear_package_install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc %{_pearname}-%{version}/docs/*
+%doc install.log
+%doc docs/%{_pearname}/docs/*
+%{php_pear_dir}/.registry/*.reg
 %dir %{php_pear_dir}/%{_class}
 %dir %{php_pear_dir}/%{_class}/Messages/
 %dir %{php_pear_dir}/%{_class}/Common/
@@ -67,6 +67,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2005/09/27 21:57:40  glen
+- new pear packaging
+
 Revision 1.14  2004/12/04 22:13:33  adamg
 - fix path to I18N/Messages/Common.php in I18N/Messages/File.php
 - release 3

================================================================
Index: SPECS/php-pear-Image_Barcode.spec
diff -u SPECS/php-pear-Image_Barcode.spec:1.11 SPECS/php-pear-Image_Barcode.spec:1.12
--- SPECS/php-pear-Image_Barcode.spec:1.11	Sun May  8 18:46:50 2005
+++ SPECS/php-pear-Image_Barcode.spec	Tue Sep 27 23:57:40 2005
@@ -9,18 +9,21 @@
 Summary(pl):	%{_pearname} - rysowanie kodów kreskowych
 Name:		php-pear-%{_pearname}
 Version:	1.0.1
-Release:	1
+Release:	1.1
 License:	PHP 2.02
 Group:		Development/Languages/PHP
 Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tgz
 # Source0-md5:	eb7aee7fd64a2cc344c449d6eccbe5b0
 URL:		http://pear.php.net/package/Image_Barcode/
-BuildRequires:	rpm-php-pearprov >= 4.0.2-98
+BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 Requires:	php-gd
 Requires:	php-pear
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# exclude optional dependencies
+%define		_noautoreq	'pear(PHP/Compat.*)'
+
 %description
 With PEAR::Image_Barcode class you can create a barcode representation
 of description a given string. This class uses GD functions because of
@@ -37,32 +40,56 @@
 
 Ta klasa ma w PEAR status: %{_status}.
 
+%package tests
+Summary:	Tests for PEAR::%{_pearname}
+Summary(pl):	Testy dla PEAR::%{_pearname}
+Group:		Development
+Requires:	%{name} = %{version}-%{release}
+
+%description tests
+Tests for PEAR::%{_pearname}.
+
+%description tests -l pl
+Testy dla PEAR::%{_pearname}.
+
 %prep
-%setup -q -c
+%pear_package_setup
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/%{_subclass}
-
-install %{_pearname}-%{version}/%{_subclass}.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/
-install %{_pearname}-%{version}/%{_subclass}/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/%{_subclass}
+install -d $RPM_BUILD_ROOT%{php_pear_dir}
+%pear_package_install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+if [ -f %{_docdir}/%{name}-%{version}/optional-packages.txt ]; then
+	cat %{_docdir}/%{name}-%{version}/optional-packages.txt
+fi
+
 %files
 %defattr(644,root,root,755)
-%doc %{_pearname}-%{version}/{*.txt,ChangeLog,*test*.php,barcode_img.php}
+%doc install.log optional-packages.txt
+%doc docs/%{_pearname}/{*.txt,ChangeLog}
+%{php_pear_dir}/.registry/*.reg
 %dir %{php_pear_dir}/%{_class}/%{_subclass}
 %{php_pear_dir}/%{_class}/*.php
 %{php_pear_dir}/%{_class}/%{_subclass}/*.php
 
+%files tests
+%defattr(644,root,root,755)
+%{php_pear_dir}/tests/*
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2005/09/27 21:57:40  glen
+- new pear packaging
+
 Revision 1.11  2005/05/08 16:46:50  adamg
 - updated to 1.0.1
 

================================================================
Index: SPECS/php-pear-Image_Canvas.spec
diff -u SPECS/php-pear-Image_Canvas.spec:1.2 SPECS/php-pear-Image_Canvas.spec:1.3
--- SPECS/php-pear-Image_Canvas.spec:1.2	Sun Aug 21 20:14:59 2005
+++ SPECS/php-pear-Image_Canvas.spec	Tue Sep 27 23:57:40 2005
@@ -9,13 +9,13 @@
 Summary(pl):	%{_pearname} - wspólny interfejs do rysowania obrazków
 Name:		php-pear-%{_pearname}
 Version:	0.2.1
-Release:	1
+Release:	1.1
 License:	LGPL
 Group:		Development/Languages/PHP
 Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tgz
 # Source0-md5:	f480e05d0cd9d3c7efd664e07d4a3e34
 URL:		http://pear.php.net/package/Image_Canvas/
-BuildRequires:	rpm-php-pearprov >= 4.0.2-98
+BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 Requires:	php-gd
 Requires:	php-pear
 BuildArch:	noarch
@@ -33,33 +33,52 @@
 
 Ta klasa ma w PEAR status: %{_status}.
 
+%package tests
+Summary:	Tests for PEAR::%{_pearname}
+Summary(pl):	Testy dla PEAR::%{_pearname}
+Group:		Development
+Requires:	%{name} = %{version}-%{release}
+
+%description tests
+Tests for PEAR::%{_pearname}.
+
+%description tests -l pl
+Testy dla PEAR::%{_pearname}.
+
 %prep
-%setup -q -c
+%pear_package_setup
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/%{_subclass}/{Fonts,GD}
-
-install %{_pearname}-%{version}/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}
-install %{_pearname}-%{version}/%{_subclass}/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/%{_subclass}
-install %{_pearname}-%{version}/%{_subclass}/Fonts/fontmap.txt $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/%{_subclass}/Fonts
-install %{_pearname}-%{version}/%{_subclass}/GD/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/%{_subclass}/GD
+install -d $RPM_BUILD_ROOT%{php_pear_dir}
+%pear_package_install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc %{_pearname}-%{version}/{docs,tests}
+%doc install.log
+%doc docs/%{_pearname}/docs/*
+%{php_pear_dir}/.registry/*.reg
 %{php_pear_dir}/%{_class}/*.php
 %{php_pear_dir}/%{_class}/%{_subclass}
 
+%{php_pear_dir}/data/%{_pearname}
+
+%files tests
+%defattr(644,root,root,755)
+%{php_pear_dir}/tests/*
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2005/09/27 21:57:40  glen
+- new pear packaging
+
 Revision 1.2  2005/08/21 18:14:59  adamg
 - updated to 0.2.1
 

================================================================
Index: SPECS/php-pear-Image_Color.spec
diff -u SPECS/php-pear-Image_Color.spec:1.9 SPECS/php-pear-Image_Color.spec:1.10
--- SPECS/php-pear-Image_Color.spec:1.9	Fri Dec  3 23:17:03 2004
+++ SPECS/php-pear-Image_Color.spec	Tue Sep 27 23:57:40 2005
@@ -9,13 +9,13 @@
 Summary(pl):	%{_pearname} - obsługa konwersji i zarządzania kolorami
 Name:		php-pear-%{_pearname}
 Version:	1.0.1
-Release:	2
+Release:	2.1
 License:	PHP 2.02
 Group:		Development/Languages/PHP
 Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tgz
 # Source0-md5:	fdf3699039d3e1557ad479a6bc9b84cc
 URL:		http://pear.php.net/package/Image_Color/
-BuildRequires:	rpm-php-pearprov >= 4.0.2-98
+BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 Requires:	php-gd
 Requires:	php-pear
 BuildArch:	noarch
@@ -32,19 +32,20 @@
 Ta klasa ma w PEAR status: %{_status}.
 
 %prep
-%setup -q -c
+%pear_package_setup
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}
-
-install %{_pearname}-%{version}/%{_subclass}.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/
+install -d $RPM_BUILD_ROOT%{php_pear_dir}
+%pear_package_install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc install.log
+%{php_pear_dir}/.registry/*.reg
 %{php_pear_dir}/%{_class}/*.php
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -53,6 +54,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2005/09/27 21:57:40  glen
+- new pear packaging
+
 Revision 1.9  2004/12/03 22:17:03  adamg
 - rebuild with new PEAR provides/requires scripts
 - release 2

================================================================
Index: SPECS/php-pear-Image_GIS.spec
diff -u SPECS/php-pear-Image_GIS.spec:1.10 SPECS/php-pear-Image_GIS.spec:1.11
--- SPECS/php-pear-Image_GIS.spec:1.10	Fri Dec  3 23:17:03 2004
+++ SPECS/php-pear-Image_GIS.spec	Tue Sep 27 23:57:40 2005
@@ -9,13 +9,13 @@
 Summary(pl):	%{_pearname} - wizualizacja danych GIS
 Name:		php-pear-%{_pearname}
 Version:	1.1.1
-Release:	2
+Release:	2.1
 License:	PHP 2.02
 Group:		Development/Languages/PHP
 Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tgz
 # Source0-md5:	08a175de367af29ef33abc3559117b7f
 URL:		http://pear.php.net/package/Image_GIS/
-BuildRequires:	rpm-php-pearprov >= 4.0.2-98
+BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 Requires:	php-gd
 Requires:	php-pear
 BuildArch:	noarch
@@ -43,22 +43,20 @@
 Ta klasa ma w PEAR status: %{_status}.
 
 %prep
-%setup -q -c
+%pear_package_setup
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/%{_subclass}/{Parser,Renderer}
-
-install %{_pearname}-%{version}/%{_subclass}.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/
-install %{_pearname}-%{version}/%{_subclass}/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/%{_subclass}
-install %{_pearname}-%{version}/%{_subclass}/Parser/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/%{_subclass}/Parser
-install %{_pearname}-%{version}/%{_subclass}/Renderer/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/%{_subclass}/Renderer
+install -d $RPM_BUILD_ROOT%{php_pear_dir}
+%pear_package_install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc install.log
+%{php_pear_dir}/.registry/*.reg
 %dir %{php_pear_dir}/%{_class}/%{_subclass}
 %dir %{php_pear_dir}/%{_class}/%{_subclass}/Parser
 %dir %{php_pear_dir}/%{_class}/%{_subclass}/Renderer
@@ -73,6 +71,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2005/09/27 21:57:40  glen
+- new pear packaging
+
 Revision 1.10  2004/12/03 22:17:03  adamg
 - rebuild with new PEAR provides/requires scripts
 - release 2

================================================================
Index: SPECS/php-pear-Image_Graph.spec
diff -u SPECS/php-pear-Image_Graph.spec:1.16 SPECS/php-pear-Image_Graph.spec:1.17
--- SPECS/php-pear-Image_Graph.spec:1.16	Mon Aug 29 08:34:45 2005
+++ SPECS/php-pear-Image_Graph.spec	Tue Sep 27 23:57:40 2005
@@ -12,17 +12,20 @@
 Summary(pl):	%{_pearname} - rysowanie wykresów danych liczbowych (handel, pieniądze, ...)
 Name:		php-pear-%{_pearname}
 Version:	0.6.0
-Release:	1
+Release:	1.1
 License:	PHP 2.02
 Group:		Development/Languages/PHP
 Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tgz
 # Source0-md5:	2f144455886000e5b230629e4ad71845
 URL:		http://pear.php.net/package/Image_Graph/
-BuildRequires:	rpm-php-pearprov >= 4.0.2-98
+BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 Requires:	php-pear
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# exclude optional dependencies
+%define		_noautoreq	'pear(Numbers/Roman.php)' 'pear(Numbers/Words.php)'
+
 %description
 Features:
 - drawing graphs in various formats (line, bar, points marked by
@@ -49,48 +52,55 @@
 
 Ta klasa ma w PEAR status: %{_status}.
 
+%package tests
+Summary:	Tests for PEAR::%{_pearname}
+Summary(pl):	Testy dla PEAR::%{_pearname}
+Group:		Development
+Requires:	%{name} = %{version}-%{release}
+
+%description tests
+Tests for PEAR::%{_pearname}.
+
+%description tests -l pl
+Testy dla PEAR::%{_pearname}.
+
 %prep
-%setup -q -c
+%pear_package_setup
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/%{_subclass}/{Axis/Marker,DataPreprocessor,DataSelector,Dataset,Figure,Fill,Grid,Images/{Icons,Maps},Layout,Line,Marker/Pointing,Plot/Smoothed,Plotarea}
-
-install %{_pearname}-%{version}/*.php				$RPM_BUILD_ROOT%{php_pear_dir}/%{_class}
-install %{_pearname}-%{version}/%{_subclass}/*.php				$RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/%{_subclass}
-install %{_pearname}-%{version}/%{_subclass}/Axis/*.php		$RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/%{_subclass}/Axis
-install %{_pearname}-%{version}/%{_subclass}/Axis/Marker/*.php	$RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/%{_subclass}/Axis/Marker
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php-pear-HTTP_Upload.spec?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/SPECS/php-pear-HTTP_WebDAV_Client.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/php-pear-HTTP_WebDAV_Server.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/php-pear-I18N.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/php-pear-Image_Barcode.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/php-pear-Image_Canvas.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/php-pear-Image_Color.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/php-pear-Image_GIS.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/php-pear-Image_Graph.spec?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/SPECS/php-pear-Image_GraphViz.spec?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/SPECS/php-pear-Image_IPTC.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/php-pear-Image_Text.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/php-pear-Image_Tools.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/php-pear-Image_Transform.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/php-pear-Image_XBM.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/php-pear-LiveUser.spec?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/SPECS/php-pear-MDB2.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/php-pear-MDB2_Schema.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/php-pear-XML_DTD.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/php-pear-XML_SVG.spec?r1=1.8&r2=1.9&f=u




More information about the pld-cvs-commit mailing list