From 9f172e604fd64e72e917a914edf811d752b7dd916db0ff979d220cdaff4d601f Mon Sep 17 00:00:00 2001
From: Martin Hauke <mardnh@gmx.de>
Date: Sat, 21 Sep 2019 20:33:42 +0000
Subject: [PATCH] Accepting request 731594 from home:mnhauke

- Update to initial upstream release 0.1:
  * doh.1: initial man page
  * doh: sort the -h options alphabetically
  * version: add header file, support -V and call it version 0.1 now
  * README: show the current cloudflare URL in the example output
  * Update Google Public DNS DoH endpoint in example
  * doh_encode: fix the comparison for long host names
  * doh: added -k for insecure mode - skips server cert validation

OBS-URL: https://build.opensuse.org/request/show/731594
OBS-URL: https://build.opensuse.org/package/show/network:utilities/doh?expand=0&rev=3
---
 _service                      | 13 -------------
 _servicedata                  |  4 ----
 doh-0.0.0+git.20190908.tar.xz |  3 ---
 doh-0.1.tar.gz                |  3 +++
 doh.changes                   | 12 ++++++++++++
 doh.spec                      |  9 ++++++---
 6 files changed, 21 insertions(+), 23 deletions(-)
 delete mode 100644 _service
 delete mode 100644 _servicedata
 delete mode 100644 doh-0.0.0+git.20190908.tar.xz
 create mode 100644 doh-0.1.tar.gz

diff --git a/_service b/_service
deleted file mode 100644
index cc66d72..0000000
--- a/_service
+++ /dev/null
@@ -1,13 +0,0 @@
-<services>
-  <service mode="disabled" name="tar_scm">
-    <param name="url">https://github.com/curl/doh.git</param>
-    <param name="scm">git</param>
-    <param name="changesgenerate">enable</param>
-    <param name="versionformat">0.0.0+git.%cd</param>
-  </service>
-  <service mode="disabled" name="recompress">
-    <param name="file">*.tar</param>
-    <param name="compression">xz</param>
-  </service>
-  <service mode="disabled" name="set_version"/>
-</services>
diff --git a/_servicedata b/_servicedata
deleted file mode 100644
index f853dfa..0000000
--- a/_servicedata
+++ /dev/null
@@ -1,4 +0,0 @@
-<servicedata>
-<service name="tar_scm">
-                <param name="url">https://github.com/curl/doh.git</param>
-              <param name="changesrevision">9c4a78588ac66c091ddc34816547c346cab10930</param></service></servicedata>
\ No newline at end of file
diff --git a/doh-0.0.0+git.20190908.tar.xz b/doh-0.0.0+git.20190908.tar.xz
deleted file mode 100644
index e6aa76a..0000000
--- a/doh-0.0.0+git.20190908.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:844e51d97f100d14ae895bf04afa78999ad46902adec5a18183cc18d72bb26a7
-size 7576
diff --git a/doh-0.1.tar.gz b/doh-0.1.tar.gz
new file mode 100644
index 0000000..db57170
--- /dev/null
+++ b/doh-0.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b36c4b4a27fabb508d5d3bb0fb58bd9cfadcef30d22e552bbe5c4442ae81e742
+size 9041
diff --git a/doh.changes b/doh.changes
index a22d88d..b099d1d 100644
--- a/doh.changes
+++ b/doh.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Sep 17 21:08:59 UTC 2019 - Martin Hauke <mardnh@gmx.de>
+
+- Update to initial upstream release 0.1:
+  * doh.1: initial man page
+  * doh: sort the -h options alphabetically
+  * version: add header file, support -V and call it version 0.1 now
+  * README: show the current cloudflare URL in the example output
+  * Update Google Public DNS DoH endpoint in example
+  * doh_encode: fix the comparison for long host names
+  * doh: added -k for insecure mode - skips server cert validation
+
 -------------------------------------------------------------------
 Mon Sep  9 20:33:49 UTC 2019 - Martin Hauke <mardnh@gmx.de>
 
diff --git a/doh.spec b/doh.spec
index da4b4e7..6066523 100644
--- a/doh.spec
+++ b/doh.spec
@@ -1,6 +1,7 @@
 #
 # spec file for package doh
 #
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2019, Martin Hauke <mardnh@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
@@ -17,14 +18,14 @@
 
 
 Name:           doh
-Version:        0.0.0+git.20190908
+Version:        0.1
 Release:        0
 Summary:        Simple DoH (DNS-over-HTTPS) client
 License:        MIT
 Group:          Productivity/Networking/DNS/Utilities
 URL:            https://github.com/curl/doh
 #Git-Clone:     https://github.com/curl/doh.git
-Source:         %{name}-%{version}.tar.xz
+Source:         https://github.com/curl/%{name}/archive/%{name}-%{version}.tar.gz
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(libcurl)
 
@@ -34,7 +35,7 @@ DNS-over-HTTPS (DOH).
 This code uses POST requests unconditionally for this.
 
 %prep
-%setup -q
+%setup -q -n doh-doh-%{version}
 
 %build
 export CFLAGS="%{optflags}"
@@ -42,10 +43,12 @@ make %{?_smp_mflags}
 
 %install
 install -Dm 0755 doh %{buildroot}%{_bindir}/doh
+install -Dm 0644 doh.1 %{buildroot}%{_mandir}/man1/%{name}.1
 
 %files
 %license LICENSE
 %doc README.md
 %{_bindir}/doh
+%{_mandir}/man1/%{name}.1%{?ext_man}
 
 %changelog