rpms/php-pear-PEAR-Command-Packaging/devel 3_01.txt, NONE, 1.1 php-pear-PEAR-Command-Packaging-0.1.2-cvs.patch, NONE, 1.1 php-pear-PEAR-Command-Packaging-0.1.2-fedora-conventions1.patch, NONE, 1.1 php-pear-PEAR-Command-Packaging-fedora-template-specfile, NONE, 1.1 php-pear-PEAR-Command-Packaging.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Tim Jackson (timj)
fedora-extras-commits at redhat.com
Sat Sep 23 21:28:44 UTC 2006
Author: timj
Update of /cvs/extras/rpms/php-pear-PEAR-Command-Packaging/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8334/devel
Modified Files:
.cvsignore sources
Added Files:
3_01.txt php-pear-PEAR-Command-Packaging-0.1.2-cvs.patch
php-pear-PEAR-Command-Packaging-0.1.2-fedora-conventions1.patch
php-pear-PEAR-Command-Packaging-fedora-template-specfile
php-pear-PEAR-Command-Packaging.spec
Log Message:
auto-import php-pear-PEAR-Command-Packaging-0.1.2-5 on branch devel from php-pear-PEAR-Command-Packaging-0.1.2-5.src.rpm
--- NEW FILE 3_01.txt ---
--------------------------------------------------------------------
The PHP License, version 3.01
Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
--------------------------------------------------------------------
Redistribution and use in source and binary forms, with or without
modification, is permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.
3. The name "PHP" must not be used to endorse or promote products
derived from this software without prior written permission. For
written permission, please contact group at php.net.
4. Products derived from this software may not be called "PHP", nor
may "PHP" appear in their name, without prior written permission
from group at php.net. You may indicate that your software works in
conjunction with PHP by saying "Foo for PHP" instead of calling
it "PHP Foo" or "phpfoo"
5. The PHP Group may publish revised and/or new versions of the
license from time to time. Each version will be given a
distinguishing version number.
Once covered code has been published under a particular version
of the license, you may always continue to use it under the terms
of that version. You may also choose to use such covered code
under the terms of any subsequent version of the license
published by the PHP Group. No one other than the PHP Group has
the right to modify the terms applicable to covered code created
under this License.
6. Redistributions of any form whatsoever must retain the following
acknowledgment:
"This product includes PHP software, freely available from
<http://www.php.net/software/>".
THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------
This software consists of voluntary contributions made by many
individuals on behalf of the PHP Group.
The PHP Group can be contacted via Email at group at php.net.
For more information on the PHP Group and the PHP project,
please see <http://www.php.net>.
PHP includes the Zend Engine, freely available at
<http://www.zend.com>.
php-pear-PEAR-Command-Packaging-0.1.2-cvs.patch:
--- NEW FILE php-pear-PEAR-Command-Packaging-0.1.2-cvs.patch ---
diff -ur PEAR_Command_Packaging-0.1.2.orig/Packaging.php PEAR_Command_Packaging-0.1.2/Packaging.php
--- PEAR_Command_Packaging-0.1.2.orig/Packaging.php 2006-06-28 15:08:04.000000000 +0100
+++ PEAR_Command_Packaging-0.1.2/Packaging.php 2006-09-09 21:36:59.000000000 +0100
@@ -347,6 +347,7 @@
}
if (!isset($dep['channel'])) $dep['channel'] = null;
+ if (!isset($dep['name'])) $dep['name'] = null;
// $package contains the *dependency name* here, which may or may
// not be the same as the package name
$package = $this->_getRPMName($dep['name'], $dep['channel'], $type);
@@ -565,8 +566,6 @@
if (isset($options['rpm-depname'])) {
$this->_rpm_depname_format['pkg'] = $options['rpm-depname'];
- } else {
- $this->_rpm_depname_format['pkg'] = $this->_rpm_pkgname_format;
}
}
php-pear-PEAR-Command-Packaging-0.1.2-fedora-conventions1.patch:
--- NEW FILE php-pear-PEAR-Command-Packaging-0.1.2-fedora-conventions1.patch ---
diff -ur PEAR_Command_Packaging-0.1.2.orig/Packaging.php PEAR_Command_Packaging-0.1.2/Packaging.php
--- PEAR_Command_Packaging-0.1.2.orig/Packaging.php 2006-06-28 15:08:04.000000000 +0100
+++ PEAR_Command_Packaging-0.1.2/Packaging.php 2006-09-10 00:01:51.000000000 +0100
@@ -69,14 +69,13 @@
%S = PEAR package name (with underscores replaced with hyphens)
%C = Channel alias
%c = Channel alias, lowercased
-Defaults to "%C::%s".',
+Defaults to "php-%c-%S".',
),
'rpm-depname' => array(
'shortopt' => 'd',
'arg' => 'FORMAT',
'doc' => 'Use FORMAT as format string for RPM package name. Substitutions
-are as for the --rpm-pkgname option. Defaults to be the same as
-the format defined by the --rpm-pkgname option.',
+are as for the --rpm-pkgname option. Defaults to "php-%c(%s)".',
),
),
'doc' => '<package-file>
@@ -87,10 +86,10 @@
$ cd /path/to/rpm-build-tree/SPECS
$ pear make-rpm-spec ../SOURCES/Net_Socket-1.0.tgz
-Wrote RPM spec file PEAR::Net_Socket-1.0.spec
-$ rpm -bb PEAR::Net_Socket-1.0.spec
+Wrote RPM spec file php-pear-Net-Socket.spec
+$ rpm -bb php-pear-Net-Socket.spec
...
-Wrote: /path/to/rpm-build-tree/RPMS/noarch/PEAR::Net_Socket-1.0-1.noarch.rpm
+Wrote: /path/to/rpm-build-tree/RPMS/noarch/php-pear-Net-Socket-1.0-1.noarch.rpm
',
),
);
@@ -98,14 +97,14 @@
var $output;
// The default format of the RPM package name
- var $_rpm_pkgname_format = '%C::%s';
+ var $_rpm_pkgname_format = 'php-%c-%S';
// The default format of various dependencies that might be generated in the
// spec file.
// NULL = "don't generate a dep".
// %P = use the same as whatever rpm_pkgname_format is set to be
var $_rpm_depname_format = array(
- 'pkg' => '%P',
+ 'pkg' => 'php-%c(%s)',
'ext' => 'php-%l',
'php' => 'php');
@@ -113,7 +112,7 @@
// the rpm-pkgname format string, with the addition of:
// %v = package version
// %P = use the same as whatever rpm_pkgname_format is set to be
- var $_rpm_specname_format = '%P-%v.spec';
+ var $_rpm_specname_format = '%P.spec';
/**
* PEAR_Command_Packaging constructor.
@@ -228,7 +227,7 @@
}
// Set up some of the basic macros
- $info['rpm_xml_dir'] = '/var/lib/pear';
+ $info['rpm_xml_dir'] = '%{peardir}/.pkgxml';
$info['extra_config'] = '';
$info['extra_headers'] = '';
$info['doc_files'] = array();
@@ -243,9 +242,12 @@
// Hook to support virtual provides, where the dependency name differs
// from the package name
$rpmdep = $this->_getRPMName($pf->getPackage(), $pf->getChannel(), 'pkgdep');
+
+ // Not required for Fedora; handled in spec
+ /*
if (!empty($rpmdep) && $rpmdep != $info['rpm_package']) {
$info['extra_headers'] .= "Provides: $rpmdep = " . $pf->getVersion(). "\n";
- }
+ }*/
$srcfiles = 0;
foreach ($info['filelist'] as $name => $attr) {
@@ -302,8 +304,8 @@
$info['doc_files'] = '';
}
if (!empty($info['doc_files'])) {
- $info['doc_files_statement'] = '%doc ' . $info['doc_files'];
- $info['doc_files_relocation_script'] = "mv %{buildroot}/docs .\n";
+ $info['doc_files_statement'] = "%doc %{pear_name}-%{version}/docdir/%{pear_name}/*\n";
+ $info['doc_files_relocation_script'] = "# Move documentation\nmkdir -p docdir\nmv \$RPM_BUILD_ROOT%{pear_docdir}/* docdir\n";
}
if ($srcfiles > 0) {
diff -ur PEAR_Command_Packaging-0.1.2.orig/Packaging.xml PEAR_Command_Packaging-0.1.2/Packaging.xml
--- PEAR_Command_Packaging-0.1.2.orig/Packaging.xml 2006-06-28 15:08:04.000000000 +0100
+++ PEAR_Command_Packaging-0.1.2/Packaging.xml 2006-09-09 21:31:45.000000000 +0100
@@ -23,14 +23,13 @@
%S = PEAR package name (with underscores replaced with hyphens)
%C = Channel alias
%c = Channel alias, lowercased
-Defaults to "%C::%s".</doc>
+Defaults to "php-%c-%S".</doc>
</rpm-pkgname>
<rpm-depname>
<shortopt>d</shortopt>
<arg>FORMAT</arg>
<doc>Use FORMAT as format string for RPM package name. Substitutions
-are as for the --rpm-pkgname option. Defaults to be the same as
-the format defined by the --rpm-pkgname option.</doc>
+are as for the --rpm-pkgname option. Defaults to "php-%c(%s)".</doc>
</rpm-depname>
</options>
<doc><package-file>
@@ -41,10 +40,11 @@
$ cd /path/to/rpm-build-tree/SPECS
$ pear make-rpm-spec ../SOURCES/Net_Socket-1.0.tgz
-Wrote RPM spec file PEAR::Net_Socket-1.0.spec
-$ rpm -bb PEAR::Net_Socket-1.0.spec
+Wrote RPM spec file php-pear-Net-Socket.spec
+$ rpm -bb php-pear-Net-Socket.spec
...
-Wrote: /path/to/rpm-build-tree/RPMS/noarch/PEAR::Net_Socket-1.0-1.noarch.rpm
+Wrote:
+/path/to/rpm-build-tree/RPMS/noarch/php-pear-Net-Socket-1.0-1.noarch.rpm
</doc>
</make-rpm-spec>
</commands>
Only in PEAR_Command_Packaging-0.1.2: php-pear-PEAR-Command-Packaging-0.1.2-fedora-conventions1.patch
--- NEW FILE php-pear-PEAR-Command-Packaging-fedora-template-specfile ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name @package@
Name: @rpm_package@
Version: @version@
Release: @release@%{?dist}
Summary: @summary@
Group: Development/Libraries
License: @release_license@
URL: http://@master_server@/package/@package@
Source0: http://@master_server@/get/%{pear_name}-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: @arch@
BuildRequires: php-pear >= 1:1.4.9-1.2
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides: php-pear(%{pear_name}) = %{version}
@extra_headers@
%description
@description@
%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}
%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.
%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
@doc_files_relocation_script@
# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
%clean
rm -rf $RPM_BUILD_ROOT
%post
%{__pear} install --nodeps --soft --force --register-only \
%{pear_xmldir}/%{pear_name}.xml >/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
%{__pear} uninstall --nodeps --ignore-errors --register-only \
@possible_channel@%{pear_name} >/dev/null || :
fi
%files
%defattr(-,root,root,-)
@doc_files_statement@
%{pear_xmldir}/%{pear_name}.xml
# TODO upstream: pear_testdir and pear_datadir; they are currently OK though,
# caught by the below glob since they are withing pear_phpdir
# Expand this as needed to avoid owning dirs owned by our dependencies
%{pear_phpdir}/*
%changelog
--- NEW FILE php-pear-PEAR-Command-Packaging.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name PEAR_Command_Packaging
Name: php-pear-PEAR-Command-Packaging
Version: 0.1.2
Release: 5%{?dist}
Summary: Create RPM spec files from PEAR modules
Group: Development/System
License: PHP License
URL: http://pear.php.net/package/PEAR_Command_Packaging
Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz
Source1: php-pear-PEAR-Command-Packaging-fedora-template-specfile
Source2: http://www.php.net/license/3_01.txt
Patch0: php-pear-PEAR-Command-Packaging-0.1.2-fedora-conventions1.patch
# Patch1 is bits backported from upstream CVS; remove when 0.1.3 is released
Patch1: php-pear-PEAR-Command-Packaging-0.1.2-cvs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: php-pear >= 1:1.4.9-1.2
Requires: php-pear(PEAR) >= 1.4.3
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides: php-pear(%{pear_name}) = %{version}
%description
This command is an improved implementation of the standard PEAR "makerpm"
command, and contains several enhancements that make it far more flexible.
Similar functions for other external packaging mechanisms may be added at
a later date.
%prep
%setup -q -c
mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}
%build
# Empty build section, nothing required
%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
# Patches for Fedora conventions
pushd $RPM_BUILD_ROOT%{pear_phpdir}/PEAR/Command/
%{__patch} -p1 <%{PATCH0}
%{__patch} -p1 <%{PATCH1}
popd
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{pear_phpdir}/data/%{pear_name}/template.spec
# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
# Add license file
install -pm 644 %{SOURCE2} LICENSE
%clean
rm -rf $RPM_BUILD_ROOT
%post
%{__pear} install --nodeps --soft --force --register-only \
%{pear_xmldir}/%{pear_name}.xml >/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
%{__pear} uninstall --nodeps --ignore-errors --register-only \
%{pear_name} >/dev/null || :
fi
%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/LICENSE
%{pear_xmldir}/%{pear_name}.xml
%{pear_datadir}/%{pear_name}
%{pear_phpdir}/PEAR/Command/Packaging.*
%changelog
* Sat Sep 23 2006 Tim Jackson <rpm at timj.co.uk> 0.1.2-5
- Remove "PEAR:" from Summary in spec and template.spec
* Sun Sep 10 2006 Tim Jackson <rpm at timj.co.uk> 0.1.2-4
- Shorten summary
- Remove unnecessary dep on php
- Bundle LICENSE file
- Rename template specfile source to keep rpmlint happy
* Sat Sep 09 2006 Tim Jackson <rpm at timj.co.uk> 0.1.2-3
- Update to conform with latest conventions in bug #198706
- Update in-built spec (for generation of other package specs) to (nearly)
conform with latest spec conventions
* Mon Jul 03 2006 Tim Jackson <rpm at timj.co.uk> 0.1.2-2
- BR php-pear 1.4.9; 1.4.8 is broken
- Update to conform to proposed Fedora PHP packaging standards
* Wed Jun 28 2006 Tim Jackson <rpm at timj.co.uk> 0.1.2-1
- Update to 0.1.2
- Update fedora-conventions patch to patch Packaging.xml
- Update fedora-conventions patch for peardir/tests -> peardir/test
- Backport upstream patch to make Fedora conventions work properly
* Fri Jun 9 2006 Tim Jackson <rpm at timj.co.uk> 0.1.1-2
- Add Epoch to php-pear BR
* Thu May 18 2006 Tim Jackson <rpm at timj.co.uk> 0.1.1-1
- Update to 0.1.1
- XML description now in datadir/pear/.pkgxml (see bug #190252)
- Stop buildroot path ending up in output files
* Wed Mar 15 2006 Tim Jackson <rpm at timj.co.uk> 0.1.0-2
- Own data/PEAR_Command_Packaging dir
- Remove empty doc line
- Remove empty build section
- Replace cp with install
* Tue Mar 14 2006 Tim Jackson <rpm at timj.co.uk> 0.1.0-1
- Initial RPM build
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PEAR-Command-Packaging/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 23 Sep 2006 21:27:59 -0000 1.1
+++ .cvsignore 23 Sep 2006 21:28:44 -0000 1.2
@@ -0,0 +1 @@
+PEAR_Command_Packaging-0.1.2.tgz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PEAR-Command-Packaging/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 23 Sep 2006 21:27:59 -0000 1.1
+++ sources 23 Sep 2006 21:28:44 -0000 1.2
@@ -0,0 +1 @@
+b8b3e3791c687e8ddaaeac7c65732233 PEAR_Command_Packaging-0.1.2.tgz
More information about the scm-commits
mailing list