SPECS (DEVEL): php-pear-Archive_Tar.spec, php-pear-Auth.spec, php-...

glen glen at pld-linux.org
Sun Sep 18 14:40:58 CEST 2005 

Author: glen                         Date: Sun Sep 18 12:40:58 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- unify

---- Files affected:
SPECS:
   php-pear-Archive_Tar.spec (1.23.2.7 -> 1.23.2.8) , php-pear-Auth.spec (1.25.2.4 -> 1.25.2.5) , php-pear-Auth_HTTP.spec (1.27.2.2 -> 1.27.2.3) , php-pear-PEAR.spec (1.65.2.9 -> 1.65.2.10) , php-pear-build.spec (1.5 -> 1.6) , template-php-pear.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/php-pear-Archive_Tar.spec
diff -u SPECS/php-pear-Archive_Tar.spec:1.23.2.7 SPECS/php-pear-Archive_Tar.spec:1.23.2.8
--- SPECS/php-pear-Archive_Tar.spec:1.23.2.7	Sun Sep 18 12:54:56 2005
+++ SPECS/php-pear-Archive_Tar.spec	Sun Sep 18 14:40:53 2005
@@ -10,7 +10,7 @@
 Summary(pl):	%{_pearname} - klasa do zarządzania plikami Tar
 Name:		php-pear-%{_pearname}
 Version:	1.3.1
-Release:	1.13
+Release:	1.16
 License:	PHP 2.02
 Group:		Development/Languages/PHP
 Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tgz
@@ -42,13 +42,14 @@
 rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{php_pear_dir}
