Author: glen Date: Mon Sep 19 18:57:30 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merged from DEVEL: use new pear packaging system
---- Files affected:
SPECS:
php-pear-Auth_SASL.spec (1.14 -> 1.15) , php-pear-PEAR.spec (1.65 -> 1.66)
---- Diffs:
================================================================
Index: SPECS/php-pear-Auth_SASL.spec
diff -u SPECS/php-pear-Auth_SASL.spec:1.14 SPECS/php-pear-Auth_SASL.spec:1.15
--- SPECS/php-pear-Auth_SASL.spec:1.14 Sun Sep 18 20:15:30 2005
+++ SPECS/php-pear-Auth_SASL.spec Mon Sep 19 20:57:25 2005
@@ -9,13 +9,13 @@
Summary(pl): %{_pearname} - generowanie odpowiedzi dla popularnych
mechanizmów SASL
Name: php-pear-%{_pearname}
Version: 1.0.1
-Release: 4
+Release: 4.1
License: BSD
Group: Development/Languages/PHP
Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz
# Source0-md5: 9ed28f3f9bffc8265ea2339021f5dbf5
URL: http://pear.php.net/package/Auth_SASL/
-BuildRequires: rpm-php-pearprov >= 4.0.2-98
+BuildRequires: rpm-php-pearprov >= 4.4.2-10.2
Requires: php-pear
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -35,20 +35,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}
-
-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 -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}
%{php_pear_dir}/%{_class}/*.php
%{php_pear_dir}/%{_class}/%{_subclass}/*.php
@@ -59,8 +59,14 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.14 2005/09/18 18:15:30 glen
-- reverted (gone to DEVEL)
+Revision 1.15 2005/09/19 18:57:25 glen
+- merged from DEVEL: use new pear packaging system
+
+Revision 1.13.2.1 2005/09/19 17:36:33 glen
+- macros moved to rpm-build
+
+Revision 1.13 2005/09/18 14:28:22 glen
+- use php-pear-build
Revision 1.12 2004/12/03 20:48:13 adamg
- rebuild with new PEAR provides/requires scripts
================================================================
Index: SPECS/php-pear-PEAR.spec
diff -u SPECS/php-pear-PEAR.spec:1.65 SPECS/php-pear-PEAR.spec:1.66
--- SPECS/php-pear-PEAR.spec:1.65 Mon Sep 5 08:01:15 2005
+++ SPECS/php-pear-PEAR.spec Mon Sep 19 20:57:25 2005
@@ -1,7 +1,7 @@
# $Revision$, $Date$
%include /usr/lib/rpm/macros.php
%define _class PEAR
-%define _status beta
+%define _status stable
%define _pearname %{_class}
%define _noautoreq 'pear(PEAR/FTP.php)'
@@ -9,18 +9,21 @@
Summary(pl): %{_pearname} - podstawowa klasa dla PHP PEAR
Name: php-pear-%{_pearname}
Version: 1.4.0
-%define _pre b1
-Release: 0.%{_pre}.3
+%define _rel 0.6
+Release: 1.%{_rel}
Epoch: 1
License: PHP 3.0
Group: Development/Languages/PHP
-Source0: http://pear.php.net/get/%{_pearname}-%{version}%{_pre}.tgz
-# Source0-md5: fac6e8d80991ae3a63cb6a616958e833
+Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz
+# Source0-md5: 8a1cf99a637d5420b7749a1c3dfaceb5
+Source1: %{name}-template.spec
Patch0: %{name}-memory.patch
-URL: http://pear.php.net/package/PEAR/
-BuildRequires: rpm-php-pearprov >= 4.0.2-98
-BuildRequires: sed >= 4.0.0
-Requires: php-pear
+Patch1: %{name}-sysconfdir.patch
+Patch2: %{name}-rpmpkgname.patch
+Patch3: %{name}-rpmvars.patch
+URL: http://pear.php.net/package/PEAR
+BuildRequires: rpm-php-pearprov >= 4.4.2-10.2
+Requires: php-pear >= 4:1.0-5.5
Requires: php-cli
Obsoletes: php-pear-PEAR-Command
Obsoletes: php-pear-PEAR-Frontend-CLI
@@ -59,46 +62,44 @@
Ta klasa ma w PEAR status: %{_status}.
%prep
-%setup -q -c -n %{name}-%{version}%{_pre}
+%pear_package_setup
%patch0 -p2
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
-%build
-# put proper paths
-sed -i -e 's,@php_dir@,%{php_pear_dir},g' -e 's,@php_bin@,%{_bindir}/php,g'
%{_pearname}-%{version}%{_pre}/scripts/*
-# fix include path
-sed -i -e
's,PEAR/PackageFile/Generator/v2/rw.php,PEAR/PackageFile/v2/rw.php,g'
%{_pearname}-%{version}%{_pre}/PEAR/PackageFile/v2.php
+find '(' -name '*~' -o -name '*.orig' ')' | xargs -r rm -v
%install
rm -rf $RPM_BUILD_ROOT
-install -d
$RPM_BUILD_ROOT{%{php_pear_dir}/{%{_class}/{ChannelFile,Command,Downloader,Frontend,Installer/Role,PackageFile/{Generator,Parser,v2},Task,Validator},OS},%{_bindir}}
-install %{_pearname}-%{version}%{_pre}/*.php $RPM_BUILD_ROOT%{php_pear_dir}
-install %{_pearname}-%{version}%{_pre}/*.dtd $RPM_BUILD_ROOT%{php_pear_dir}
-install %{_pearname}-%{version}%{_pre}/OS/*.php
$RPM_BUILD_ROOT%{php_pear_dir}/OS
-install %{_pearname}-%{version}%{_pre}/%{_class}/*.php
$RPM_BUILD_ROOT%{php_pear_dir}/%{_class}
-install %{_pearname}-%{version}%{_pre}/%{_class}/ChannelFile/*.php
$RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/ChannelFile
-install %{_pearname}-%{version}%{_pre}/%{_class}/Command/*.php
$RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/Command
-install %{_pearname}-%{version}%{_pre}/%{_class}/Downloader/*.php
$RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/Downloader
-install %{_pearname}-%{version}%{_pre}/%{_class}/Frontend/CLI.php
$RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/Frontend
-install %{_pearname}-%{version}%{_pre}/%{_class}/Installer/*.php
$RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/Installer
-install %{_pearname}-%{version}%{_pre}/%{_class}/Installer/Role/*.php
$RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/Installer/Role
-install %{_pearname}-%{version}%{_pre}/%{_class}/PackageFile/*.php
$RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/PackageFile
-install %{_pearname}-%{version}%{_pre}/%{_class}/PackageFile/Generator/*.php
$RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/PackageFile/Generator
-install %{_pearname}-%{version}%{_pre}/%{_class}/PackageFile/Parser/*.php
$RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/PackageFile/Parser
-install %{_pearname}-%{version}%{_pre}/%{_class}/PackageFile/v2/*.php
$RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/PackageFile/v2
-install %{_pearname}-%{version}%{_pre}/%{_class}/Task/*.php
$RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/Task
-install %{_pearname}-%{version}%{_pre}/%{_class}/Validator/*.php
$RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/Validator
-install %{_pearname}-%{version}%{_pre}/scripts/pearcmd.php
$RPM_BUILD_ROOT%{php_pear_dir}
-install %{_pearname}-%{version}%{_pre}/scripts/peclcmd.php
$RPM_BUILD_ROOT%{php_pear_dir}
-install %{_pearname}-%{version}%{_pre}/scripts/pear.sh
$RPM_BUILD_ROOT%{_bindir}/pear
-install %{_pearname}-%{version}%{_pre}/scripts/pecl.sh
$RPM_BUILD_ROOT%{_bindir}/pecl
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{php_pear_dir},%{_bindir}}
+
+D=$(pwd)
+pearcmd() {
+ php -d output_buffering=1 -d include_path=".:${D}%{php_pear_dir}"
${D}%{php_pear_dir}/pearcmd.php -c ${D}/pearrc "$@"
+}
+pearcmd config-set doc_dir %{_docdir} || exit
+pearcmd config-set data_dir %{php_pear_dir}/data || exit
+pearcmd config-set php_dir %{php_pear_dir} || exit
+pearcmd config-set test_dir %{php_pear_dir}/tests || exit
+pearcmd config-set sig_bin %{_bindir}/gpg || exit
+cp $D/pearrc $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf
+
+%pear_package_install
+cp -a ./%{_bindir}/* $RPM_BUILD_ROOT%{_bindir}
+
+install %{SOURCE1} $RPM_BUILD_ROOT%{php_pear_dir}/data/%{_class}/template.spec
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
+%doc install.log
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pear.conf
%attr(755,root,root) %{_bindir}/*
+%{php_pear_dir}/.registry/*.reg
%{php_pear_dir}/*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -107,6 +108,62 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.66 2005/09/19 18:57:25 glen
+- merged from DEVEL: use new pear packaging system
+
+Revision 1.65.2.17 2005/09/19 17:08:55 glen
+- new macros moved to rpm.spec
+
+Revision 1.65.2.16 2005/09/19 08:00:26 glen
+- don't care what the builddir is
+
+Revision 1.65.2.15 2005/09/19 07:09:34 glen
+- avoid packaging backup files
+
+Revision 1.65.2.14 2005/09/18 19:48:39 glen
+- 1.4.0 release
+
+Revision 1.65.2.13 2005/09/18 14:07:28 glen
+- updated, added rpmvars patch
+
+Revision 1.65.2.12 2005/09/18 13:38:52 glen
+- updated to 1.4.0RC2 (beta)
+
+Revision 1.65.2.11 2005/09/18 13:34:25 glen
+- use PLD-ized template for rpm packages
+- add patch for PLD package naming schema
+
+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
+
+Revision 1.65.2.8 2005/09/18 11:00:35 glen
+- use php-pear-build
+
+Revision 1.65.2.7 2005/09/18 10:09:20 glen
+- such package method requires php-zlib
+
+Revision 1.65.2.6 2005/09/18 10:07:38 glen
+- optional pear/PEAR_Delegator available
+
+Revision 1.65.2.5 2005/09/18 08:44:10 glen
+- minimum BR php-pear-PEAR
+
+Revision 1.65.2.4 2005/09/18 08:39:26 glen
+- updated
+
+Revision 1.65.2.3 2005/09/18 08:19:21 glen
+- create pear.conf
+
+Revision 1.65.2.2 2005/09/17 23:40:30 glen
+- remove builddir hack
+
+Revision 1.65.2.1 2005/09/17 23:12:43 glen
+- using pear to install files. package filelist differs a little.
+ see urpmdiff: http://glen.pastebin.com/366706
+
Revision 1.65 2005/09/05 06:01:15 adamg
- noautoreq for pear(PEAR/FTP.php)
- release 3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/php-pear-Auth_SASL.spec?r1=1.14&r2=1.15&f=u
http://cvs.pld-linux.org/SPECS/php-pear-PEAR.spec?r1=1.65&r2=1.66&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
