From 9846d5a91fb1cd2914d4bb75c89cbb472410f507 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Tue, 29 Oct 2019 13:42:15 +0200
Subject: [PATCH] Fixing bugs.

--HG--
branch : develop
---
 dist/AppImage/appimage.yml |  7 ++-----
 dist/rpm/_service          | 22 ++++++++++++++++------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/dist/AppImage/appimage.yml b/dist/AppImage/appimage.yml
index 5c2dc429a..2c1ad7e84 100644
--- a/dist/AppImage/appimage.yml
+++ b/dist/AppImage/appimage.yml
@@ -24,9 +24,6 @@ build:
     - pkgconfig(Qt5Concurrent)
     - pkgconfig(Qt5XmlPatterns)
     - pkgconfig(zlib)
-    - qt5-qtxmlpatterns-devel
-    - qt5-qtsvg-devel
-    - qt5-qttools-devel
     - libQt5Core-devel
     - libpng-devel
     - libqt5-linguist-devel
@@ -34,8 +31,8 @@ build:
 
 # resources which will become available as part of the source.
 # The "appimage" source service needs to be enabled to process these.
-  git:
-    - https://github.com/dismine/Valentina_git.git
+#  git:
+#    - https://github.com/dismine/Valentina_git.git
 #  hg:
 #    - ....
 #  svn:
diff --git a/dist/rpm/_service b/dist/rpm/_service
index ab94e8912..31b0d7e69 100644
--- a/dist/rpm/_service
+++ b/dist/rpm/_service
@@ -1,19 +1,29 @@
-<services>                   
+<services>
   <service name="tar_scm">
-  	<param name="url">https://github.com/dismine/Valentina_git.git</param>
-  	<param name="versionprefix">0.7.0</param>
+    <param name="url">git://github.com/dismine/Valentina_git.git</param>
+    <param name="versionprefix">0.6.999</param>
     <param name="filename">valentina</param>
-  	<param name="scm">git</param>
+    <param name="scm">git</param>
+    <param name="exclude">.git</param>
     <param name="versionformat">%at</param>
   </service>
   <service name="extract_file">
     <param name="archive">*.tar</param>
-    <param name="files">*/dist/rpm/valentina.spec */dist/OBS_debian/* */dist/AppImage/*</param>
+    <param name="files">*/dist/rpm/valentina.spec */dist/OBS_debian/*</param>
+  </service>
+  <service name="extract_file">
+      <param name="archive">*.tar</param>
+      <param name="files">*/dist/AppImage/appimage.yml</param>
+      <param name="outfilename">appimage.yml</param>
+  </service>
+  <service name="extract_file">
+      <param name="archive">*.tar</param>
+      <param name="files">*/dist/AppImage/_icon</param>
+      <param name="outfilename">_icon</param>
   </service>
   <service name="recompress">
     <param name="file">*.tar</param>
     <param name="compression">gz</param>
   </service>
   <service name="set_version"/>
-  <service name="appimage"/>
 </services>