From 87ca6d888d42e4650ea33b4fa805fc916ec5294a Mon Sep 17 00:00:00 2001
From: jykanase <v-jykanase@microsoft.com>
Date: Thu, 14 Nov 2024 11:05:25 +0000
Subject: [PATCH] upgrade: libdvdnav version to 6.1.1

---
 .../libdvdnav/libdvdnav-6.0.1.tar.bz2.asc         |  6 ------
 .../libdvdnav/libdvdnav-6.1.1.tar.bz2.asc         |  6 ++++++
 .../libdvdnav/libdvdnav.signatures.json           |  4 ++--
 SPECS-EXTENDED/libdvdnav/libdvdnav.spec           | 15 +++++++++++----
 cgmanifest.json                                   |  4 ++--
 5 files changed, 21 insertions(+), 14 deletions(-)
 delete mode 100644 SPECS-EXTENDED/libdvdnav/libdvdnav-6.0.1.tar.bz2.asc
 create mode 100644 SPECS-EXTENDED/libdvdnav/libdvdnav-6.1.1.tar.bz2.asc

diff --git a/SPECS-EXTENDED/libdvdnav/libdvdnav-6.0.1.tar.bz2.asc b/SPECS-EXTENDED/libdvdnav/libdvdnav-6.0.1.tar.bz2.asc
deleted file mode 100644
index 38bd8917e3d..00000000000
--- a/SPECS-EXTENDED/libdvdnav/libdvdnav-6.0.1.tar.bz2.asc
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iF0EARECAB0WIQRl98a0IGvQV6frc3hxgHE75Y0a3AUCXbOZsgAKCRBxgHE75Y0a
-3OmpAKCgMhjIL9nzhXw6Cs5CG8gTxQBrqwCgpjY7vAAoKjZmY49auPeyTHuT+wc=
-=Hhyj
------END PGP SIGNATURE-----
diff --git a/SPECS-EXTENDED/libdvdnav/libdvdnav-6.1.1.tar.bz2.asc b/SPECS-EXTENDED/libdvdnav/libdvdnav-6.1.1.tar.bz2.asc
new file mode 100644
index 00000000000..c723397f25c
--- /dev/null
+++ b/SPECS-EXTENDED/libdvdnav/libdvdnav-6.1.1.tar.bz2.asc
@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABECAB0WIQRl98a0IGvQV6frc3hxgHE75Y0a3AUCYH73lwAKCRBxgHE75Y0a
+3IQEAKCSMnMQBjvgNc63lYgfU0vxPBfdLQCfYyUHiJcGgZvrSplqvYNf3/g4cNQ=
+=49PA
+-----END PGP SIGNATURE-----
diff --git a/SPECS-EXTENDED/libdvdnav/libdvdnav.signatures.json b/SPECS-EXTENDED/libdvdnav/libdvdnav.signatures.json
index 5874c45df9d..ac69f3ebeba 100644
--- a/SPECS-EXTENDED/libdvdnav/libdvdnav.signatures.json
+++ b/SPECS-EXTENDED/libdvdnav/libdvdnav.signatures.json
@@ -1,7 +1,7 @@
 {
  "Signatures": {
   "7180713BE58D1ADC.asc": "3e62e0776b9ffe71449d553ceff56e60e9ad7902ec18199c953a1392f7974628",
-  "libdvdnav-6.0.1.tar.bz2": "e566a396f1950017088bfd760395b0565db44234195ada5413366c9d23926733",
-  "libdvdnav-6.0.1.tar.bz2.asc": "551428a76312db6ea063827c379ecdf6084fd8aa5c99de1717aa5091dbd23790"
+  "libdvdnav-6.1.1.tar.bz2": "c191a7475947d323ff7680cf92c0fb1be8237701885f37656c64d04e98d18d48",
+  "libdvdnav-6.1.1.tar.bz2.asc": "8f71e9acfb2856554b257c0d72b64daf4d74f9ea28038dd0b3b321c8dd585551"
  }
 }
diff --git a/SPECS-EXTENDED/libdvdnav/libdvdnav.spec b/SPECS-EXTENDED/libdvdnav/libdvdnav.spec
index 166fe235ae4..ffff866d36e 100644
--- a/SPECS-EXTENDED/libdvdnav/libdvdnav.spec
+++ b/SPECS-EXTENDED/libdvdnav/libdvdnav.spec
@@ -1,8 +1,10 @@
+%global abi 4
+
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 Name:           libdvdnav
-Version:        6.0.1
-Release:        4%{?dist}
+Version:        6.1.1
+Release:        1%{?dist}
 Summary:        A library for reading DVD video discs based on Ogle code
 License:        GPLv2+
 URL:            http://dvdnav.mplayerhq.hu/
@@ -12,7 +14,8 @@ Source2:        https://download.videolan.org/pub/keys/7180713BE58D1ADC.asc
 BuildRequires:  doxygen
 BuildRequires:  gcc
 BuildRequires:  gnupg2
-BuildRequires:  libdvdread-devel >= 5.0.2
+BuildRequires:  make
+BuildRequires:  libdvdread-devel >= 6.0.0
 
 %description
 libdvdnav provides a simple library for reading DVD video discs.
@@ -50,7 +53,7 @@ rm %{buildroot}%{_pkgdocdir}/{COPYING,TODO}
 %files
 %license COPYING
 %doc AUTHORS ChangeLog README
-%{_libdir}/libdvdnav.so.*
+%{_libdir}/libdvdnav.so.%{abi}*
 
 %files devel
 %doc TODO doc/html/*
@@ -59,6 +62,10 @@ rm %{buildroot}%{_pkgdocdir}/{COPYING,TODO}
 %{_libdir}/pkgconfig/dvdnav.pc
 
 %changelog
+* Thu Nov 14 2024 Jyoti Kanase <v-jykanase@microsoft.com> - 6.1.1-1
+- Update to 6.1.1
+- License verified
+
 * Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 6.0.1-4
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).
 
diff --git a/cgmanifest.json b/cgmanifest.json
index 0ed85d46aec..4eb99a076aa 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -9071,8 +9071,8 @@
         "type": "other",
         "other": {
           "name": "libdvdnav",
-          "version": "6.0.1",
-          "downloadUrl": "https://download.videolan.org/pub/videolan/libdvdnav/6.0.1/libdvdnav-6.0.1.tar.bz2"
+          "version": "6.1.1",
+          "downloadUrl": "https://download.videolan.org/pub/videolan/libdvdnav/6.1.1/libdvdnav-6.1.1.tar.bz2"
         }
       }
     },