Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/qubes-manager

This commit is contained in:
Joanna Rutkowska 2012-06-22 15:01:40 +02:00
commit 1161455c0b
3 changed files with 7 additions and 7 deletions

View File

@ -1,5 +0,0 @@
#!/usr/bin/python2.6
import qubesmanager.appmenu_select
qubesmanager.appmenu_select.main()

5
qubes-vm-settings Executable file
View File

@ -0,0 +1,5 @@
#!/usr/bin/python
import qubesmanager.settings
qubesmanager.settings.main()

View File

@ -29,7 +29,7 @@ python -O -m compileall qubesmanager
%install %install
mkdir -p $RPM_BUILD_ROOT/usr/bin/ mkdir -p $RPM_BUILD_ROOT/usr/bin/
cp qubes-manager $RPM_BUILD_ROOT/usr/bin cp qubes-manager $RPM_BUILD_ROOT/usr/bin
cp qubes-appmenu-select $RPM_BUILD_ROOT/usr/bin cp qubes-vm-settings $RPM_BUILD_ROOT/usr/bin
mkdir -p $RPM_BUILD_ROOT/usr/libexec/qubes-manager/ mkdir -p $RPM_BUILD_ROOT/usr/libexec/qubes-manager/
cp qubesmanager/mount_for_backup.sh $RPM_BUILD_ROOT/usr/libexec/qubes-manager/ cp qubesmanager/mount_for_backup.sh $RPM_BUILD_ROOT/usr/libexec/qubes-manager/
@ -77,7 +77,7 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
/usr/bin/qubes-manager /usr/bin/qubes-manager
/usr/bin/qubes-appmenu-select /usr/bin/qubes-vm-settings
/usr/libexec/qubes-manager/mount_for_backup.sh /usr/libexec/qubes-manager/mount_for_backup.sh
%{python_sitearch}/qubesmanager/__init__.py %{python_sitearch}/qubesmanager/__init__.py
%{python_sitearch}/qubesmanager/__init__.pyo %{python_sitearch}/qubesmanager/__init__.pyo