[phodav] spice: fix upgrade code



commit 334e99c8eec40be91e3abfae5c89cb98c150b950
Author: Marc-André Lureau <marcandre lureau gmail com>
Date:   Tue Feb 25 14:41:36 2014 +0100

    spice: fix upgrade code

 Makefile.am          |   11 +++++++----
 spice-webdavd.wxs.in |    2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5027a7f..6c6c594 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,14 +50,14 @@ spice_webdavd_LDADD =               \
        $(PIE_LDFLAGS)          \
        $(NULL)
 
-EXTRA_DIST += spice-webdavd.wxs.in
-CONFIG_STATUS_DEPENDENCIES = spice-webdavd.wxs.in
-
 deps.txt:
        $(AM_V_GEN)rpm -qa | grep $(host_os) | sort | unix2dos > $@
 
 MANUFACTURER = The Spice Project
 
+EXTRA_DIST += chezdav.wxs.in
+CONFIG_STATUS_DEPENDENCIES = chezdav.wxs.in
+
 chezdav-$(WIXL_ARCH)-$(VERSION)$(BUILDID).msi: chezdav.wxs deps.txt all
        $(AM_V_GEN)DESTDIR=`mktemp -d`&&                                \
        make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null && \
@@ -67,6 +67,9 @@ chezdav-$(WIXL_ARCH)-$(VERSION)$(BUILDID).msi: chezdav.wxs deps.txt all
 
 MSI = chezdav-$(WIXL_ARCH)-$(VERSION)$(BUILDID).msi
 
+EXTRA_DIST += spice-webdavd.wxs.in
+CONFIG_STATUS_DEPENDENCIES = spice-webdavd.wxs.in
+
 spice-webdavd-$(WIXL_ARCH)-$(VERSION)$(BUILDID).msi: spice-webdavd.wxs deps.txt all
        $(AM_V_GEN)DESTDIR=`mktemp -d`&&                                \
        make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null && \
@@ -78,7 +81,7 @@ MSI += spice-webdavd-$(WIXL_ARCH)-$(VERSION)$(BUILDID).msi
 
 msi: $(MSI)
 
-CLEANFILES = spice-webavd-$(WIXL_ARCH)-$(VERSION)$(BUILDID).msi
+CLEANFILES = $(MSI)
 
 .PHONY: msi
 
diff --git a/spice-webdavd.wxs.in b/spice-webdavd.wxs.in
index 0d85ba4..50ae957 100644
--- a/spice-webdavd.wxs.in
+++ b/spice-webdavd.wxs.in
@@ -3,7 +3,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
 
   <?define Version = "@WINDOWS_PRODUCTVERSION@"?>
-  <?define UpgradeCode = "7eb9b146-db04-42d7-a8ba-71fc8ced7eed"?>
+  <?define UpgradeCode = "33f0af8e-ade3-4e25-a020-77a179ff75e3"?>
   <?define Arch = "@WIXL_ARCH@"?>
   <?if $(var.Arch) = "x64"?>
       <?define GLIB_ARCH = "win64"?>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]