Hello community,
here is the log from the commit of package switchboard-plug-about for
openSUSE:Factory checked in at 2018-12-24 11:46:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/switchboard-plug-about (Old)
and /work/SRC/openSUSE:Factory/.switchboard-plug-about.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "switchboard-plug-about"
Mon Dec 24 11:46:50 2018 rev:2 rq:660382 version:2.5.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/switchboard-plug-about/switchboard-plug-about.changes
2018-03-29 11:53:57.665951958 +0200
+++
/work/SRC/openSUSE:Factory/.switchboard-plug-about.new.28833/switchboard-plug-about.changes
2018-12-24 11:46:52.189161336 +0100
@@ -1,0 +2,25 @@
+Thu Nov 8 02:29:30 UTC 2018 - Alexei Podvalsky <[email protected]>
+
+- Add regex for filtering provided libraries
+
+-------------------------------------------------------------------
+Wed Oct 17 18:56:04 UTC 2018 - Alexei Podvalsky <[email protected]>
+
+- Update to 2.5.1:
+ * New upstream release.
+
+-------------------------------------------------------------------
+Mon Jun 11 12:43:39 UTC 2018 - [email protected]
+
+- Update to 0.2.5:
+ * New upstream release.
+
+-------------------------------------------------------------------
+Sat Jun 9 02:31:02 UTC 2018 - [email protected]
+
+- Switch to github
+- Switch to meson
+- Update switchboard-plug-about-info.patch
+- Spec file cleanup
+
+-------------------------------------------------------------------
Old:
----
switchboard-plug-about-0.2.4.tar.gz
New:
----
switchboard-plug-about-2.5.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ switchboard-plug-about.spec ++++++
--- /var/tmp/diff_new_pack.L7cEy7/_old 2018-12-24 11:46:52.553161016 +0100
+++ /var/tmp/diff_new_pack.L7cEy7/_new 2018-12-24 11:46:52.553161016 +0100
@@ -1,7 +1,7 @@
#
# spec file for package switchboard-plug-about
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,20 +15,20 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+%global __provides_exclude_from ^%{_libdir}/switchboard/.*\\.so$
Name: switchboard-plug-about
-Version: 0.2.4
+Version: 2.5.1
Release: 0
Summary: Switchboard plug to show system information
-License: GPL-3.0
+License: GPL-3.0-only
Group: System/GUI/Other
-Url: https://launchpad.net/switchboard-plug-about
+URL: https://elementary.io/
Source:
https://github.com/elementary/switchboard-plug-about/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-# PATCH-FIX-OPENSUSE about.patch [email protected] -- Provide accurate
information
+# PATCH-FIX-OPENSUSE -- Change info about system and place bugtracker to
"http://bugzilla.opensuse.org";
Patch0: switchboard-plug-about-info.patch
-BuildRequires: cmake
BuildRequires: fdupes
-BuildRequires: gcc-c++
+BuildRequires: meson >= 0.40.0
BuildRequires: pkgconfig
BuildRequires: vala >= 0.28.0
BuildRequires: pkgconfig(granite)
@@ -37,7 +37,6 @@
BuildRequires: pkgconfig(switchboard-2.0)
Requires: switchboard
Recommends: %{name}-lang
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
About plug for Switchboard.
@@ -48,28 +47,24 @@
%prep
%setup -q
-
%patch0 -p1
%build
-%cmake
-make %{?_smp_mflags}
+%meson
+%meson_build
%install
-%cmake_install
-%fdupes %{buildroot}%{_datadir}/locale
-
+%meson_install
+%fdupes %{buildroot}%{_datadir}
%find_lang about-plug %{name}.lang
%files
-%defattr(-,root,root)
+%license COPYING
+%doc README.md
%dir %{_libdir}/switchboard
-%dir %{_libdir}/switchboard/system
-%dir %{_libdir}/switchboard/system/pantheon-about
-%{_libdir}/switchboard/system/pantheon-about/*.so
-%{_libdir}/switchboard/system/pantheon-about/*.plugin
+%dir %{_libdir}/switchboard/hardware
+%{_libdir}/switchboard/hardware/libabout.so
%files lang -f %{name}.lang
-%defattr(-,root,root)
%changelog
++++++ switchboard-plug-about-0.2.4.tar.gz ->
switchboard-plug-about-2.5.1.tar.gz ++++++
++++ 47978 lines of diff (skipped)
++++++ switchboard-plug-about-info.patch ++++++
--- /var/tmp/diff_new_pack.L7cEy7/_old 2018-12-24 11:46:52.689160896 +0100
+++ /var/tmp/diff_new_pack.L7cEy7/_new 2018-12-24 11:46:52.689160896 +0100
@@ -1,63 +1,84 @@
+diff -ruN switchboard-plug-about.orig/src/meson.build
switchboard-plug-about/src/meson.build
+--- switchboard-plug-about.orig/src/meson.build 2018-08-01
23:52:06.644891294 +0300
++++ switchboard-plug-about/src/meson.build 2018-08-01 23:53:34.423195424
+0300
+@@ -1,6 +1,5 @@
+ plug_files = files(
+ 'Plug.vala',
+- 'Dialogs/IssueDialog.vala',
+ 'Dialogs/RestoreDialog.vala',
+ 'Views/HardwareView.vala'
+ )
diff -ruN switchboard-plug-about.orig/src/Plug.vala
switchboard-plug-about/src/Plug.vala
---- switchboard-plug-about.orig/src/Plug.vala 2017-09-07 22:40:08.355706105
+0300
-+++ switchboard-plug-about/src/Plug.vala 2017-09-07 23:20:53.588535097
+0300
-@@ -62,7 +62,6 @@
- // 'search' returns results like ("Keyboard → Behavior → Duration",
"keyboard<sep>behavior")
- public override async Gee.TreeMap<string, string> search (string search) {
- var search_results = new Gee.TreeMap<string, string>
((GLib.CompareDataFunc<string>)strcmp, (Gee.EqualDataFunc<string>)str_equal);
-- search_results.set ("%s → %s".printf (display_name, _("System
Information")), "");
+--- switchboard-plug-about.orig/src/Plug.vala 2018-08-01 23:52:06.644891294
+0300
++++ switchboard-plug-about/src/Plug.vala 2018-08-01 23:57:58.902980860
+0300
+@@ -20,6 +20,7 @@
+ private string gtk_version;
+ private string kernel_version;
+ private string website_url;
++ private string bugtracker_url;
+ private string support_url;
+ private string arch;
+ private Gtk.Label based_off;
+@@ -65,7 +66,6 @@
search_results.set ("%s → %s".printf (display_name, _("Restore
Default Settings")), "");
search_results.set ("%s → %s".printf (display_name, _("Suggest
Translation")), "");
search_results.set ("%s → %s".printf (display_name, _("Report
Problems")), "");
-@@ -89,13 +88,13 @@
+- search_results.set ("%s → %s".printf (display_name, _("Updates")),
"");
+ return search_results;
+ }
+
+@@ -86,13 +86,14 @@
+ }
+
os = osrel["PRETTY_NAME"];
- website_url = osrel["HOME_URL"];
- bugtracker_url = osrel["BUG_REPORT_URL"];
+- website_url = osrel["HOME_URL"];
- support_url = osrel["SUPPORT_URL"];
++ bugtracker_url = osrel["BUG_REPORT_URL"];
+ support_url = "https://en.opensuse.org/Portal:Pantheon";;
} catch (Error e) {
-- warning("Couldn't read os-release file, assuming elementary OS");
+- warning ("Couldn't read os-release file, assuming elementary OS");
- os = "elementary OS";
- website_url = "https://elementary.io";;
-- bugtracker_url =
"https://bugs.launchpad.net/elementaryos/+filebug";;
- support_url = "https://elementary.io/support";;
+ warning("Couldn't read os-release file");
+ os = _("Unknown");
+ website_url = "https://www.opensuse.org";;
+ bugtracker_url = "http://bugzilla.opensuse.org";;
+ support_url = "https://en.opensuse.org/Portal:Pantheon";;
-
}
-@@ -138,8 +137,8 @@
+ gtk_version = "%u.%u.%u".printf (Gtk.get_major_version (),
Gtk.get_minor_version (), Gtk.get_micro_version ());
+@@ -135,9 +136,9 @@
// Wires up and configures initial UI
private void setup_ui () {
- // Create the section about elementary OS
-- var logo = new Gtk.Image.from_icon_name ("distributor-logo",
Gtk.icon_size_register ("LOGO", 128, 128));
+ // Create the section about system
-+ var logo = new Gtk.Image.from_icon_name ("distributor",
Gtk.icon_size_register ("LOGO", 128, 128));
+ var logo = new Gtk.Image ();
+- logo.icon_name = "distributor-logo";
++ logo.icon_name = "distributor";
logo.pixel_size = 128;
logo.hexpand = true;
-@@ -206,16 +205,6 @@
- }
- });
-
+@@ -197,16 +198,8 @@
+ // Bug button
+ var bug_button = new Gtk.Button.with_label (_("Report a Problem"));
+ bug_button.clicked.connect (() => {
+- var issue_dialog = new IssueDialog ();
+- issue_dialog.transient_for = (Gtk.Window) main_grid.get_toplevel
();
+- issue_dialog.run ();
+- });
+-
- // Update button
- var update_button = new Gtk.Button.with_label (_("Check for
Updates"));
- update_button.clicked.connect (() => {
-- try {
+ try {
- Process.spawn_command_line_async ("io.elementary.appcenter
--show-updates");
-- } catch (Error e) {
-- warning (e.message);
-- }
-- });
--
- // Restore settings button
- var settings_restore_button = new Gtk.Button.with_label (_("Restore
Default Settings"));
- settings_restore_button.clicked.connect (settings_restore_clicked);
-@@ -228,7 +217,6 @@
++ AppInfo.launch_default_for_uri (bugtracker_url, null);
+ } catch (Error e) {
+ warning (e.message);
+ }
+@@ -224,7 +217,6 @@
button_grid.add (settings_restore_button);
button_grid.add (translate_button);
button_grid.add (bug_button);
@@ -66,9 +87,9 @@
var software_grid = new Gtk.Grid ();
diff -ruN switchboard-plug-about.orig/src/Views/HardwareView.vala
switchboard-plug-about/src/Views/HardwareView.vala
---- switchboard-plug-about.orig/src/Views/HardwareView.vala 2017-09-05
14:08:37.354571099 +0300
-+++ switchboard-plug-about/src/Views/HardwareView.vala 2017-09-07
23:21:26.500613921 +0300
-@@ -162,7 +162,7 @@
+--- switchboard-plug-about.orig/src/Views/HardwareView.vala 2018-08-01
23:52:06.644891294 +0300
++++ switchboard-plug-about/src/Views/HardwareView.vala 2018-08-01
23:58:32.373741458 +0300
+@@ -179,7 +179,7 @@
// Graphics
try {
