From 7250fc548c77d350b7d35f4ea969ad339062eb90 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 16 Sep 2014 15:32:14 +0200 Subject: [PATCH] Replace gnome-system-log with gnome-logs in the system apps list --- gnome-software-system-apps-firefox.patch | 26 --------------- gnome-software-system-apps.patch | 41 ++++++++++++++++++++++++ gnome-software.spec | 7 ++-- 3 files changed, 45 insertions(+), 29 deletions(-) delete mode 100644 gnome-software-system-apps-firefox.patch create mode 100644 gnome-software-system-apps.patch diff --git a/gnome-software-system-apps-firefox.patch b/gnome-software-system-apps-firefox.patch deleted file mode 100644 index a7fd723..0000000 --- a/gnome-software-system-apps-firefox.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 7e254824b6ca25e11140b695b360d35de95e7b10 Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Sun, 3 Aug 2014 10:37:27 +0200 -Subject: [PATCH] Downstream patch to replace Epiphany with Firefox in system - apps - ---- - data/modulesets/gnome.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/modulesets/gnome.xml b/data/modulesets/gnome.xml -index d3689e8..2bd89f5 100644 ---- a/data/modulesets/gnome.xml -+++ b/data/modulesets/gnome.xml -@@ -23,7 +23,7 @@ - - empathy.desktop - eog.desktop -- epiphany.desktop -+ firefox.desktop - evince.desktop - gnome-calculator.desktop - gnome-dictionary.desktop --- -2.0.4 - diff --git a/gnome-software-system-apps.patch b/gnome-software-system-apps.patch new file mode 100644 index 0000000..8b2f0aa --- /dev/null +++ b/gnome-software-system-apps.patch @@ -0,0 +1,41 @@ +From c7feb5464fee66feb68aea38bee4664662efe86b Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Tue, 16 Sep 2014 15:30:39 +0200 +Subject: [PATCH] Downstream patch to the list of unremovable system apps + +Replace Epiphany with Firefox, gnome-system-log with gnome-logs, and +drop baobab that isn't shipped at all in the Workstation default +install. +--- + data/modulesets/gnome.xml | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/data/modulesets/gnome.xml b/data/modulesets/gnome.xml +index 7fe8cce..7432132 100644 +--- a/data/modulesets/gnome.xml ++++ b/data/modulesets/gnome.xml +@@ -23,19 +23,18 @@ + + empathy.desktop + eog.desktop +- epiphany.desktop + evince.desktop ++ firefox.desktop + gnome-calculator.desktop + gnome-dictionary.desktop + gnome-disks.desktop +- gnome-system-log.desktop + gnome-system-monitor.desktop + gnome-terminal.desktop + gucharmap.desktop +- org.gnome.baobab.desktop + org.gnome.Contacts.desktop + org.gnome.font-viewer.desktop + org.gnome.gedit.desktop ++ org.gnome.Logs.desktop + org.gnome.Nautilus.desktop + org.gnome.Screenshot.desktop + org.gnome.Software.desktop +-- +2.1.0 + diff --git a/gnome-software.spec b/gnome-software.spec index 4a82691..5629f06 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -7,8 +7,8 @@ Group: Applications/System URL: https://wiki.gnome.org/Apps/Software Source0: http://download.gnome.org/sources/gnome-software/3.13/%{name}-%{version}.tar.xz -# Replace Epiphany with Firefox in the system apps list -Patch0: gnome-software-system-apps-firefox.patch +# Downstream patch to the list of unremovable system apps +Patch0: gnome-software-system-apps.patch Requires: appstream-data Requires: epiphany-runtime @@ -37,7 +37,7 @@ and update software in the GNOME desktop. %prep %setup -q -%patch0 -p1 -b .firefox +%patch0 -p1 -b .system-apps %build %configure --disable-static @@ -98,6 +98,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %changelog * Tue Sep 16 2014 Kalev Lember - 3.13.92-1 - Update to 3.13.92 +- Replace gnome-system-log with gnome-logs in the system apps list * Tue Sep 02 2014 Kalev Lember - 3.13.91-1 - Update to 3.13.91