Compare commits
No commits in common. "c8" and "c9" have entirely different histories.
|
|
@ -0,0 +1,31 @@
|
|||
From 9c25c3c501a85220701d2b377f609e15ac11b829 Mon Sep 17 00:00:00 2001
|
||||
From: David King <amigadave@amigadave.com>
|
||||
Date: Tue, 19 Oct 2021 10:04:07 +0100
|
||||
Subject: [PATCH] checksum: Default to SHA256 rather than MD5
|
||||
|
||||
---
|
||||
data/org.gnome.brasero.gschema.xml | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/data/org.gnome.brasero.gschema.xml b/data/org.gnome.brasero.gschema.xml
|
||||
index 4bad20b0..2359bc7f 100644
|
||||
--- a/data/org.gnome.brasero.gschema.xml
|
||||
+++ b/data/org.gnome.brasero.gschema.xml
|
||||
@@ -12,12 +12,12 @@
|
||||
</schema>
|
||||
<schema id="org.gnome.brasero.config" path="/org/gnome/brasero/config/">
|
||||
<key name="checksum-image" type="i">
|
||||
- <default>0</default>
|
||||
+ <default>2</default>
|
||||
<summary>The type of checksum used for images</summary>
|
||||
<description>Set to 0 for MD5, 1 for SHA1 and 2 for SHA256</description>
|
||||
</key>
|
||||
<key name="checksum-files" type="i">
|
||||
- <default>0</default>
|
||||
+ <default>2</default>
|
||||
<summary>The type of checksum used for files</summary>
|
||||
<description>Set to 0 for MD5, 1 for SHA1 and 2 for SHA256</description>
|
||||
</key>
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
|
@ -1,153 +0,0 @@
|
|||
From a2cca499d8b7e4b8ca7030e0656f6c57e98beb88 Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Thu, 9 Sep 2021 15:09:35 +0200
|
||||
Subject: [PATCH 1/4] libbrasero-media: Fix memset() warning
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
libbrasero-media/scsi-read-track-information.c: In function ‘brasero_read_track_info’:
|
||||
libbrasero-media/scsi-read-track-information.c:116:33: warning: argument to ‘sizeof’ in ‘memset’ call is the same pointer type ‘BraseroScsiTrackInfo *’ {aka ‘struct _BraseroScsiTrackInfo *’} as the destination; expected ‘BraseroScsiTrackInfo’ {aka ‘struct _BraseroScsiTrackInfo’} or an explicit length [-Wsizeof-pointer-memaccess]
|
||||
116 | memset (&hdr, 0, sizeof (info));
|
||||
| ^
|
||||
---
|
||||
libbrasero-media/scsi-read-track-information.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libbrasero-media/scsi-read-track-information.c b/libbrasero-media/scsi-read-track-information.c
|
||||
index 37644f25..6f6274ad 100644
|
||||
--- a/libbrasero-media/scsi-read-track-information.c
|
||||
+++ b/libbrasero-media/scsi-read-track-information.c
|
||||
@@ -113,7 +113,7 @@ brasero_read_track_info (BraseroRdTrackInfoCDB *cdb,
|
||||
|
||||
/* first ask the drive how long should the data be and then ... */
|
||||
datasize = 4;
|
||||
- memset (&hdr, 0, sizeof (info));
|
||||
+ memset (&hdr, 0, sizeof (hdr));
|
||||
BRASERO_SET_16 (cdb->alloc_len, datasize);
|
||||
res = brasero_scsi_command_issue_sync (cdb, &hdr, datasize, error);
|
||||
if (res)
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
From 45dee052e1c3d636fd1c6d32f6320e33163ee05d Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Thu, 9 Sep 2021 22:44:58 +0200
|
||||
Subject: [PATCH 2/4] libbrasero-burn: Better log for
|
||||
brasero_check_flags_for_drive()
|
||||
|
||||
Print some debug when flags don't match.
|
||||
---
|
||||
libbrasero-burn/burn-basics.c | 20 +++++++++++++++-----
|
||||
1 file changed, 15 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/libbrasero-burn/burn-basics.c b/libbrasero-burn/burn-basics.c
|
||||
index 2bfe7fde..f4c3a9f0 100644
|
||||
--- a/libbrasero-burn/burn-basics.c
|
||||
+++ b/libbrasero-burn/burn-basics.c
|
||||
@@ -118,24 +118,34 @@ brasero_check_flags_for_drive (BraseroDrive *drive,
|
||||
media = brasero_medium_get_status (medium);
|
||||
if (flags & BRASERO_BURN_FLAG_DUMMY) {
|
||||
/* This is always FALSE */
|
||||
- if (media & BRASERO_MEDIUM_PLUS)
|
||||
+ if (media & BRASERO_MEDIUM_PLUS) {
|
||||
+ BRASERO_BURN_LOG ("Drive does not support BRASERO_MEDIUM_PLUS flag");
|
||||
return FALSE;
|
||||
+ }
|
||||
|
||||
if (media & BRASERO_MEDIUM_DVD) {
|
||||
- if (!brasero_medium_can_use_dummy_for_sao (medium))
|
||||
+ if (!brasero_medium_can_use_dummy_for_sao (medium)) {
|
||||
+ BRASERO_BURN_LOG ("Drive does not support using dummy for SAO");
|
||||
return FALSE;
|
||||
+ }
|
||||
}
|
||||
else if (flags & BRASERO_BURN_FLAG_DAO) {
|
||||
- if (!brasero_medium_can_use_dummy_for_sao (medium))
|
||||
+ if (!brasero_medium_can_use_dummy_for_sao (medium)) {
|
||||
+ BRASERO_BURN_LOG ("Drive does not support using dummy for DAO");
|
||||
return FALSE;
|
||||
+ }
|
||||
}
|
||||
- else if (!brasero_medium_can_use_dummy_for_tao (medium))
|
||||
+ else if (!brasero_medium_can_use_dummy_for_tao (medium)) {
|
||||
+ BRASERO_BURN_LOG ("Drive does not support using dummy for TAO");
|
||||
return FALSE;
|
||||
+ }
|
||||
}
|
||||
|
||||
if (flags & BRASERO_BURN_FLAG_BURNPROOF) {
|
||||
- if (!brasero_medium_can_use_burnfree (medium))
|
||||
+ if (!brasero_medium_can_use_burnfree (medium)) {
|
||||
+ BRASERO_BURN_LOG ("Drive does not support burnproof/burnfree");
|
||||
return FALSE;
|
||||
+ }
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
From 52137beac620cf34541698a3d0222f5e169eba85 Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Thu, 9 Sep 2021 23:45:03 +0200
|
||||
Subject: [PATCH 3/4] libbrasero-burn: Fix
|
||||
BRASERO_PLUGIN_ADD_STANDARD_BD_R_FLAGS
|
||||
|
||||
The macro was never used and was missing an opening parenthesis.
|
||||
---
|
||||
libbrasero-burn/brasero-plugin-registration.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libbrasero-burn/brasero-plugin-registration.h b/libbrasero-burn/brasero-plugin-registration.h
|
||||
index 2d3719d8..a92fe1e9 100644
|
||||
--- a/libbrasero-burn/brasero-plugin-registration.h
|
||||
+++ b/libbrasero-burn/brasero-plugin-registration.h
|
||||
@@ -494,7 +494,7 @@ brasero_plugin_register (BraseroPlugin *plugin) \
|
||||
BRASERO_MEDIUM_BDR_SRM_POW| \
|
||||
BRASERO_MEDIUM_DUAL_L| \
|
||||
BRASERO_MEDIUM_BLANK, \
|
||||
- BRASERO_BURN_FLAG_MULTI| \
|
||||
+ (BRASERO_BURN_FLAG_MULTI| \
|
||||
BRASERO_BURN_FLAG_DUMMY| \
|
||||
BRASERO_BURN_FLAG_NOGRACE) & \
|
||||
(~(unsupported_MACRO)), \
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
From 5e703334370ccc51e02bcd4bed33ef5bb2bd364d Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Thu, 9 Sep 2021 23:40:28 +0200
|
||||
Subject: [PATCH 4/4] growisofs: Fix burning BD-R media not working
|
||||
|
||||
The BD-R flags were simply never applied to the plugin, so the brasero
|
||||
core didn't know how to burn that type of media.
|
||||
|
||||
See https://bugzilla.redhat.com/show_bug.cgi?id=1704341
|
||||
and https://bugzilla.redhat.com/show_bug.cgi?id=1456971
|
||||
|
||||
Closes: #324
|
||||
---
|
||||
plugins/growisofs/burn-growisofs.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/plugins/growisofs/burn-growisofs.c b/plugins/growisofs/burn-growisofs.c
|
||||
index 3d00a779..c9955aac 100644
|
||||
--- a/plugins/growisofs/burn-growisofs.c
|
||||
+++ b/plugins/growisofs/burn-growisofs.c
|
||||
@@ -877,6 +877,9 @@ brasero_growisofs_export_caps (BraseroPlugin *plugin)
|
||||
/* for DVD+RW */
|
||||
BRASERO_PLUGIN_ADD_STANDARD_DVDRW_PLUS_FLAGS (plugin, BRASERO_BURN_FLAG_NONE);
|
||||
|
||||
+ /* for BD-R */
|
||||
+ BRASERO_PLUGIN_ADD_STANDARD_BD_R_FLAGS (plugin, BRASERO_BURN_FLAG_NONE);
|
||||
+
|
||||
/* for BD-RE */
|
||||
BRASERO_PLUGIN_ADD_STANDARD_BD_RE_FLAGS (plugin, BRASERO_BURN_FLAG_NONE);
|
||||
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
|
@ -0,0 +1,240 @@
|
|||
From ca0d487aac3b9cf21e520a00b94cb3eaf833b9a3 Mon Sep 17 00:00:00 2001
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Thu, 24 Dec 2020 12:19:49 +0100
|
||||
Subject: [PATCH 1/5] Obtain TrackerSparqlConnection in a single point
|
||||
|
||||
The is_available vmethod tries to create a connection if it's not
|
||||
there. But the BraseroSearchTracker initialization already tries to
|
||||
obtain the SPARQL connection. Let this method return wether
|
||||
initialiation was successful.
|
||||
---
|
||||
src/brasero-search-tracker.c | 6 ------
|
||||
1 file changed, 6 deletions(-)
|
||||
|
||||
diff --git a/src/brasero-search-tracker.c b/src/brasero-search-tracker.c
|
||||
index fe7be2bd..f8c29c0d 100644
|
||||
--- a/src/brasero-search-tracker.c
|
||||
+++ b/src/brasero-search-tracker.c
|
||||
@@ -56,12 +56,6 @@ brasero_search_tracker_is_available (BraseroSearchEngine *engine)
|
||||
BraseroSearchTrackerPrivate *priv;
|
||||
|
||||
priv = BRASERO_SEARCH_TRACKER_PRIVATE (engine);
|
||||
- GError *error = NULL;
|
||||
- if (priv->connection)
|
||||
- return TRUE;
|
||||
-
|
||||
- priv->cancellable = g_cancellable_new ();
|
||||
- priv->connection = tracker_sparql_connection_get (priv->cancellable, &error);
|
||||
return (priv->connection != NULL);
|
||||
}
|
||||
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
From c0dace005ec34b345845aacd1f929fd618b199af Mon Sep 17 00:00:00 2001
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Thu, 24 Dec 2020 12:37:13 +0100
|
||||
Subject: [PATCH 2/5] Fix ORDER BY clauses in Tracker search
|
||||
|
||||
The ?urn variable is not defined anywhere else in the query, so
|
||||
ordering is left undefined. Access the url/filename properly here.
|
||||
---
|
||||
src/brasero-search-tracker.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/brasero-search-tracker.c b/src/brasero-search-tracker.c
|
||||
index f8c29c0d..94085070 100644
|
||||
--- a/src/brasero-search-tracker.c
|
||||
+++ b/src/brasero-search-tracker.c
|
||||
@@ -307,7 +307,7 @@ brasero_search_tracker_query_start_real (BraseroSearchEngine *search,
|
||||
g_string_append (query, ")");
|
||||
|
||||
g_string_append (query,
|
||||
- "} ORDER BY DESC(nie:url(?urn)) DESC(nfo:fileName(?urn))");
|
||||
+ "} ORDER BY DESC(?url) DESC(nfo:fileName(?file))");
|
||||
|
||||
tracker_sparql_connection_query_async (priv->connection,
|
||||
query->str,
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
From f7181445bf9c88b7fab1bb5237d602b491694a9e Mon Sep 17 00:00:00 2001
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Thu, 24 Dec 2020 13:04:03 +0100
|
||||
Subject: [PATCH 3/5] Only use fts:rank with FTS searches
|
||||
|
||||
This fixes two things:
|
||||
- The use of fts:match depends on priv->keywords being set, but
|
||||
fts:rank() has undefined behavior if fts:match is not present.
|
||||
Its value is returned in the cursor, but fortunately unused,
|
||||
so it can go away.
|
||||
|
||||
- Fixes "garbage" being added at the end of the query, concretely
|
||||
") } ORDER BY ... " is appended at the supposed end of the query
|
||||
string. Older SPARQL parser implementations would allow garbage
|
||||
at the end of its parsing state, I suspect "LIMIT 0 OFFSET 10000"
|
||||
was just a mean to push it to that state that it'd allow the
|
||||
remaining string, so that is gone too.
|
||||
---
|
||||
src/brasero-search-tracker.c | 21 +++++++++------------
|
||||
1 file changed, 9 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/src/brasero-search-tracker.c b/src/brasero-search-tracker.c
|
||||
index 94085070..ae1d388a 100644
|
||||
--- a/src/brasero-search-tracker.c
|
||||
+++ b/src/brasero-search-tracker.c
|
||||
@@ -234,7 +234,7 @@ brasero_search_tracker_query_start_real (BraseroSearchEngine *search,
|
||||
|
||||
priv = BRASERO_SEARCH_TRACKER_PRIVATE (search);
|
||||
|
||||
- query = g_string_new ("SELECT ?file ?url ?mime fts:rank(?file) " /* Which variables should be returned */
|
||||
+ query = g_string_new ("SELECT ?file ?url ?mime " /* Which variables should be returned */
|
||||
"WHERE {" /* Start defining the search and its scope */
|
||||
" ?file a nfo:FileDataObject . " /* File must be a file (not a stream, ...) */
|
||||
" ?file nie:url ?url . " /* Get the url of the file */
|
||||
@@ -293,21 +293,18 @@ brasero_search_tracker_query_start_real (BraseroSearchEngine *search,
|
||||
" ) ");
|
||||
}
|
||||
|
||||
- if (priv->keywords)
|
||||
+ if (priv->keywords) {
|
||||
g_string_append_printf (query,
|
||||
" ?file fts:match \"%s\" ", /* File must match possible keywords */
|
||||
priv->keywords);
|
||||
|
||||
- g_string_append (query,
|
||||
- " } "
|
||||
- "ORDER BY ASC(fts:rank(?file)) "
|
||||
- "OFFSET 0 "
|
||||
- "LIMIT 10000");
|
||||
-
|
||||
- g_string_append (query, ")");
|
||||
-
|
||||
- g_string_append (query,
|
||||
- "} ORDER BY DESC(?url) DESC(nfo:fileName(?file))");
|
||||
+ g_string_append (query,
|
||||
+ " } "
|
||||
+ "ORDER BY ASC(fts:rank(?file))");
|
||||
+ } else {
|
||||
+ g_string_append (query,
|
||||
+ "} ORDER BY DESC(?url) DESC(nfo:fileName(?file))");
|
||||
+ }
|
||||
|
||||
tracker_sparql_connection_query_async (priv->connection,
|
||||
query->str,
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
From ede7758e2fae487d57be641a120c4c02bfd249f1 Mon Sep 17 00:00:00 2001
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Thu, 24 Dec 2020 13:15:21 +0100
|
||||
Subject: [PATCH 4/5] Observe nfo:FileDataObject/nie:InformationElement split
|
||||
|
||||
These resources are interpreted differently in Tracker 3.0 compared
|
||||
to older versions, the newer version makes those 2 different resources
|
||||
(one representing the "file", other the "content) that relate to each
|
||||
other. In older tracker versions, these 2 aspects were conflated in
|
||||
a single resource.
|
||||
|
||||
The query is implicitly crossing that barrier, so make it explicit.
|
||||
With this change, the query may run with either version.
|
||||
---
|
||||
src/brasero-search-tracker.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/brasero-search-tracker.c b/src/brasero-search-tracker.c
|
||||
index ae1d388a..9aa06289 100644
|
||||
--- a/src/brasero-search-tracker.c
|
||||
+++ b/src/brasero-search-tracker.c
|
||||
@@ -238,7 +238,8 @@ brasero_search_tracker_query_start_real (BraseroSearchEngine *search,
|
||||
"WHERE {" /* Start defining the search and its scope */
|
||||
" ?file a nfo:FileDataObject . " /* File must be a file (not a stream, ...) */
|
||||
" ?file nie:url ?url . " /* Get the url of the file */
|
||||
- " ?file nie:mimeType ?mime . "); /* Get its mime */
|
||||
+ " ?file nie:mimeType ?mime . " /* Get its mime */
|
||||
+ " ?content nie:isStoredAs ?file . "); /* Get the resource representing the content */
|
||||
|
||||
if (priv->mimes) {
|
||||
int i;
|
||||
@@ -259,7 +260,7 @@ brasero_search_tracker_query_start_real (BraseroSearchEngine *search,
|
||||
gboolean param_added = FALSE;
|
||||
|
||||
g_string_append (query,
|
||||
- " ?file a ?type . "
|
||||
+ " ?content a ?type . "
|
||||
" FILTER ( ");
|
||||
|
||||
if (priv->scope & BRASERO_SEARCH_SCOPE_MUSIC) {
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
From 05589be7da3a0dfb00617df049d129abba703c36 Mon Sep 17 00:00:00 2001
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Thu, 24 Dec 2020 13:22:43 +0100
|
||||
Subject: [PATCH 5/5] Support Tracker 3.0
|
||||
|
||||
Add the compile-time checks, and add the minimal code catering for
|
||||
the API changes. In 3.0 connections are no longer singletons.
|
||||
---
|
||||
configure.ac | 6 +++++-
|
||||
src/brasero-search-tracker.c | 8 ++++++++
|
||||
2 files changed, 13 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index d0c7a870..96afc551 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], [2.0]],
|
||||
+ m4_foreach([VERSION], [[0.10], [0.12], [0.14], [0.16], [0.18], [1.0], [2.0], [3.0]],
|
||||
[PKG_CHECK_EXISTS([tracker-sparql-VERSION >= $TRACKER_REQUIRED],
|
||||
[tracker_api="VERSION"])
|
||||
])
|
||||
@@ -408,6 +408,10 @@ if test x"$enable_search" = "xyes"; then
|
||||
AC_SUBST(BRASERO_SEARCH_LIBS)
|
||||
build_tracker="yes"
|
||||
build_search="yes"
|
||||
+
|
||||
+ if test x"$tracker_api" = x"3.0"; then
|
||||
+ AC_DEFINE(HAVE_TRACKER3, 1, [define if tracker3 is available])
|
||||
+ fi
|
||||
else
|
||||
build_search="no"
|
||||
fi
|
||||
diff --git a/src/brasero-search-tracker.c b/src/brasero-search-tracker.c
|
||||
index 9aa06289..40c5f1ac 100644
|
||||
--- a/src/brasero-search-tracker.c
|
||||
+++ b/src/brasero-search-tracker.c
|
||||
@@ -17,6 +17,8 @@
|
||||
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
+#include "config.h"
|
||||
+
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <libtracker-sparql/tracker-sparql.h>
|
||||
@@ -444,7 +446,13 @@ brasero_search_tracker_init (BraseroSearchTracker *object)
|
||||
|
||||
priv = BRASERO_SEARCH_TRACKER_PRIVATE (object);
|
||||
priv->cancellable = g_cancellable_new ();
|
||||
+
|
||||
+#ifdef HAVE_TRACKER3
|
||||
+ priv->connection = tracker_sparql_connection_bus_new ("org.freedesktop.Tracker3.Miner.Files",
|
||||
+ NULL, NULL, &error);
|
||||
+#else
|
||||
priv->connection = tracker_sparql_connection_get (priv->cancellable, &error);
|
||||
+#endif
|
||||
|
||||
if (error) {
|
||||
g_warning ("Could not establish a connection to Tracker: %s", error->message);
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
|
@ -1,45 +1,66 @@
|
|||
%define basever %(echo %{version} | sed "s/\.[0-9]*$//")
|
||||
|
||||
%if 0%{?rhel} >= 9
|
||||
%bcond_with cdrdao
|
||||
%bcond_with cdrkit
|
||||
%bcond_with dvdrwtools
|
||||
%else
|
||||
%bcond_without cdrdao
|
||||
%bcond_without cdrkit
|
||||
%bcond_without dvdrwtools
|
||||
%endif
|
||||
|
||||
Name: brasero
|
||||
Version: 3.12.2
|
||||
Release: 5%{?dist}
|
||||
Release: 19%{?dist}
|
||||
Summary: Gnome CD/DVD burning application
|
||||
|
||||
|
||||
# see https://bugzilla.gnome.org/show_bug.cgi?id=683503
|
||||
License: GPLv3+
|
||||
URL: https://wiki.gnome.org/Apps/Brasero
|
||||
Source0: https://download.gnome.org/sources/brasero/3.12/brasero-%{version}.tar.xz
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1704341
|
||||
Patch0: brasero-3.12.2-fix-bdr-flags.patch
|
||||
Source0: https://download.gnome.org/sources/brasero/%{basever}/brasero-%{version}.tar.xz
|
||||
|
||||
BuildRequires: gtk3-devel >= 2.99.0
|
||||
BuildRequires: glib2-devel >= 2.15.6
|
||||
BuildRequires: gettext intltool gtk-doc
|
||||
# https://gitlab.gnome.org/GNOME/brasero/-/merge_requests/10
|
||||
Patch0: tracker3.patch
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1935460
|
||||
Patch1: brasero-3.12.2-default-checksum.patch
|
||||
|
||||
# For patch0
|
||||
BuildRequires: autoconf automake
|
||||
BuildRequires: gnome-common
|
||||
|
||||
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) >= 0.11.92
|
||||
BuildRequires: pkgconfig(gtk+-3.0) >= 2.99.0
|
||||
BuildRequires: pkgconfig(ice)
|
||||
BuildRequires: pkgconfig(libburn-1) >= 0.4.0
|
||||
BuildRequires: pkgconfig(libcanberra-gtk3)
|
||||
BuildRequires: pkgconfig(libisofs-1) >= 0.6.4
|
||||
BuildRequires: pkgconfig(libnotify) >= 0.7.0
|
||||
BuildRequires: pkgconfig(libnautilus-extension) >= 2.22.2
|
||||
BuildRequires: pkgconfig(libxml-2.0) >= 2.6.0
|
||||
BuildRequires: pkgconfig(sm)
|
||||
BuildRequires: pkgconfig(totem-plparser) >= 2.29.1
|
||||
BuildRequires: pkgconfig(tracker-sparql-3.0)
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: gstreamer1-devel >= 0.11.92
|
||||
BuildRequires: gstreamer1-plugins-base-devel >= 0.11.92
|
||||
BuildRequires: totem-pl-parser-devel >= 2.22.0
|
||||
BuildRequires: libnotify-devel >= 0.7.0
|
||||
BuildRequires: libxml2-devel >= 2.6.0
|
||||
BuildRequires: dbus-glib-devel >= 0.7.2
|
||||
BuildRequires: libxslt
|
||||
BuildRequires: libappstream-glib
|
||||
BuildRequires: libburn-devel >= 0.4.0
|
||||
BuildRequires: libisofs-devel >= 0.6.4
|
||||
BuildRequires: nautilus-devel >= 2.22.2
|
||||
BuildRequires: libSM-devel
|
||||
BuildRequires: libcanberra-devel
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gettext
|
||||
BuildRequires: gobject-introspection-devel
|
||||
BuildRequires: tracker-devel
|
||||
BuildRequires: gtk-doc
|
||||
BuildRequires: intltool
|
||||
BuildRequires: itstool
|
||||
BuildRequires: libappstream-glib
|
||||
BuildRequires: make
|
||||
BuildRequires: yelp-tools
|
||||
|
||||
Requires: dvd+rw-tools
|
||||
Requires: cdrecord
|
||||
Requires: mkisofs
|
||||
Requires: cdda2wav
|
||||
%{?with_dvdrwtools:Requires: dvd+rw-tools}
|
||||
%{?with_cdrkit:Requires: wodim}
|
||||
%{?with_cdrkit:Requires: genisoimage}
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
%ifnarch s390 s390x
|
||||
Requires: cdrdao
|
||||
%ifnarch s390x
|
||||
%{?with_cdrdao:Requires: cdrdao}
|
||||
%endif
|
||||
%{?with_cdrkit:Recommends: icedax}
|
||||
|
||||
%description
|
||||
Simple and easy to use CD/DVD burning application for the Gnome
|
||||
|
|
@ -48,7 +69,6 @@ desktop.
|
|||
|
||||
%package libs
|
||||
Summary: Libraries for %{name}
|
||||
Obsoletes: nautilus-cd-burner-libs < 2.25.4
|
||||
|
||||
%description libs
|
||||
The %{name}-libs package contains the runtime shared libraries for
|
||||
|
|
@ -57,19 +77,15 @@ The %{name}-libs package contains the runtime shared libraries for
|
|||
|
||||
%package nautilus
|
||||
Summary: Nautilus extension for %{name}
|
||||
|
||||
Provides: nautilus-cd-burner = %{version}-%{release}
|
||||
Obsoletes: nautilus-cd-burner < 2.25.4
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description nautilus
|
||||
The %{name}-nautilus package contains the brasero nautilus extension.
|
||||
|
||||
|
||||
%package devel
|
||||
Summary: Headers for developing programs that will use %{name}
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: nautilus-cd-burner-devel < 2.25.4
|
||||
%package devel
|
||||
Summary: Headers for developing programs that will use %{name}
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
|
||||
|
||||
%description devel
|
||||
|
|
@ -82,6 +98,9 @@ developing brasero applications.
|
|||
|
||||
|
||||
%build
|
||||
# For patch0
|
||||
autoreconf -fi
|
||||
|
||||
%configure \
|
||||
--enable-nautilus \
|
||||
--enable-libburnia \
|
||||
|
|
@ -89,6 +108,9 @@ developing brasero applications.
|
|||
--enable-playlist \
|
||||
--enable-preview \
|
||||
--enable-inotify \
|
||||
%{!?with_cdrdao:--disable-cdrdao} \
|
||||
%{!?with_cdrkit:--disable-cdrkit} \
|
||||
%{!?with_dvdrwtools:--disable-growisofs} \
|
||||
--disable-caches \
|
||||
--disable-static
|
||||
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
|
||||
|
|
@ -97,7 +119,7 @@ sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
|
|||
|
||||
%install
|
||||
%make_install
|
||||
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
|
||||
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
|
||||
%find_lang %{name}
|
||||
|
||||
# Update the screenshot shown in the software center
|
||||
|
|
@ -154,8 +176,52 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Sep 10 2021 David King <dking@redhat.com> - 3.12.2-5
|
||||
- Fix BD-R media flags
|
||||
* Mon Nov 29 2021 David King <amigadave@amigadave.com> - 3.12.2-19
|
||||
- Improve default checksum hash algorithm (#1935460)
|
||||
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.12.2-18
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Mon Jun 28 2021 David King <amigadave@amigadave.com> - 3.12.2-17
|
||||
- Drop dependencies on cdrdao, cdrkit, and dvd+rw-tools for el9+ (#1973071)
|
||||
|
||||
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 3.12.2-16
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Mon Mar 15 2021 Kalev Lember <klember@redhat.com> - 3.12.2-15
|
||||
- Switch to Tracker 3
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Thu Jan 21 2021 Adam Jackson <ajax@redhat.com> - 3.12.2-13
|
||||
- Relax Requires: icedax to Recommends
|
||||
|
||||
* Thu Jan 07 2021 David King <amigadave@amigadave.com> - 3.12.2-12
|
||||
- Use pkgconfig for BuildRequires
|
||||
- Depend on tracker only on Fedora
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Mon Jul 9 2018 Peter Robinson <pbrobinson@fedoraproject.org> 3.12.2-6
|
||||
- Update requires
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Sat Feb 03 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.12.2-4
|
||||
- Switch to %%ldconfig_scriptlets
|
||||
|
|
|
|||
Loading…
Reference in New Issue