From 4ca749928a1ba0da43fa83b02c97268b6b3bc984 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Thu, 20 Jul 2006 11:27:08 -0400 Subject: [PATCH] Change _SCRIPTS back to _DATA, and instead remove the #!/usr/bin/python stuff which is what rpmlint was really complaining about --- src/Makefile.am | 4 ++-- src/virt-manager.py.in | 1 - src/virtManager/Makefile.am | 4 ++-- src/vncViewer/Makefile.am | 4 ++-- src/vncViewer/crippled_des.py | 1 - src/vncViewer/image.py | 1 - src/vncViewer/rfb.py | 1 - src/vncViewer/vnc.py | 1 - 8 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index bc1e330e2..9828414f5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,7 +6,7 @@ bin_SCRIPTS = virt-manager pythondir = $(pkgdatadir) python_SOURCES = $(PACKAGE).py.in -python_SCRIPTS = $(PACKAGE).py +python_DATA = $(PACKAGE).py libexec_SOURCES = $(PACKAGE)-launch.in libexec_SCRIPTS = $(PACKAGE)-launch @@ -22,7 +22,7 @@ dbusdir = $(datadir)/dbus-1/services dbus_SOURCES = $(PACKAGE).service.in dbus_DATA = $(PACKAGE).service -CLEANFILES = $(bin_SCRIPTS) $(desktop_DATA) $(dbus_DATA) $(python_SCRIPTS) $(libexec_SCRIPTS) +CLEANFILES = $(bin_SCRIPTS) $(desktop_DATA) $(dbus_DATA) $(python_DATA) $(libexec_SCRIPTS) EXTRA_DIST = $(bin_SOURCES) $(desktop_SOURCES) $(dbus_SOURCES) $(python_SOURCES) $(glade_DATA) $(libexec_SOURCES) diff --git a/src/virt-manager.py.in b/src/virt-manager.py.in index 8b4dc98d1..328df0011 100755 --- a/src/virt-manager.py.in +++ b/src/virt-manager.py.in @@ -1,4 +1,3 @@ -#!/usr/bin/python # -*- python -*- # # Copyright (C) 2006 Red Hat, Inc. diff --git a/src/virtManager/Makefile.am b/src/virtManager/Makefile.am index b9cf5196c..6aa887c60 100644 --- a/src/virtManager/Makefile.am +++ b/src/virtManager/Makefile.am @@ -1,5 +1,5 @@ pythondir = $(pkgdatadir)/virtManager -python_SCRIPTS = $(wildcard $(srcdir)/*.py) +python_DATA = $(wildcard $(srcdir)/*.py) -EXTRA_DIST = $(python_SCRIPTS) +EXTRA_DIST = $(python_DATA) diff --git a/src/vncViewer/Makefile.am b/src/vncViewer/Makefile.am index f000a51c7..708f6e9af 100644 --- a/src/vncViewer/Makefile.am +++ b/src/vncViewer/Makefile.am @@ -1,5 +1,5 @@ pythondir = $(pkgdatadir)/vncViewer -python_SCRIPTS = $(wildcard $(srcdir)/*.py) +python_DATA = $(wildcard $(srcdir)/*.py) -EXTRA_DIST = $(python_SCRIPTS) +EXTRA_DIST = $(python_DATA) diff --git a/src/vncViewer/crippled_des.py b/src/vncViewer/crippled_des.py index c1a519d43..e605c83e7 100644 --- a/src/vncViewer/crippled_des.py +++ b/src/vncViewer/crippled_des.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python ## ## pyvnc2swf - crippled_des.py ## diff --git a/src/vncViewer/image.py b/src/vncViewer/image.py index 1407ae8ad..dd46f84b7 100644 --- a/src/vncViewer/image.py +++ b/src/vncViewer/image.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python ## ## pyvnc2swf - image.py ## diff --git a/src/vncViewer/rfb.py b/src/vncViewer/rfb.py index 2eac0d267..490cb0961 100644 --- a/src/vncViewer/rfb.py +++ b/src/vncViewer/rfb.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python ## ## pyvnc2swf - rfb.py ## diff --git a/src/vncViewer/vnc.py b/src/vncViewer/vnc.py index f297f2e9e..49e4379ab 100755 --- a/src/vncViewer/vnc.py +++ b/src/vncViewer/vnc.py @@ -1,4 +1,3 @@ -#!/usr/bin/python # # Copyright (C) 2006 Daniel Berrange # Copyright (C) 2006 Red Hat