From 2b3097e09ede5b886cbe3c191a10d5c11c7e89d7d0b42a35cb6c3f33ae0608c0 Mon Sep 17 00:00:00 2001
From: Mia Herkt <9+suse@cirno.systems>
Date: Fri, 4 May 2018 12:36:37 +0000
Subject: [PATCH] - Use upstream Makefile to install   * Package scripts and
 manpage - Package AppStream metadata

OBS-URL: https://build.opensuse.org/package/show/network/qutebrowser?expand=0&rev=35
---
 qutebrowser.changes |  3 +++
 qutebrowser.spec    | 30 ++++++++++++++----------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/qutebrowser.changes b/qutebrowser.changes
index cfb44dd..8c118b7 100644
--- a/qutebrowser.changes
+++ b/qutebrowser.changes
@@ -1,6 +1,9 @@
 -------------------------------------------------------------------
 Fri May  4 10:29:52 UTC 2018 - 9+suse@cirno.systems
 
+- Use upstream Makefile to install
+  * Package scripts and manpage
+- Package AppStream metadata
 - Update to version 1.3.0:
   Added:
     * New :scroll-to-anchor command to scroll to an anchor in the
diff --git a/qutebrowser.spec b/qutebrowser.spec
index 644d636..83b4aa6 100644
--- a/qutebrowser.spec
+++ b/qutebrowser.spec
@@ -22,10 +22,11 @@ Release:        0
 Summary:        Keyboard-driven vim-like browser on Qt5
 License:        GPL-3.0-or-later
 Group:          Productivity/Networking/Web/Browsers
-Url:            https://qutebrowser.org/
+URL:            https://qutebrowser.org/
 Source:         https://github.com/The-Compiler/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
 Source1:        https://github.com/The-Compiler/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz.asc
 Source2:        %{name}.keyring
+BuildRequires:  asciidoc
 BuildRequires:  fdupes
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  python3-Jinja2
@@ -59,26 +60,20 @@ It's based on Python, PyQt5 and QtWebKit and is free software.
 %prep
 %setup -q
 sed -i '1d' %{name}/__main__.py
-touch -r qutebrowser/browser/network/__init__.py \
-         qutebrowser/browser/webkit/network/__init__.py
+sed -i 's,^#!/usr/bin/env python,#!/usr/bin/python,;s,^#!/usr/bin/env bash,#!/bin/bash,' \
+    misc/userscripts/* \
+    scripts/*.py
+mv misc/Makefile .
 
 %build
-python3 setup.py build
 
 %install
-python3 setup.py install \
-  --root=%{buildroot} --prefix=%{_prefix}
-
-install -Dpm 0644 misc/%{name}.desktop \
-  %{buildroot}%{_datadir}/applications/%{name}.desktop
-
-for size in 16 24 32 48 64 128 256; do
-    install -Dpm 0644 "icons/%{name}-${size}x${size}.png" \
-      "%{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/%{name}.png"
-done
-install -Dpm 0644 icons/%{name}.svg \
-  %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+%make_install PREFIX=%{_prefix}
+install -d %{buildroot}%{_datadir}/appdata
+install -m644 misc/%{name}.appdata.xml %{buildroot}%{_datadir}/appdata
 
+chmod -x %{buildroot}%{_datadir}/%{name}/scripts/cycle-inputs.js \
+    %{buildroot}%{_datadir}/%{name}/scripts/utils.py
 rm %{buildroot}%{python3_sitelib}/%{name}/git-commit-id
 %fdupes %{buildroot}%{python3_sitelib}/
 
@@ -100,5 +95,8 @@ rm %{buildroot}%{python3_sitelib}/%{name}/git-commit-id
 %{python3_sitelib}/%{name}-*
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_datadir}/appdata/%{name}.appdata.xml
+%{_datadir}/%{name}
+%{_mandir}/man1/%{name}.1%{?ext_man}
 
 %changelog