[fpaste/el6] Sync el6 branch with master

[Athmane Madjoudj]

commit b3cee5051c4d81de8fc0d2daccee5b966b05c120
Author: Athmane Madjoudj <athmane at fedoraproject.org>
Date:   Fri Mar 1 01:55:26 2013 +0100

    Sync el6 branch with master

 .gitignore  |    3 +++
 fpaste.spec |   57 +++++++++++++++++++++++++++++++++++++++++++++++----------
 sources     |    2 +-
 3 files changed, 51 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 672ce47..dc2c6fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 fpaste-0.3.4.tar.bz2
 /fpaste-0.3.5.tar.bz2
+/fpaste-0.3.6.tar.bz2
+/fpaste-0.3.7.tar.bz2
+/fpaste-0.3.7.1.tar.bz2
diff --git a/fpaste.spec b/fpaste.spec
index dfbe6e6..5217da7 100644
--- a/fpaste.spec
+++ b/fpaste.spec
@@ -1,13 +1,23 @@
 Name:		fpaste
-Version:	0.3.5
-Release:	1%{?dist}
+Version:	0.3.7.1
+Release:	6%{?dist}
 Summary:	A simple tool for pasting info onto fpaste.org
 BuildArch:	noarch
 Group:		Applications/Internet
 License:	GPLv3+
 URL:		https://fedorahosted.org/fpaste/
 Source0:	https://fedorahosted.org/released/fpaste/fpaste-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# Point fpaste to fedora sticky notes staging instance
+# Thanks Clint for the patch. 
+# https://fedorahosted.org/fpaste/ticket/7#comment:1
+Patch0:     %{name}-0.3.7.1-fedora-production.patch
+
+# Remove smolt data from fpaste
+# https://fedorahosted.org/fpaste/ticket/6
+Patch1:     %{name}-0.3.7.1-remove-smolt-code.patch
+
+Patch2:     %{name}-default-private-and-use-expire-option.patch
 
 %description
 It is often useful to be able to easily paste text to the Fedora
@@ -43,6 +53,40 @@ rm -rf %{buildroot}
 %{_mandir}/man1/fpaste.1.gz
 
 %changelog
+* Fri Mar 01 2013 Athmane Madjoudj <athmane at fedoraproject.org> 0.3.7.1-6
+- Add a patch to make private url default and use expire option.
+
+* Fri Feb 01 2013 Ankur Sinha <ankursinha AT fedoraproject DOT org> 0.3.7.1-5
+- Update patch to point to fedora fpaste production environment
+
+* Fri Oct 19 2012 Ankur Sinha <ankursinha AT fedoraproject DOT org> 0.3.7.1-4
+- Patch: remove smolt data
+- Patch: point to fedora staging sticky notes server
+- THIS UPDATE DOES NOT GO TO STABLE. TESTING ONLY.
+- Will go to stable when the fedora sticky notes moves to production
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.7.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jan 06 2012 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.7.1-2
+- spec bump for gcc 4.7 rebuild
+
+* Sun Oct 16 2011 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.7.1-1
+- update to new upstream release
+- drop dependency on xsel (#743311)
+
+* Wed Aug 24 2011 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.7-1
+- Update to latest upstream release
+
+* Thu Apr 14 2011 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.6-1
+- Update to new upstream release
+- Pastes which exceed the server's size limit now error more gracefully
+- stdin and clipboard descriptions now default to showing a small text summary of the form "beginning ... middle ... end". 
+- sysinfo improvements
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Mon Oct 18 2010 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.5-1
 - New maintenance release
 - --sysinfo: detect running and installed Desktop Environment(s)
@@ -50,13 +94,6 @@ rm -rf %{buildroot}
 - --sysinfo: Smolt fixed, GL and other additions. by Francois Cami
 - --sysinfo: Optimized: rpm -qa --list --nodigest --nosignature. by Dave Riches
 
-* Fri May 28 2010 Kevin Fenzi <kevin at tummy.com> - 0.3.4-3
-- Remove bogus xsel dep. 
-
-* Mon Apr 12 2010 Kevin Fenzi <kevin at tummy.com> - 0.3.4-2
-- Add BuildRoot for epel
-- Branch and build for epel
-
 * Mon Aug 24 2009 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.4-1
 - New release
 - Validate paste size and content as non-binary before sending; user is prompted Y/N to override for huge pastes or binary content.
diff --git a/sources b/sources
index f4284d3..ec6696a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-50d185cdc778b42e7eddc37b29079699  fpaste-0.3.5.tar.bz2
+53201ed0fdd1b9f325c43178adcd8878  fpaste-0.3.7.1.tar.bz2