From 073cfeb4048a8264175f08a6c6df36593fa0ae94763cd8d074d6adf048c65877 Mon Sep 17 00:00:00 2001
From: Duarte Pousa <pousaduarte@gmail.com>
Date: Mon, 5 Aug 2019 11:23:02 +0000
Subject: [PATCH] Switch to release branch, adjust versioning

OBS-URL: https://build.opensuse.org/package/show/hardware/scrcpy?expand=0&rev=63
---
 _service                      |  3 ++-
 _servicedata                  |  2 +-
 scrcpy-1.10.tar.xz            |  3 +++
 scrcpy-1.9~git20190730.tar.xz |  3 ---
 scrcpy-server-v1.10.jar       |  3 +++
 scrcpy-server-v1.9.jar        |  3 ---
 scrcpy.changes                | 25 +++++++++++++++++++++++++
 scrcpy.spec                   |  4 ++--
 8 files changed, 36 insertions(+), 10 deletions(-)
 create mode 100644 scrcpy-1.10.tar.xz
 delete mode 100644 scrcpy-1.9~git20190730.tar.xz
 create mode 100644 scrcpy-server-v1.10.jar
 delete mode 100644 scrcpy-server-v1.9.jar

diff --git a/_service b/_service
index e82667d..c56e569 100644
--- a/_service
+++ b/_service
@@ -2,9 +2,10 @@
   <service name="tar_scm" mode="disabled">
     <param name="scm">git</param>
     <param name="url">https://github.com/Genymobile/scrcpy.git</param>
-    <param name="versionformat">@PARENT_TAG@~git%cd</param>
+    <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="changesgenerate">enable</param>
+    <param name="revision">release</param>
   </service>
     <service name="recompress" mode="disabled">
     <param name="file">*.tar</param>
diff --git a/_servicedata b/_servicedata
index e91beb5..37dcc80 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/Genymobile/scrcpy.git</param>
-              <param name="changesrevision">6b3d9e3eab1d9ba4250300eccd04528dbee9023a</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">9bcee4ea428472c884fc869a42e0d667c5958b4b</param></service></servicedata>
\ No newline at end of file
diff --git a/scrcpy-1.10.tar.xz b/scrcpy-1.10.tar.xz
new file mode 100644
index 0000000..fa3b552
--- /dev/null
+++ b/scrcpy-1.10.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:af5090e840ec6e021fc68ced6e2477a725395a4fb2415bb36ef85c52f223f534
+size 173644
diff --git a/scrcpy-1.9~git20190730.tar.xz b/scrcpy-1.9~git20190730.tar.xz
deleted file mode 100644
index 40b8702..0000000
--- a/scrcpy-1.9~git20190730.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4cb7ef787dbacde67adca4e728efa66952ec2d7f32aed46a5887ea209d2d0c3a
-size 171876
diff --git a/scrcpy-server-v1.10.jar b/scrcpy-server-v1.10.jar
new file mode 100644
index 0000000..7742c99
--- /dev/null
+++ b/scrcpy-server-v1.10.jar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cbeb1a4e046f1392c1dc73c3ccffd7f86dec4636b505556ea20929687a119390
+size 22546
diff --git a/scrcpy-server-v1.9.jar b/scrcpy-server-v1.9.jar
deleted file mode 100644
index febdc1f..0000000
--- a/scrcpy-server-v1.9.jar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ad7e539f100e48259b646f26982bc63e0a60a81ac87ae135e242855bef69bd1a
-size 22470
diff --git a/scrcpy.changes b/scrcpy.changes
index 189ad9a..cd81e09 100644
--- a/scrcpy.changes
+++ b/scrcpy.changes
@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Mon Aug 05 11:20:09 UTC 2019 - pousaduarte@gmail.com
+
+- Update to version 1.10:
+  * Update links to v1.10 in README and BUILD
+  * Bump version to 1.10
+  * List scrcpy characteristics in README
+  * Upgrade SDL (2.0.10) for Windows
+  * Update platform-tools (29.0.2) for Windows
+  * Upgrade FFmpeg (4.1.4) for Windows
+  * Initialize queue "last" field
+  * Use Cmd instead of Ctrl on macOS when possible
+  * Use generic FIFO queue for recording
+  * Add generic intrusive FIFO queue
+  * Fix cbuf documentation
+  * Remove unnecessary backslash in cbuf
+  * Remove root directory from Windows zip releases
+  * Log recording failure
+  * Log scrcpy version and URL on start
+  * Record asynchronously
+  * Reduce latency by 1 frame
+  * Add option to change the push target
+  * Document --window-title in README
+  * Add option --window-title
+
 -------------------------------------------------------------------
 Sat Aug 03 17:28:19 UTC 2019 - pousaduarte@gmail.com
 
diff --git a/scrcpy.spec b/scrcpy.spec
index 5b9a5e9..7ac45b2 100644
--- a/scrcpy.spec
+++ b/scrcpy.spec
@@ -17,14 +17,14 @@
 
 
 Name:           scrcpy
-Version:        1.9~git20190730
+Version:        1.10
 Release:        0
 Summary:        Display and control your Android device
 License:        Apache-2.0
 Group:          Hardware/Mobile
 Url:            https://github.com/Genymobile/scrcpy
 Source0:        %{name}-%{version}.tar.xz
-Source1:        https://github.com/Genymobile/scrcpy/releases/download/v1.9/scrcpy-server-v1.9.jar
+Source1:        https://github.com/Genymobile/scrcpy/releases/download/v%{version}/scrcpy-server-v%{version}.jar
 
 BuildRequires:  meson
 BuildRequires:  gcc