packages: php-pear-Net_SmartIRC/php-pear-Net_SmartIRC.spec, php-pear-Net_Sm...
glen
glen at pld-linux.org
Thu Sep 1 22:10:49 CEST 2011
Author: glen Date: Thu Sep 1 20:10:49 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- strict mode fixes
---- Files affected:
packages/php-pear-Net_SmartIRC:
php-pear-Net_SmartIRC.spec (1.29 -> 1.30) , strict.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/php-pear-Net_SmartIRC/php-pear-Net_SmartIRC.spec
diff -u packages/php-pear-Net_SmartIRC/php-pear-Net_SmartIRC.spec:1.29 packages/php-pear-Net_SmartIRC/php-pear-Net_SmartIRC.spec:1.30
--- packages/php-pear-Net_SmartIRC/php-pear-Net_SmartIRC.spec:1.29 Mon Nov 15 16:55:11 2010
+++ packages/php-pear-Net_SmartIRC/php-pear-Net_SmartIRC.spec Thu Sep 1 22:10:44 2011
@@ -1,21 +1,22 @@
# $Revision$, $Date$
+%define status stable
+%define pearname Net_SmartIRC
%include /usr/lib/rpm/macros.php
-%define _status stable
-%define _pearname Net_SmartIRC
-Summary: %{_pearname} - IRC client class
-Summary(pl.UTF-8): %{_pearname} - klasa klienta IRC
-Name: php-pear-%{_pearname}
+Summary: %{pearname} - IRC client class
+Summary(pl.UTF-8): %{pearname} - klasa klienta IRC
+Name: php-pear-%{pearname}
Version: 1.0.2
-Release: 1
+Release: 2
License: LGPL
Group: Development/Languages/PHP
-Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz
+Source0: http://pear.php.net/get/%{pearname}-%{version}.tgz
# Source0-md5: cbaec235fb1542161f47be490a1f0bf3
Patch0: %{name}-fix_includes.patch
+Patch1: strict.patch
URL: http://pear.php.net/package/Net_SmartIRC/
BuildRequires: php-pear-PEAR
BuildRequires: rpm-php-pearprov >= 4.4.2-11
-BuildRequires: rpmbuild(macros) >= 1.300
+BuildRequires: rpmbuild(macros) >= 1.580
Requires: php-pear
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -38,13 +39,12 @@
- autoreconnect
- debugging/logging system
- supports fsocks and PHP socket extension
-- supports PHP 4.1.x to 4.3.0
- sendbuffer with priority levels
- channel synching (tracking of users/modes/topic etc in variables)
- IRC functions: op, deop, voice, devoice, ban, unban, join, part,
action, message, query, ctcp, mode, topic, nick, invite
-In PEAR status of this package is: %{_status}.
+In PEAR status of this package is: %{status}.
%description -l pl.UTF-8
Net_SmartIRC to klasa PHP do komunikacji z sieciami IRC zgodnymi z RFC
@@ -63,14 +63,13 @@
- automatyczne wznawianie połączeń
- system śledzenia i logowania
- obsługa rozszerzeń PHP fsocks i socket
-- zgodność z PHP od 4.1.x do 4.3.0
- sendbuffer z priorytetami
- synchronizacja kanałów (śledzienie użytkowników/trybów/motywów w
zmiennych)
- funkcje IRC: op, deop, voice, devoice, ban, unban, join, part,
action, message, query, ctcp, mode, topic, nick, invite.
-Ta klasa ma w PEAR status: %{_status}.
+Ta klasa ma w PEAR status: %{status}.
%package phpdoc
Summary: Online manual for %{name}
@@ -87,20 +86,21 @@
%prep
%pear_package_setup
%patch0 -p1
+%patch1 -p1
-mv docs/%{_pearname}/examples .
-mv docs/%{_pearname}/docs/HTML apidoc
-mv docs/%{_pearname}/docs/* .
-rmdir docs/%{_pearname}/docs
-mv docs/%{_pearname}/* .
+mv docs/%{pearname}/examples .
+mv docs/%{pearname}/docs/HTML apidoc
+mv docs/%{pearname}/docs/* .
+rmdir docs/%{pearname}/docs
+mv docs/%{pearname}/* .
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{php_pear_dir}
%pear_package_install
-install -d $RPM_BUILD_ROOT%{_phpdocdir}/%{_pearname}
-cp -a apidoc/* $RPM_BUILD_ROOT%{_phpdocdir}/%{_pearname}
+install -d $RPM_BUILD_ROOT%{_phpdocdir}/%{pearname}
+cp -a apidoc/* $RPM_BUILD_ROOT%{_phpdocdir}/%{pearname}
install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -121,7 +121,7 @@
%files phpdoc
%defattr(644,root,root,755)
-%{_phpdocdir}/%{_pearname}
+%{_phpdocdir}/%{pearname}
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -129,6 +129,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.30 2011/09/01 20:10:44 glen
+- strict mode fixes
+
Revision 1.29 2010/11/15 15:55:11 glen
- up to 1.0.2
================================================================
Index: packages/php-pear-Net_SmartIRC/strict.patch
diff -u /dev/null packages/php-pear-Net_SmartIRC/strict.patch:1.1
--- /dev/null Thu Sep 1 22:10:49 2011
+++ packages/php-pear-Net_SmartIRC/strict.patch Thu Sep 1 22:10:44 2011
@@ -0,0 +1,88 @@
+
+Upstream-Tracker: http://pear.php.net/bugs/bug.php?id=18774
+
+--- Net_SmartIRC-1.0.2/usr/share/pear/Net/SmartIRC/messagehandler.php 2011-09-01 23:03:18.082560612 +0300
++++ Net_SmartIRC-1.0.2/usr/share/pear/Net/SmartIRC/messagehandler.php 2011-09-01 23:02:16.796647143 +0300
+@@ -47,7 +47,7 @@
+ if ($this->_channelsyncing == true) {
+ if ($this->_nick == $ircdata->nick) {
+ $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: joining channel: '.$ircdata->channel, __FILE__, __LINE__);
+- $channel = &new Net_SmartIRC_channel();
++ $channel = new Net_SmartIRC_channel();
+ $channel->name = $ircdata->channel;
+ $microint = $this->_microint();
+ $channel->synctime_start = $microint;
+@@ -65,7 +65,7 @@
+
+ $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: '.$ircdata->nick.' joins channel: '.$ircdata->channel, __FILE__, __LINE__);
+ $channel = &$this->_channels[strtolower($ircdata->channel)];
+- $user = &new Net_SmartIRC_channeluser();
++ $user = new Net_SmartIRC_channeluser();
+ $user->nick = $ircdata->nick;
+ $user->ident = $ircdata->ident;
+ $user->host = $ircdata->host;
+@@ -335,7 +335,7 @@
+
+ $channel = &$this->_channels[strtolower($ircdata->channel)];
+
+- $user = &new Net_SmartIRC_channeluser();
++ $user = new Net_SmartIRC_channeluser();
+ $user->ident = $ircdata->rawmessageex[4];
+ $user->host = $ircdata->rawmessageex[5];
+ $user->server = $ircdata->rawmessageex[6];
+@@ -383,7 +383,7 @@
+ $userarray = explode(' ', rtrim($ircdata->message));
+ $userarraycount = count($userarray);
+ for ($i = 0; $i < $userarraycount; $i++) {
+- $user = &new Net_SmartIRC_channeluser();
++ $user = new Net_SmartIRC_channeluser();
+
+ $usermode = substr($userarray[$i], 0, 1);
+ switch ($usermode) {
+--- Net_SmartIRC-1.0.2/usr/share/pear/Net/SmartIRC.php 2011-09-01 23:03:18.485910927 +0300
++++ Net_SmartIRC-1.0.2/usr/share/pear/Net/SmartIRC.php 2011-09-01 23:02:16.406630722 +0300
+@@ -1403,7 +1403,7 @@
+ */
+ function listenFor($messagetype)
+ {
+- $listenfor = &new Net_SmartIRC_listenfor();
++ $listenfor = new Net_SmartIRC_listenfor();
+ $this->registerActionhandler($messagetype, '.*', $listenfor, 'handler');
+ $this->listen();
+ $result = $listenfor->result;
+@@ -1438,7 +1438,7 @@
+ }
+
+ $id = $this->_actionhandlerid++;
+- $newactionhandler = &new Net_SmartIRC_actionhandler();
++ $newactionhandler = new Net_SmartIRC_actionhandler();
+
+ $newactionhandler->id = $id;
+ $newactionhandler->type = $handlertype;
+@@ -1540,7 +1540,7 @@
+ function registerTimehandler($interval, &$object, $methodname)
+ {
+ $id = $this->_timehandlerid++;
+- $newtimehandler = &new Net_SmartIRC_timehandler();
++ $newtimehandler = new Net_SmartIRC_timehandler();
+
+ $newtimehandler->id = $id;
+ $newtimehandler->interval = $interval;
+@@ -1646,7 +1646,7 @@
+ }
+
+ // looks like the module satisfies us
+- $module = &new $classname;
++ $module = new $classname;
+ $this->log(SMARTIRC_DEBUG_MODULES, 'DEBUG_MODULES: successful created instance of: '.$classname, __FILE__, __LINE__);
+
+ $this->log(SMARTIRC_DEBUG_MODULES, 'DEBUG_MODULES: calling '.$classname.'::module_init()', __FILE__, __LINE__);
+@@ -1935,7 +1935,7 @@
+ $this->log(SMARTIRC_DEBUG_IRCMESSAGES, 'DEBUG_IRCMESSAGES: received: "'.$rawline.'"', __FILE__, __LINE__);
+
+ // building our data packet
+- $ircdata = &new Net_SmartIRC_data();
++ $ircdata = new Net_SmartIRC_data();
+ $ircdata->rawmessage = $rawline;
+ $lineex = explode(' ', $rawline);
+ $ircdata->rawmessageex = $lineex;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-pear-Net_SmartIRC/php-pear-Net_SmartIRC.spec?r1=1.29&r2=1.30&f=u
More information about the pld-cvs-commit
mailing list