Author: arekm Date: Fri Jul 24 17:01:14 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 0.11.2
---- Files affected:
packages/pastebinit:
pastebinit-configparsing.patch (1.1 -> 1.2) , pastebinit.spec (1.18 -> 1.19)
---- Diffs:
================================================================
Index: packages/pastebinit/pastebinit-configparsing.patch
diff -u packages/pastebinit/pastebinit-configparsing.patch:1.1
packages/pastebinit/pastebinit-configparsing.patch:1.2
--- packages/pastebinit/pastebinit-configparsing.patch:1.1 Wed Mar 4
10:57:46 2009
+++ packages/pastebinit/pastebinit-configparsing.patch Fri Jul 24 19:01:06 2009
@@ -1,35 +1,34 @@
---- pastebinit-0.11/pastebinit 2009-03-04 11:55:28.498112818 +0200
-+++ /usr/bin/pastebinit 2009-03-04 11:54:58.078111114 +0200
+--- pastebinit.orig 2009-03-10 06:24:07.000000000 +0100
++++ pastebinit 2009-07-24 18:59:46.045879618 +0200
@@ -177,6 +177,12 @@
- def getFirstNodeText(nodes, title):
- return getText(getFirstNode(nodes, title).childNodes)
+ def getFirstNodeText(nodes, title):
+ return getText(getFirstNode(nodes, title).childNodes)
-+ def nodeExists(nodes, title):
-+ node = nodes.getElementsByTagName(title)
-+ if node == []:
-+ return None
-+ return True
++ def nodeExists(nodes, title):
++ node = nodes.getElementsByTagName(title)
++ if node == []:
++ return None
++ return True
+
- # Display usage instructions
- def Usage ():
- print "pastebinit v" + version
-@@ -230,10 +236,14 @@
- #Parse configuration file
- if gotconfigxml == 1:
- try:
-- configxml = xml.dom.minidom.parseString(configfile)
-- website = getFirstNodeText(configxml, "pastebin")
-- user = getFirstNodeText(configxml, "author")
-- format = getFirstNodeText(configxml, "format")
-- jabberid = getFirstNodeText(configxml, "jabberid")
-+ configxml = xml.dom.minidom.parseString(configtext)
-+ if nodeExists(configxml, "pastebin"):
-+ website = getFirstNodeText(configxml,
"pastebin")
-+ if nodeExists(configxml, "author"):
-+ user = getFirstNodeText(configxml, "author")
-+ if nodeExists(configxml, "format"):
-+ format = getFirstNodeText(configxml, "format")
-+ if nodeExists(configxml, "jabberid"):
-+ jabberid = getFirstNodeText(configxml,
"jabberid")
- except KeyboardInterrupt:
- sys.exit(_("KeyboardInterrupt caught."))
+ # Display usage instructions
+ def Usage ():
+ print "pastebinit v" + version
+@@ -231,10 +237,14 @@
+ if gotconfigxml == 1:
+ try:
+ configxml = xml.dom.minidom.parseString(configtext)
+- website = getFirstNodeText(configxml, "pastebin")
+- user = getFirstNodeText(configxml, "author")
+- format = getFirstNodeText(configxml, "format")
+- jabberid = getFirstNodeText(configxml, "jabberid")
++ if nodeExists(configxml, "pastebin"):
++ website = getFirstNodeText(configxml, "pastebin")
++ if nodeExists(configxml, "author"):
++ user = getFirstNodeText(configxml, "author")
++ if nodeExists(configxml, "format"):
++ format = getFirstNodeText(configxml, "format")
++ if nodeExists(configxml, "jabberid"):
++ jabberid = getFirstNodeText(configxml, "jabberid")
+ except KeyboardInterrupt:
+ sys.exit(_("KeyboardInterrupt caught."))
+ except:
================================================================
Index: packages/pastebinit/pastebinit.spec
diff -u packages/pastebinit/pastebinit.spec:1.18
packages/pastebinit/pastebinit.spec:1.19
--- packages/pastebinit/pastebinit.spec:1.18 Wed Mar 4 10:57:56 2009
+++ packages/pastebinit/pastebinit.spec Fri Jul 24 19:01:06 2009
@@ -2,14 +2,13 @@
Summary: Command line Pastebin
Summary(pl.UTF-8): Pastebin działający z linii poleceń
Name: pastebinit
-Version: 0.11
-Release: 3
+Version: 0.11.2
+Release: 1
License: GPL v2+
Group: Applications
-Source0:
http://www.stgraber.org/download/projects/pastebin/%{name}-%{version}.tar.gz
-Patch0: %{name}-anybin.patch
-Patch1: %{name}-configparsing.patch
-# Source0-md5: 8342af2467545402922477a5710083f6
+Source0:
http://launchpad.net/pastebinit/trunk/%{version}/+download/%{name}-%{version}.tar.gz
+# Source0-md5: 64b620d7ae9fbdac8f2e23fbfecbdec3
+Patch0: %{name}-configparsing.patch
URL: http://www.stgraber.org/category/pastebinit
BuildRequires: rpm-pythonprov
BuildRequires: sed >= 4.0
@@ -29,8 +28,7 @@
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
+%patch0 -p0
%{__sed} -i -e 's#http://pastebin.com#http://pld.pastebin.com#g' pastebinit
%install
@@ -51,6 +49,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.19 2009/07/24 17:01:06 arekm
+- up to 0.11.2
+
Revision 1.18 2009/03/04 09:57:56 glen
- fix config parsing, let keys be optional; rel 3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pastebinit/pastebinit-configparsing.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pastebinit/pastebinit.spec?r1=1.18&r2=1.19&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