-cp -a ./%{php_pear_dir}/{.registry,*} $RPM_BUILD_ROOT%{php_pear_dir}
+%pear_package_install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc install.log
 %doc docs/%{_pearname}/docs/*
 %{php_pear_dir}/.registry/*.reg
 %dir %{php_pear_dir}/%{_class}
@@ -60,6 +61,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23.2.8  2005/09/18 12:40:53  glen
+- unify
+
 Revision 1.23.2.7  2005/09/18 10:54:56  glen
 - cosmetics
 

================================================================
Index: SPECS/php-pear-Auth.spec
diff -u SPECS/php-pear-Auth.spec:1.25.2.4 SPECS/php-pear-Auth.spec:1.25.2.5
--- SPECS/php-pear-Auth.spec:1.25.2.4	Sun Sep 18 13:52:35 2005
+++ SPECS/php-pear-Auth.spec	Sun Sep 18 14:40:53 2005
@@ -52,22 +52,19 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{php_pear_dir}
-cp -a ./%{php_pear_dir}/{.registry,*} $RPM_BUILD_ROOT%{php_pear_dir}
+%pear_package_install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-echo 'pear/Auth can optionally use package "pear/File_Passwd" (version >= 0.9.5)
-pear/Auth can optionally use package "pear/Net_POP3" (version >= 1.3)
-pear/Auth can optionally use package "pear/DB"
-pear/Auth can optionally use package "pear/MDB"
-pear/Auth can optionally use package "pear/Auth_RADIUS"
-pear/Auth can optionally use package "pear/File_SMBPasswd"
-'
+if [ -f %{_docdir}/%{name}-%{version}/optional-packages.txt ]; then
+	cat %{_docdir}/%{name}-%{version}/optional-packages.txt
+fi
 
 %files
 %defattr(644,root,root,755)
+%doc install.log optional-packages.txt
 %doc docs/%{_pearname}/README*
 %{php_pear_dir}/.registry/*.reg
 %dir %{php_pear_dir}/%{_class}
@@ -86,6 +83,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25.2.5  2005/09/18 12:40:53  glen
+- unify
+
 Revision 1.25.2.4  2005/09/18 11:52:35  glen
 - cosmetics
 

================================================================
Index: SPECS/php-pear-Auth_HTTP.spec
diff -u SPECS/php-pear-Auth_HTTP.spec:1.27.2.2 SPECS/php-pear-Auth_HTTP.spec:1.27.2.3
--- SPECS/php-pear-Auth_HTTP.spec:1.27.2.2	Sun Sep 18 13:05:53 2005
+++ SPECS/php-pear-Auth_HTTP.spec	Sun Sep 18 14:40:53 2005
@@ -49,7 +49,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{php_pear_dir}
-cp -a ./%{php_pear_dir}/{.registry,*} $RPM_BUILD_ROOT%{php_pear_dir}
+%pear_package_install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -70,6 +70,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27.2.3  2005/09/18 12:40:53  glen
+- unify
+
 Revision 1.27.2.2  2005/09/18 11:05:53  glen
 - rel 1.1
 

================================================================
Index: SPECS/php-pear-PEAR.spec
diff -u SPECS/php-pear-PEAR.spec:1.65.2.9 SPECS/php-pear-PEAR.spec:1.65.2.10
--- SPECS/php-pear-PEAR.spec:1.65.2.9	Sun Sep 18 13:52:23 2005
+++ SPECS/php-pear-PEAR.spec	Sun Sep 18 14:40:53 2005
@@ -88,7 +88,7 @@
 pearcmd config-set sig_bin %{_bindir}/gpg || exit
 cp $D/.pearrc $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf
 
-cp -a ./%{php_pear_dir}/{.registry,*} $RPM_BUILD_ROOT%{php_pear_dir}
+%pear_package_install
 cp -a ./%{_bindir}/* $RPM_BUILD_ROOT%{_bindir}
 
 %clean
@@ -113,6 +113,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.65.2.10  2005/09/18 12:40:53  glen
+- unify
+
 Revision 1.65.2.9  2005/09/18 11:52:23  glen
 - use %post message from pear install
 

================================================================
Index: SPECS/php-pear-build.spec
diff -u SPECS/php-pear-build.spec:1.5 SPECS/php-pear-build.spec:1.6
--- SPECS/php-pear-build.spec:1.5	Sun Sep 18 13:51:12 2005
+++ SPECS/php-pear-build.spec	Sun Sep 18 14:40:53 2005
@@ -2,7 +2,7 @@
 Summary:	RPM build macros for PEAR packages
 Name:		php-pear-build
 Version:	0.3
-Release:	0.1
+Release:	0.13
 License:	Public Domain
 Group:		Development/Languages/PHP
 Source0:	%{name}-macros
@@ -13,7 +13,7 @@
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define	_rpmlibdir	/usr/lib/rpm
+%define		_rpmlibdir	/usr/lib/rpm
 
 %description
 This package provides rpm macros and dependencies to help building PEAR
@@ -37,6 +37,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2005/09/18 12:40:53  glen
+- unify
+
 Revision 1.5  2005/09/18 11:51:12  glen
 - 0.3
 

================================================================
Index: SPECS/template-php-pear.spec
diff -u SPECS/template-php-pear.spec:1.6 SPECS/template-php-pear.spec:1.7
--- SPECS/template-php-pear.spec:1.6	Sat Aug 14 02:26:16 2004
+++ SPECS/template-php-pear.spec	Sun Sep 18 14:40:53 2005
@@ -1,5 +1,6 @@
 # $Revision$, $Date$
 %include	/usr/lib/rpm/macros.php
+%include	/usr/lib/rpm/macros.pear
 %define		_class		class
 %define		_subclass	subclass
 %define		_status		stable
@@ -14,11 +15,14 @@
 Group:		Development/Languages/PHP
 Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tgz
 URL:		http://pear.php.net/package/Class_Subclass/
-BuildRequires:	rpm-php-pearprov >= 4.0.2-98
+BuildRequires:	php-pear-build
 Requires:	php-pear
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# exclude optional dependencies
+%define		_noautoreq	'pear(XML/Beautifier/.*)'
+
 %description
 ...
 
@@ -30,19 +34,26 @@
 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}/*.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
 
+%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 install.log optional-packages.txt
+%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"`)
@@ -51,6 +62,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2005/09/18 12:40:53  glen
+- unify
+
 Revision 1.6  2004/08/14 00:26:16  ankry
 - spaces -> tabs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php-pear-Archive_Tar.spec?r1=1.23.2.7&r2=1.23.2.8&f=u
    http://cvs.pld-linux.org/SPECS/php-pear-Auth.spec?r1=1.25.2.4&r2=1.25.2.5&f=u
    http://cvs.pld-linux.org/SPECS/php-pear-Auth_HTTP.spec?r1=1.27.2.2&r2=1.27.2.3&f=u
    http://cvs.pld-linux.org/SPECS/php-pear-PEAR.spec?r1=1.65.2.9&r2=1.65.2.10&f=u
    http://cvs.pld-linux.org/SPECS/php-pear-build.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/template-php-pear.spec?r1=1.6&r2=1.7&f=u

More information about the pld-cvs-commit mailing list