[fpaste] Update to 0.3.7.2
Ankur Sinha
ankursinha at fedoraproject.org
Tue Apr 15 11:02:22 UTC 2014
commit cc02a781afa35ae00534379c495c9b65709ed0e7
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur at gmail.com>
Date: Tue Apr 15 21:01:47 2014 +1000
Update to 0.3.7.2
Drop all patches. They've been merged upstream.
.gitignore | 1 +
0001-fpaste-0.3.7.1-fedora-production.patch | 78 -------
0002-fpaste-0.3.7.1-remove-smolt-code.patch | 22 --
...pire-option-add-private-option-default-on.patch | 52 -----
0004-fpaste-0.3.7.1-add-url-option.patch | 46 ----
0005-fpaste-0.3.7.1-enable-shortened-urls.patch | 57 -----
0006-fpaste-0.3.7.1-correct-syntax-options.patch | 215 --------------------
0007-fpaste-0.3.7.1-correct-expire-options.patch | 21 --
...-fpaste-0.3.7.1-remove-description-option.patch | 70 -------
...e-0.3.7.1-better-check-for-kde-and-plasma.patch | 11 -
...fpaste-0.3.7.1-correct-paste-error-return.patch | 29 ---
...-0.3.7.1-reactivate-nick-password-options.patch | 99 ---------
0012-fpaste-0.3.7.1-handle-server-errors.patch | 26 ---
0013-fpaste-0.3.7.1-update-man-page.patch | 55 -----
fpaste.spec | 70 +------
sources | 2 +-
16 files changed, 9 insertions(+), 845 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dc2c6fa..12772fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ fpaste-0.3.4.tar.bz2
/fpaste-0.3.6.tar.bz2
/fpaste-0.3.7.tar.bz2
/fpaste-0.3.7.1.tar.bz2
+/fpaste-0.3.7.2.tar.gz
diff --git a/fpaste.spec b/fpaste.spec
index e8f3279..107781f 100644
--- a/fpaste.spec
+++ b/fpaste.spec
@@ -1,57 +1,12 @@
Name: fpaste
-Version: 0.3.7.1
-Release: 12%{?dist}
+Version: 0.3.7.2
+Release: 1%{?dist}
Summary: A simple tool for pasting info onto sticky notes instances
BuildArch: noarch
Group: Applications/Internet
License: GPLv3+
URL: https://fedorahosted.org/fpaste/
-Source0: https://fedorahosted.org/released/fpaste/fpaste-%{version}.tar.bz2
-
-# Point fpaste to fedora sticky notes staging instance
-# Thanks Clint for the patch.
-# https://fedorahosted.org/fpaste/ticket/7#comment:1
-Patch0: 0001-%{name}-0.3.7.1-fedora-production.patch
-
-# Remove smolt data from fpaste
-# https://fedorahosted.org/fpaste/ticket/6
-Patch1: 0002-%{name}-0.3.7.1-remove-smolt-code.patch
-
-# Adds an option to make paste private or public, sets default to on
-# Makes use of expiry option
-Patch2: 0003-%{name}-0.3.7.1-use-expire-option-add-private-option-default-on.patch
-
-# Enables user to specify another paste bin url
-Patch3: 0004-%{name}-0.3.7.1-add-url-option.patch
-
-# Returns a short url when possible and prints it
-# Checks fpaste server instance url for trailing slash
-Patch4: 0005-%{name}-0.3.7.1-enable-shortened-urls.patch
-
-# Updates the language list to match what sticky server supports
-Patch5: 0006-%{name}-0.3.7.1-correct-syntax-options.patch
-
-# Updates the expiry options to match sticky server, sets default to 30 days
-# also
-Patch6: 0007-%{name}-0.3.7.1-correct-expire-options.patch
-
-# Remove description option since sticky notes does not support it
-Patch7: 0008-%{name}-0.3.7.1-remove-description-option.patch
-
-# Better kde/plasma detection
-Patch8: 0009-%{name}-0.3.7.1-better-check-for-kde-and-plasma.patch
-
-# Correct the return value for empty or errored inputs
-Patch9: 0010-%{name}-0.3.7.1-correct-paste-error-return.patch
-
-# Reactivate the nick and password options
-Patch10: 0011-%{name}-0.3.7.1-reactivate-nick-password-options.patch
-
-# Handle server errors properly
-Patch11: 0012-%{name}-0.3.7.1-handle-server-errors.patch
-
-# Update man page
-Patch12: 0013-%{name}-0.3.7.1-update-man-page.patch
+Source0: https://fedorahosted.org/released/fpaste/fpaste-%{version}.tar.gz
%description
It is often useful to be able to easily paste text to the Fedora
@@ -64,21 +19,6 @@ reason they may be unable to paste something into the pastebin
%prep
%setup -q
-# Patching order is important
-%patch0 -p1
-%patch1
-%patch2
-%patch3 -p1
-%patch4
-%patch5
-%patch6
-%patch7
-%patch8
-%patch9
-%patch10
-%patch11
-%patch12 -p1
-
%build
#nothing required
@@ -97,6 +37,10 @@ rm -rf %{buildroot}
%{_mandir}/man1/fpaste.1.gz
%changelog
+* Tue Apr 15 2014 Ankur Sinha <ankursinha AT fedoraproject DOT org> 0.3.7.2-1
+- Update to latest upstream release
+- Get rid of all patches. They've been merged upstream.
+
* Fri Apr 04 2014 Ankur Sinha <ankursinha AT fedoraproject DOT org> 0.3.7.1-12
- Update man page
diff --git a/sources b/sources
index ec6696a..a3a4617 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-53201ed0fdd1b9f325c43178adcd8878 fpaste-0.3.7.1.tar.bz2
+dd69969e6f68f3503ed32afaed0c7eed fpaste-0.3.7.2.tar.gz
More information about the scm-commits
mailing list