packages: wicd/wicd.spec, wicd/install_kde.patch (NEW)=?UTF-8?Q?=20?=- added install_kde....

sls sls at pld-linux.org
Wed Jun 13 23:29:17 CEST 2012


Author: sls                          Date: Wed Jun 13 21:29:17 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added install_kde.patch

---- Files affected:
packages/wicd:
   wicd.spec (1.60 -> 1.61) , install_kde.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/wicd/wicd.spec
diff -u packages/wicd/wicd.spec:1.60 packages/wicd/wicd.spec:1.61
--- packages/wicd/wicd.spec:1.60	Wed Jun 13 22:58:30 2012
+++ packages/wicd/wicd.spec	Wed Jun 13 23:29:12 2012
@@ -22,6 +22,7 @@
 Patch0:		%{name}-init_status.patch
 Patch1:		bashism.patch
 Patch2:		%{name}-desktop.patch
+Patch3:		install_kde.patch
 URL:		http://www.wicd.net/
 BuildRequires:	gettext-devel
 # /etc/pld-release used to detect platform
@@ -148,6 +149,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p0
 
 mv po/{ar_EG,ar}.po
 rm po/ast.po
@@ -282,6 +284,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.61  2012/06/13 21:29:12  sls
+- added install_kde.patch
+
 Revision 1.60  2012/06/13 20:58:30  sls
 - added BR: python-distribute
 

================================================================
Index: packages/wicd/install_kde.patch
diff -u /dev/null packages/wicd/install_kde.patch:1.1
--- /dev/null	Wed Jun 13 23:29:17 2012
+++ packages/wicd/install_kde.patch	Wed Jun 13 23:29:12 2012
@@ -0,0 +1,15 @@
+# don't require kde4-kdelibs on builders
+--- setup.py.orig	2012-06-13 23:25:44.228006911 +0200
++++ setup.py	2012-06-13 23:26:32.061153694 +0200
+@@ -238,9 +238,9 @@
+                 # If neither kde-config nor kde4-config are not present or 
+                 # return an error, then we can assume that kde isn't installed
+                 # on the user's system
+-                self.no_install_kde = True
++                #self.no_install_kde = False
+                 # If the assumption above turns out to be wrong, do this:
+-                #pass # use our default
++                pass # use our default
+ 
+         self.python = '/usr/bin/python'
+         self.pidfile = '/var/run/wicd/wicd.pid'
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/wicd/wicd.spec?r1=1.60&r2=1.61



More information about the pld-cvs-commit mailing list