From cff60a317c4774c781c456ffcd3c6b096bc8a9a0 Mon Sep 17 00:00:00 2001
From: Joao Carreira <jfmcarreira@gmail.com>
Date: Tue, 10 Mar 2015 18:20:57 +0000
Subject: [PATCH] Fix version in xml

---
 CMakeLists.txt        | 3 ++-
 PlaYUVerUpdate.xml.in | 6 +++---
 app/main.cpp          | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 929c946..018345c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,6 +47,8 @@ if(NOT RELEASE_BUILD AND EXISTS ${CMAKE_SOURCE_DIR}/.git)
 endif()
 
 SET(UPDATE_CHANNEL "stable" CACHE STRING "Update channel" )
+CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/PlaYUVerUpdate.xml.in ${CMAKE_CURRENT_BINARY_DIR}/PlaYUVerUpdate-${UPDATE_CHANNEL}.xml )
+
 
 ######################################################################################
 # CMake Defin1itions
@@ -104,7 +106,6 @@ ENDIF()
 # Configuration
 ######################################################################################
 CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h )
-CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/PlaYUVerUpdate.xml.in ${CMAKE_CURRENT_BINARY_DIR}/PlaYUVerUpdate-${UPDATE_CHANNEL}.xml )
 
 ######################################################################################
 # Target App
diff --git a/PlaYUVerUpdate.xml.in b/PlaYUVerUpdate.xml.in
index 8f9c858..a312f02 100644
--- a/PlaYUVerUpdate.xml.in
+++ b/PlaYUVerUpdate.xml.in
@@ -14,7 +14,7 @@
 		<atom:link href="http://pypt.github.com/fervor/Appcast.xml" rel="self" type="application/rss+xml" />
 
 		<item>
-			<title>Version @PLAYUVER_VERSION@</title>
+			<title>Version @PLAYUVER_VERSION_STRING@</title>
 			<pubDate>Mon, 09 Jan 2006 19:20:11 +0000</pubDate>
 			<guid isPermaLink="true">http://192.168.96.201/share/PlaYUVerProject/ReleaseNotes-@UPDATE_CHANNEL@.html</guid>
 
@@ -29,7 +29,7 @@
 			<!-- Windows version. -->
 			<enclosure
 				url="http://sourceforge.net/projects/playuver/files/playuver-@UPDATE_CHANNEL@-windows-amd64.zip/download  "
-				fervor:version="2"
+				fervor:version="@PLAYUVER_VERSION_STRING@"
 				fervor:platform="Q_OS_WIN32"
         fervor:dependencies="ALL"
 				type="application/octet-stream" />
@@ -37,7 +37,7 @@
 			<!-- Linux version. -->
       <enclosure
 				url="http://sourceforge.net/projects/playuver/files/playuver-@UPDATE_CHANNEL@-linux-amd64.zip/download"
-				fervor:version="2.0"
+				fervor:version="@PLAYUVER_VERSION_STRING@"
 				fervor:platform="Q_OS_LINUX"
         fervor:dependencies="ALL"
 				type="application/octet-stream" />
diff --git a/app/main.cpp b/app/main.cpp
index 2d59f75..3e04ea1 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -134,7 +134,7 @@ int main( int argc, char *argv[] )
   mainwindow.parseArgs( argc, argv );
 
 #ifdef USE_FERVOR
-  FvUpdater::sharedUpdater()->SetFeedURL("http://192.168.96.201/share/pixLRA/plaYUVer/PlaYUVerUpdate-" UPDATE_CHANNEL  ".xml");
+  FvUpdater::sharedUpdater()->SetFeedURL("http://192.168.96.201/share/PlaYUVerProject/PlaYUVerUpdate-" UPDATE_CHANNEL  ".xml");
   FvUpdater::sharedUpdater()->SetDependencies("ALL");
 #endif