Luigi Baldoni
8022d6db82
Update to version 3.0 OBS-URL: https://build.opensuse.org/request/show/734562 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xpra?expand=0&rev=23
42 lines
2.1 KiB
Diff
42 lines
2.1 KiB
Diff
Index: xpra-3.0-rc3/setup.py
|
|
===================================================================
|
|
--- xpra-3.0-rc3.orig/setup.py
|
|
+++ xpra-3.0-rc3/setup.py
|
|
@@ -1501,7 +1501,7 @@ else:
|
|
add_data_files("%s/man1" % man_path, ["man/xpra.1", "man/xpra_launcher.1"])
|
|
add_data_files("share/applications", glob.glob("xdg/*.desktop"))
|
|
add_data_files("share/mime/packages", ["xdg/application-x-xpraconfig.xml"])
|
|
- add_data_files("share/icons", ["xdg/xpra.png", "xdg/xpra-mdns.png", "xdg/xpra-shadow.png"])
|
|
+ add_data_files("share/pixmaps", ["xdg/xpra.png", "xdg/xpra-mdns.png", "xdg/xpra-shadow.png"])
|
|
add_data_files("share/appdata", ["xdg/xpra.appdata.xml"])
|
|
|
|
#here, we override build and install so we can
|
|
@@ -1574,7 +1574,7 @@ else:
|
|
if pam_ENABLED:
|
|
copytodir("etc/pam.d/xpra", "/etc/pam.d")
|
|
|
|
- systemd_dir = "/lib/systemd/system"
|
|
+ systemd_dir = "__UNITDIR__"
|
|
if service_ENABLED:
|
|
#Linux init service:
|
|
if os.path.exists("/bin/systemctl"):
|
|
@@ -1585,7 +1585,9 @@ else:
|
|
else:
|
|
copytodir("service/xpra", "/etc/init.d")
|
|
if os.path.exists("/etc/sysconfig"):
|
|
- copytodir("etc/sysconfig/xpra", "/etc/sysconfig")
|
|
+ shutil.copy("etc/sysconfig/xpra", "etc/sysconfig/sysconfig.xpra")
|
|
+ os.chmod("etc/sysconfig/sysconfig.xpra", 0o644)
|
|
+ copytodir("etc/sysconfig/sysconfig.xpra", "__FILLUPDIR__")
|
|
elif os.path.exists("/etc/default"):
|
|
copytodir("etc/sysconfig/xpra", "/etc/default")
|
|
if sd_listen_ENABLED:
|
|
@@ -1703,7 +1705,6 @@ if scripts_ENABLED:
|
|
toggle_modules(WIN32, "xpra/scripts/win32_proxy_service")
|
|
|
|
if data_ENABLED:
|
|
- add_data_files(share_xpra, ["README", "COPYING"])
|
|
add_data_files(share_xpra, ["bell.wav"])
|
|
add_data_files("%s/http-headers" % share_xpra, glob.glob("http-headers/*"))
|
|
add_data_files("%s/icons" % share_xpra, glob.glob("icons/*png"))
|