Compare commits

...

No commits in common. "c9s" and "c8s" have entirely different histories.
c9s ... c8s

6 changed files with 52 additions and 47 deletions

2
.gitignore vendored
View File

@ -12,5 +12,3 @@ libcdio-0.82.tar.gz.sig
/libcdio-0.94.tar.gz.sig
/libcdio-2.0.0.tar.gz
/libcdio-2.0.0.tar.gz.sig
/libcdio-2.1.0.tar.bz2
/libcdio-2.1.0.tar.bz2.sig

View File

@ -1,2 +0,0 @@
ec22e5168bc0dcfc179ec7b1164af1e5b672ca89 libcdio-2.1.0.tar.bz2
a2030f01eab516ac1b8f9aa1cb48133cafc36cef libcdio-2.1.0.tar.bz2.sig

View File

@ -1,6 +1,6 @@
--- !Policy
product_versions:
- rhel-9
- rhel-8
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

View File

@ -0,0 +1,10 @@
--- a/lib/driver/cdtext.c 2012-03-23 15:30:24.002795726 +0100
+++ b/lib/driver/cdtext.c 2012-03-23 15:30:59.581851545 +0100
@@ -237,6 +237,7 @@
i_track = p_data->i_track;
for( j=0; j < CDIO_CDTEXT_MAX_TEXT_DATA; (p_data->bDBC ? j+=2 : j++) ) {
+ if (i_track > 99) break;
if( p_data->text[j] == 0x00 && (!p_data->bDBC || p_data->text[j+1] == 0x00)) {
/* omit empty strings */

View File

@ -1,20 +1,28 @@
Name: libcdio
Version: 2.1.0
Release: 6%{?dist}
Version: 2.0.0
Release: 3%{?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.bz2
Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-%{version}.tar.bz2.sig
Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-%{version}.tar.gz
Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-%{version}.tar.gz.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
@ -23,6 +31,7 @@ devices.
%package devel
Summary: Header files and libraries for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
@ -35,13 +44,16 @@ 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_build
make %{?_smp_mflags}
# another multilib fix; remove the architecture information from version.h
sed -i -e "s,%{version} .*$,%{version}\\\",g" include/cdio/version.h
@ -53,7 +65,7 @@ cp %{SOURCE2} .
./run_doxygen
%install
%make_install
make install DESTDIR=$RPM_BUILD_ROOT
# multilib header hack; taken from postgresql.spec
case `uname -i` in
@ -96,9 +108,23 @@ 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.md README README.libcdio THANKS TODO
%doc AUTHORS NEWS README README.libcdio THANKS TODO
%{_bindir}/*
%{_libdir}/*.so.*
%{_infodir}/*
@ -106,6 +132,7 @@ make check
%files devel
%defattr(-,root,root,-)
%doc doc/doxygen/html examples
%{_includedir}/cdio
%{_includedir}/cdio++
@ -114,37 +141,9 @@ make check
%changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.1.0-6
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
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
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Jakub Martisko <jamartis@redhat.com> - 2.0.0-3
- Add annocheck related flags
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

View File

@ -1,2 +1,2 @@
SHA512 (libcdio-2.1.0.tar.bz2) = c290821da55fd9ae366670a58857aa6efcebc9f25b7caea063cf12f9cbda84fe770c5f59f972227fda50517ca58c5f39c0137daa0f93179e3daa45303d8b610f
SHA512 (libcdio-2.1.0.tar.bz2.sig) = fa02c7ed6e9f6ea5a2fa30829a901cff15092125030d720f79258c72fca0bfdaad2bb5e0470fa3ec36ab177391e856a38c796cb8ebe4a302de0ca782be58df06
SHA512 (libcdio-2.0.0.tar.gz) = 8f48cc71d28b427b16f48e50bcaf0aea171055c72a9aeee383ac4374eee1d3d288323814c3a3f308a9ba097aa815319429c1931072897985a3b02b814766fd4f
SHA512 (libcdio-2.0.0.tar.gz.sig) = 55e14f3fc9b4d1c911d0065464a64aec699aec805a9f2542410a7976154aa5e0d8ea8425440bff2dff10097b2b49c649902456f4fbf24b782368b69be9a8de05