diff --git a/10-drop_rafb.net.patch b/10-drop_rafb.net.patch deleted file mode 100644 index 41d5f9b..0000000 --- a/10-drop_rafb.net.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: pastebinit/pastebinit.xml -=================================================================== ---- pastebinit.orig/pastebinit.xml 2010-05-15 11:00:12.000000000 +0200 -+++ pastebinit/pastebinit.xml 2010-05-15 11:00:44.000000000 +0200 -@@ -110,9 +110,6 @@ - http://1t2.us (including subdomains) - --> - -- http://rafb.net -- -- - http://slexy.org - - diff --git a/pastebinit-1.2-delete-dependancy-to-lsb_release.patch b/pastebinit-1.2-delete-dependancy-to-lsb_release.patch new file mode 100644 index 0000000..fb5b8b8 --- /dev/null +++ b/pastebinit-1.2-delete-dependancy-to-lsb_release.patch @@ -0,0 +1,23 @@ +diff -up ./pastebinit.orig ./pastebinit +--- ./pastebinit.orig 2011-02-08 18:22:31.131484827 +0100 ++++ ./pastebinit 2011-02-08 18:24:16.685481719 +0100 +@@ -17,18 +17,7 @@ + # along with this program; if not, write to the Free Software + # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +-defaultPB = "http://pastebin.com" #Default pastebin +-try: +- import lsb_release +- release = lsb_release.get_distro_information()['ID'].lower() +- if release == 'debian': +- defaultPB = "http://paste.debian.net" +- elif release == 'fedora': +- defaultPB = "http://fpaste.org" +- elif release == 'ubuntu': +- defaultPB = "http://paste.ubuntu.com" +-except ImportError: +- pass ++defaultPB = "http://fpaste.org" + + try: + import urllib, os, sys, re, getopt, xml.dom.minidom, gettext diff --git a/pastebinit.spec b/pastebinit.spec index 84b0a4c..c52656f 100644 --- a/pastebinit.spec +++ b/pastebinit.spec @@ -7,11 +7,13 @@ Group: Applications/Internet License: GPLv2+ URL: https://launchpad.net/pastebinit Source0: http://launchpad.net/%{name}/trunk/%{version}/+download/%{name}-%{version}.tar.gz + # -# Patch to delete deprecated RAFB pastebin reference on the manpage +# supress useless dependancy to lsb_release, folow the comportement of +# upstream by using per default fpaste.org. +# this patch musn't be push to the upstream # -Patch0: http://patch-tracker.debian.org/patch/series/dl/%{name}/1.1-2/10-drop_rafb.net.patch - +Patch0: %{name}-1.2-delete-dependancy-to-lsb_release.patch BuildArch: noarch BuildRequires: docbook-style-xsl libxslt gettext Requires: python-configobj @@ -24,8 +26,7 @@ or simply the result of a command directly to the pastebin you want %prep %setup -q -%patch0 -p1 -# +%patch0 -p1 # Change the location of pastebin config file from /etc/pastebin.d/ # to /usr/share/pastebinit/ (unappropriate dir. name "pastebinit.d" # + FHS) @@ -76,6 +77,8 @@ rm -rf %{buildroot} %changelog * Tue Feb 08 2011 Lameire Alexis - 1.2-1 - update to 1.2 upstream release +- delete old rafb patchs +- supress dependancy to lsb_release * Tue Feb 08 2011 Fedora Release Engineering - 1.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild