Mailinglist Archive: opensuse-commit (2092 mails)

< Previous Next >
commit php5-pear-file
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Thu, 09 Aug 2007 15:07:44 +0200
  • Message-id: <20070809130744.662EA678180@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package php5-pear-file
checked in at Thu Aug 9 15:07:44 CEST 2007.

--------
--- php5-pear-file/php5-pear-file.changes       2006-10-26 13:52:55.000000000 +0200
+++ /mounts/work_src_done/NOARCH/php5-pear-file/php5-pear-file.changes  2007-08-07 01:17:09.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Aug  7 01:16:49 CEST 2007 - crrodriguez@xxxxxxx
+
+- update to version 1.3.0
+- use the new pear package format 
+
+-------------------------------------------------------------------

Old:
----
  File-1.2.2-dependency.patch
  File-1.2.2.tgz

New:
----
  File-1.3.0.tgz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ php5-pear-file.spec ++++++
--- /var/tmp/diff_new_pack.u22258/_old  2007-08-09 15:05:08.000000000 +0200
+++ /var/tmp/diff_new_pack.u22258/_new  2007-08-09 15:05:08.000000000 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package php5-pear-file (Version 1.2.2)
+# spec file for package php5-pear-file (Version 1.3.0)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -11,20 +11,19 @@
 # norootforbuild
 
 Name:           php5-pear-file
-BuildRequires:  php5-pear
-%define peardir %{_datadir}/php5/PEAR
-License:        Other License(s), see package
-Group:          Productivity/Networking/Web/Servers
-Version:        1.2.2
-Release:        32
+%define peardir %(pear config-get php_dir 2> /dev/null)
+%define xmldir  /var/lib/pear
 Summary:        Common PEAR file and directory routines
+Version:        1.3.0
+Release:        1
+License:        Other uncritical OpenSource License, The PHP License, version 3.0
+Group:          Development/Libraries/PHP
+Source0:        http://pear.php.net/get/File-%{version}.tgz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 URL:            http://pear.php.net/package/File
-Requires:       php5-pear
-Provides:       php-pear-file
-Source:         http://pear.php.net/get/File-%{version}.tgz
-Patch1:         File-%{version}-dependency.patch
+BuildRequires:  php5-pear
+PreReq:         php5-pear
 BuildArch:    noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 This PEAR package Provides easy access to read/write to files along
@@ -42,25 +41,54 @@
     Thomas V.V.Cox <cox@xxxxxxxxxxx>
 
 %prep
-%setup -c
-%patch1
+%setup -c -T
+pear -v -c pearrc \
+        -d php_dir=%{peardir} \
+        -d doc_dir=/docs \
+        -d bin_dir=%{_bindir} \
+        -d data_dir=%{peardir}/data \
+        -d test_dir=%{peardir}/tests \
+        -d ext_dir=%{_libdir} \
+        -s
 
 %build
 
 %install
-mv package*.xml File-%{version}
-cd File-%{version}
-PHP_PEAR_PHP_BIN="/usr/bin/php5 -d memory_limit=50m" pear5 -v -d doc_dir=%{_docdir}/%{name} install --offline -R "$RPM_BUILD_ROOT" package.xml
-rm -rf "$RPM_BUILD_ROOT"/%{peardir}/.{filemap,lock,registry,channels,depdb,depdblock}
+pear -c pearrc install --nodeps --packagingroot %{buildroot} %{SOURCE0}
 
-%files
-%defattr(-, root, root)
-%dir %{peardir}/test
-%{peardir}/test/File
-%{peardir}/File
-%{peardir}/File.php
+# Clean up unnecessary files
+%{__rm} pearrc
+%{__rm} %{buildroot}/%{peardir}/.filemap
+%{__rm} %{buildroot}/%{peardir}/.lock
+%{__rm} -rf %{buildroot}/%{peardir}/.registry
+%{__rm} -rf %{buildroot}%{peardir}/.channels
+%{__rm} %{buildroot}%{peardir}/.depdb
+%{__rm} %{buildroot}%{peardir}/.depdblock
+# Install XML package description
+%{__mkdir_p} %{buildroot}%{xmldir}
+%{__tar} -xzf %{SOURCE0} package.xml
+%{__cp} -p package.xml %{buildroot}%{xmldir}/File.xml
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%post
+pear install --nodeps --soft --force --register-only %{xmldir}/File.xml
+
+%postun
+if [ "$1" -eq "0" ]; then
+    pear uninstall --nodeps --ignore-errors --register-only pear.php.net/File
+fi
 
-%changelog -n php5-pear-file
+%files
+%defattr(-,root,root)
+%{peardir}/*
+%{xmldir}/File.xml
+
+%changelog
+* Tue Aug 07 2007 - crrodriguez@xxxxxxx
+- update to version 1.3.0
+- use the new pear package format
 * Thu Oct 26 2006 - anosek@xxxxxxx
 - fixed: pear is pulling packages from the network during autobuild
   [#214347]

++++++ File-1.2.2.tgz -> File-1.3.0.tgz ++++++
++++ 7438 lines of diff (skipped)


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread