From f72c26d34e50dbb5fa205eb39ec82a5b134e1700 Mon Sep 17 00:00:00 2001
From: Richard M. Shaw <hobbes1069@gmail.com>
Date: Nov 17 2015 19:31:30 +0000
Subject: Fix merge conflicts.


---

diff --git a/brasero-libdvdcss.patch b/brasero-libdvdcss.patch
new file mode 100644
index 0000000..86b009d
--- /dev/null
+++ b/brasero-libdvdcss.patch
@@ -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	2015-11-12 09:48:53.782886516 -0600
++++ brasero-3.12.1/plugins/dvdcss/burn-dvdcss.c	2015-11-12 09:53:03.152656908 -0600
+@@ -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;
diff --git a/brasero.spec b/brasero.spec
index ab75f4b..edc591c 100644
--- a/brasero.spec
+++ b/brasero.spec
@@ -1,6 +1,6 @@
 Name:      brasero
 Version:   3.12.1
-Release:   1%{?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
@@ -105,6 +108,17 @@ make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 %find_lang %{name}
 
+# Update the screenshot shown in the software center
+#
+# NOTE: It would be *awesome* if this file was pushed upstream.
+#
+# See http://people.freedesktop.org/~hughsient/appdata/#screenshots for more details.
+#
+appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/appdata/brasero.appdata.xml \
+  https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/brasero/a.png \
+  https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/brasero/b.png \
+  https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/brasero/c.png 
+
 sed -i 's/cd:x/cd;x/' $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 desktop-file-install --vendor ""                   \
@@ -150,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
@@ -183,9 +199,19 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Tue Nov 17 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
+
 * Tue Apr 29 2015 Matthias Clasen <mclasen@redhat.com> - 3.12.1-1
 - Update to 3.12.1
 
+* Mon Mar 30 2015 Richard Hughes <rhughes@redhat.com> - 3.12.0-2
+- Use better AppData screenshots
+
 * Thu Nov 13 2014 Kalev Lember <kalevlember@gmail.com> - 3.12.0-1
 - Update to 3.12.0