shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-07 01:58:19 +03:00
Code Issues Projects Releases Wiki Activity

Merge with head

Browse Source
This commit is contained in:
Daniel P. Berrange 2006-07-19 11:23:41 -04:00
commit 0a319ddd07
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile.am
View File

@ -6,7 +6,7 @@ bin_SCRIPTS = virt-manager
pythondir = $(pkgdatadir) pythondir = $(pkgdatadir)
python_SOURCES = $(PACKAGE).py.in python_SOURCES = $(PACKAGE).py.in
python_DATA = $(PACKAGE).py python_SCRIPTS = $(PACKAGE).py
libexec_SOURCES = $(PACKAGE)-launch.in libexec_SOURCES = $(PACKAGE)-launch.in
libexec_SCRIPTS = $(PACKAGE)-launch libexec_SCRIPTS = $(PACKAGE)-launch
@ -22,7 +22,7 @@ dbusdir = $(datadir)/dbus-1/services
dbus_SOURCES = $(PACKAGE).service.in dbus_SOURCES = $(PACKAGE).service.in
dbus_DATA = $(PACKAGE).service dbus_DATA = $(PACKAGE).service
CLEANFILES = $(bin_SCRIPTS) $(desktop_DATA) $(dbus_DATA) $(python_DATA) $(libexec_SCRIPTS) CLEANFILES = $(bin_SCRIPTS) $(desktop_DATA) $(dbus_DATA) $(python_SCRIPTS) $(libexec_SCRIPTS)
EXTRA_DIST = $(bin_SOURCES) $(desktop_SOURCES) $(dbus_SOURCES) $(python_SOURCES) $(glade_DATA) $(libexec_SOURCES) EXTRA_DIST = $(bin_SOURCES) $(desktop_SOURCES) $(dbus_SOURCES) $(python_SOURCES) $(glade_DATA) $(libexec_SOURCES)

4
src/virtManager/Makefile.am
View File

@ -1,5 +1,5 @@
pythondir = $(pkgdatadir)/virtManager pythondir = $(pkgdatadir)/virtManager
python_DATA = $(wildcard $(srcdir)/*.py) python_SCRIPTS = $(wildcard $(srcdir)/*.py)
EXTRA_DIST = $(python_DATA) EXTRA_DIST = $(python_SCRIPTS)

4
src/vncViewer/Makefile.am
View File

@ -1,5 +1,5 @@
pythondir = $(pkgdatadir)/vncViewer pythondir = $(pkgdatadir)/vncViewer
python_DATA = $(wildcard $(srcdir)/*.py) python_SCRIPTS = $(wildcard $(srcdir)/*.py)
EXTRA_DIST = $(python_DATA) EXTRA_DIST = $(python_SCRIPTS)

16
virt-manager.spec.in
View File

@ -8,8 +8,8 @@ Release: 1%{_extra_release}
Summary: Virtual Machine Manager Summary: Virtual Machine Manager
Group: Applications/Emulators Group: Applications/Emulators
License: GPL v2+ License: GPL
URL: http://people.redhat.com/berrange/virt-manager/ URL: http://virt-manager.et.redhat.com/
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -19,12 +19,9 @@ Requires: gnome-python2-gconf >= 1.99.11-7
Requires: libvirt-python >= 0.1.1 Requires: libvirt-python >= 0.1.1
Requires: dbus-python >= 0.61 Requires: dbus-python >= 0.61
# src/vncViewer/image.py needs either this # src/vncViewer/image.py needs this but we'd like to kill it off
# soon because it pulls in TCL/TK :-(
Requires: python-imaging Requires: python-imaging
# Or this
# pygame pulls in crazy dependancies such as Tcl, so we use python-imaging for now
#Requires: pygame
# But not both!
BuildRequires: pygtk2-devel BuildRequires: pygtk2-devel
BuildRequires: gtk2-devel BuildRequires: gtk2-devel
@ -54,6 +51,7 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc README COPYING AUTHORS ChangeLog NEWS
%{_bindir}/%{name} %{_bindir}/%{name}
%{_libexecdir}/%{name}-launch %{_libexecdir}/%{name}-launch
%{_libdir}/%{name}/* %{_libdir}/%{name}/*
@ -62,6 +60,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/dbus-1/services/%{name}.service %{_datadir}/dbus-1/services/%{name}.service
%changelog %changelog
* Mon Jul 17 2006 Daniel Berrange <berrange@redhat.com> - 0.1.3-1
- Fix License tag
- Updated for new release
* Wed Jun 28 2006 Daniel Berrange <berrange@redhat.com> - 0.1.2-3 * Wed Jun 28 2006 Daniel Berrange <berrange@redhat.com> - 0.1.2-3
- Added missing copyright headers on all .py files - Added missing copyright headers on all .py files