From 8a5b16daaabe2e2d8beb99abe80689b129087d40 Mon Sep 17 00:00:00 2001
From: Daniel P. Berrangé <berrange@redhat.com>
Date: Aug 02 2022 17:49:44 +0000
Subject: Rebase to 3.0 release


Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

---

diff --git a/0001-meson-fix-build-for-meson-0.60.0.patch b/0001-meson-fix-build-for-meson-0.60.0.patch
index 19d0686..679f1a3 100644
--- a/0001-meson-fix-build-for-meson-0.60.0.patch
+++ b/0001-meson-fix-build-for-meson-0.60.0.patch
@@ -1,21 +1,38 @@
-diff -rupN entangle-2.0.orig/src/meson.build entangle-2.0.new/src/meson.build
---- entangle-2.0.orig/src/meson.build	2019-01-13 21:43:04.000000000 +0000
-+++ entangle-2.0.new/src/meson.build	2022-08-02 14:36:29.372639954 +0100
-@@ -41,7 +41,7 @@ entangle = executable(
- desktop = 'entangle.desktop'
+From 54795d275a93e94331a614c8712740fcedbdd4f0 Mon Sep 17 00:00:00 2001
+From: EorlBruder <eorl@bruder.space>
+Date: Wed, 12 Jan 2022 11:27:50 +0100
+Subject: [PATCH] meson: fix build for meson >=0.60.0
+
+Replaced the positional arguments in i18n.merge_files with the
+data_dirs-keyword
+
+Fixes #67
+---
+ src/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index b82bd3a..22dd55b 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -40,7 +40,7 @@ appname = 'org.entangle_photo.Manager'
+ desktop = appname + '.desktop'
  
  i18n.merge_file (
 -  desktop,
 +  data_dirs: desktop,
    type: 'desktop',
-   input: desktop + '.in',
+   input: desktop,
    output: desktop,
-@@ -53,7 +53,7 @@ i18n.merge_file (
- appdata = 'entangle.appdata.xml'
+@@ -60,7 +60,7 @@ metainfotmp = custom_target('gen-metadata',
+ 		 '@INPUT@', '@OUTPUT@'])
  
  i18n.merge_file(
--  appdata,
-+  data_dirs: appdata,
-   input: appdata + '.in',
-   output: appdata,
+-  metainfo,
++  data_dirs: metainfo,
+   input: metainfotmp,
+   output: metainfo,
    install: true,
+-- 
+2.37.1
+
diff --git a/entangle.spec b/entangle.spec
index 485ab0f..00ac8b7 100644
--- a/entangle.spec
+++ b/entangle.spec
@@ -2,12 +2,12 @@
 
 Summary: Tethered shooting & control of digital cameras
 Name: entangle
-Version: 2.0
-Release: 12%{?dist}
+Version: 3.0
+Release: 1%{?dist}
 License: GPLv3+
-Source: http://entangle-photo.org/download/sources/%{name}-%{version}.tar.xz
+Source: https://entangle-photo.org/download/sources/%{name}-%{version}.tar.xz
 Patch: 0001-meson-fix-build-for-meson-0.60.0.patch
-URL: http://entangle-photo.org/
+URL: https://entangle-photo.org/
 
 BuildRequires: glib2-devel >= 2.36.0
 BuildRequires: gtk3-devel >= 3.22.0
@@ -53,7 +53,7 @@ rm -f %{buildroot}%{_libdir}/libentangle_backend.so
 rm -f %{buildroot}%{_libdir}/libentangle_frontend.so
 
 %files -f %{name}.lang
-%doc README COPYING AUTHORS NEWS ChangeLog
+%doc README.rst COPYING AUTHORS NEWS ChangeLog
 %{_bindir}/entangle
 %{_mandir}/man1/entangle.1*
 
@@ -67,9 +67,9 @@ rm -f %{buildroot}%{_libdir}/libentangle_frontend.so
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/plugins
 
-%{_datadir}/icons/hicolor/*/apps/entangle.png
+%{_datadir}/icons/hicolor/*/apps/org.entangle_photo.Manager.png
 %{_datadir}/icons/hicolor/*/apps/entangle-*.png
-%{_datadir}/icons/hicolor/scalable/apps/entangle.svg
+%{_datadir}/icons/hicolor/scalable/apps/org.entangle_photo.Manager.svg
 
 %dir %{_datadir}/help/C/entangle/
 %{_datadir}/help/C/entangle/*.page
@@ -103,13 +103,16 @@ rm -f %{buildroot}%{_libdir}/libentangle_frontend.so
 
 %{_datadir}/%{name}/sRGB.icc
 %{_datadir}/gtk-doc/html/%{name}
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/appdata/%{name}.appdata.xml
+%{_datadir}/applications/org.entangle_photo.Manager.desktop
+%{_datadir}/metainfo/org.entangle_photo.Manager.metainfo.xml
 %{_datadir}/glib-2.0/schemas/org.entangle-photo.manager.gschema.xml
 %{_datadir}/gir-1.0/Entangle-0.1.gir
 %{_libdir}/girepository-1.0/Entangle-0.1.typelib
 
 %changelog
+* Tue Aug  2 2022 Daniel P. Berrange <berrange@redhat.com> - 3.0-1
+- Update to 3.0 release
+
 * Tue Aug  2 2022 Daniel P. Berrange <berrange@redhat.com> - 2.0-12
 - Fix meson incompatibility (rhbz#2113204)
 
diff --git a/sources b/sources
index f00fd90..9713a0e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (entangle-2.0.tar.xz) = be8b75c5dd0bdd7cd380f35b5d46d7be9f7caa2be257ce954cf9516ebd5601071ac8b50838f9c40470b6e3e5f95083c3671af68ac43eb345a60d674636a0fe86
+SHA512 (entangle-3.0.tar.xz) = 8c6d7e067f88a770c63b76fde2a6ae71894aae95477fcf66b4670697889fdf7939d3f95532626d6f4ca7ae75841d8f247f6bcf78a1ce195b540989f1bfe5ebdd