packages: wicd/wicd.spec, wicd/bashism.patch (NEW) - cleanup shebangs; rel 5

glen glen at pld-linux.org
Fri Nov 6 21:49:37 CET 2009


Author: glen                         Date: Fri Nov  6 20:49:37 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cleanup shebangs; rel 5

---- Files affected:
packages/wicd:
   wicd.spec (1.36 -> 1.37) , bashism.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/wicd/wicd.spec
diff -u packages/wicd/wicd.spec:1.36 packages/wicd/wicd.spec:1.37
--- packages/wicd/wicd.spec:1.36	Fri Nov  6 21:37:51 2009
+++ packages/wicd/wicd.spec	Fri Nov  6 21:49:31 2009
@@ -3,19 +3,21 @@
 Summary(pl.UTF-8):	Zarządca sieci przewodowych i bezprzewodowych
 Name:		wicd
 Version:	1.6.2.2
-Release:	4
+Release:	5
 License:	GPL v2
 Group:		X11/Applications/Networking
 Source0:	http://dl.sourceforge.net/wicd/%{name}-%{version}.tar.gz
 # Source0-md5:	acbbe695abf7ff83161c62317dfc7509
 Source1:	%{name}.init
 Patch0:		%{name}-init_status.patch
+Patch1:		bashism.patch
 URL:		http://www.wicd.net/
 # /etc/pld-release used to detect platform
 BuildRequires:	issue
 BuildRequires:	python-devel
 BuildRequires:	python-modules
 BuildRequires:	rpm-pythonprov
+BuildRequires:	sed >= 4.0
 BuildRequires:	rpmbuild(macros) >= 1.228
 Requires(post,preun):	/sbin/chkconfig
 Requires:	dbus(org.freedesktop.Notifications)
@@ -67,6 +69,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 mv translations/{ar_EG,ar}
 mv translations/{de_DE,de}
@@ -76,6 +79,8 @@
 mv translations/{no,nb}
 mv translations/{ru_RU,ru}
 
+grep -r bin/env.*python -l . | xargs sed -i -e '1s,^#!.*env python,#!%{__python},'
+
 %build
 %{__python} setup.py configure \
 	--backends %{_libdir}/%{name}/backends \
@@ -167,6 +172,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2009/11/06 20:49:31  glen
+- cleanup shebangs; rel 5
+
 Revision 1.36  2009/11/06 20:37:51  glen
 - use external python-iwscan, python-wpactrl packages, back to noarch
 - previous versions always obsoleted by newer one, drop pointless self obsolete

================================================================
Index: packages/wicd/bashism.patch
diff -u /dev/null packages/wicd/bashism.patch:1.1
--- /dev/null	Fri Nov  6 21:49:37 2009
+++ packages/wicd/bashism.patch	Fri Nov  6 21:49:31 2009
@@ -0,0 +1,23 @@
+--- wicd-1.6.2.2/in/scripts/wicd-curses.in~	2009-11-06 22:35:54.137467255 +0200
++++ wicd-1.6.2.2/in/scripts=wicd-curses.in	2009-11-06 22:40:09.374108616 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ if [ ! -d "$HOME/.wicd" ]; then
+     mkdir -p "$HOME/.wicd"
+ fi
+--- wicd-1.6.2.2/in/scripts=wicd.in~	2009-11-06 22:35:54.207466582 +0200
++++ wicd-1.6.2.2/in/scripts=wicd.in	2009-11-06 22:40:20.997500135 +0200
+@@ -1,3 +1,3 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ exec python -O /usr/lib/wicd/wicd-daemon.py $@
+--- wicd-1.6.2.2/in/scripts=wicd-client.in~	2009-11-06 22:35:54.284132812 +0200
++++ wicd-1.6.2.2/in/scripts=wicd-client.in	2009-11-06 22:41:19.855680431 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ BOLD=$(tput bold)
+ BLUE=$(tput setaf 4)
+ NC=$(tput sgr0)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wicd/wicd.spec?r1=1.36&r2=1.37&f=u



More information about the pld-cvs-commit mailing list