[twirssi: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/twirssi

[Julian C. Dunn]

commit 70f3550ab438695131affd4f03262644d48fa951
Merge: 01af6e3 2db82c6
Author: Julian C. Dunn <jdunn at aquezada.com>
Date:   Sat Aug 24 01:14:37 2013 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/twirssi
    
    Conflicts:
    	twirssi.spec

 twirssi.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --cc twirssi.spec
index b3310f5,4ff1894..b6c32cd
--- a/twirssi.spec
+++ b/twirssi.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           twirssi
  Version:        2.6.0
- Release:        2%{?dist}
 -Release:        3%{?dist}
++Release:        4%{?dist}
  Summary:        An Irssi script to interact with Twitter
  License:        GPLv2
  Group:          Applications/Communications
@@@ -48,12 -45,15 +48,18 @@@ install -m 644 -p %{SOURCE2} $RPM_BUILD
  
  %files
  %{_datarootdir}/irssi/scripts/%{name}.pl
 -%doc %{_docdir}/%{name}-%{version}
 +%doc %{_pkgdocdir}
  
  %changelog
- * Sat Aug 24 2013 Julian C. Dunn <jdunn at aquezada.com> 2.6.0-2
++* Sat Aug 24 2013 Julian C. Dunn <jdunn at aquezada.com> 2.6.0-4
 +- Update for unversioned docdir change (bz#993953)
 +
+ * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.0-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
+ * Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 2.6.0-2
+ - Perl 5.18 rebuild
+ 
  * Fri Jun 14 2013 Julian C. Dunn <jdunn at aquezada.com> 2.6.0-1
  - Upgrade to 2.6.0 for Twitter 1.1 API