Author: glen                         Date: Wed Nov  8 19:08:25 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- pear make-rpm-spec portion is handled now in this package

---- Files affected:
SPECS:
   php-pear-PEAR_Command_Packaging.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/php-pear-PEAR_Command_Packaging.spec
diff -u SPECS/php-pear-PEAR_Command_Packaging.spec:1.7 
SPECS/php-pear-PEAR_Command_Packaging.spec:1.8
--- SPECS/php-pear-PEAR_Command_Packaging.spec:1.7      Wed Jun 28 19:09:59 2006
+++ SPECS/php-pear-PEAR_Command_Packaging.spec  Wed Nov  8 20:08:19 2006
@@ -1,19 +1,23 @@
 # $Revision$, $Date$
+# TODO
+# - finish ../SOURCES/php-pear-PEAR-rpmvars.patch merge
 %include       /usr/lib/rpm/macros.php
 %define                _class          PEAR
 %define                _subclass       Command_Packaging
 %define                _status         alpha
 %define                _pearname       PEAR_Command_Packaging
-
+%include       %{_sourcedir}/php-pear-build-macros
 Summary:       %{_pearname} - make-rpm-spec command for managing RPM .spec 
files for PEAR packages
 Summary(pl):   %{_pearname} - polecenie make-rpm-spec do zarządzania plikami 
.spec pakietów PEAR-a
 Name:          php-pear-%{_pearname}
 Version:       0.1.2
-Release:       0.1
+Release:       0.10
 License:       PHP 3.01
 Group:         Development/Languages/PHP
 Source0:       http://pear.php.net/get/%{_pearname}-%{version}.tgz
 # Source0-md5: b8b3e3791c687e8ddaaeac7c65732233
+Source1:       php-pear-PEAR-template.spec
+Patch0:                php-pear-PEAR_Command_Packaging.patch
 URL:           http://pear.php.net/package/PEAR_Command_Packaging/
 BuildRequires: php-pear-PEAR
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
@@ -32,10 +36,10 @@
 Enhanced features over the original PEAR "makerpm" command include:
 - Ability to define a release on the command line
 - Allows more advanced customisation of the generated package name
-- Allows virtual Provides/Requires that differ in format from the package name
-  format
-- tries to intelligently distinguish between PEAR and PECL when generating
-  packages
+- Allows virtual Provides/Requires that differ in format from the
+  package name format
+- tries to intelligently distinguish between PEAR and PECL when
+  generating packages
 
 In PEAR status of this package is: %{_status}.
 
@@ -58,12 +62,16 @@
 
 %prep
 %pear_package_setup
+%patch0
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{php_pear_dir}
 %pear_package_install
 
+sed -e '/^\$''Log: /,$d' %{SOURCE1} > 
$RPM_BUILD_ROOT%{php_pear_dir}/data/%{_pearname}/template.spec
+echo '$''Log: $' >> 
$RPM_BUILD_ROOT%{php_pear_dir}/data/%{_pearname}/template.spec
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -81,6 +89,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2006/11/08 19:08:19  glen
+- pear make-rpm-spec portion is handled now in this package
+
 Revision 1.7  2006/06/28 17:09:59  adamg
 - updated to 0.1.2
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/SPECS/php-pear-PEAR_Command_Packaging.spec?r1=1.7&r2=1.8&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to