diff --git a/.gitignore b/.gitignore index b17f604..0051306 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ brasero-2.31.5.tar.bz2 /brasero-3.11.4.tar.xz /brasero-3.12.0.tar.xz /brasero-3.12.1.tar.gz +/brasero-3.12.2.tar.xz diff --git a/brasero-3.12.1-fix-build.patch b/brasero-3.12.1-fix-build.patch deleted file mode 100644 index 9fe89bf..0000000 --- a/brasero-3.12.1-fix-build.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 55f4f7267612d2977b470b2b20e5802fbb1ef019 Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi -Date: Tue, 31 May 2016 16:27:57 +0100 -Subject: [PATCH] build: Use -Wno-error=format-nonliteral - -Let's get Brasero building for another year. ---- - libbrasero-burn/Makefile.am | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/libbrasero-burn/Makefile.am b/libbrasero-burn/Makefile.am -index ed71f238..70622a63 100644 ---- a/libbrasero-burn/Makefile.am -+++ b/libbrasero-burn/Makefile.am -@@ -17,9 +17,10 @@ AM_CPPFLAGS = \ - $(BRASERO_GLIB_CFLAGS) \ - $(BRASERO_GIO_CFLAGS) \ - $(BRASERO_GTK_CFLAGS) \ -- $(BRASERO_LIBNOTIFY_CFLAGS) \ -+ $(BRASERO_LIBNOTIFY_CFLAGS) \ - $(BRASERO_GSTREAMER_CFLAGS) \ -- $(BRASERO_CANBERRA_CFLAGS) -+ $(BRASERO_CANBERRA_CFLAGS) \ -+ -Wno-error=format-nonliteral - - GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` - RECMARSHALFILES = libbrasero-marshal.h libbrasero-marshal.c --- -2.13.0 - -From 7ed500b063c1a1cea7d07f41d22e0be3d3b7ab22 Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi -Date: Tue, 31 May 2016 16:45:03 +0100 -Subject: [PATCH] build: Use -Wno-error=format-y2k - -Because two digits are enough for everybody. ---- - src/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index ba1b0e69..55b933f3 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -24,7 +24,8 @@ AM_CPPFLAGS = \ - $(BRASERO_LIBXML_CFLAGS) \ - $(BRASERO_SEARCH_CFLAGS) \ - $(BRASERO_PL_PARSER_CFLAGS) \ -- $(BRASERO_SM_CFLAGS) -+ $(BRASERO_SM_CFLAGS) \ -+ -Wno-error=format-y2k - - GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` - RECMARSHALFILES = brasero-marshal.h brasero-marshal.c --- -2.13.0 - -From 14d03eecba21becb0a9c05609ae98764a4b6d155 Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi -Date: Tue, 31 May 2016 17:08:16 +0100 -Subject: [PATCH] build: Disable format-y2k error - ---- - nautilus/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/nautilus/Makefile.am b/nautilus/Makefile.am -index 72eed5a0..01dfe69a 100644 ---- a/nautilus/Makefile.am -+++ b/nautilus/Makefile.am -@@ -22,7 +22,8 @@ AM_CPPFLAGS = \ - -DSHAREDIR=\""$(datadir)"\" \ - -DDATADIR=\""$(datadir)/brasero"\" \ - $(NAUTILUS_EXTENSION_CFLAGS) \ -- $(DISABLE_DEPRECATED) -+ $(DISABLE_DEPRECATED) \ -+ -Wno-error=format-y2k - - @INTLTOOL_DESKTOP_RULE@ - --- -2.13.0 - -From 7cf9d3146d0782d1ff3a594f59d50f0cdd14688d Mon Sep 17 00:00:00 2001 -From: Jeremy Bicha -Date: Sat, 22 Jul 2017 21:30:19 -0400 -Subject: [PATCH] build: Allow building with tracker2 - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index da450778..186e1a63 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -388,7 +388,7 @@ AC_ARG_ENABLE(search, - if test x"$enable_search" != "xno"; then - # Try to figure out the tracker API version to use - tracker_api="0.10" -- m4_foreach([VERSION], [[0.10], [0.12], [0.14], [0.16], [0.18], [1.0]], -+ m4_foreach([VERSION], [[0.10], [0.12], [0.14], [0.16], [0.18], [1.0], [2.0]], - [PKG_CHECK_EXISTS([tracker-sparql-VERSION >= $TRACKER_REQUIRED], - [tracker_api="VERSION"]) - ]) --- -2.13.0 - diff --git a/brasero-libdvdcss.patch b/brasero-libdvdcss.patch deleted file mode 100644 index 86b009d..0000000 --- a/brasero-libdvdcss.patch +++ /dev/null @@ -1,18 +0,0 @@ -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 0cf82f8..5599459 100644 --- a/brasero.spec +++ b/brasero.spec @@ -1,6 +1,6 @@ Name: brasero -Version: 3.12.1 -Release: 7%{?dist} +Version: 3.12.2 +Release: 1%{?dist} Summary: Gnome CD/DVD burning application Group: Applications/Multimedia # see https://bugzilla.gnome.org/show_bug.cgi?id=683503 @@ -9,10 +9,6 @@ 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 -# Backported from upstream -Patch1: brasero-3.12.1-fix-build.patch - BuildRequires: gtk3-devel >= 2.99.0 BuildRequires: glib2-devel >= 2.15.6 BuildRequires: gettext intltool gtk-doc @@ -32,8 +28,6 @@ BuildRequires: libSM-devel BuildRequires: libcanberra-devel BuildRequires: gobject-introspection-devel BuildRequires: tracker-devel -BuildRequires: autoconf automake libtool -BuildRequires: gnome-common BuildRequires: itstool BuildRequires: yelp-tools @@ -88,12 +82,9 @@ developing brasero applications. %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build -autoreconf -fi %configure \ --enable-nautilus \ --enable-libburnia \ @@ -203,6 +194,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Mon Jul 31 2017 Kalev Lember - 3.12.2-1 +- Update to 3.12.2 + * Mon Jul 31 2017 Kalev Lember - 3.12.1-7 - Rebuilt for libtotem-plparser soname bump diff --git a/sources b/sources index 2d8468b..b8f414f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ca10d0d3b0c39124c1fe83bd4e0ffe9c brasero-3.12.1.tar.gz +SHA512 (brasero-3.12.2.tar.xz) = 14886e772123f179f79d3172b59e21ced990fd8834cd27e8717eb635a75163c44c1d5084818b53da559a0c2ef25e7c0da4a3a7d3781e2ea74b59cfe98987384f