rpms/php-pear-PEAR-Command-Packaging/F-11 php-pear-PEAR-Command-Packaging-0.2.0-fedora-conventions.patch, NONE, 1.1 php-pear-PEAR-Command-Packaging-fedora-template-specfile, 1.1, 1.2 php-pear-PEAR-Command-Packaging.spec, 1.3, 1.4 sources, 1.2, 1.3 3_01.txt, 1.1, NONE php-pear-PEAR-Command-Packaging-0.1.2-cvs.patch, 1.1, NONE php-pear-PEAR-Command-Packaging-0.1.2-fedora-conventions1.patch, 1.1, NONE
Tim Jackson
timj at fedoraproject.org
Wed Jul 8 13:52:40 UTC 2009
Author: timj
Update of /cvs/extras/rpms/php-pear-PEAR-Command-Packaging/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2262
Modified Files:
php-pear-PEAR-Command-Packaging-fedora-template-specfile
php-pear-PEAR-Command-Packaging.spec sources
Added Files:
php-pear-PEAR-Command-Packaging-0.2.0-fedora-conventions.patch
Removed 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
Log Message:
Update to 0.2.0
php-pear-PEAR-Command-Packaging-0.2.0-fedora-conventions.patch:
--- NEW FILE php-pear-PEAR-Command-Packaging-0.2.0-fedora-conventions.patch ---
--- Packaging.php.orig 1970-01-01 10:13:24.000000000 +0100
+++ Packaging.php 2009-06-27 22:05:09.000000000 +0100
@@ -72,15 +72,14 @@
%n = Channel name (full) e.g. pear.example.com
%N = Non standard channel name followed by a "/" (e.g. "pear.example.com/")
-Defaults to "%C::%s" for library/application packages and "php-channel-%c" for
+Defaults to "php-%c-%S" for library/application packages and "php-channel-%c" for
channel packages.',
),
'rpm-depname' => array(
'shortopt' => 'd',
'arg' => 'FORMAT',
'doc' => 'Use FORMAT as format string for naming RPM dependencies. 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>
@@ -91,10 +90,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
',
),
);
@@ -121,7 +120,7 @@
* $commands array above and in Packaging.xml so that it is consistent.
*/
var $_rpm_pkgname_format = array(
- 'pkg' => '%C::%s',
+ 'pkg' => 'php-%c-%S',
'chan' => 'php-channel-%c',
);
@@ -140,7 +139,7 @@
* %P = use the same as whatever rpm_pkgname_format is set to be
*/
var $_rpm_depname_format = array(
- 'pkg' => '%P',
+ 'pkg' => 'php-(%N%s)',
'ext' => 'php-%l',
'php' => 'php',
'chan' => 'php-channel(%n)',
@@ -159,7 +158,7 @@
* chan - used when generating a spec file for a channel
*/
var $_rpm_specname_format = array(
- 'pkg' => '%P-%v.spec',
+ 'pkg' => '%P.spec',
'chan' => 'php-channel-%c.spec'
);
@@ -182,14 +181,14 @@
* need to be listed here
*/
var $_file_prefixes = array(
- 'php' => '%{_libdir}/php/pear',
+ 'php' => '%{pear_phpdir}',
'doc' => '',
- 'ext' => '%{_libdir}/php',
- 'test' => '%{_libdir}/php/tests/%s',
- 'data' => '%{_libdir}/php/data/%s',
+ 'ext' => '%{_libdir}/php/modules',
+ 'test' => '%{pear_testdir}/%s',
+ 'data' => '%{pear_datadir}/%s',
'script' => '%{_bindir}',
'cfg' => '%{_sysconfdir}/pear',
- 'www' => '%{_datadir}/pear/www'
+ 'www' => '%{pear_wwwdir}/%s'
);
/**
@@ -197,7 +196,7 @@
* printf format. The first '%s' is the RPM header name followed by a colon,
* the second is the header value.
*/
- var $_spec_line_format = '%s %s';
+ var $_spec_line_format = '%-16s%s';
// ------------------------------------------------------------------------
// --- END DISTRIBUTION CONFIG
@@ -593,13 +592,15 @@
if ($pf->getDeps()) {
$this->_generatePackageDeps($pf);
}
-
+
+ /* Fedora: we handle this in our template spec
// Hook to support virtual Provides, where the dependency name differs
// from the package name
$rpmdep = $this->_getRPMName($pf->getPackage(), $pf->getChannel(), null, 'pkgdep');
if (!empty($rpmdep) && $rpmdep != $this->_output['rpm_package']) {
$this->_output['extra_headers'] .= $this->_formatRpmHeader('Provides', "$rpmdep = %{version}") . "\n";
}
+ */
// Create the list of files in the package
foreach ($package_info['filelist'] as $filename => $attr) {
@@ -657,9 +658,9 @@
// Handle doc files
if (isset($file_list['doc'])) {
- $this->_output['doc_files'] = 'docs/' . $pf->getPackage() . '/*';
+ $this->_output['doc_files'] = '%{pear_name}-%{version}/docdir/%{pear_name}/*';
$this->_output['doc_files_statement'] = '%doc ' . $this->_output['doc_files'];
- $this->_output['doc_files_relocation_script'] = "mv %{buildroot}/docs .\n";
+ $this->_output['doc_files_relocation_script'] = "# Move documentation\nmkdir -p docdir\nmv \$RPM_BUILD_ROOT%{pear_docdir}/* docdir\n";
}
// Work out architecture
Index: php-pear-PEAR-Command-Packaging-fedora-template-specfile
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PEAR-Command-Packaging/F-11/php-pear-PEAR-Command-Packaging-fedora-template-specfile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-pear-PEAR-Command-Packaging-fedora-template-specfile 23 Sep 2006 21:28:44 -0000 1.1
+++ php-pear-PEAR-Command-Packaging-fedora-template-specfile 8 Jul 2009 13:52:10 -0000 1.2
@@ -12,7 +12,7 @@ URL: http://@master_server@/p
Source0: http://@master_server@/get/%{pear_name}-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: @arch@
+BuildArch: noarch
BuildRequires: php-pear >= 1:1.4.9-1.2
Requires(post): %{__pear}
Requires(postun): %{__pear}
@@ -60,18 +60,20 @@ rm -rf $RPM_BUILD_ROOT
%postun
if [ $1 -eq 0 ] ; then
%{__pear} uninstall --nodeps --ignore-errors --register-only \
- @possible_channel@%{pear_name} >/dev/null || :
+ @possible_channel@/%{pear_name} >/dev/null || :
fi
%files
%defattr(-,root,root,-)
@doc_files_statement@
+ at cfg_files_statement@
+ at www_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}/*
-
+ at php_files_statement@
+ at data_files_statement@
+ at test_files_statement@
+ at script_files_statement@
%changelog
Index: php-pear-PEAR-Command-Packaging.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PEAR-Command-Packaging/F-11/php-pear-PEAR-Command-Packaging.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-pear-PEAR-Command-Packaging.spec 26 Feb 2009 22:00:18 -0000 1.3
+++ php-pear-PEAR-Command-Packaging.spec 8 Jul 2009 13:52:10 -0000 1.4
@@ -2,8 +2,8 @@
%define pear_name PEAR_Command_Packaging
Name: php-pear-PEAR-Command-Packaging
-Version: 0.1.2
-Release: 7%{?dist}
+Version: 0.2.0
+Release: 1%{?dist}
Summary: Create RPM spec files from PEAR modules
Group: Development/System
@@ -11,10 +11,7 @@ License: PHP
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
+Patch0: php-pear-PEAR-Command-Packaging-0.2.0-fedora-conventions.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -45,21 +42,20 @@ rm -rf $RPM_BUILD_ROOT
# Patches for Fedora conventions
pushd $RPM_BUILD_ROOT%{pear_phpdir}/PEAR/Command/
-%{__patch} -p1 <%{PATCH0}
-%{__patch} -p1 <%{PATCH1}
+%{__patch} -p0 <%{PATCH0}
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}/.??*
+# Remove doc; will be installed later
+rm -f $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name}/LICENSE
+
# 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
@@ -84,6 +80,9 @@ fi
%changelog
+* Sat Jun 27 2009 Tim Jackson <rpm at timj.co.uk> 0.2.0-1
+- Update to 0.2.0
+
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PEAR-Command-Packaging/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 23 Sep 2006 21:28:44 -0000 1.2
+++ sources 8 Jul 2009 13:52:10 -0000 1.3
@@ -1 +1 @@
-b8b3e3791c687e8ddaaeac7c65732233 PEAR_Command_Packaging-0.1.2.tgz
+457881b46b8c42ba58cdb698872df2e6 PEAR_Command_Packaging-0.2.0.tgz
--- 3_01.txt DELETED ---
--- php-pear-PEAR-Command-Packaging-0.1.2-cvs.patch DELETED ---
--- php-pear-PEAR-Command-Packaging-0.1.2-fedora-conventions1.patch DELETED ---
More information about the fedora-extras-commits
mailing list