up to 1.1.0

diff --git a/php-pear-Net_SmartIRC-fix_includes.patch b/php-pear-Net_SmartIRC-fix_includes.patch
deleted file mode 100644 (file)
index 1899eb1..0000000
--- a/php-pear-Net_SmartIRC-fix_includes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Upstream-Tracker: http://pear.php.net/bugs/bug.php?id=17769
-
---- Net_SmartIRC-1.0.2/usr/share/pear/Net/SmartIRC.php~        2010-11-15 17:51:07.000000000 +0200
-+++ Net_SmartIRC-1.0.2/usr/share/pear/Net/SmartIRC.php 2010-11-15 17:54:00.468941323 +0200
-@@ -43,7 +43,7 @@
-  *
-  */
- // ------- PHP code ----------
--require_once 'SmartIRC/defines.php';
-+require_once 'Net/SmartIRC/defines.php';
- define('SMARTIRC_VERSION', '1.1.0-dev ($Revision$)');
- define('SMARTIRC_VERSIONSTRING', 'Net_SmartIRC '.SMARTIRC_VERSION);
- 
-@@ -2587,8 +2587,8 @@
- }
- 
- // includes must be after the base class definition, required for PHP5
--require_once 'SmartIRC/irccommands.php';
--require_once 'SmartIRC/messagehandler.php';
-+require_once 'Net/SmartIRC/irccommands.php';
-+require_once 'Net/SmartIRC/messagehandler.php';
- 
- class Net_SmartIRC extends Net_SmartIRC_messagehandler
- {

diff --git a/php-pear-Net_SmartIRC.spec b/php-pear-Net_SmartIRC.spec
index e45bdeed5fe6f2d67b96b5600153f01dfc1a3a75..28ee79ef6b3018b347ef4ad66568c78557db3c9c 100644 (file)
--- a/php-pear-Net_SmartIRC.spec
+++ b/php-pear-Net_SmartIRC.spec
@@ -1,21 +1,21 @@
 %define                status          stable
 %define                pearname        Net_SmartIRC
+%define                php_min_version 5.3.0
 %include       /usr/lib/rpm/macros.php
 Summary:       %{pearname} - IRC client class
 Summary(pl.UTF-8):     %{pearname} - klasa klienta IRC
 Name:          php-pear-%{pearname}
-Version:       1.0.2
-Release:       2
-License:       LGPL
+Version:       1.1.0
+Release:       1
+License:       LGPL v2.1
 Group:         Development/Languages/PHP
 Source0:       http://pear.php.net/get/%{pearname}-%{version}.tgz
-# Source0-md5: cbaec235fb1542161f47be490a1f0bf3
-Patch0:                %{name}-fix_includes.patch
-Patch1:                strict.patch
+# Source0-md5: 28fcb9d501af5e666130717576acff50
 URL:           http://pear.php.net/package/Net_SmartIRC/
 BuildRequires: php-pear-PEAR
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
 BuildRequires: rpmbuild(macros) >= 1.580
+Requires:      php(core) >= %{php_min_version}
 Requires:      php-pear
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -84,10 +84,7 @@ Dokumentacja do %{name}.
 
 %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
@@ -110,12 +107,11 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc install.log
-%doc CHANGELOG CREDITS FEATURES README
+%doc CREDITS FEATURES README.md
 %doc DOCUMENTATION HOWTO
 %{php_pear_dir}/.registry/*.reg
 %{php_pear_dir}/Net/SmartIRC.php
 %{php_pear_dir}/Net/SmartIRC
-
 %{_examplesdir}/%{name}-%{version}
 
 %files phpdoc

diff --git a/strict.patch b/strict.patch
deleted file mode 100644 (file)
index ce083f9..0000000
--- a/strict.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-
-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;