Skip to content
Browse files

* fix Bug #6034: date format bug

  * fix Bug #6047: pear makerpm fails to handle docs in root directory


git-svn-id: http://svn.php.net/repository/pear/pear-core/pear/pear-core/trunk@201367 c90b9560-bf6c-de11-be94-00142212c4b1
  • Loading branch information...
1 parent 87f60d8 commit 77387276c862cf0ff9bd16f92962451393112284 cellog committed Nov 27, 2005
Showing with 52 additions and 25 deletions.
  1. +1 −1 PEAR/Command/Registry.php
  2. +1 −1 package-Archive_Tar.xml
  3. +20 −9 package-PEAR.xml
  4. +26 −9 package2.xml
  5. +4 −5 template.spec
View
2 PEAR/Command/Registry.php
@@ -980,7 +980,7 @@ function _doInfo2($command, $options, $params, &$obj, $installed)
$info['package.xml version'] = '2.0';
if ($installed) {
if ($obj->getLastModified()) {
- $info['Last Modified'] = date('Y-m-d H:m', $obj->getLastModified());
+ $info['Last Modified'] = date('Y-m-d H:i', $obj->getLastModified());
}
$v = $obj->getLastInstalledVersion();
$info['Last Installed Version'] = $v ? $v : '- None -';
View
2 package-Archive_Tar.xml
@@ -19,7 +19,7 @@ loaded. Bz2 compression is also supported with the bz2 extension loaded.
<maintainer>
<user>ssb</user>
<role>helper</role>
- <name>Stig Sæther Bakken</name>
+ <name>Stig Bakken</name>
<email>stig@php.net</email>
</maintainer>
</maintainers>
View
29 package-PEAR.xml
@@ -66,18 +66,14 @@ http://pear.php.net/dtd/package-1.0.xsd">
</maintainer>
</maintainers>
<release>
- <version>1.4.5</version>
- <date>2005-11-21</date>
+ <version>1.4.6</version>
+ <date>2005-12-15</date>
<license>PHP License</license>
<state>stable</state>
<notes>
- * REALLY fix Bug #5865: doesn't work with PHP4.2.x
- * fix Bug #5854: if no installconditions match, no error is raised
- * fix Bug #5945: installer should auto-skip to the next channel on timeout
- * fix Bug #5947: Some package-info not handled by PEAR_PackageFile_v2
- * fix Bug #5948: Minor typo in PEAR_Validate
- * fix Bug #5958: strange error on mistyping
- * fix Bug #5959: patch: pear makerpm produces RPMs that do not uninstall/upgrade cleanly
+ Minor bugfix release
+ * fix Bug #6034: date format bug
+ * fix Bug #6047: pear makerpm fails to handle docs in root directory
</notes>
<provides type="class" name="OS_Guess"/>
<provides type="class" name="System"/>
@@ -552,5 +548,20 @@ http://pear.php.net/dtd/package-1.0.xsd">
* fix Bug #5865: doesn't work with PHP4.2.x
</notes>
</release>
+ <release>
+ <version>1.4.5</version>
+ <date>2005-11-21</date>
+ <license>PHP License</license>
+ <state>stable</state>
+ <notes>
+ * REALLY fix Bug #5865: doesn't work with PHP4.2.x
+ * fix Bug #5854: if no installconditions match, no error is raised
+ * fix Bug #5945: installer should auto-skip to the next channel on timeout
+ * fix Bug #5947: Some package-info not handled by PEAR_PackageFile_v2
+ * fix Bug #5948: Minor typo in PEAR_Validate
+ * fix Bug #5958: strange error on mistyping
+ * fix Bug #5959: patch: pear makerpm produces RPMs that do not uninstall/upgrade cleanly
+ </notes>
+ </release>
</changelog>
</package>
View
35 package2.xml
@@ -65,9 +65,9 @@ http://pear.php.net/dtd/package-2.0.xsd">
<email>mj@php.net</email>
<active>no</active>
</helper>
- <date>2005-11-21</date>
+ <date>2005-12-15</date>
<version>
- <release>1.4.5</release>
+ <release>1.4.6</release>
<api>1.4.1</api>
</version>
<stability>
@@ -76,13 +76,9 @@ http://pear.php.net/dtd/package-2.0.xsd">
</stability>
<license uri="http://www.php.net/license">PHP License</license>
<notes>
- * REALLY fix Bug #5865: doesn't work with PHP4.2.x
- * fix Bug #5854: if no installconditions match, no error is raised
- * fix Bug #5945: installer should auto-skip to the next channel on timeout
- * fix Bug #5947: Some package-info not handled by PEAR_PackageFile_v2
- * fix Bug #5948: Minor typo in PEAR_Validate
- * fix Bug #5958: strange error on mistyping
- * fix Bug #5959: patch: pear makerpm produces RPMs that do not uninstall/upgrade cleanly
+ Minor bugfix release
+ * fix Bug #6034: date format bug
+ * fix Bug #6047: pear makerpm fails to handle docs in root directory
</notes>
<contents>
<dir name="/">
@@ -681,5 +677,26 @@ http://pear.php.net/dtd/package-2.0.xsd">
* fix Bug #5865: doesn't work with PHP4.2.x
</notes>
</release>
+ <release>
+ <version>
+ <release>1.4.5</release>
+ <api>1.4.1</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <date>2005-11-21</date>
+ <license uri="http://www.php.net/license/3_0.txt">PHP License</license>
+ <notes>
+ * REALLY fix Bug #5865: doesn't work with PHP4.2.x
+ * fix Bug #5854: if no installconditions match, no error is raised
+ * fix Bug #5945: installer should auto-skip to the next channel on timeout
+ * fix Bug #5947: Some package-info not handled by PEAR_PackageFile_v2
+ * fix Bug #5948: Minor typo in PEAR_Validate
+ * fix Bug #5958: strange error on mistyping
+ * fix Bug #5959: patch: pear makerpm produces RPMs that do not uninstall/upgrade cleanly
+ </notes>
+ </release>
</changelog>
</package>
View
9 template.spec
@@ -8,7 +8,6 @@ Source: http://@master_server@/get/@package@-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-root
URL: http://@master_server@/package/@package@
Prefix: %{_prefix}
-#Docdir: @doc_dir@/@package@
BuildArchitectures: @arch@
@extra_headers@
@@ -17,6 +16,7 @@ BuildArchitectures: @arch@
%prep
rm -rf %{buildroot}/*
+%setup -c -T
# XXX Source files location is missing here in pear cmd
pear -v -c %{buildroot}/pearrc \
-d php_dir=%{_libdir}/php/pear \
@@ -53,10 +53,9 @@ rm %{buildroot}/pearrc
rm %{buildroot}/%{_libdir}/php/pear/.filemap
rm %{buildroot}/%{_libdir}/php/pear/.lock
rm -rf %{buildroot}/%{_libdir}/php/pear/.registry
-if [ -d "%{buildroot}/docs/@package@/doc" ]; then
- rm -rf $RPM_BUILD_DIR/doc
- mv %{buildroot}/docs/@package@/doc $RPM_BUILD_DIR
- rm -rf %{buildroot}/docs
+if [ "@doc_files@" != "" ]; then
+ mv %{buildroot}/docs/@package@/* .
+ rm -rf %{buildroot}/docs
fi
mkdir -p %{buildroot}@rpm_xml_dir@
tar -xzf $RPM_SOURCE_DIR/@package@-%{version}.tgz package@package2xml@.xml

0 comments on commit 7738727

Please sign in to comment.
Something went wrong with that request. Please try again.