.gitignore

@@ -1 +1 @@
-SOURCES/libcdio-2.0.0.tar.gz
+SOURCES/libcdio-2.1.0.tar.bz2

.libcdio.metadata

@@ -1 +1 @@
-d348c08944e09ae6201fafebccda5393a2efb8ba SOURCES/libcdio-2.0.0.tar.gz
+ec22e5168bc0dcfc179ec7b1164af1e5b672ca89 SOURCES/libcdio-2.1.0.tar.bz2

SOURCES/libcdio-2.0.0.tar.gz.sig

@@ -1,6 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iEYEABECAAYFAlpJdAsACgkQGo3lAIJ17CEXdgCdEZXiRK7QgIz2cT0J7ck9URTK
-xh8AnjmWzo2mrHFaROhv+upvO/XKv8gg
-=gzNu
------END PGP SIGNATURE-----

SOURCES/libcdio-2.1.0.tar.bz2.sig

@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABECAB0WIQTapjvCWCA0oCuSPVIajeUAgnXsIQUCXLfTGgAKCRAajeUAgnXs
+IbgPAJ9VeCzDcgfxpLh+zfNIwrRfEYxEegCffF1BoaCcEB9CKxx7rleF2CYRosA=
+=tmRS
+-----END PGP SIGNATURE-----

SPECS/libcdio.spec

@@ -1,30 +1,20 @@
-%undefine _annotated_build
-
 Name: libcdio
-Version: 2.0.0
+Version: 2.1.0
-Release: 3%{?dist}.inferit
+Release: 6%{?dist}
 Summary: CD-ROM input and control library
-Group: System Environment/Libraries
 License: GPLv3+
 URL: http://www.gnu.org/software/libcdio/
-Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-%{version}.tar.gz
+Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-%{version}.tar.bz2
-Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-%{version}.tar.gz.sig
+Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-%{version}.tar.bz2.sig
 Source2: libcdio-no_date_footer.hml
 Source3: cdio_config.h
+BuildRequires: gcc gcc-c++
 BuildRequires: pkgconfig doxygen
 BuildRequires: ncurses-devel
 BuildRequires: help2man
-Requires(post): /sbin/ldconfig
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
 BuildRequires: gettext-devel
 BuildRequires: chrpath
-
+BuildRequires: make
-%if 0%{?fedora} >= 23
-# ABI compatibility package dropped in F23
-Obsoletes: compat-libcdio15 < 0.93
-%endif
-
 
 %description
 This library provides an interface for CD-ROM access. It can be used
@@ -33,7 +23,6 @@ devices.
 
 %package devel
 Summary: Header files and libraries for %{name}
-Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description devel
@@ -46,16 +35,13 @@ This package contains header files and libraries for %{name}.
 iconv -f ISO88591 -t utf-8 -o THANKS.utf8 THANKS && mv THANKS.utf8 THANKS
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS -Wa,--generate-missing-build-notes=yes -fplugin=annobin"
-export CXXFLAGS="$RPM_OPT_FLAGS -Wa,--generate-missing-build-notes=yes -fplugin=annobin"
-export LDFLAGS="$RPM_LD_FLAGS"
 %configure \
 	--disable-vcd-info \
 	--disable-dependency-tracking \
 	--disable-cddb \
 	--disable-static \
 	--disable-rpath
-make %{?_smp_mflags}
+%make_build
 
 # another multilib fix; remove the architecture information from version.h
 sed -i -e "s,%{version} .*$,%{version}\\\",g" include/cdio/version.h
@@ -67,7 +53,7 @@ cp %{SOURCE2} .
 ./run_doxygen
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 
 # multilib header hack; taken from postgresql.spec
 case `uname -i` in
@@ -110,23 +96,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so.*
 make check
 
 
-%post
-/sbin/ldconfig
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
-
-%preun
-if [ $1 = 0 ]; then
-	/sbin/install-info --delete %{_infodir}/%{name}.info \
-		%{_infodir}/dir 2>/dev/null || :
-fi
-
-%postun -p /sbin/ldconfig
-
-
 %files
-%defattr(-,root,root,-)
 %license COPYING
-%doc AUTHORS NEWS README README.libcdio THANKS TODO
+%doc AUTHORS NEWS.md README README.libcdio THANKS TODO
 %{_bindir}/*
 %{_libdir}/*.so.*
 %{_infodir}/*
@@ -134,7 +106,6 @@ fi
 
 
 %files devel
-%defattr(-,root,root,-)
 %doc doc/doxygen/html examples
 %{_includedir}/cdio
 %{_includedir}/cdio++
@@ -143,13 +114,37 @@ fi
 
 
 %changelog
-* Tue Dec 05 2023 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 2.0.0-3.inferit
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.1.0-6
-- The ANNOBIN plugin is disabled for a successful build
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-- Rebuilt for MSVSphere 8.8
+  Related: rhbz#1991688
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.1.0-5
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 2.1.0-2
+- Use make macros
+- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
+
+* Mon Mar 30 2020 Adrian Reber <adrian@lisas.de> - 2.1.0-1
+- updated to 2.1.0
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
-* Wed Feb 07 2018 Jakub Martisko <jamartis@redhat.com> - 2.0.0-3
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-3
-- Add annocheck related flags
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-Resolves: #1704029
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild