From de9662cfcc7eb69e43c1f1f853b4a5793b1e4474f55d3fd609a68b1b0803fc83 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Thu, 16 Jan 2025 00:36:55 +0000
Subject: [PATCH] - Update to 2.2.0:   - Revised to note ABI change in ISO-9660
 shared library (.so)     version numbers; bump release version from 2.1.1 to
 2.2.0     to note both API and ABI changes. These are the last three    
 bullet items under Version 2.1.1.   - Remove LIBCDIO_SOURCE_PATH from
 configure.ac.

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libcdio?expand=0&rev=79
---
 baselibs.conf         |  4 ++--
 c99.patch             |  6 +++---
 cdio-utils.spec       |  4 ++--
 libcdio-2.1.1.tar.bz2 |  3 ---
 libcdio-2.2.0.tar.bz2 |  3 +++
 libcdio.changes       | 10 ++++++++++
 libcdio.spec          |  6 +++---
 7 files changed, 23 insertions(+), 13 deletions(-)
 delete mode 100644 libcdio-2.1.1.tar.bz2
 create mode 100644 libcdio-2.2.0.tar.bz2

diff --git a/baselibs.conf b/baselibs.conf
index 6bede6d..f5b2145 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,8 +1,8 @@
 libcdio19
   obsoletes "libcdio-<targettype> <= <version>"
   provides "libcdio-<targettype> = <version>"
-libiso9660-11
-libiso9660++0
+libiso9660-12
+libiso9660++1
 libcdio++1
 libudf0
 #libcdio_cdda1
diff --git a/c99.patch b/c99.patch
index 03917c7..bf78430 100644
--- a/c99.patch
+++ b/c99.patch
@@ -18,9 +18,9 @@ Signed-off-by: Alfred Wingate <parona@protonmail.com>
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -544,10 +544,10 @@ AC_DEFINE_UNQUOTED(LIBCDIO_SOURCE_PATH,
- 	[Full path to libcdio top_sourcedir.])
- AC_SUBST(LIBCDIO_SOURCE_PATH)
+@@ -539,10 +539,10 @@ AC_SUBST(HAVE_SOLARIS_CDROM)
+ AC_SUBST(HAVE_WIN32_CDROM)
+ AC_SUBST(HAVE_OS2_CDROM)
  
 -AC_CHECK_FUNCS( [chdir drand48 fseeko fseeko64 ftruncate geteuid getgid \
 -		 getuid getpwuid gettimeofday lseek64 lstat memcpy memset mkstemp rand \
diff --git a/cdio-utils.spec b/cdio-utils.spec
index a1e8b78..3ffd079 100644
--- a/cdio-utils.spec
+++ b/cdio-utils.spec
@@ -18,7 +18,7 @@
 
 %define cdioutils 1
 Name:           cdio-utils
-Version:        2.1.1
+Version:        2.2.0
 Release:        0
 Summary:        Utility programs making use of libcdio, a CD-ROM access library
 License:        GPL-3.0-or-later
@@ -74,7 +74,7 @@ rm -rf %{buildroot}%{_libdir} %{buildroot}%{_includedir} %{buildroot}%{_infodir}
 %fdupes -s %{buildroot}%{_mandir}
 
 %files -n cdio-utils
-%doc AUTHORS NEWS.md README README.libcdio THANKS TODO
+%doc AUTHORS THANKS TODO ChangeLog NEWS.md README-libcdio.md README.md
 %license COPYING*
 %{_bindir}/cd-*
 %{_bindir}/cdda-*
diff --git a/libcdio-2.1.1.tar.bz2 b/libcdio-2.1.1.tar.bz2
deleted file mode 100644
index 2cb22a1..0000000
--- a/libcdio-2.1.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d3a7230f6804d5a84bf9805ed4a0de705b156299510c8085ae1fc693ca239f87
-size 1729790
diff --git a/libcdio-2.2.0.tar.bz2 b/libcdio-2.2.0.tar.bz2
new file mode 100644
index 0000000..61dae9f
--- /dev/null
+++ b/libcdio-2.2.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6f8fbdf4d189cf63f2a7a1549c516cd720c7b222c7aaadbc924a26e745a48539
+size 1729378
diff --git a/libcdio.changes b/libcdio.changes
index d736499..7a3f62b 100644
--- a/libcdio.changes
+++ b/libcdio.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Jan 16 00:15:33 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
+
+- Update to 2.2.0:
+  - Revised to note ABI change in ISO-9660 shared library (.so)
+    version numbers; bump release version from 2.1.1 to 2.2.0
+    to note both API and ABI changes. These are the last three
+    bullet items under Version 2.1.1.
+  - Remove LIBCDIO_SOURCE_PATH from configure.ac.
+
 -------------------------------------------------------------------
 Fri Jan 10 11:33:28 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
 
diff --git a/libcdio.spec b/libcdio.spec
index b845495..41be488 100644
--- a/libcdio.spec
+++ b/libcdio.spec
@@ -18,11 +18,11 @@
 
 %define cdio_name libcdio19
 %define cdiopp_name libcdio++1
-%define iso9660_name libiso9660-11
-%define iso9660pp_name libiso9660++0
+%define iso9660_name libiso9660-12
+%define iso9660pp_name libiso9660++1
 %define udf_name libudf0
 Name:           libcdio
-Version:        2.1.1
+Version:        2.2.0
 Release:        0
 Summary:        CD-ROM Access Library
 License:        GPL-3.0-or-later