gunnar: server/pear/PEAR-Net_Socket Makefile, 1.4, 1.5 PEAR-Net_Socket.spec, 1.4, 1.5
cvs at kolab.org
cvs at kolab.org
Mon Jul 23 19:23:24 CEST 2007
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Net_Socket
In directory doto:/tmp/cvs-serv19001/pear/PEAR-Net_Socket
Modified Files:
Makefile PEAR-Net_Socket.spec
Log Message:
The newer php-5.* package allows a sane PEAR-package installation.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_Socket/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile 23 Jul 2007 16:06:44 -0000 1.4
+++ Makefile 23 Jul 2007 17:23:21 -0000 1.5
@@ -23,6 +23,7 @@
.PHONY: clean
clean:
+ rm -rf /kolab/RPM/TMP/$(PEAR_NAME)*
rm -rf /kolab/RPM/TMP/$(PACKAGE)
rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
rm -rf *~
Index: PEAR-Net_Socket.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_Socket/PEAR-Net_Socket.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- PEAR-Net_Socket.spec 23 Jul 2007 16:06:44 -0000 1.4
+++ PEAR-Net_Socket.spec 23 Jul 2007 17:23:21 -0000 1.5
@@ -43,8 +43,8 @@
%install
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
- %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
- rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels}
+ %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
+ rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb,.depdblock}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
More information about the commits
mailing list