Merge branch 'master' into f13

Conflicts:
	.gitignore

.gitignore

@@ -1 +1 @@
-IO-Multiplex-1.10.tar.gz
+/IO-Multiplex-1.11.tar.gz

perl-IO-Multiplex.spec

@@ -1,11 +1,11 @@
-Summary:	IO-Multiplex module for perl
+Summary:	Manage IO on many file handles
 Name:		perl-IO-Multiplex
-Version:	1.10
-Release:	6%{?dist}
+Version:	1.11
+Release:	1%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/IO-Multiplex/
-Source:		http://search.cpan.org/CPAN/authors/id/B/BB/BBB/IO-Multiplex-%{version}.tar.gz
+Source0:	http://search.cpan.org/CPAN/authors/id/M/MA/MARKOV/IO-Multiplex-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	perl(ExtUtils::MakeMaker)
@@ -13,10 +13,10 @@ Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 IO::Multiplex is designed to take the effort out of managing multiple file
-handles. It is essentially a really fancy front end to the select system
-call. In addition to maintaining the select loop, it buffers all input and
-output to/from the file handles. It can also accept incoming connections on
-one or more listen sockets.
+handles. It is essentially a really fancy front end to the select system call.
+In addition to maintaining the select loop, it buffers all input and output
+to/from the file handles. It can also accept incoming connections on one or
+more listen sockets.
 
 %prep
 %setup -q -n IO-Multiplex-%{version}
@@ -29,13 +29,13 @@ one or more listen sockets.
 %{__rm} -rf %{buildroot}
 %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
 /usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
-/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} 2>/dev/null ';'
-%{__chmod} -R u+w %{buildroot}/*
+/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} ';' 2>/dev/null
+%{_fixperms} %{buildroot}
 
 %check
 %{__make} test
 
-%clean 
+%clean
 %{__rm} -rf %{buildroot}
 
 %files
@@ -45,8 +45,29 @@ one or more listen sockets.
 %{_mandir}/man3/IO::Multiplex.3pm*
 
 %changelog
+* Mon Feb 21 2011 Paul Howarth <paul@city-fan.org> - 1.11-1
+- Update to 1.11
+  - Avoid warning while adding pipe (CPAN RT#16259, CPAN RT#60068)
+  - Add EWOULDBLOCK and non-blocking mode for windows (CPAN RT#23982)
+  - Fix typo in documentation (CPAN RT#21085)
+  - Avoid shutdown after close (CPAN RT#5885, CPAN RT#5715)
+  - Use length of outbuf, not exists to see if it is empty
+  - Turn "use warnings" on
+- This release by MARKOV -> update source URL
+- Use %%{_fixperms} rather than our own chmod incantation
+- Tidy up %%summary and %%description
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.10-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Dec 20 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.10-8
+- Rebuild to fix problems with vendorarch/lib (#661697)
+
+* Sun May 02 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.10-7
+- Mass rebuild with perl 5.12.0
+
 * Mon Dec  7 2009 Stepan Kasal <skasal@redhat.com> - 1.10-6
-- rebuild against perl 5.10.1
+- Rebuild against perl 5.10.1
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.10-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@@ -82,10 +103,10 @@ one or more listen sockets.
 - Cosmetic changes for fedora xtras
 
 * Sun Feb 20 2005 Dag Wieers <dag@wieers.com> - 1.08-2
-- Cosmetic changes.
+- Cosmetic changes
 
 * Thu Mar 18 2004 Dag Wieers <dag@wieers.com> - 1.08-1
-- Updated to release 1.08.
+- Updated to release 1.08
 
 * Mon Jul 14 2003 Dag Wieers <dag@wieers.com> - 1.04-0
-- Initial package. (using DAR)
+- Initial package (using DAR)

sources

@@ -1 +1 @@
-ce230ee0a4afbff59da66f0c42e0340b  IO-Multiplex-1.10.tar.gz
+7db84e16c24579865c9044843880962a  IO-Multiplex-1.11.tar.gz