Add patch to fix libdvdcss version detection, fixes BZ#1193628.

- Use %license tag.
This commit is contained in:
Richard M. Shaw 2015-11-17 12:24:51 -06:00
parent 09730e5f4b
commit cdc0fca67b
2 changed files with 29 additions and 2 deletions

18
brasero-libdvdcss.patch Normal file
View File

@ -0,0 +1,18 @@
The current version of libdvdcss has removed the dvdcss_interface_2 symbol so
brasero incorrectly assumes it's the wrong version.
https://bugzilla.redhat.com/show_bug.cgi?id=1193628
diff -Naur brasero-3.12.1.orig/plugins/dvdcss/burn-dvdcss.c brasero-3.12.1/plugins/dvdcss/burn-dvdcss.c
--- brasero-3.12.1.orig/plugins/dvdcss/burn-dvdcss.c 2014-03-06 07:59:54.000000000 -0600
+++ brasero-3.12.1/plugins/dvdcss/burn-dvdcss.c 2015-05-27 10:57:23.929044954 -0500
@@ -95,9 +95,6 @@
if (!module)
goto error_doesnt_exist;
- if (!g_module_symbol (module, "dvdcss_interface_2", &address))
- goto error_version;
-
if (!g_module_symbol (module, "dvdcss_open", &address))
goto error_version;
dvdcss_open = address;

View File

@ -1,6 +1,6 @@
Name: brasero
Version: 3.12.1
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Gnome CD/DVD burning application
Group: Applications/Multimedia
# see https://bugzilla.gnome.org/show_bug.cgi?id=683503
@ -9,6 +9,8 @@ URL: http://www.gnome.org/projects/brasero/
#VCS: git:git://git.gnome.org/brasero
Source0: http://ftp.gnome.org/pub/GNOME/sources/brasero/3.12/%{name}-%{version}.tar.gz
Patch0: brasero-libdvdcss.patch
BuildRequires: gtk3-devel >= 2.99.0
BuildRequires: glib2-devel >= 2.15.6
BuildRequires: gettext intltool gtk-doc
@ -84,6 +86,7 @@ developing brasero applications.
%prep
%setup -q
%patch0 -p1
%build
@ -161,7 +164,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%files -f %{name}.lang
%doc AUTHORS COPYING NEWS README
%{!?_licensedir:%global license %doc}
%license COPYING
%doc AUTHORS NEWS README
%{_mandir}/man1/%{name}.*
%{_bindir}/*
%{_libdir}/brasero3
@ -194,6 +199,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog
* Tue Nov 27 2015 Richard Shaw <hobbes1069@gmail.com> - 3.12.1-3
- Add patch to fix libdvdcss version detection, fixes BZ#1193628.
- Use %%license tag.
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.12.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild