From e8733be45dc252eb76b173c185d7f9981ea51995 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 13 Jun 2018 21:38:49 +0200 Subject: [PATCH 01/41] rebuild for granite5 soname bump --- wingpanel-indicator-datetime.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index e5bf31f..d9b101b 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -3,7 +3,7 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel Version: 2.0.2 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv3+ URL: https://github.com/elementary/%{name} @@ -19,7 +19,6 @@ Patch1: 01-fix-linker-flags.patch BuildRequires: cmake BuildRequires: gettext BuildRequires: vala >= 0.22.0 -BuildRequires: vala-tools BuildRequires: pkgconfig(glib-2.0) >= 2.32 BuildRequires: pkgconfig(granite) @@ -30,6 +29,7 @@ BuildRequires: pkgconfig(libical) BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(wingpanel-2.0) +Requires: wingpanel%{?_isa} Supplements: wingpanel%{?_isa} @@ -66,6 +66,9 @@ popd %changelog +* Wed Jun 13 2018 Fabio Valentini - 2.0.2-8 +- Rebuild for granite5 soname bump. + * Wed Feb 07 2018 Kalev Lember - 2.0.2-7 - Rebuilt for evolution-data-server soname bump From 03dbb61c9f3db14ff6dca2467ec6e2ecc2b9930f Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 5 Jul 2018 15:41:30 +0200 Subject: [PATCH 02/41] update to version 2.1.0 --- .gitignore | 1 + 00-fix-vala-0.36.patch | 221 ------------------------------ sources | 2 +- wingpanel-indicator-datetime.spec | 15 +- 4 files changed, 10 insertions(+), 229 deletions(-) delete mode 100644 00-fix-vala-0.36.patch diff --git a/.gitignore b/.gitignore index 56ab611..0835c68 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /wingpanel-indicator-datetime-2.0.1.tar.xz /wingpanel-indicator-datetime-2.0.2.tar.gz +/wingpanel-indicator-datetime-2.1.0.tar.gz diff --git a/00-fix-vala-0.36.patch b/00-fix-vala-0.36.patch deleted file mode 100644 index 0ca13c7..0000000 --- a/00-fix-vala-0.36.patch +++ /dev/null @@ -1,221 +0,0 @@ -diff --git a/src/Widgets/calendar/CalendarModel.vala b/src/Widgets/calendar/CalendarModel.vala -index 9dc0438..9ff1755 100644 ---- a/src/Widgets/calendar/CalendarModel.vala -+++ b/src/Widgets/calendar/CalendarModel.vala -@@ -61,7 +61,7 @@ namespace DateTime.Widgets { - return summary; - } else if (alarm) { - return "%s - %s".printf (start_time.format (Util.TimeFormat ()), summary); -- } else if (range.days > 0 && date.compare (range.first) != 0) { -+ } else if (range.days > 0 && date.compare (range.first_dt) != 0) { - return summary; - } - return "%s - %s".printf (summary, start_time.format (Util.TimeFormat ())); -@@ -365,8 +365,8 @@ namespace DateTime.Widgets { - (Gee.EqualDataFunc? )Util.calcomponent_equal_func); - source_events.set (source, events); - /* query client view */ -- var iso_first = E.Util.isodate_from_time_t ((time_t)data_range.first.to_unix ()); -- var iso_last = E.Util.isodate_from_time_t ((time_t)data_range.last.add_days (1).to_unix ()); -+ var iso_first = E.Util.isodate_from_time_t ((time_t)data_range.first_dt.to_unix ()); -+ var iso_last = E.Util.isodate_from_time_t ((time_t)data_range.last_dt.add_days (1).to_unix ()); - var query = @"(occur-in-time-range? (make-time \"$iso_first\") (make-time \"$iso_last\"))"; - - E.CalClient client; -@@ -488,4 +488,4 @@ namespace DateTime.Widgets { - events_removed (source, removed_events.read_only_view); - } - } --} -\ No newline at end of file -+} -diff --git a/src/Widgets/calendar/CalendarView.vala b/src/Widgets/calendar/CalendarView.vala -index 4615782..4ede210 100644 ---- a/src/Widgets/calendar/CalendarView.vala -+++ b/src/Widgets/calendar/CalendarView.vala -@@ -102,7 +102,7 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid { - - void on_show_weeks_changed () { - var model = CalendarModel.get_default (); -- weeks.update (model.data_range.first, model.num_weeks); -+ weeks.update (model.data_range.first_dt, model.num_weeks); - } - - /* Indicates the month has changed */ -@@ -122,18 +122,18 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid { - /* Sets the calendar widgets to the date range of the model */ - void sync_with_model () { - var model = CalendarModel.get_default (); -- if (grid.grid_range != null && (model.data_range.equals (grid.grid_range) || grid.grid_range.first.compare (model.data_range.first) == 0)) -+ if (grid.grid_range != null && (model.data_range.equals (grid.grid_range) || grid.grid_range.first_dt.compare (model.data_range.first_dt) == 0)) - return; // nothing to do - - GLib.DateTime previous_first = null; - if (grid.grid_range != null) -- previous_first = grid.grid_range.first; -+ previous_first = grid.grid_range.first_dt; - var previous_big_grid = big_grid; - big_grid = create_big_grid (); - stack.add (big_grid); - - header.update_columns (model.week_starts_on); -- weeks.update (model.data_range.first, model.num_weeks); -+ weeks.update (model.data_range.first_dt, model.num_weeks); - grid.set_range (model.data_range, model.month_start); - - // keep focus date on the same day of the month -@@ -151,7 +151,7 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid { - } - - if (previous_first != null) { -- if (previous_first.compare (grid.grid_range.first) == -1) { -+ if (previous_first.compare (grid.grid_range.first_dt) == -1) { - stack.transition_type = Gtk.StackTransitionType.SLIDE_LEFT; - } else { - stack.transition_type = Gtk.StackTransitionType.SLIDE_RIGHT; -diff --git a/src/Widgets/calendar/Util.vala b/src/Widgets/calendar/Util.vala -index f0ffa08..e3fcb69 100644 ---- a/src/Widgets/calendar/Util.vala -+++ b/src/Widgets/calendar/Util.vala -@@ -22,8 +22,8 @@ - namespace Util { - /* Represents date range from 'first' to 'last' inclusive */ - public class DateRange : Object, Gee.Traversable, Gee.Iterable { -- public GLib.DateTime first { get; private set; } -- public GLib.DateTime last { get; private set; } -+ public GLib.DateTime first_dt { get; private set; } -+ public GLib.DateTime last_dt { get; private set; } - public bool @foreach (Gee.ForallFunc f) { - foreach (var date in this) { - if (f (date) == false) { -@@ -36,22 +36,22 @@ namespace Util { - - public int64 days { - get { -- return last.difference (first) / GLib.TimeSpan.DAY; -+ return last_dt.difference (first_dt) / GLib.TimeSpan.DAY; - } - } - - public DateRange (GLib.DateTime first, GLib.DateTime last) { - assert (first.compare (last) <= 0); -- this.first = first; -- this.last = last; -+ first_dt = first; -+ last_dt = last; - } - - public DateRange.copy (DateRange date_range) { -- this(date_range.first, date_range.last); -+ this(date_range.first_dt, date_range.last_dt); - } - - public bool equals (DateRange other) { -- return (first == other.first && last == other.last); -+ return (first_dt == other.first_dt && last_dt == other.last_dt); - } - - public Type element_type { -@@ -65,7 +65,7 @@ namespace Util { - } - - public bool contains (GLib.DateTime time) { -- return (first.compare (time) < 1) && (last.compare (time) > -1); -+ return (first_dt.compare (time) < 1) && (last_dt.compare (time) > -1); - } - - public Gee.SortedSet to_set () { -@@ -107,13 +107,13 @@ namespace Util { - - public DateIterator (DateRange range) { - this.range = range; -- this.current = range.first.add_days (-1); -+ this.current = range.first_dt.add_days (-1); - } - - public bool @foreach (Gee.ForallFunc f) { -- var element = range.first; -+ var element = range.first_dt; - -- while (element.compare (range.last) < 0) { -+ while (element.compare (range.last_dt) < 0) { - if (f (element) == false) { - return false; - } -@@ -135,11 +135,11 @@ namespace Util { - } - - public bool has_next () { -- return current.compare (range.last) < 0; -+ return current.compare (range.last_dt) < 0; - } - - public bool first () { -- current = range.first; -+ current = range.first_dt; - - return true; - } -@@ -384,8 +384,8 @@ namespace Util { - var exdate = property.get_exdate (); - var date = ical_to_date_time (exdate); - dateranges.@foreach ((daterange) => { -- var first = daterange.first; -- var last = daterange.last; -+ var first = daterange.first_dt; -+ var last = daterange.last_dt; - - if (first.get_year () <= date.get_year () && last.get_year () >= date.get_year ()) { - if (first.get_day_of_year () <= date.get_day_of_year () && last.get_day_of_year () >= date.get_day_of_year ()) { -@@ -426,7 +426,7 @@ namespace Util { - int i = 1; - int n = i * rrule.interval; - -- while (view_range.last.compare (start.add_days (n)) > 0) { -+ while (view_range.last_dt.compare (start.add_days (n)) > 0) { - dateranges.add (new Util.DateRange (start.add_days (n), end.add_days (n))); - i++; - n = i * rrule.interval; -@@ -456,7 +456,7 @@ namespace Util { - bool is_null_time = rrule.until.is_null_time () == 1; - var temp_start = start.add_years (n); - -- while (view_range.last.compare (temp_start) > 0) { -+ while (view_range.last_dt.compare (temp_start) > 0) { - if (is_null_time == false) { - if (temp_start.get_year () > rrule.until.year) { - break; -@@ -494,7 +494,7 @@ namespace Util { - var start_ical_day = get_date_from_ical_day (start.add_months (n), rrule.by_day[k]); - int week_of_month = (int)GLib.Math.ceil ((double)start.get_day_of_month () / 7); - -- while (view_range.last.compare (start_ical_day) > 0) { -+ while (view_range.last_dt.compare (start_ical_day) > 0) { - if (is_null_time == false) { - if (start_ical_day.get_year () > rrule.until.year) { - break; -@@ -541,7 +541,7 @@ namespace Util { - bool is_null_time = rrule.until.is_null_time () == 1; - var temp_start = start.add_months (n); - -- while (view_range.last.compare (temp_start) > 0) { -+ while (view_range.last_dt.compare (temp_start) > 0) { - if (is_null_time == false) { - if (temp_start.get_year () > rrule.until.year) { - break; -@@ -618,7 +618,7 @@ namespace Util { - bool is_null_time = rrule.until.is_null_time () == 1; - var temp_start = start.add_days (n); - -- while (view_range.last.compare (temp_start) > 0) { -+ while (view_range.last_dt.compare (temp_start) > 0) { - if (is_null_time == false) { - if (temp_start.get_year () > rrule.until.year) { - break; -@@ -810,4 +810,4 @@ namespace Util { - return false; - }); - } --} -\ No newline at end of file -+} diff --git a/sources b/sources index c2398a3..a4c23de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wingpanel-indicator-datetime-2.0.2.tar.gz) = d9723ccc6dc8d346ff7caad7defb01a9b7dae2d4958fd1576a23a25813431c47ee8edb3aa636f88a81ce099c2bc0107b11c2cb94e83eb665adf90694a8f8aecb +SHA512 (wingpanel-indicator-datetime-2.1.0.tar.gz) = cfa20e16148fcdd2d63a52c79ec9344fd30e33a015d4d7377f2304c0bac7749d807fb681c092f8ae26779d7636f5b9c7d780822af916c640e657cbde99ea6a60 diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index d9b101b..40d953b 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -1,18 +1,16 @@ %global __provides_exclude_from ^%{_libdir}/wingpanel/.*\\.so$ +%global appname io.elementary.desktop.wingpanel.datetime + Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel -Version: 2.0.2 -Release: 8%{?dist} +Version: 2.1.0 +Release: 1%{?dist} License: GPLv3+ URL: https://github.com/elementary/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -# Upstream patch to fix compilation with vala 0.36+ -# https://github.com/elementary/wingpanel-indicator-datetime/commit/834f0ff2c6aacc6f6453e22986a4d1e7e058d75e -Patch0: 00-fix-vala-0.36.patch - # Patch to fix undefined symbols Patch1: 01-fix-linker-flags.patch @@ -62,10 +60,13 @@ popd %{_libdir}/wingpanel/libdatetime.so -%{_datadir}/glib-2.0/schemas/org.pantheon.desktop.wingpanel.indicators.datetime.gschema.xml +%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml %changelog +* Wed Jul 04 2018 Fabio Valentini - 2.1.0-1 +- Update to version 2.1.0. + * Wed Jun 13 2018 Fabio Valentini - 2.0.2-8 - Rebuild for granite5 soname bump. From 798c8ab75fa2a1758f1e1239123023b5d3afaea8 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 12 Jul 2018 12:13:26 +0200 Subject: [PATCH 03/41] add missing BR: gcc, gcc-c++ --- wingpanel-indicator-datetime.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index 40d953b..88c2369 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -5,7 +5,7 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel Version: 2.1.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ URL: https://github.com/elementary/%{name} @@ -15,6 +15,8 @@ Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz Patch1: 01-fix-linker-flags.patch BuildRequires: cmake +BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: vala >= 0.22.0 @@ -64,6 +66,9 @@ popd %changelog +* Thu Jul 12 2018 Fabio Valentini - 2.1.0-2 +- Add missing BR: gcc, gcc-c++. + * Wed Jul 04 2018 Fabio Valentini - 2.1.0-1 - Update to version 2.1.0. From d797909ac90052b6983ad781101dcfac02ae0439 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:52:57 +0000 Subject: [PATCH 04/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wingpanel-indicator-datetime.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index 88c2369..d97ba1a 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -5,7 +5,7 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel Version: 2.1.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ URL: https://github.com/elementary/%{name} @@ -66,6 +66,9 @@ popd %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 2.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Jul 12 2018 Fabio Valentini - 2.1.0-2 - Add missing BR: gcc, gcc-c++. From 324ea25ad46d2d07fe2d2345ea838ed7a496cf0a Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 2 Oct 2018 14:58:54 +0200 Subject: [PATCH 05/41] update to version 2.1.1 --- .gitignore | 3 +++ 01-fix-linker-flags.patch | 13 ------------- sources | 2 +- wingpanel-indicator-datetime.spec | 25 +++++++++---------------- 4 files changed, 13 insertions(+), 30 deletions(-) delete mode 100644 01-fix-linker-flags.patch diff --git a/.gitignore b/.gitignore index 0835c68..4c08dcd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +/results* +/*.src.rpm /wingpanel-indicator-datetime-2.0.1.tar.xz /wingpanel-indicator-datetime-2.0.2.tar.gz /wingpanel-indicator-datetime-2.1.0.tar.gz +/wingpanel-indicator-datetime-2.1.1.tar.gz diff --git a/01-fix-linker-flags.patch b/01-fix-linker-flags.patch deleted file mode 100644 index 52c8bb4..0000000 --- a/01-fix-linker-flags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 80eb477..e7ae0a1 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -44,7 +44,7 @@ OPTIONS - ) - - add_library (${CMAKE_PROJECT_NAME} MODULE ${VALA_C}) --target_link_libraries(${CMAKE_PROJECT_NAME} ${DEPS_LIBRARIES}) -+target_link_libraries(${CMAKE_PROJECT_NAME} ${DEPS_LIBRARIES} m) - - # Installation - install (TARGETS ${CMAKE_PROJECT_NAME} DESTINATION ${PKGDATADIR}) diff --git a/sources b/sources index a4c23de..10376b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wingpanel-indicator-datetime-2.1.0.tar.gz) = cfa20e16148fcdd2d63a52c79ec9344fd30e33a015d4d7377f2304c0bac7749d807fb681c092f8ae26779d7636f5b9c7d780822af916c640e657cbde99ea6a60 +SHA512 (wingpanel-indicator-datetime-2.1.1.tar.gz) = 8ccabeef520ef57549c680694233350da511cadc3f2912ba3439bc2df3f053001711f25bde6f9ac99cae5f6b5525da25d6de7faaa3ac57900b0310e7425ded53 diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index d97ba1a..7646906 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -4,20 +4,15 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel -Version: 2.1.0 -Release: 3%{?dist} +Version: 2.1.1 +Release: 1%{?dist} License: GPLv3+ URL: https://github.com/elementary/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -# Patch to fix undefined symbols -Patch1: 01-fix-linker-flags.patch - -BuildRequires: cmake -BuildRequires: gcc -BuildRequires: gcc-c++ BuildRequires: gettext +BuildRequires: meson BuildRequires: vala >= 0.22.0 BuildRequires: pkgconfig(glib-2.0) >= 2.32 @@ -26,7 +21,6 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libecal-1.2) BuildRequires: pkgconfig(libedataserver-1.2) BuildRequires: pkgconfig(libical) -BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(wingpanel-2.0) Requires: wingpanel%{?_isa} @@ -42,16 +36,12 @@ A datetime indicator for wingpanel. %build -mkdir build && pushd build -%cmake .. -%make_build -popd +%meson +%meson_build %install -pushd build -%make_install -popd +%meson_install %find_lang datetime-indicator @@ -66,6 +56,9 @@ popd %changelog +* Tue Oct 02 2018 Fabio Valentini - 2.1.1-1 +- Update to version 2.1.1. + * Sat Jul 14 2018 Fedora Release Engineering - 2.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 01670ba826cb66f38acb8ad7b5fd4bf1ad702a04 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 20 Oct 2018 19:00:55 +0200 Subject: [PATCH 06/41] update to version 2.1.2 --- .gitignore | 4 +++- sources | 2 +- wingpanel-indicator-datetime.rpmlintrc | 3 +++ wingpanel-indicator-datetime.spec | 5 ++++- 4 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 wingpanel-indicator-datetime.rpmlintrc diff --git a/.gitignore b/.gitignore index 4c08dcd..dd8499a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ -/results* +/results_* /*.src.rpm + /wingpanel-indicator-datetime-2.0.1.tar.xz /wingpanel-indicator-datetime-2.0.2.tar.gz /wingpanel-indicator-datetime-2.1.0.tar.gz /wingpanel-indicator-datetime-2.1.1.tar.gz +/wingpanel-indicator-datetime-2.1.2.tar.gz diff --git a/sources b/sources index 10376b5..64ec67c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wingpanel-indicator-datetime-2.1.1.tar.gz) = 8ccabeef520ef57549c680694233350da511cadc3f2912ba3439bc2df3f053001711f25bde6f9ac99cae5f6b5525da25d6de7faaa3ac57900b0310e7425ded53 +SHA512 (wingpanel-indicator-datetime-2.1.2.tar.gz) = f2db0f67c4ebfc790f75ab201ed2bdc5fcea9387c323f084f3ada283473ade6afd545191f989e3883eef16054f13d4fbcfc11252c79f1ad7b33c225b38957c9b diff --git a/wingpanel-indicator-datetime.rpmlintrc b/wingpanel-indicator-datetime.rpmlintrc new file mode 100644 index 0000000..fbcdc48 --- /dev/null +++ b/wingpanel-indicator-datetime.rpmlintrc @@ -0,0 +1,3 @@ +# false positives +addFilter("E: invalid-lc-messages-dir /usr/share/locale/bh*") +addFilter("E: invalid-lc-messages-dir /usr/share/locale/mo*") diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index 7646906..a82826a 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -4,7 +4,7 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel -Version: 2.1.1 +Version: 2.1.2 Release: 1%{?dist} License: GPLv3+ @@ -56,6 +56,9 @@ A datetime indicator for wingpanel. %changelog +* Sat Oct 20 2018 Fabio Valentini - 2.1.2-1 +- Update to version 2.1.2. + * Tue Oct 02 2018 Fabio Valentini - 2.1.1-1 - Update to version 2.1.1. From e0e63f963874804515e3df70d74a5e716bebd668 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 14 Nov 2018 13:39:53 +0100 Subject: [PATCH 07/41] rebuild for libedataserver soname bump --- wingpanel-indicator-datetime.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index a82826a..75601b8 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -5,7 +5,7 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel Version: 2.1.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ URL: https://github.com/elementary/%{name} @@ -56,6 +56,9 @@ A datetime indicator for wingpanel. %changelog +* Wed Nov 14 2018 Fabio Valentini - 2.1.2-2 +- Rebuild for libedataserver soname bump. + * Sat Oct 20 2018 Fabio Valentini - 2.1.2-1 - Update to version 2.1.2. From 48fe425a617dfe4636116ecadfdf6204e6389580 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 12 Dec 2018 15:09:41 +0100 Subject: [PATCH 08/41] update to version 2.1.3 --- .gitignore | 1 + sources | 2 +- wingpanel-indicator-datetime.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dd8499a..dd083dc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /wingpanel-indicator-datetime-2.1.0.tar.gz /wingpanel-indicator-datetime-2.1.1.tar.gz /wingpanel-indicator-datetime-2.1.2.tar.gz +/wingpanel-indicator-datetime-2.1.3.tar.gz diff --git a/sources b/sources index 64ec67c..b2855f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wingpanel-indicator-datetime-2.1.2.tar.gz) = f2db0f67c4ebfc790f75ab201ed2bdc5fcea9387c323f084f3ada283473ade6afd545191f989e3883eef16054f13d4fbcfc11252c79f1ad7b33c225b38957c9b +SHA512 (wingpanel-indicator-datetime-2.1.3.tar.gz) = ab3100c98485aa7aafaedf7cb80d56eb75963b317d4a1d81d39e11eb28ddb5f61143072d4e86ebdf4557b39e17ce2e285c57113ca004b28d9cdf175b1b540efd diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index 75601b8..bec4878 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -4,8 +4,8 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel -Version: 2.1.2 -Release: 2%{?dist} +Version: 2.1.3 +Release: 1%{?dist} License: GPLv3+ URL: https://github.com/elementary/%{name} @@ -56,6 +56,9 @@ A datetime indicator for wingpanel. %changelog +* Wed Dec 12 2018 Fabio Valentini - 2.1.3-1 +- Update to version 2.1.3. + * Wed Nov 14 2018 Fabio Valentini - 2.1.2-2 - Rebuild for libedataserver soname bump. From c8d515b76aa812c141212d5515621a6febd781a3 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 18 Dec 2018 15:29:57 +0100 Subject: [PATCH 09/41] adapt to gsettings key that's been moved to granite --- ...ove-clock-format-settings-to-granite.patch | 69 +++++++++++++++++++ wingpanel-indicator-datetime.spec | 12 +++- 2 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 00-move-clock-format-settings-to-granite.patch diff --git a/00-move-clock-format-settings-to-granite.patch b/00-move-clock-format-settings-to-granite.patch new file mode 100644 index 0000000..06bfdd5 --- /dev/null +++ b/00-move-clock-format-settings-to-granite.patch @@ -0,0 +1,69 @@ +From f5e0f6b020dc7ee0001ca54a4ab107f794e73ac4 Mon Sep 17 00:00:00 2001 +From: Fabio Valentini +Date: Sun, 4 Nov 2018 22:15:34 +0100 +Subject: [PATCH] move "clock-format" GSettings key to granite + +--- + ...o.elementary.desktop.wingpanel.datetime.gschema.xml | 10 ---------- + src/Widgets/PanelLabel.vala | 4 +++- + src/Widgets/calendar/Util.vala | 2 +- + 3 files changed, 4 insertions(+), 12 deletions(-) + +diff --git a/data/io.elementary.desktop.wingpanel.datetime.gschema.xml b/data/io.elementary.desktop.wingpanel.datetime.gschema.xml +index 32e0bdd..6cb8433 100644 +--- a/data/io.elementary.desktop.wingpanel.datetime.gschema.xml ++++ b/data/io.elementary.desktop.wingpanel.datetime.gschema.xml +@@ -1,21 +1,11 @@ + + +- +- +- +- +- + + + false + Show week numbers. + If this is set to true, week numbers will be shown in the calendar. + +- +- "12h" +- Whether the clock displays in 12h or 24h format +- Whether the clock displays in 12h or 24h format +- + + false + If this is set to true, seconds will be shown in the clock +diff --git a/src/Widgets/PanelLabel.vala b/src/Widgets/PanelLabel.vala +index 01dd433..58282d9 100644 +--- a/src/Widgets/PanelLabel.vala ++++ b/src/Widgets/PanelLabel.vala +@@ -40,11 +40,13 @@ public class DateTime.Widgets.PanelLabel : Gtk.Grid { + add (time_label); + + var clock_settings = new GLib.Settings ("io.elementary.desktop.wingpanel.datetime"); +- clock_settings.bind ("clock-format", this, "clock-format", SettingsBindFlags.DEFAULT); + clock_settings.bind ("clock-show-seconds", this, "clock-show-seconds", SettingsBindFlags.DEFAULT); + clock_settings.bind ("clock-show-date", date_revealer, "reveal_child", SettingsBindFlags.DEFAULT); + clock_settings.bind ("clock-show-weekday", this, "clock-show-weekday", SettingsBindFlags.DEFAULT); + ++ var format_settings = new GLib.Settings ("io.elementary.granite"); ++ format_settings.bind ("clock-format", this, "clock-format", SettingsBindFlags.DEFAULT); ++ + notify.connect (() => { + update_labels (); + }); +diff --git a/src/Widgets/calendar/Util.vala b/src/Widgets/calendar/Util.vala +index a8183ea..d18181c 100644 +--- a/src/Widgets/calendar/Util.vala ++++ b/src/Widgets/calendar/Util.vala +@@ -214,7 +214,7 @@ namespace Util { + } + + /* If AM/PM exists, assume it is the default time format and check for format override. */ +- var setting = new GLib.Settings ("org.gnome.desktop.interface"); ++ var setting = new GLib.Settings ("io.elementary.granite"); + var clockformat = setting.get_user_value ("clock-format"); + + if (clockformat == null) { diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index bec4878..a34067f 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -5,12 +5,16 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel Version: 2.1.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ URL: https://github.com/elementary/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +# the "clock-format" GSettings key has been moved to granite +# to resolve a circular dependency and to fix third-party apps +Patch0: 00-move-clock-format-settings-to-granite.patch + BuildRequires: gettext BuildRequires: meson BuildRequires: vala >= 0.22.0 @@ -23,6 +27,9 @@ BuildRequires: pkgconfig(libedataserver-1.2) BuildRequires: pkgconfig(libical) BuildRequires: pkgconfig(wingpanel-2.0) +# this is the first package of granite that has the required gsettings key +Requires: granite > 5.2.2-1 + Requires: wingpanel%{?_isa} Supplements: wingpanel%{?_isa} @@ -56,6 +63,9 @@ A datetime indicator for wingpanel. %changelog +* Tue Dec 18 2018 Fabio Valentini - 2.1.3-2 +- Add patch to move some gsettings to granite itself. + * Wed Dec 12 2018 Fabio Valentini - 2.1.3-1 - Update to version 2.1.3. From b3e3064c5a54c42de4823d6632640c0fab276819 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:46:23 +0000 Subject: [PATCH 10/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wingpanel-indicator-datetime.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index a34067f..ea87bea 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -5,7 +5,7 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel Version: 2.1.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ URL: https://github.com/elementary/%{name} @@ -63,6 +63,9 @@ A datetime indicator for wingpanel. %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 2.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Dec 18 2018 Fabio Valentini - 2.1.3-2 - Add patch to move some gsettings to granite itself. From 71a87a209af22a2830bd3fd59f61c58a993ca5ac Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 8 Jul 2019 21:33:37 +0200 Subject: [PATCH 11/41] drop unnecessary granite/datetime patch --- ...ove-clock-format-settings-to-granite.patch | 69 ------------------- wingpanel-indicator-datetime.spec | 12 ++-- 2 files changed, 4 insertions(+), 77 deletions(-) delete mode 100644 00-move-clock-format-settings-to-granite.patch diff --git a/00-move-clock-format-settings-to-granite.patch b/00-move-clock-format-settings-to-granite.patch deleted file mode 100644 index 06bfdd5..0000000 --- a/00-move-clock-format-settings-to-granite.patch +++ /dev/null @@ -1,69 +0,0 @@ -From f5e0f6b020dc7ee0001ca54a4ab107f794e73ac4 Mon Sep 17 00:00:00 2001 -From: Fabio Valentini -Date: Sun, 4 Nov 2018 22:15:34 +0100 -Subject: [PATCH] move "clock-format" GSettings key to granite - ---- - ...o.elementary.desktop.wingpanel.datetime.gschema.xml | 10 ---------- - src/Widgets/PanelLabel.vala | 4 +++- - src/Widgets/calendar/Util.vala | 2 +- - 3 files changed, 4 insertions(+), 12 deletions(-) - -diff --git a/data/io.elementary.desktop.wingpanel.datetime.gschema.xml b/data/io.elementary.desktop.wingpanel.datetime.gschema.xml -index 32e0bdd..6cb8433 100644 ---- a/data/io.elementary.desktop.wingpanel.datetime.gschema.xml -+++ b/data/io.elementary.desktop.wingpanel.datetime.gschema.xml -@@ -1,21 +1,11 @@ - - -- -- -- -- -- - - - false - Show week numbers. - If this is set to true, week numbers will be shown in the calendar. - -- -- "12h" -- Whether the clock displays in 12h or 24h format -- Whether the clock displays in 12h or 24h format -- - - false - If this is set to true, seconds will be shown in the clock -diff --git a/src/Widgets/PanelLabel.vala b/src/Widgets/PanelLabel.vala -index 01dd433..58282d9 100644 ---- a/src/Widgets/PanelLabel.vala -+++ b/src/Widgets/PanelLabel.vala -@@ -40,11 +40,13 @@ public class DateTime.Widgets.PanelLabel : Gtk.Grid { - add (time_label); - - var clock_settings = new GLib.Settings ("io.elementary.desktop.wingpanel.datetime"); -- clock_settings.bind ("clock-format", this, "clock-format", SettingsBindFlags.DEFAULT); - clock_settings.bind ("clock-show-seconds", this, "clock-show-seconds", SettingsBindFlags.DEFAULT); - clock_settings.bind ("clock-show-date", date_revealer, "reveal_child", SettingsBindFlags.DEFAULT); - clock_settings.bind ("clock-show-weekday", this, "clock-show-weekday", SettingsBindFlags.DEFAULT); - -+ var format_settings = new GLib.Settings ("io.elementary.granite"); -+ format_settings.bind ("clock-format", this, "clock-format", SettingsBindFlags.DEFAULT); -+ - notify.connect (() => { - update_labels (); - }); -diff --git a/src/Widgets/calendar/Util.vala b/src/Widgets/calendar/Util.vala -index a8183ea..d18181c 100644 ---- a/src/Widgets/calendar/Util.vala -+++ b/src/Widgets/calendar/Util.vala -@@ -214,7 +214,7 @@ namespace Util { - } - - /* If AM/PM exists, assume it is the default time format and check for format override. */ -- var setting = new GLib.Settings ("org.gnome.desktop.interface"); -+ var setting = new GLib.Settings ("io.elementary.granite"); - var clockformat = setting.get_user_value ("clock-format"); - - if (clockformat == null) { diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index ea87bea..22a0edc 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -5,16 +5,12 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel Version: 2.1.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ URL: https://github.com/elementary/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -# the "clock-format" GSettings key has been moved to granite -# to resolve a circular dependency and to fix third-party apps -Patch0: 00-move-clock-format-settings-to-granite.patch - BuildRequires: gettext BuildRequires: meson BuildRequires: vala >= 0.22.0 @@ -27,9 +23,6 @@ BuildRequires: pkgconfig(libedataserver-1.2) BuildRequires: pkgconfig(libical) BuildRequires: pkgconfig(wingpanel-2.0) -# this is the first package of granite that has the required gsettings key -Requires: granite > 5.2.2-1 - Requires: wingpanel%{?_isa} Supplements: wingpanel%{?_isa} @@ -63,6 +56,9 @@ A datetime indicator for wingpanel. %changelog +* Mon Jul 08 2019 Fabio Valentini - 2.1.3-4 +- Drop unnecessary granite/datetime patch. + * Sun Feb 03 2019 Fedora Release Engineering - 2.1.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 2e1f1c1ce1844da673448b19f295634df38ca812 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:31:53 +0000 Subject: [PATCH 12/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wingpanel-indicator-datetime.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index 22a0edc..1347a32 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -5,7 +5,7 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel Version: 2.1.3 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3+ URL: https://github.com/elementary/%{name} @@ -56,6 +56,9 @@ A datetime indicator for wingpanel. %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 2.1.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon Jul 08 2019 Fabio Valentini - 2.1.3-4 - Drop unnecessary granite/datetime patch. From 2e86a0fb8aca2f78d53bfa7f8ca61f78f954705e Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 1 Nov 2019 14:35:59 +0100 Subject: [PATCH 13/41] update to version 2.2.0 --- .gitignore | 1 + sources | 2 +- wingpanel-indicator-datetime.spec | 28 +++++++++++++++++++--------- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index dd083dc..52ba58e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /wingpanel-indicator-datetime-2.1.1.tar.gz /wingpanel-indicator-datetime-2.1.2.tar.gz /wingpanel-indicator-datetime-2.1.3.tar.gz +/wingpanel-indicator-datetime-2.2.0.tar.gz diff --git a/sources b/sources index b2855f7..8c6a634 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wingpanel-indicator-datetime-2.1.3.tar.gz) = ab3100c98485aa7aafaedf7cb80d56eb75963b317d4a1d81d39e11eb28ddb5f61143072d4e86ebdf4557b39e17ce2e285c57113ca004b28d9cdf175b1b540efd +SHA512 (wingpanel-indicator-datetime-2.2.0.tar.gz) = 9aba2e66248409e12fec55cc3ccb7859c1d0013eda4ed212c6bae051b8f8099bc7ad6f9f61fc41a04b72745ea7fc5e1941b3da25f75cad4a2ed1aa82ba6de446 diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index 1347a32..c966266 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -1,17 +1,19 @@ %global __provides_exclude_from ^%{_libdir}/wingpanel/.*\\.so$ -%global appname io.elementary.desktop.wingpanel.datetime +%global indi_name datetime +%global indi_rdnn io.elementary.wingpanel.datetime Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel -Version: 2.1.3 -Release: 5%{?dist} +Version: 2.2.0 +Release: 1%{?dist} License: GPLv3+ -URL: https://github.com/elementary/%{name} +URL: https://github.com/elementary/wingpanel-indicator-datetime Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: gettext +BuildRequires: libappstream-glib BuildRequires: meson BuildRequires: vala >= 0.22.0 @@ -43,19 +45,28 @@ A datetime indicator for wingpanel. %install %meson_install -%find_lang datetime-indicator +%find_lang %{indi_name}-indicator -%files -f datetime-indicator.lang +%check +appstream-util validate-relax --nonet \ + %{buildroot}/%{_datadir}/metainfo/%{indi_rdnn}.appdata.xml + + +%files -f %{indi_name}-indicator.lang %doc README.md %license COPYING -%{_libdir}/wingpanel/libdatetime.so +%{_libdir}/wingpanel/lib%{indi_name}.so -%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml +%{_datadir}/glib-2.0/schemas/io.elementary.desktop.wingpanel.datetime.gschema.xml +%{_datadir}/metainfo/%{indi_rdnn}.appdata.xml %changelog +* Fri Nov 01 2019 Fabio Valentini - 2.2.0-1 +- Update to version 2.2.0. + * Sat Jul 27 2019 Fedora Release Engineering - 2.1.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild @@ -134,4 +145,3 @@ A datetime indicator for wingpanel. * Sun Aug 21 2016 Fabio Valentini - 2.0-1 - Update to version 2.0. - From 3f83d508cb33276b233b7592ba8761ed9623f683 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 27 Nov 2019 10:49:06 +0100 Subject: [PATCH 14/41] update to version 2.2.1 --- .gitignore | 1 + sources | 2 +- wingpanel-indicator-datetime.spec | 18 ++++++++++-------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 52ba58e..b051c20 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /wingpanel-indicator-datetime-2.1.2.tar.gz /wingpanel-indicator-datetime-2.1.3.tar.gz /wingpanel-indicator-datetime-2.2.0.tar.gz +/wingpanel-indicator-datetime-2.2.1.tar.gz diff --git a/sources b/sources index 8c6a634..43aa442 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wingpanel-indicator-datetime-2.2.0.tar.gz) = 9aba2e66248409e12fec55cc3ccb7859c1d0013eda4ed212c6bae051b8f8099bc7ad6f9f61fc41a04b72745ea7fc5e1941b3da25f75cad4a2ed1aa82ba6de446 +SHA512 (wingpanel-indicator-datetime-2.2.1.tar.gz) = 963416c510f718a5abd4bed92e0036fc4991cbc700b4f4a2120615be69a3c7e5851464ab82f1beed79933f202156a3ebba1b87a01eaebbf37ce67845dbeb3e36 diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index c966266..ea77fed 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -1,11 +1,10 @@ %global __provides_exclude_from ^%{_libdir}/wingpanel/.*\\.so$ -%global indi_name datetime -%global indi_rdnn io.elementary.wingpanel.datetime +%global appname io.elementary.wingpanel.datetime Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel -Version: 2.2.0 +Version: 2.2.1 Release: 1%{?dist} License: GPLv3+ @@ -45,25 +44,28 @@ A datetime indicator for wingpanel. %install %meson_install -%find_lang %{indi_name}-indicator +%find_lang datetime-indicator %check appstream-util validate-relax --nonet \ - %{buildroot}/%{_datadir}/metainfo/%{indi_rdnn}.appdata.xml + %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml -%files -f %{indi_name}-indicator.lang +%files -f datetime-indicator.lang %doc README.md %license COPYING -%{_libdir}/wingpanel/lib%{indi_name}.so +%{_libdir}/wingpanel/libdatetime.so %{_datadir}/glib-2.0/schemas/io.elementary.desktop.wingpanel.datetime.gschema.xml -%{_datadir}/metainfo/%{indi_rdnn}.appdata.xml +%{_datadir}/metainfo/%{appname}.appdata.xml %changelog +* Wed Nov 27 2019 Fabio Valentini - 2.2.1-1 +- Update to version 2.2.1. + * Fri Nov 01 2019 Fabio Valentini - 2.2.0-1 - Update to version 2.2.0. From 45e139fda66948daee3e0dec9ed686e1d06721c8 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 7 Dec 2019 22:22:15 +0100 Subject: [PATCH 15/41] include upstream patch for libecal-2.0 support --- 3ccd05d.patch | 146 ++++++++++++++++++++++++++++++ wingpanel-indicator-datetime.spec | 13 ++- 2 files changed, 155 insertions(+), 4 deletions(-) create mode 100644 3ccd05d.patch diff --git a/3ccd05d.patch b/3ccd05d.patch new file mode 100644 index 0000000..c5814ea --- /dev/null +++ b/3ccd05d.patch @@ -0,0 +1,146 @@ +From 3ccd05d611e6dd5274a03f061ba1b5e13d6fe0cf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Corentin=20No=C3=ABl?= +Date: Fri, 6 Dec 2019 19:41:32 +0100 +Subject: [PATCH] Add support for libecal-2.0 (#202) + +--- + meson.build | 16 ++++++++++++-- + src/Widgets/calendar/CalendarModel.vala | 28 ++++++++++++++++++------- + src/Widgets/calendar/Util.vala | 12 +++++++++-- + 3 files changed, 45 insertions(+), 11 deletions(-) + +diff --git a/meson.build b/meson.build +index 71c80a1..a1b9b46 100644 +--- a/meson.build ++++ b/meson.build +@@ -24,6 +24,18 @@ gresource = gnome.compile_resources( + wingpanel_dep = dependency('wingpanel-2.0') + wingpanel_indicatorsdir = wingpanel_dep.get_pkgconfig_variable('indicatorsdir', define_variable: ['libdir', libdir]) + ++ ++libecal_dep = dependency('libecal-2.0', required: false) ++if libecal_dep.found() ++ libical_dep = dependency('libical-glib') ++ add_project_arguments('--define=E_CAL_2_0', language: 'vala') ++ add_project_arguments('-DLIBICAL_GLIB_UNSTABLE_API=1', language: 'c') ++else ++ libecal_dep = dependency('libecal-1.2', version: '>=3.8.0') ++ libical_dep = dependency('libical') ++ add_project_arguments('--vapidir', join_paths(meson.current_source_dir(), 'vapi'), language: 'vala') ++endif ++ + shared_module( + meson.project_name(), + gresource, +@@ -43,9 +55,9 @@ shared_module( + dependency('gobject-2.0'), + dependency('granite'), + dependency('gtk+-3.0'), +- dependency('libecal-1.2'), ++ libecal_dep, + dependency('libedataserver-1.2'), +- dependency('libical'), ++ libical_dep, + wingpanel_dep, + ], + install: true, +diff --git a/src/Widgets/calendar/CalendarModel.vala b/src/Widgets/calendar/CalendarModel.vala +index c30401e..7602303 100644 +--- a/src/Widgets/calendar/CalendarModel.vala ++++ b/src/Widgets/calendar/CalendarModel.vala +@@ -260,25 +260,35 @@ namespace DateTime.Widgets { + return view; + } + +- private void on_objects_added (E.Source source, ECal.Client client, SList objects) { ++#if E_CAL_2_0 ++ private void on_objects_added (E.Source source, ECal.Client client, SList objects) { ++#else ++ private void on_objects_added (E.Source source, ECal.Client client, SList objects) { ++#endif + debug (@"Received $(objects.length()) added event(s) for source '%s'", source.dup_display_name ()); + var events = source_events.get (source); + var added_events = new Gee.ArrayList ((Gee.EqualDataFunc?) Util.calcomponent_equal_func); +- + objects.foreach ((comp) => { + unowned string uid = comp.get_uid (); ++#if E_CAL_2_0 ++ client.generate_instances_for_object_sync (comp, (time_t) data_range.first_dt.to_unix (), (time_t) data_range.last_dt.to_unix (), null, (comp, start, end) => { ++ var event = new ECal.Component.from_icalcomponent (comp); ++#else + client.generate_instances_for_object_sync (comp, (time_t) data_range.first_dt.to_unix (), (time_t) data_range.last_dt.to_unix (), (event, start, end) => { ++#endif + debug_event (source, event); + events.set (uid, event); + added_events.add (event); + return true; + }); + }); +- +- events_added (source, added_events.read_only_view); + } + +- private void on_objects_modified (E.Source source, ECal.Client client, SList objects) { ++#if E_CAL_2_0 ++ private void on_objects_modified (E.Source source, ECal.Client client, SList objects) { ++#else ++ private void on_objects_modified (E.Source source, ECal.Client client, SList objects) { ++#endif + debug (@"Received $(objects.length()) modified event(s) for source '%s'", source.dup_display_name ()); + var updated_events = new Gee.ArrayList ((Gee.EqualDataFunc?) Util.calcomponent_equal_func); + +@@ -294,7 +304,11 @@ namespace DateTime.Widgets { + events_updated (source, updated_events.read_only_view); + } + +- private void on_objects_removed (E.Source source, ECal.Client client, SList cids) { ++#if E_CAL_2_0 ++ private void on_objects_removed (E.Source source, ECal.Client client, SList cids) { ++#else ++ private void on_objects_removed (E.Source source, ECal.Client client, SList cids) { ++#endif + debug (@"Received $(cids.length()) removed event(s) for source '%s'", source.dup_display_name ()); + var events = source_events.get (source); + var removed_events = new Gee.ArrayList ((Gee.EqualDataFunc?) Util.calcomponent_equal_func); +@@ -304,7 +318,7 @@ namespace DateTime.Widgets { + return; + } + +- var comps = events.get (cid.uid); ++ var comps = events.get (cid.get_uid ()); + foreach (ECal.Component event in comps) { + removed_events.add (event); + debug_event (source, event); +diff --git a/src/Widgets/calendar/Util.vala b/src/Widgets/calendar/Util.vala +index ff9164b..e51f784 100644 +--- a/src/Widgets/calendar/Util.vala ++++ b/src/Widgets/calendar/Util.vala +@@ -93,8 +93,16 @@ namespace Util { + * XXX : Track next versions of evolution in order to convert ICal.Timezone to GLib.TimeZone with a dedicated function… + */ + public GLib.DateTime ical_to_date_time (ICal.Time date) { ++#if E_CAL_2_0 ++ int year, month, day, hour, minute, second; ++ date.get_date (out year, out month, out day); ++ date.get_time (out hour, out minute, out second); ++ return new GLib.DateTime (timezone_from_ical (date), year, month, ++ day, hour, minute, second); ++#else + return new GLib.DateTime (timezone_from_ical (date), date.year, date.month, + date.day, date.hour, date.minute, date.second); ++#endif + } + + /** +@@ -162,9 +170,9 @@ namespace Util { + + var a_id = a.get_id (); + var b_id = b.get_id (); +- int res = GLib.strcmp (a_id.uid, b_id.uid); ++ int res = GLib.strcmp (a_id.get_uid (), b_id.get_uid ()); + if (res == 0) { +- return GLib.strcmp (a_id.rid, b_id.rid); ++ return GLib.strcmp (a_id.get_rid (), b_id.get_rid ()); + } + + return res; diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index ea77fed..7d4b9d9 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -5,12 +5,15 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel Version: 2.2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ URL: https://github.com/elementary/wingpanel-indicator-datetime Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +# include upstream patch for libecal-2.0 support +Patch0: %{url}/commit/3ccd05d.patch + BuildRequires: gettext BuildRequires: libappstream-glib BuildRequires: meson @@ -19,9 +22,8 @@ BuildRequires: vala >= 0.22.0 BuildRequires: pkgconfig(glib-2.0) >= 2.32 BuildRequires: pkgconfig(granite) BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(libecal-1.2) -BuildRequires: pkgconfig(libedataserver-1.2) -BuildRequires: pkgconfig(libical) +BuildRequires: pkgconfig(libecal-2.0) +BuildRequires: pkgconfig(libical-glib) BuildRequires: pkgconfig(wingpanel-2.0) Requires: wingpanel%{?_isa} @@ -63,6 +65,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sat Dec 07 2019 Fabio Valentini - 2.2.1-2 +- Include upstream patch for libecal-2.0 support. + * Wed Nov 27 2019 Fabio Valentini - 2.2.1-1 - Update to version 2.2.1. From 2b902f488906bdf1f79c5a9712160131c5dd7a13 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:45:31 +0000 Subject: [PATCH 16/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wingpanel-indicator-datetime.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index 7d4b9d9..5a22cfc 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -5,7 +5,7 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel Version: 2.2.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ URL: https://github.com/elementary/wingpanel-indicator-datetime @@ -65,6 +65,9 @@ appstream-util validate-relax --nonet \ %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 2.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Dec 07 2019 Fabio Valentini - 2.2.1-2 - Include upstream patch for libecal-2.0 support. From e58bcc96db8b684da1ccd84f8dd00c047fa02fb3 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 30 Mar 2020 15:33:29 +0200 Subject: [PATCH 17/41] update to version 2.2.2 --- .gitignore | 1 + 3ccd05d.patch | 146 ------------------------------ sources | 2 +- wingpanel-indicator-datetime.spec | 10 +- 4 files changed, 7 insertions(+), 152 deletions(-) delete mode 100644 3ccd05d.patch diff --git a/.gitignore b/.gitignore index b051c20..1de8a00 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /wingpanel-indicator-datetime-2.1.3.tar.gz /wingpanel-indicator-datetime-2.2.0.tar.gz /wingpanel-indicator-datetime-2.2.1.tar.gz +/wingpanel-indicator-datetime-2.2.2.tar.gz diff --git a/3ccd05d.patch b/3ccd05d.patch deleted file mode 100644 index c5814ea..0000000 --- a/3ccd05d.patch +++ /dev/null @@ -1,146 +0,0 @@ -From 3ccd05d611e6dd5274a03f061ba1b5e13d6fe0cf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Corentin=20No=C3=ABl?= -Date: Fri, 6 Dec 2019 19:41:32 +0100 -Subject: [PATCH] Add support for libecal-2.0 (#202) - ---- - meson.build | 16 ++++++++++++-- - src/Widgets/calendar/CalendarModel.vala | 28 ++++++++++++++++++------- - src/Widgets/calendar/Util.vala | 12 +++++++++-- - 3 files changed, 45 insertions(+), 11 deletions(-) - -diff --git a/meson.build b/meson.build -index 71c80a1..a1b9b46 100644 ---- a/meson.build -+++ b/meson.build -@@ -24,6 +24,18 @@ gresource = gnome.compile_resources( - wingpanel_dep = dependency('wingpanel-2.0') - wingpanel_indicatorsdir = wingpanel_dep.get_pkgconfig_variable('indicatorsdir', define_variable: ['libdir', libdir]) - -+ -+libecal_dep = dependency('libecal-2.0', required: false) -+if libecal_dep.found() -+ libical_dep = dependency('libical-glib') -+ add_project_arguments('--define=E_CAL_2_0', language: 'vala') -+ add_project_arguments('-DLIBICAL_GLIB_UNSTABLE_API=1', language: 'c') -+else -+ libecal_dep = dependency('libecal-1.2', version: '>=3.8.0') -+ libical_dep = dependency('libical') -+ add_project_arguments('--vapidir', join_paths(meson.current_source_dir(), 'vapi'), language: 'vala') -+endif -+ - shared_module( - meson.project_name(), - gresource, -@@ -43,9 +55,9 @@ shared_module( - dependency('gobject-2.0'), - dependency('granite'), - dependency('gtk+-3.0'), -- dependency('libecal-1.2'), -+ libecal_dep, - dependency('libedataserver-1.2'), -- dependency('libical'), -+ libical_dep, - wingpanel_dep, - ], - install: true, -diff --git a/src/Widgets/calendar/CalendarModel.vala b/src/Widgets/calendar/CalendarModel.vala -index c30401e..7602303 100644 ---- a/src/Widgets/calendar/CalendarModel.vala -+++ b/src/Widgets/calendar/CalendarModel.vala -@@ -260,25 +260,35 @@ namespace DateTime.Widgets { - return view; - } - -- private void on_objects_added (E.Source source, ECal.Client client, SList objects) { -+#if E_CAL_2_0 -+ private void on_objects_added (E.Source source, ECal.Client client, SList objects) { -+#else -+ private void on_objects_added (E.Source source, ECal.Client client, SList objects) { -+#endif - debug (@"Received $(objects.length()) added event(s) for source '%s'", source.dup_display_name ()); - var events = source_events.get (source); - var added_events = new Gee.ArrayList ((Gee.EqualDataFunc?) Util.calcomponent_equal_func); -- - objects.foreach ((comp) => { - unowned string uid = comp.get_uid (); -+#if E_CAL_2_0 -+ client.generate_instances_for_object_sync (comp, (time_t) data_range.first_dt.to_unix (), (time_t) data_range.last_dt.to_unix (), null, (comp, start, end) => { -+ var event = new ECal.Component.from_icalcomponent (comp); -+#else - client.generate_instances_for_object_sync (comp, (time_t) data_range.first_dt.to_unix (), (time_t) data_range.last_dt.to_unix (), (event, start, end) => { -+#endif - debug_event (source, event); - events.set (uid, event); - added_events.add (event); - return true; - }); - }); -- -- events_added (source, added_events.read_only_view); - } - -- private void on_objects_modified (E.Source source, ECal.Client client, SList objects) { -+#if E_CAL_2_0 -+ private void on_objects_modified (E.Source source, ECal.Client client, SList objects) { -+#else -+ private void on_objects_modified (E.Source source, ECal.Client client, SList objects) { -+#endif - debug (@"Received $(objects.length()) modified event(s) for source '%s'", source.dup_display_name ()); - var updated_events = new Gee.ArrayList ((Gee.EqualDataFunc?) Util.calcomponent_equal_func); - -@@ -294,7 +304,11 @@ namespace DateTime.Widgets { - events_updated (source, updated_events.read_only_view); - } - -- private void on_objects_removed (E.Source source, ECal.Client client, SList cids) { -+#if E_CAL_2_0 -+ private void on_objects_removed (E.Source source, ECal.Client client, SList cids) { -+#else -+ private void on_objects_removed (E.Source source, ECal.Client client, SList cids) { -+#endif - debug (@"Received $(cids.length()) removed event(s) for source '%s'", source.dup_display_name ()); - var events = source_events.get (source); - var removed_events = new Gee.ArrayList ((Gee.EqualDataFunc?) Util.calcomponent_equal_func); -@@ -304,7 +318,7 @@ namespace DateTime.Widgets { - return; - } - -- var comps = events.get (cid.uid); -+ var comps = events.get (cid.get_uid ()); - foreach (ECal.Component event in comps) { - removed_events.add (event); - debug_event (source, event); -diff --git a/src/Widgets/calendar/Util.vala b/src/Widgets/calendar/Util.vala -index ff9164b..e51f784 100644 ---- a/src/Widgets/calendar/Util.vala -+++ b/src/Widgets/calendar/Util.vala -@@ -93,8 +93,16 @@ namespace Util { - * XXX : Track next versions of evolution in order to convert ICal.Timezone to GLib.TimeZone with a dedicated function… - */ - public GLib.DateTime ical_to_date_time (ICal.Time date) { -+#if E_CAL_2_0 -+ int year, month, day, hour, minute, second; -+ date.get_date (out year, out month, out day); -+ date.get_time (out hour, out minute, out second); -+ return new GLib.DateTime (timezone_from_ical (date), year, month, -+ day, hour, minute, second); -+#else - return new GLib.DateTime (timezone_from_ical (date), date.year, date.month, - date.day, date.hour, date.minute, date.second); -+#endif - } - - /** -@@ -162,9 +170,9 @@ namespace Util { - - var a_id = a.get_id (); - var b_id = b.get_id (); -- int res = GLib.strcmp (a_id.uid, b_id.uid); -+ int res = GLib.strcmp (a_id.get_uid (), b_id.get_uid ()); - if (res == 0) { -- return GLib.strcmp (a_id.rid, b_id.rid); -+ return GLib.strcmp (a_id.get_rid (), b_id.get_rid ()); - } - - return res; diff --git a/sources b/sources index 43aa442..31f8e24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wingpanel-indicator-datetime-2.2.1.tar.gz) = 963416c510f718a5abd4bed92e0036fc4991cbc700b4f4a2120615be69a3c7e5851464ab82f1beed79933f202156a3ebba1b87a01eaebbf37ce67845dbeb3e36 +SHA512 (wingpanel-indicator-datetime-2.2.2.tar.gz) = 08214b2edb87e0a9e56329be72e6ff8c47e702f052a8a96ccfa4167626ade7f7a1a4277ef4837a134fc7a3f3596725b8bdc6fcc93512a974c8b54dea8dc6613c diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index 5a22cfc..0588626 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -4,16 +4,13 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel -Version: 2.2.1 -Release: 3%{?dist} +Version: 2.2.2 +Release: 1%{?dist} License: GPLv3+ URL: https://github.com/elementary/wingpanel-indicator-datetime Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -# include upstream patch for libecal-2.0 support -Patch0: %{url}/commit/3ccd05d.patch - BuildRequires: gettext BuildRequires: libappstream-glib BuildRequires: meson @@ -65,6 +62,9 @@ appstream-util validate-relax --nonet \ %changelog +* Mon Mar 30 2020 Fabio Valentini - 2.2.2-1 +- Update to version 2.2.2. + * Fri Jan 31 2020 Fedora Release Engineering - 2.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 4e63d83138f490376979cf739816b6264df9bb36 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 20 May 2020 23:49:40 +0200 Subject: [PATCH 18/41] update to version 2.2.3 --- .gitignore | 1 + sources | 2 +- wingpanel-indicator-datetime.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1de8a00..b2a069d 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /wingpanel-indicator-datetime-2.2.0.tar.gz /wingpanel-indicator-datetime-2.2.1.tar.gz /wingpanel-indicator-datetime-2.2.2.tar.gz +/wingpanel-indicator-datetime-2.2.3.tar.gz diff --git a/sources b/sources index 31f8e24..60c0219 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wingpanel-indicator-datetime-2.2.2.tar.gz) = 08214b2edb87e0a9e56329be72e6ff8c47e702f052a8a96ccfa4167626ade7f7a1a4277ef4837a134fc7a3f3596725b8bdc6fcc93512a974c8b54dea8dc6613c +SHA512 (wingpanel-indicator-datetime-2.2.3.tar.gz) = f75f0284bdaf1b488feace8cce9e72da0534f0887cd64dc534342f621f1653d700d473a67560fda0aea6a51bd41a6d3c2da3e28eee4d16d4f7ff460c8e7a80ba diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index 0588626..9e17653 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -4,7 +4,7 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel -Version: 2.2.2 +Version: 2.2.3 Release: 1%{?dist} License: GPLv3+ @@ -62,6 +62,9 @@ appstream-util validate-relax --nonet \ %changelog +* Wed May 20 2020 Fabio Valentini - 2.2.3-1 +- Update to version 2.2.3. + * Mon Mar 30 2020 Fabio Valentini - 2.2.2-1 - Update to version 2.2.2. From 5ace5740eacb29de7b2cfa3b49205506c21b80a3 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 29 May 2020 00:04:51 +0200 Subject: [PATCH 19/41] update to version 2.2.4 --- .gitignore | 1 + sources | 2 +- wingpanel-indicator-datetime.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b2a069d..f79f4bb 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /wingpanel-indicator-datetime-2.2.1.tar.gz /wingpanel-indicator-datetime-2.2.2.tar.gz /wingpanel-indicator-datetime-2.2.3.tar.gz +/wingpanel-indicator-datetime-2.2.4.tar.gz diff --git a/sources b/sources index 60c0219..6a68de9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wingpanel-indicator-datetime-2.2.3.tar.gz) = f75f0284bdaf1b488feace8cce9e72da0534f0887cd64dc534342f621f1653d700d473a67560fda0aea6a51bd41a6d3c2da3e28eee4d16d4f7ff460c8e7a80ba +SHA512 (wingpanel-indicator-datetime-2.2.4.tar.gz) = 455c724ed4c0c594e2c758a49c8b6427f5122edf679edf6a4dc9c96f0cbefbc60aa804ae91c58198f4776bc59c9df25b6a544d19a0aa09eed2240731773ae986 diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index 9e17653..cc0cede 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -4,7 +4,7 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel -Version: 2.2.3 +Version: 2.2.4 Release: 1%{?dist} License: GPLv3+ @@ -62,6 +62,9 @@ appstream-util validate-relax --nonet \ %changelog +* Thu May 28 2020 Fabio Valentini - 2.2.4-1 +- Update to version 2.2.4. + * Wed May 20 2020 Fabio Valentini - 2.2.3-1 - Update to version 2.2.3. From 4be1e19a59a3fd0c2c9a0bff38c26b05344fca0a Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 4 Jul 2020 17:54:17 +0200 Subject: [PATCH 20/41] update to version 2.2.5 --- .gitignore | 1 + sources | 2 +- wingpanel-indicator-datetime.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f79f4bb..ec091f7 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /wingpanel-indicator-datetime-2.2.2.tar.gz /wingpanel-indicator-datetime-2.2.3.tar.gz /wingpanel-indicator-datetime-2.2.4.tar.gz +/wingpanel-indicator-datetime-2.2.5.tar.gz diff --git a/sources b/sources index 6a68de9..0c5ebf2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wingpanel-indicator-datetime-2.2.4.tar.gz) = 455c724ed4c0c594e2c758a49c8b6427f5122edf679edf6a4dc9c96f0cbefbc60aa804ae91c58198f4776bc59c9df25b6a544d19a0aa09eed2240731773ae986 +SHA512 (wingpanel-indicator-datetime-2.2.5.tar.gz) = 2d174384f56e1deb3d86f01a03415d5db85a2b3de09ead4e6e2ca8552dc3c9f3ec6cf5cf450e0312db99ff92ca07aa13decd319091e5b32bce874e235850fd04 diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index cc0cede..1f5f8b5 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -4,7 +4,7 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel -Version: 2.2.4 +Version: 2.2.5 Release: 1%{?dist} License: GPLv3+ @@ -62,6 +62,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sat Jul 04 2020 Fabio Valentini - 2.2.5-1 +- Update to version 2.2.5. + * Thu May 28 2020 Fabio Valentini - 2.2.4-1 - Update to version 2.2.4. From bbedba23a889ef6790eb23e9ed93add67df2719b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:10:43 +0000 Subject: [PATCH 21/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wingpanel-indicator-datetime.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index 1f5f8b5..1e016fa 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -5,7 +5,7 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel Version: 2.2.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ URL: https://github.com/elementary/wingpanel-indicator-datetime @@ -62,6 +62,9 @@ appstream-util validate-relax --nonet \ %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2.2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Jul 04 2020 Fabio Valentini - 2.2.5-1 - Update to version 2.2.5. From 0116286a0854f27b9eff53827209dc5f51cb21c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:31:50 +0000 Subject: [PATCH 22/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wingpanel-indicator-datetime.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index 1e016fa..32da5b8 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -5,7 +5,7 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel Version: 2.2.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ URL: https://github.com/elementary/wingpanel-indicator-datetime @@ -62,6 +62,9 @@ appstream-util validate-relax --nonet \ %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 2.2.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 2.2.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From d9b13e90e49d295bd6aaaef69462ed46d8105c76 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 12 Feb 2021 15:50:08 +0100 Subject: [PATCH 23/41] Rebuilt for evolution-data-server soname bump --- wingpanel-indicator-datetime.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index 32da5b8..1466d9f 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -5,7 +5,7 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel Version: 2.2.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ URL: https://github.com/elementary/wingpanel-indicator-datetime @@ -62,6 +62,9 @@ appstream-util validate-relax --nonet \ %changelog +* Fri Feb 12 2021 Fabio Valentini - 2.2.5-4 +- Rebuilt for evolution-data-server soname bump + * Wed Jan 27 2021 Fedora Release Engineering - 2.2.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From bd9e7f9990fcbb967659e3f83a4c13b841d8025e Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 19 Feb 2021 11:56:37 +0100 Subject: [PATCH 24/41] bump to commit 89a2496; rebuilt for granite 6 soname bump and wingpanel 3 --- .gitignore | 1 + sources | 2 +- wingpanel-indicator-datetime.spec | 20 ++++++++++++++++---- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index ec091f7..4de833a 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /wingpanel-indicator-datetime-2.2.3.tar.gz /wingpanel-indicator-datetime-2.2.4.tar.gz /wingpanel-indicator-datetime-2.2.5.tar.gz +/wingpanel-indicator-datetime-89a2496.tar.gz diff --git a/sources b/sources index 0c5ebf2..16d6462 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wingpanel-indicator-datetime-2.2.5.tar.gz) = 2d174384f56e1deb3d86f01a03415d5db85a2b3de09ead4e6e2ca8552dc3c9f3ec6cf5cf450e0312db99ff92ca07aa13decd319091e5b32bce874e235850fd04 +SHA512 (wingpanel-indicator-datetime-89a2496.tar.gz) = 996509babf1cdc836e8cde957960a2d7511b7607924e30886511b2278ed32ce2cd60a7e1f5b3095e87131d9f87223b614de01543a49421841138322118748c47 diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index 1466d9f..86d481f 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -1,15 +1,20 @@ +%global commit 89a2496dd9f09d046f08cf85bdcb345c0ef22955 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commitdate 20210217 + %global __provides_exclude_from ^%{_libdir}/wingpanel/.*\\.so$ +%global srcname wingpanel-indicator-datetime %global appname io.elementary.wingpanel.datetime Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel Version: 2.2.5 -Release: 4%{?dist} +Release: 5.%{commitdate}git%{shortcommit}%{?dist} License: GPLv3+ URL: https://github.com/elementary/wingpanel-indicator-datetime -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Source0: %{url}/archive/%{commit}/%{srcname}-%{shortcommit}.tar.gz BuildRequires: gettext BuildRequires: libappstream-glib @@ -20,8 +25,9 @@ BuildRequires: pkgconfig(glib-2.0) >= 2.32 BuildRequires: pkgconfig(granite) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libecal-2.0) +BuildRequires: pkgconfig(libhandy-1) BuildRequires: pkgconfig(libical-glib) -BuildRequires: pkgconfig(wingpanel-2.0) +BuildRequires: pkgconfig(wingpanel) >= 3.0.0 Requires: wingpanel%{?_isa} Supplements: wingpanel%{?_isa} @@ -32,7 +38,7 @@ A datetime indicator for wingpanel. %prep -%autosetup -p1 +%autosetup -n %{srcname}-%{commit} -p1 %build @@ -45,6 +51,9 @@ A datetime indicator for wingpanel. %find_lang datetime-indicator +# remove the specified stock icon from appdata (invalid in libappstream-glib) +sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml + %check appstream-util validate-relax --nonet \ @@ -62,6 +71,9 @@ appstream-util validate-relax --nonet \ %changelog +* Fri Feb 19 2021 Fabio Valentini - 2.2.5-5.20210217git89a2496 +- Bump to commit 89a2496. Rebuilt for granite 6 soname bump and wingpanel 3. + * Fri Feb 12 2021 Fabio Valentini - 2.2.5-4 - Rebuilt for evolution-data-server soname bump From 16f6a3e6956b4142163833f79cd3aa478900ff69 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 17 Jul 2021 12:14:35 +0200 Subject: [PATCH 25/41] convert to rpmautospec --- changelog | 113 +++++++++++++++++++++++++++++ wingpanel-indicator-datetime.spec | 117 +----------------------------- 2 files changed, 115 insertions(+), 115 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..ba51523 --- /dev/null +++ b/changelog @@ -0,0 +1,113 @@ +* Fri Feb 19 2021 Fabio Valentini - 2.2.5-5.20210217git89a2496 +- Bump to commit 89a2496. Rebuilt for granite 6 soname bump and wingpanel 3. + +* Fri Feb 12 2021 Fabio Valentini - 2.2.5-4 +- Rebuilt for evolution-data-server soname bump + +* Wed Jan 27 2021 Fedora Release Engineering - 2.2.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 2.2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 04 2020 Fabio Valentini - 2.2.5-1 +- Update to version 2.2.5. + +* Thu May 28 2020 Fabio Valentini - 2.2.4-1 +- Update to version 2.2.4. + +* Wed May 20 2020 Fabio Valentini - 2.2.3-1 +- Update to version 2.2.3. + +* Mon Mar 30 2020 Fabio Valentini - 2.2.2-1 +- Update to version 2.2.2. + +* Fri Jan 31 2020 Fedora Release Engineering - 2.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Dec 07 2019 Fabio Valentini - 2.2.1-2 +- Include upstream patch for libecal-2.0 support. + +* Wed Nov 27 2019 Fabio Valentini - 2.2.1-1 +- Update to version 2.2.1. + +* Fri Nov 01 2019 Fabio Valentini - 2.2.0-1 +- Update to version 2.2.0. + +* Sat Jul 27 2019 Fedora Release Engineering - 2.1.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon Jul 08 2019 Fabio Valentini - 2.1.3-4 +- Drop unnecessary granite/datetime patch. + +* Sun Feb 03 2019 Fedora Release Engineering - 2.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Dec 18 2018 Fabio Valentini - 2.1.3-2 +- Add patch to move some gsettings to granite itself. + +* Wed Dec 12 2018 Fabio Valentini - 2.1.3-1 +- Update to version 2.1.3. + +* Wed Nov 14 2018 Fabio Valentini - 2.1.2-2 +- Rebuild for libedataserver soname bump. + +* Sat Oct 20 2018 Fabio Valentini - 2.1.2-1 +- Update to version 2.1.2. + +* Tue Oct 02 2018 Fabio Valentini - 2.1.1-1 +- Update to version 2.1.1. + +* Sat Jul 14 2018 Fedora Release Engineering - 2.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Jul 12 2018 Fabio Valentini - 2.1.0-2 +- Add missing BR: gcc, gcc-c++. + +* Wed Jul 04 2018 Fabio Valentini - 2.1.0-1 +- Update to version 2.1.0. + +* Wed Jun 13 2018 Fabio Valentini - 2.0.2-8 +- Rebuild for granite5 soname bump. + +* Wed Feb 07 2018 Kalev Lember - 2.0.2-7 +- Rebuilt for evolution-data-server soname bump + +* Wed Jan 24 2018 Fabio Valentini - 2.0.2-6 +- Add patch to fix undefined symbols. + +* Wed Nov 08 2017 Fabio Valentini - 2.0.2-5 +- Rebuild for libical soname bump. + +* Sat Nov 04 2017 Fabio Valentini - 2.0.2-4 +- Rebuild for granite soname bump. + +* Thu Aug 03 2017 Fedora Release Engineering - 2.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 2.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Jul 01 2017 Fabio Valentini - 2.0.2-1 +- Update to version 2.0.2. + +* Sat Feb 11 2017 Fedora Release Engineering - 2.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jan 24 2017 Fabio Valentini - 2.0.1-3 +- Remove explicit BR: pkgconfig. + +* Tue Jan 17 2017 Fabio Valentini - 2.0.1-2 +- Clean up spec file. + +* Mon Oct 31 2016 Fabio Valentini - 2.0.1-1 +- Update to version 2.0.1. + +* Thu Sep 29 2016 Fabio Valentini - 2.0-3 +- Mass rebuild. + +* Wed Sep 28 2016 Fabio Valentini - 2.0-2 +- Spec file cleanups. + +* Sun Aug 21 2016 Fabio Valentini - 2.0-1 +- Update to version 2.0. diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index 86d481f..c4e8bbd 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -10,7 +10,7 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel Version: 2.2.5 -Release: 5.%{commitdate}git%{shortcommit}%{?dist} +Release: %autorelease -e %{commitdate}git%{shortcommit} License: GPLv3+ URL: https://github.com/elementary/wingpanel-indicator-datetime @@ -71,117 +71,4 @@ appstream-util validate-relax --nonet \ %changelog -* Fri Feb 19 2021 Fabio Valentini - 2.2.5-5.20210217git89a2496 -- Bump to commit 89a2496. Rebuilt for granite 6 soname bump and wingpanel 3. - -* Fri Feb 12 2021 Fabio Valentini - 2.2.5-4 -- Rebuilt for evolution-data-server soname bump - -* Wed Jan 27 2021 Fedora Release Engineering - 2.2.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 2.2.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Jul 04 2020 Fabio Valentini - 2.2.5-1 -- Update to version 2.2.5. - -* Thu May 28 2020 Fabio Valentini - 2.2.4-1 -- Update to version 2.2.4. - -* Wed May 20 2020 Fabio Valentini - 2.2.3-1 -- Update to version 2.2.3. - -* Mon Mar 30 2020 Fabio Valentini - 2.2.2-1 -- Update to version 2.2.2. - -* Fri Jan 31 2020 Fedora Release Engineering - 2.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Dec 07 2019 Fabio Valentini - 2.2.1-2 -- Include upstream patch for libecal-2.0 support. - -* Wed Nov 27 2019 Fabio Valentini - 2.2.1-1 -- Update to version 2.2.1. - -* Fri Nov 01 2019 Fabio Valentini - 2.2.0-1 -- Update to version 2.2.0. - -* Sat Jul 27 2019 Fedora Release Engineering - 2.1.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Jul 08 2019 Fabio Valentini - 2.1.3-4 -- Drop unnecessary granite/datetime patch. - -* Sun Feb 03 2019 Fedora Release Engineering - 2.1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Dec 18 2018 Fabio Valentini - 2.1.3-2 -- Add patch to move some gsettings to granite itself. - -* Wed Dec 12 2018 Fabio Valentini - 2.1.3-1 -- Update to version 2.1.3. - -* Wed Nov 14 2018 Fabio Valentini - 2.1.2-2 -- Rebuild for libedataserver soname bump. - -* Sat Oct 20 2018 Fabio Valentini - 2.1.2-1 -- Update to version 2.1.2. - -* Tue Oct 02 2018 Fabio Valentini - 2.1.1-1 -- Update to version 2.1.1. - -* Sat Jul 14 2018 Fedora Release Engineering - 2.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Jul 12 2018 Fabio Valentini - 2.1.0-2 -- Add missing BR: gcc, gcc-c++. - -* Wed Jul 04 2018 Fabio Valentini - 2.1.0-1 -- Update to version 2.1.0. - -* Wed Jun 13 2018 Fabio Valentini - 2.0.2-8 -- Rebuild for granite5 soname bump. - -* Wed Feb 07 2018 Kalev Lember - 2.0.2-7 -- Rebuilt for evolution-data-server soname bump - -* Wed Jan 24 2018 Fabio Valentini - 2.0.2-6 -- Add patch to fix undefined symbols. - -* Wed Nov 08 2017 Fabio Valentini - 2.0.2-5 -- Rebuild for libical soname bump. - -* Sat Nov 04 2017 Fabio Valentini - 2.0.2-4 -- Rebuild for granite soname bump. - -* Thu Aug 03 2017 Fedora Release Engineering - 2.0.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Jul 01 2017 Fabio Valentini - 2.0.2-1 -- Update to version 2.0.2. - -* Sat Feb 11 2017 Fedora Release Engineering - 2.0.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jan 24 2017 Fabio Valentini - 2.0.1-3 -- Remove explicit BR: pkgconfig. - -* Tue Jan 17 2017 Fabio Valentini - 2.0.1-2 -- Clean up spec file. - -* Mon Oct 31 2016 Fabio Valentini - 2.0.1-1 -- Update to version 2.0.1. - -* Thu Sep 29 2016 Fabio Valentini - 2.0-3 -- Mass rebuild. - -* Wed Sep 28 2016 Fabio Valentini - 2.0-2 -- Spec file cleanups. - -* Sun Aug 21 2016 Fabio Valentini - 2.0-1 -- Update to version 2.0. - +%autochangelog From f780e02ebdff6400a66266947c32faf6d01a290e Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 17 Jul 2021 12:17:38 +0200 Subject: [PATCH 26/41] Update to version 2.3.0; Fixes RHBZ#1982586 --- .gitignore | 1 + sources | 2 +- wingpanel-indicator-datetime.spec | 12 ++++-------- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 4de833a..bbcd068 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /wingpanel-indicator-datetime-2.2.4.tar.gz /wingpanel-indicator-datetime-2.2.5.tar.gz /wingpanel-indicator-datetime-89a2496.tar.gz +/wingpanel-indicator-datetime-2.3.0.tar.gz diff --git a/sources b/sources index 16d6462..778f10a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wingpanel-indicator-datetime-89a2496.tar.gz) = 996509babf1cdc836e8cde957960a2d7511b7607924e30886511b2278ed32ce2cd60a7e1f5b3095e87131d9f87223b614de01543a49421841138322118748c47 +SHA512 (wingpanel-indicator-datetime-2.3.0.tar.gz) = d71053f700f6928e1fe21b3fbdfc0b3263dd847aa9ee9b35aae58c3547dacac9a60b99587928174a99fbd81a40b3cff866e48d22181da1e32ca9d5ab8f758719 diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index c4e8bbd..c65d55c 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -1,7 +1,3 @@ -%global commit 89a2496dd9f09d046f08cf85bdcb345c0ef22955 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20210217 - %global __provides_exclude_from ^%{_libdir}/wingpanel/.*\\.so$ %global srcname wingpanel-indicator-datetime @@ -9,12 +5,12 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel -Version: 2.2.5 -Release: %autorelease -e %{commitdate}git%{shortcommit} +Version: 2.3.0 +Release: %autorelease License: GPLv3+ URL: https://github.com/elementary/wingpanel-indicator-datetime -Source0: %{url}/archive/%{commit}/%{srcname}-%{shortcommit}.tar.gz +Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz BuildRequires: gettext BuildRequires: libappstream-glib @@ -38,7 +34,7 @@ A datetime indicator for wingpanel. %prep -%autosetup -n %{srcname}-%{commit} -p1 +%autosetup -n %{srcname}-%{version} -p1 %build From 08e176fabfaf7e1bd65bbe4602eaa85b0c794b43 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:58:44 +0000 Subject: [PATCH 27/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From bfc53ff3374195d95df9b0f65b88e71f6b640d48 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 30 Oct 2021 11:53:40 +0200 Subject: [PATCH 28/41] Update to version 2.3.1; Fixes RHBZ#2018623 --- .gitignore | 1 + sources | 2 +- wingpanel-indicator-datetime.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bbcd068..21bdb4b 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /wingpanel-indicator-datetime-2.2.5.tar.gz /wingpanel-indicator-datetime-89a2496.tar.gz /wingpanel-indicator-datetime-2.3.0.tar.gz +/wingpanel-indicator-datetime-2.3.1.tar.gz diff --git a/sources b/sources index 778f10a..5989617 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wingpanel-indicator-datetime-2.3.0.tar.gz) = d71053f700f6928e1fe21b3fbdfc0b3263dd847aa9ee9b35aae58c3547dacac9a60b99587928174a99fbd81a40b3cff866e48d22181da1e32ca9d5ab8f758719 +SHA512 (wingpanel-indicator-datetime-2.3.1.tar.gz) = f2edf0c1db18e0c083b6f941c86d8337cc4d211267ec7639d371b87a94369c843d750d213d5b5cdbb04906e932de695ddcb4669f88f4667bd221d150bd6699b9 diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index c65d55c..d50f65b 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -5,7 +5,7 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel -Version: 2.3.0 +Version: 2.3.1 Release: %autorelease License: GPLv3+ From e989a7f1bfee7f3e7f5eed14d82183df80bb05a7 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 16 Dec 2021 00:24:29 +0100 Subject: [PATCH 29/41] Update to version 2.4.0; Fixes RHBZ#2031388 --- .gitignore | 1 + sources | 2 +- wingpanel-indicator-datetime.spec | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 21bdb4b..a28cb4c 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /wingpanel-indicator-datetime-89a2496.tar.gz /wingpanel-indicator-datetime-2.3.0.tar.gz /wingpanel-indicator-datetime-2.3.1.tar.gz +/wingpanel-indicator-datetime-2.4.0.tar.gz diff --git a/sources b/sources index 5989617..cde5341 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wingpanel-indicator-datetime-2.3.1.tar.gz) = f2edf0c1db18e0c083b6f941c86d8337cc4d211267ec7639d371b87a94369c843d750d213d5b5cdbb04906e932de695ddcb4669f88f4667bd221d150bd6699b9 +SHA512 (wingpanel-indicator-datetime-2.4.0.tar.gz) = 8e8865deaafa99cece11ac549ab1c43419ba6a8b88332f13d829e1fb7de20228e2799c5f0f1fcb41bb7b4e8f6ebc0f2f4940e910a2903ef76fb7dac28a2b4852 diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index d50f65b..8bbd573 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -5,7 +5,7 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel -Version: 2.3.1 +Version: 2.4.0 Release: %autorelease License: GPLv3+ @@ -18,7 +18,7 @@ BuildRequires: meson BuildRequires: vala >= 0.22.0 BuildRequires: pkgconfig(glib-2.0) >= 2.32 -BuildRequires: pkgconfig(granite) +BuildRequires: pkgconfig(granite) >= 6.0.0 BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libecal-2.0) BuildRequires: pkgconfig(libhandy-1) From 8f32f8e8a485dffc6dbbc22807f3331c05a9ae0f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:30:30 +0000 Subject: [PATCH 30/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 3fa8cfa1ae971609b2e2e3fb2209c274fa29b76b Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 19 Jul 2022 22:17:29 +0200 Subject: [PATCH 31/41] Rebuilt for evolution-data-server soname bump From 2e252cb6f0462ba7eba8e7816f0203d87f42622c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:27:50 +0000 Subject: [PATCH 32/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 21daca92e4089713a6486a1616a90061a4d00195 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 31 Aug 2022 12:07:54 +0200 Subject: [PATCH 33/41] remove package (temporarily) due to unresolved issues with GNOME 43 --- .gitignore | 19 ----- changelog | 113 ------------------------- dead.package | 1 + sources | 1 - wingpanel-indicator-datetime.rpmlintrc | 3 - wingpanel-indicator-datetime.spec | 70 --------------- 6 files changed, 1 insertion(+), 206 deletions(-) delete mode 100644 .gitignore delete mode 100644 changelog create mode 100644 dead.package delete mode 100644 sources delete mode 100644 wingpanel-indicator-datetime.rpmlintrc delete mode 100644 wingpanel-indicator-datetime.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index a28cb4c..0000000 --- a/.gitignore +++ /dev/null @@ -1,19 +0,0 @@ -/results_* -/*.src.rpm - -/wingpanel-indicator-datetime-2.0.1.tar.xz -/wingpanel-indicator-datetime-2.0.2.tar.gz -/wingpanel-indicator-datetime-2.1.0.tar.gz -/wingpanel-indicator-datetime-2.1.1.tar.gz -/wingpanel-indicator-datetime-2.1.2.tar.gz -/wingpanel-indicator-datetime-2.1.3.tar.gz -/wingpanel-indicator-datetime-2.2.0.tar.gz -/wingpanel-indicator-datetime-2.2.1.tar.gz -/wingpanel-indicator-datetime-2.2.2.tar.gz -/wingpanel-indicator-datetime-2.2.3.tar.gz -/wingpanel-indicator-datetime-2.2.4.tar.gz -/wingpanel-indicator-datetime-2.2.5.tar.gz -/wingpanel-indicator-datetime-89a2496.tar.gz -/wingpanel-indicator-datetime-2.3.0.tar.gz -/wingpanel-indicator-datetime-2.3.1.tar.gz -/wingpanel-indicator-datetime-2.4.0.tar.gz diff --git a/changelog b/changelog deleted file mode 100644 index ba51523..0000000 --- a/changelog +++ /dev/null @@ -1,113 +0,0 @@ -* Fri Feb 19 2021 Fabio Valentini - 2.2.5-5.20210217git89a2496 -- Bump to commit 89a2496. Rebuilt for granite 6 soname bump and wingpanel 3. - -* Fri Feb 12 2021 Fabio Valentini - 2.2.5-4 -- Rebuilt for evolution-data-server soname bump - -* Wed Jan 27 2021 Fedora Release Engineering - 2.2.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 2.2.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Jul 04 2020 Fabio Valentini - 2.2.5-1 -- Update to version 2.2.5. - -* Thu May 28 2020 Fabio Valentini - 2.2.4-1 -- Update to version 2.2.4. - -* Wed May 20 2020 Fabio Valentini - 2.2.3-1 -- Update to version 2.2.3. - -* Mon Mar 30 2020 Fabio Valentini - 2.2.2-1 -- Update to version 2.2.2. - -* Fri Jan 31 2020 Fedora Release Engineering - 2.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Dec 07 2019 Fabio Valentini - 2.2.1-2 -- Include upstream patch for libecal-2.0 support. - -* Wed Nov 27 2019 Fabio Valentini - 2.2.1-1 -- Update to version 2.2.1. - -* Fri Nov 01 2019 Fabio Valentini - 2.2.0-1 -- Update to version 2.2.0. - -* Sat Jul 27 2019 Fedora Release Engineering - 2.1.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Jul 08 2019 Fabio Valentini - 2.1.3-4 -- Drop unnecessary granite/datetime patch. - -* Sun Feb 03 2019 Fedora Release Engineering - 2.1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Dec 18 2018 Fabio Valentini - 2.1.3-2 -- Add patch to move some gsettings to granite itself. - -* Wed Dec 12 2018 Fabio Valentini - 2.1.3-1 -- Update to version 2.1.3. - -* Wed Nov 14 2018 Fabio Valentini - 2.1.2-2 -- Rebuild for libedataserver soname bump. - -* Sat Oct 20 2018 Fabio Valentini - 2.1.2-1 -- Update to version 2.1.2. - -* Tue Oct 02 2018 Fabio Valentini - 2.1.1-1 -- Update to version 2.1.1. - -* Sat Jul 14 2018 Fedora Release Engineering - 2.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Jul 12 2018 Fabio Valentini - 2.1.0-2 -- Add missing BR: gcc, gcc-c++. - -* Wed Jul 04 2018 Fabio Valentini - 2.1.0-1 -- Update to version 2.1.0. - -* Wed Jun 13 2018 Fabio Valentini - 2.0.2-8 -- Rebuild for granite5 soname bump. - -* Wed Feb 07 2018 Kalev Lember - 2.0.2-7 -- Rebuilt for evolution-data-server soname bump - -* Wed Jan 24 2018 Fabio Valentini - 2.0.2-6 -- Add patch to fix undefined symbols. - -* Wed Nov 08 2017 Fabio Valentini - 2.0.2-5 -- Rebuild for libical soname bump. - -* Sat Nov 04 2017 Fabio Valentini - 2.0.2-4 -- Rebuild for granite soname bump. - -* Thu Aug 03 2017 Fedora Release Engineering - 2.0.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Jul 01 2017 Fabio Valentini - 2.0.2-1 -- Update to version 2.0.2. - -* Sat Feb 11 2017 Fedora Release Engineering - 2.0.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jan 24 2017 Fabio Valentini - 2.0.1-3 -- Remove explicit BR: pkgconfig. - -* Tue Jan 17 2017 Fabio Valentini - 2.0.1-2 -- Clean up spec file. - -* Mon Oct 31 2016 Fabio Valentini - 2.0.1-1 -- Update to version 2.0.1. - -* Thu Sep 29 2016 Fabio Valentini - 2.0-3 -- Mass rebuild. - -* Wed Sep 28 2016 Fabio Valentini - 2.0-2 -- Spec file cleanups. - -* Sun Aug 21 2016 Fabio Valentini - 2.0-1 -- Update to version 2.0. diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..43a9af6 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +remove package (temporarily) due to unresolved issues with GNOME 43 diff --git a/sources b/sources deleted file mode 100644 index cde5341..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (wingpanel-indicator-datetime-2.4.0.tar.gz) = 8e8865deaafa99cece11ac549ab1c43419ba6a8b88332f13d829e1fb7de20228e2799c5f0f1fcb41bb7b4e8f6ebc0f2f4940e910a2903ef76fb7dac28a2b4852 diff --git a/wingpanel-indicator-datetime.rpmlintrc b/wingpanel-indicator-datetime.rpmlintrc deleted file mode 100644 index fbcdc48..0000000 --- a/wingpanel-indicator-datetime.rpmlintrc +++ /dev/null @@ -1,3 +0,0 @@ -# false positives -addFilter("E: invalid-lc-messages-dir /usr/share/locale/bh*") -addFilter("E: invalid-lc-messages-dir /usr/share/locale/mo*") diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec deleted file mode 100644 index 8bbd573..0000000 --- a/wingpanel-indicator-datetime.spec +++ /dev/null @@ -1,70 +0,0 @@ -%global __provides_exclude_from ^%{_libdir}/wingpanel/.*\\.so$ - -%global srcname wingpanel-indicator-datetime -%global appname io.elementary.wingpanel.datetime - -Name: wingpanel-indicator-datetime -Summary: Datetime Indicator for wingpanel -Version: 2.4.0 -Release: %autorelease -License: GPLv3+ - -URL: https://github.com/elementary/wingpanel-indicator-datetime -Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz - -BuildRequires: gettext -BuildRequires: libappstream-glib -BuildRequires: meson -BuildRequires: vala >= 0.22.0 - -BuildRequires: pkgconfig(glib-2.0) >= 2.32 -BuildRequires: pkgconfig(granite) >= 6.0.0 -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(libecal-2.0) -BuildRequires: pkgconfig(libhandy-1) -BuildRequires: pkgconfig(libical-glib) -BuildRequires: pkgconfig(wingpanel) >= 3.0.0 - -Requires: wingpanel%{?_isa} -Supplements: wingpanel%{?_isa} - - -%description -A datetime indicator for wingpanel. - - -%prep -%autosetup -n %{srcname}-%{version} -p1 - - -%build -%meson -%meson_build - - -%install -%meson_install - -%find_lang datetime-indicator - -# remove the specified stock icon from appdata (invalid in libappstream-glib) -sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml - - -%check -appstream-util validate-relax --nonet \ - %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml - - -%files -f datetime-indicator.lang -%doc README.md -%license COPYING - -%{_libdir}/wingpanel/libdatetime.so - -%{_datadir}/glib-2.0/schemas/io.elementary.desktop.wingpanel.datetime.gschema.xml -%{_datadir}/metainfo/%{appname}.appdata.xml - - -%changelog -%autochangelog From e4adc6ae3273dd9d367753741b0b8e12c743b344 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 13 Jun 2024 09:12:14 +0000 Subject: [PATCH 34/41] Unretirement Releng Request: https://pagure.io/releng/issue/12153 Signed-off-by: Fedora Release Engineering --- .gitignore | 19 +++++ changelog | 113 +++++++++++++++++++++++++ dead.package | 1 - sources | 1 + wingpanel-indicator-datetime.rpmlintrc | 3 + wingpanel-indicator-datetime.spec | 70 +++++++++++++++ 6 files changed, 206 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 changelog delete mode 100644 dead.package create mode 100644 sources create mode 100644 wingpanel-indicator-datetime.rpmlintrc create mode 100644 wingpanel-indicator-datetime.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a28cb4c --- /dev/null +++ b/.gitignore @@ -0,0 +1,19 @@ +/results_* +/*.src.rpm + +/wingpanel-indicator-datetime-2.0.1.tar.xz +/wingpanel-indicator-datetime-2.0.2.tar.gz +/wingpanel-indicator-datetime-2.1.0.tar.gz +/wingpanel-indicator-datetime-2.1.1.tar.gz +/wingpanel-indicator-datetime-2.1.2.tar.gz +/wingpanel-indicator-datetime-2.1.3.tar.gz +/wingpanel-indicator-datetime-2.2.0.tar.gz +/wingpanel-indicator-datetime-2.2.1.tar.gz +/wingpanel-indicator-datetime-2.2.2.tar.gz +/wingpanel-indicator-datetime-2.2.3.tar.gz +/wingpanel-indicator-datetime-2.2.4.tar.gz +/wingpanel-indicator-datetime-2.2.5.tar.gz +/wingpanel-indicator-datetime-89a2496.tar.gz +/wingpanel-indicator-datetime-2.3.0.tar.gz +/wingpanel-indicator-datetime-2.3.1.tar.gz +/wingpanel-indicator-datetime-2.4.0.tar.gz diff --git a/changelog b/changelog new file mode 100644 index 0000000..ba51523 --- /dev/null +++ b/changelog @@ -0,0 +1,113 @@ +* Fri Feb 19 2021 Fabio Valentini - 2.2.5-5.20210217git89a2496 +- Bump to commit 89a2496. Rebuilt for granite 6 soname bump and wingpanel 3. + +* Fri Feb 12 2021 Fabio Valentini - 2.2.5-4 +- Rebuilt for evolution-data-server soname bump + +* Wed Jan 27 2021 Fedora Release Engineering - 2.2.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 2.2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 04 2020 Fabio Valentini - 2.2.5-1 +- Update to version 2.2.5. + +* Thu May 28 2020 Fabio Valentini - 2.2.4-1 +- Update to version 2.2.4. + +* Wed May 20 2020 Fabio Valentini - 2.2.3-1 +- Update to version 2.2.3. + +* Mon Mar 30 2020 Fabio Valentini - 2.2.2-1 +- Update to version 2.2.2. + +* Fri Jan 31 2020 Fedora Release Engineering - 2.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Dec 07 2019 Fabio Valentini - 2.2.1-2 +- Include upstream patch for libecal-2.0 support. + +* Wed Nov 27 2019 Fabio Valentini - 2.2.1-1 +- Update to version 2.2.1. + +* Fri Nov 01 2019 Fabio Valentini - 2.2.0-1 +- Update to version 2.2.0. + +* Sat Jul 27 2019 Fedora Release Engineering - 2.1.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon Jul 08 2019 Fabio Valentini - 2.1.3-4 +- Drop unnecessary granite/datetime patch. + +* Sun Feb 03 2019 Fedora Release Engineering - 2.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Dec 18 2018 Fabio Valentini - 2.1.3-2 +- Add patch to move some gsettings to granite itself. + +* Wed Dec 12 2018 Fabio Valentini - 2.1.3-1 +- Update to version 2.1.3. + +* Wed Nov 14 2018 Fabio Valentini - 2.1.2-2 +- Rebuild for libedataserver soname bump. + +* Sat Oct 20 2018 Fabio Valentini - 2.1.2-1 +- Update to version 2.1.2. + +* Tue Oct 02 2018 Fabio Valentini - 2.1.1-1 +- Update to version 2.1.1. + +* Sat Jul 14 2018 Fedora Release Engineering - 2.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Jul 12 2018 Fabio Valentini - 2.1.0-2 +- Add missing BR: gcc, gcc-c++. + +* Wed Jul 04 2018 Fabio Valentini - 2.1.0-1 +- Update to version 2.1.0. + +* Wed Jun 13 2018 Fabio Valentini - 2.0.2-8 +- Rebuild for granite5 soname bump. + +* Wed Feb 07 2018 Kalev Lember - 2.0.2-7 +- Rebuilt for evolution-data-server soname bump + +* Wed Jan 24 2018 Fabio Valentini - 2.0.2-6 +- Add patch to fix undefined symbols. + +* Wed Nov 08 2017 Fabio Valentini - 2.0.2-5 +- Rebuild for libical soname bump. + +* Sat Nov 04 2017 Fabio Valentini - 2.0.2-4 +- Rebuild for granite soname bump. + +* Thu Aug 03 2017 Fedora Release Engineering - 2.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 2.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Jul 01 2017 Fabio Valentini - 2.0.2-1 +- Update to version 2.0.2. + +* Sat Feb 11 2017 Fedora Release Engineering - 2.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jan 24 2017 Fabio Valentini - 2.0.1-3 +- Remove explicit BR: pkgconfig. + +* Tue Jan 17 2017 Fabio Valentini - 2.0.1-2 +- Clean up spec file. + +* Mon Oct 31 2016 Fabio Valentini - 2.0.1-1 +- Update to version 2.0.1. + +* Thu Sep 29 2016 Fabio Valentini - 2.0-3 +- Mass rebuild. + +* Wed Sep 28 2016 Fabio Valentini - 2.0-2 +- Spec file cleanups. + +* Sun Aug 21 2016 Fabio Valentini - 2.0-1 +- Update to version 2.0. diff --git a/dead.package b/dead.package deleted file mode 100644 index 43a9af6..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -remove package (temporarily) due to unresolved issues with GNOME 43 diff --git a/sources b/sources new file mode 100644 index 0000000..cde5341 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (wingpanel-indicator-datetime-2.4.0.tar.gz) = 8e8865deaafa99cece11ac549ab1c43419ba6a8b88332f13d829e1fb7de20228e2799c5f0f1fcb41bb7b4e8f6ebc0f2f4940e910a2903ef76fb7dac28a2b4852 diff --git a/wingpanel-indicator-datetime.rpmlintrc b/wingpanel-indicator-datetime.rpmlintrc new file mode 100644 index 0000000..fbcdc48 --- /dev/null +++ b/wingpanel-indicator-datetime.rpmlintrc @@ -0,0 +1,3 @@ +# false positives +addFilter("E: invalid-lc-messages-dir /usr/share/locale/bh*") +addFilter("E: invalid-lc-messages-dir /usr/share/locale/mo*") diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec new file mode 100644 index 0000000..8bbd573 --- /dev/null +++ b/wingpanel-indicator-datetime.spec @@ -0,0 +1,70 @@ +%global __provides_exclude_from ^%{_libdir}/wingpanel/.*\\.so$ + +%global srcname wingpanel-indicator-datetime +%global appname io.elementary.wingpanel.datetime + +Name: wingpanel-indicator-datetime +Summary: Datetime Indicator for wingpanel +Version: 2.4.0 +Release: %autorelease +License: GPLv3+ + +URL: https://github.com/elementary/wingpanel-indicator-datetime +Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz + +BuildRequires: gettext +BuildRequires: libappstream-glib +BuildRequires: meson +BuildRequires: vala >= 0.22.0 + +BuildRequires: pkgconfig(glib-2.0) >= 2.32 +BuildRequires: pkgconfig(granite) >= 6.0.0 +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(libecal-2.0) +BuildRequires: pkgconfig(libhandy-1) +BuildRequires: pkgconfig(libical-glib) +BuildRequires: pkgconfig(wingpanel) >= 3.0.0 + +Requires: wingpanel%{?_isa} +Supplements: wingpanel%{?_isa} + + +%description +A datetime indicator for wingpanel. + + +%prep +%autosetup -n %{srcname}-%{version} -p1 + + +%build +%meson +%meson_build + + +%install +%meson_install + +%find_lang datetime-indicator + +# remove the specified stock icon from appdata (invalid in libappstream-glib) +sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml + + +%check +appstream-util validate-relax --nonet \ + %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml + + +%files -f datetime-indicator.lang +%doc README.md +%license COPYING + +%{_libdir}/wingpanel/libdatetime.so + +%{_datadir}/glib-2.0/schemas/io.elementary.desktop.wingpanel.datetime.gschema.xml +%{_datadir}/metainfo/%{appname}.appdata.xml + + +%changelog +%autochangelog From 614064ad012cec23bc6fa0729f3f4caee821b10a Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 14 Jun 2024 15:25:53 +0200 Subject: [PATCH 35/41] Package unretirement and update to version 2.4.1 --- .gitignore | 1 + changelog | 24 ++++++++++++++++++++++++ sources | 2 +- wingpanel-indicator-datetime.rpmlintrc | 3 --- wingpanel-indicator-datetime.spec | 6 +++--- 5 files changed, 29 insertions(+), 7 deletions(-) delete mode 100644 wingpanel-indicator-datetime.rpmlintrc diff --git a/.gitignore b/.gitignore index a28cb4c..60241c5 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /wingpanel-indicator-datetime-2.3.0.tar.gz /wingpanel-indicator-datetime-2.3.1.tar.gz /wingpanel-indicator-datetime-2.4.0.tar.gz +/wingpanel-indicator-datetime-2.4.1.tar.gz diff --git a/changelog b/changelog index ba51523..517a9d5 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,27 @@ +* Tue Nov 14 2023 Fabio Valentini - 2.4.1-1 +- Update to version 2.4.1 + +* Sat Jul 23 2022 Fedora Release Engineering - 2.4.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Jul 19 2022 Kalev Lember - 2.4.0-3 +- Rebuilt for evolution-data-server soname bump + +* Sat Jan 22 2022 Fedora Release Engineering - 2.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Dec 15 2021 Fabio Valentini - 2.4.0-1 +- Update to version 2.4.0; Fixes RHBZ#2031388 + +* Sat Oct 30 2021 Fabio Valentini - 2.3.1-1 +- Update to version 2.3.1; Fixes RHBZ#2018623 + +* Fri Jul 23 2021 Fedora Release Engineering - 2.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sat Jul 17 2021 Fabio Valentini - 2.3.0-1 +- Update to version 2.3.0; Fixes RHBZ#1982586 + * Fri Feb 19 2021 Fabio Valentini - 2.2.5-5.20210217git89a2496 - Bump to commit 89a2496. Rebuilt for granite 6 soname bump and wingpanel 3. diff --git a/sources b/sources index cde5341..cadc016 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wingpanel-indicator-datetime-2.4.0.tar.gz) = 8e8865deaafa99cece11ac549ab1c43419ba6a8b88332f13d829e1fb7de20228e2799c5f0f1fcb41bb7b4e8f6ebc0f2f4940e910a2903ef76fb7dac28a2b4852 +SHA512 (wingpanel-indicator-datetime-2.4.1.tar.gz) = 26009def0cb0cb82fa01aced7acde18492c81f61d2d83bd7cafbbfd8df6bce44004bf4835cc831678f88eeddd5dc556c1a3e671ef620901826f162a1371c7917 diff --git a/wingpanel-indicator-datetime.rpmlintrc b/wingpanel-indicator-datetime.rpmlintrc deleted file mode 100644 index fbcdc48..0000000 --- a/wingpanel-indicator-datetime.rpmlintrc +++ /dev/null @@ -1,3 +0,0 @@ -# false positives -addFilter("E: invalid-lc-messages-dir /usr/share/locale/bh*") -addFilter("E: invalid-lc-messages-dir /usr/share/locale/mo*") diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index 8bbd573..9d8e09b 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -5,9 +5,9 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel -Version: 2.4.0 +Version: 2.4.1 Release: %autorelease -License: GPLv3+ +License: GPL-3.0-or-later AND GPL-2.0-or-later URL: https://github.com/elementary/wingpanel-indicator-datetime Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz @@ -57,8 +57,8 @@ appstream-util validate-relax --nonet \ %files -f datetime-indicator.lang -%doc README.md %license COPYING +%doc README.md %{_libdir}/wingpanel/libdatetime.so From 221402d1d767402ce9aeb5583c4bbf0fff7f74ae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:23:31 +0000 Subject: [PATCH 36/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From f6696f771768e7bb182ba842db3b58c6400a2b87 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 12 Jan 2025 19:47:48 +0100 Subject: [PATCH 37/41] Update to version 2.4.2; Fixes RHBZ#2307501 --- .gitignore | 1 + sources | 2 +- wingpanel-indicator-datetime.spec | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 60241c5..861540a 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /wingpanel-indicator-datetime-2.3.1.tar.gz /wingpanel-indicator-datetime-2.4.0.tar.gz /wingpanel-indicator-datetime-2.4.1.tar.gz +/wingpanel-indicator-datetime-2.4.2.tar.gz diff --git a/sources b/sources index cadc016..c300b59 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wingpanel-indicator-datetime-2.4.1.tar.gz) = 26009def0cb0cb82fa01aced7acde18492c81f61d2d83bd7cafbbfd8df6bce44004bf4835cc831678f88eeddd5dc556c1a3e671ef620901826f162a1371c7917 +SHA512 (wingpanel-indicator-datetime-2.4.2.tar.gz) = 5852e0e41be485296c2d766cb5cbdfee8232ff0296c34961d899a75ce01c00110488f8440ccfbb731d46ee287b2557729bdf66ba2d905c049349bddacb08085f diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index 9d8e09b..4f88e24 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -5,7 +5,7 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel -Version: 2.4.1 +Version: 2.4.2 Release: %autorelease License: GPL-3.0-or-later AND GPL-2.0-or-later @@ -48,12 +48,12 @@ A datetime indicator for wingpanel. %find_lang datetime-indicator # remove the specified stock icon from appdata (invalid in libappstream-glib) -sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml +sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml %check appstream-util validate-relax --nonet \ - %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml + %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml %files -f datetime-indicator.lang @@ -63,7 +63,7 @@ appstream-util validate-relax --nonet \ %{_libdir}/wingpanel/libdatetime.so %{_datadir}/glib-2.0/schemas/io.elementary.desktop.wingpanel.datetime.gschema.xml -%{_datadir}/metainfo/%{appname}.appdata.xml +%{_datadir}/metainfo/%{appname}.metainfo.xml %changelog From 535d70749e962cf51f8aa911b72eb7c13532c683 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:04:23 +0000 Subject: [PATCH 38/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From ecf354c0b6ac44c5a7abed13205852e533622957 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:26:56 +0000 Subject: [PATCH 39/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From be4bcd0d9e8b78b987558d9a0fa7aec1a5d171df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:16:04 +0000 Subject: [PATCH 40/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 46c0cf7ae99486c0fde81fed0f79f7273d614371 Mon Sep 17 00:00:00 2001 From: Orphaned Packages Process Date: Fri, 19 Jun 2026 15:35:07 -0500 Subject: [PATCH 41/41] Orphaned for 6+ weeks --- .gitignore | 21 ----- changelog | 137 ------------------------------ dead.package | 1 + sources | 1 - wingpanel-indicator-datetime.spec | 70 --------------- 5 files changed, 1 insertion(+), 229 deletions(-) delete mode 100644 .gitignore delete mode 100644 changelog create mode 100644 dead.package delete mode 100644 sources delete mode 100644 wingpanel-indicator-datetime.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 861540a..0000000 --- a/.gitignore +++ /dev/null @@ -1,21 +0,0 @@ -/results_* -/*.src.rpm - -/wingpanel-indicator-datetime-2.0.1.tar.xz -/wingpanel-indicator-datetime-2.0.2.tar.gz -/wingpanel-indicator-datetime-2.1.0.tar.gz -/wingpanel-indicator-datetime-2.1.1.tar.gz -/wingpanel-indicator-datetime-2.1.2.tar.gz -/wingpanel-indicator-datetime-2.1.3.tar.gz -/wingpanel-indicator-datetime-2.2.0.tar.gz -/wingpanel-indicator-datetime-2.2.1.tar.gz -/wingpanel-indicator-datetime-2.2.2.tar.gz -/wingpanel-indicator-datetime-2.2.3.tar.gz -/wingpanel-indicator-datetime-2.2.4.tar.gz -/wingpanel-indicator-datetime-2.2.5.tar.gz -/wingpanel-indicator-datetime-89a2496.tar.gz -/wingpanel-indicator-datetime-2.3.0.tar.gz -/wingpanel-indicator-datetime-2.3.1.tar.gz -/wingpanel-indicator-datetime-2.4.0.tar.gz -/wingpanel-indicator-datetime-2.4.1.tar.gz -/wingpanel-indicator-datetime-2.4.2.tar.gz diff --git a/changelog b/changelog deleted file mode 100644 index 517a9d5..0000000 --- a/changelog +++ /dev/null @@ -1,137 +0,0 @@ -* Tue Nov 14 2023 Fabio Valentini - 2.4.1-1 -- Update to version 2.4.1 - -* Sat Jul 23 2022 Fedora Release Engineering - 2.4.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Jul 19 2022 Kalev Lember - 2.4.0-3 -- Rebuilt for evolution-data-server soname bump - -* Sat Jan 22 2022 Fedora Release Engineering - 2.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Dec 15 2021 Fabio Valentini - 2.4.0-1 -- Update to version 2.4.0; Fixes RHBZ#2031388 - -* Sat Oct 30 2021 Fabio Valentini - 2.3.1-1 -- Update to version 2.3.1; Fixes RHBZ#2018623 - -* Fri Jul 23 2021 Fedora Release Engineering - 2.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sat Jul 17 2021 Fabio Valentini - 2.3.0-1 -- Update to version 2.3.0; Fixes RHBZ#1982586 - -* Fri Feb 19 2021 Fabio Valentini - 2.2.5-5.20210217git89a2496 -- Bump to commit 89a2496. Rebuilt for granite 6 soname bump and wingpanel 3. - -* Fri Feb 12 2021 Fabio Valentini - 2.2.5-4 -- Rebuilt for evolution-data-server soname bump - -* Wed Jan 27 2021 Fedora Release Engineering - 2.2.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 2.2.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Jul 04 2020 Fabio Valentini - 2.2.5-1 -- Update to version 2.2.5. - -* Thu May 28 2020 Fabio Valentini - 2.2.4-1 -- Update to version 2.2.4. - -* Wed May 20 2020 Fabio Valentini - 2.2.3-1 -- Update to version 2.2.3. - -* Mon Mar 30 2020 Fabio Valentini - 2.2.2-1 -- Update to version 2.2.2. - -* Fri Jan 31 2020 Fedora Release Engineering - 2.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Dec 07 2019 Fabio Valentini - 2.2.1-2 -- Include upstream patch for libecal-2.0 support. - -* Wed Nov 27 2019 Fabio Valentini - 2.2.1-1 -- Update to version 2.2.1. - -* Fri Nov 01 2019 Fabio Valentini - 2.2.0-1 -- Update to version 2.2.0. - -* Sat Jul 27 2019 Fedora Release Engineering - 2.1.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Jul 08 2019 Fabio Valentini - 2.1.3-4 -- Drop unnecessary granite/datetime patch. - -* Sun Feb 03 2019 Fedora Release Engineering - 2.1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Dec 18 2018 Fabio Valentini - 2.1.3-2 -- Add patch to move some gsettings to granite itself. - -* Wed Dec 12 2018 Fabio Valentini - 2.1.3-1 -- Update to version 2.1.3. - -* Wed Nov 14 2018 Fabio Valentini - 2.1.2-2 -- Rebuild for libedataserver soname bump. - -* Sat Oct 20 2018 Fabio Valentini - 2.1.2-1 -- Update to version 2.1.2. - -* Tue Oct 02 2018 Fabio Valentini - 2.1.1-1 -- Update to version 2.1.1. - -* Sat Jul 14 2018 Fedora Release Engineering - 2.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Jul 12 2018 Fabio Valentini - 2.1.0-2 -- Add missing BR: gcc, gcc-c++. - -* Wed Jul 04 2018 Fabio Valentini - 2.1.0-1 -- Update to version 2.1.0. - -* Wed Jun 13 2018 Fabio Valentini - 2.0.2-8 -- Rebuild for granite5 soname bump. - -* Wed Feb 07 2018 Kalev Lember - 2.0.2-7 -- Rebuilt for evolution-data-server soname bump - -* Wed Jan 24 2018 Fabio Valentini - 2.0.2-6 -- Add patch to fix undefined symbols. - -* Wed Nov 08 2017 Fabio Valentini - 2.0.2-5 -- Rebuild for libical soname bump. - -* Sat Nov 04 2017 Fabio Valentini - 2.0.2-4 -- Rebuild for granite soname bump. - -* Thu Aug 03 2017 Fedora Release Engineering - 2.0.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Jul 01 2017 Fabio Valentini - 2.0.2-1 -- Update to version 2.0.2. - -* Sat Feb 11 2017 Fedora Release Engineering - 2.0.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jan 24 2017 Fabio Valentini - 2.0.1-3 -- Remove explicit BR: pkgconfig. - -* Tue Jan 17 2017 Fabio Valentini - 2.0.1-2 -- Clean up spec file. - -* Mon Oct 31 2016 Fabio Valentini - 2.0.1-1 -- Update to version 2.0.1. - -* Thu Sep 29 2016 Fabio Valentini - 2.0-3 -- Mass rebuild. - -* Wed Sep 28 2016 Fabio Valentini - 2.0-2 -- Spec file cleanups. - -* Sun Aug 21 2016 Fabio Valentini - 2.0-1 -- Update to version 2.0. diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index c300b59..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (wingpanel-indicator-datetime-2.4.2.tar.gz) = 5852e0e41be485296c2d766cb5cbdfee8232ff0296c34961d899a75ce01c00110488f8440ccfbb731d46ee287b2557729bdf66ba2d905c049349bddacb08085f diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec deleted file mode 100644 index 4f88e24..0000000 --- a/wingpanel-indicator-datetime.spec +++ /dev/null @@ -1,70 +0,0 @@ -%global __provides_exclude_from ^%{_libdir}/wingpanel/.*\\.so$ - -%global srcname wingpanel-indicator-datetime -%global appname io.elementary.wingpanel.datetime - -Name: wingpanel-indicator-datetime -Summary: Datetime Indicator for wingpanel -Version: 2.4.2 -Release: %autorelease -License: GPL-3.0-or-later AND GPL-2.0-or-later - -URL: https://github.com/elementary/wingpanel-indicator-datetime -Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz - -BuildRequires: gettext -BuildRequires: libappstream-glib -BuildRequires: meson -BuildRequires: vala >= 0.22.0 - -BuildRequires: pkgconfig(glib-2.0) >= 2.32 -BuildRequires: pkgconfig(granite) >= 6.0.0 -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(libecal-2.0) -BuildRequires: pkgconfig(libhandy-1) -BuildRequires: pkgconfig(libical-glib) -BuildRequires: pkgconfig(wingpanel) >= 3.0.0 - -Requires: wingpanel%{?_isa} -Supplements: wingpanel%{?_isa} - - -%description -A datetime indicator for wingpanel. - - -%prep -%autosetup -n %{srcname}-%{version} -p1 - - -%build -%meson -%meson_build - - -%install -%meson_install - -%find_lang datetime-indicator - -# remove the specified stock icon from appdata (invalid in libappstream-glib) -sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml - - -%check -appstream-util validate-relax --nonet \ - %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml - - -%files -f datetime-indicator.lang -%license COPYING -%doc README.md - -%{_libdir}/wingpanel/libdatetime.so - -%{_datadir}/glib-2.0/schemas/io.elementary.desktop.wingpanel.datetime.gschema.xml -%{_datadir}/metainfo/%{appname}.metainfo.xml - - -%changelog -%autochangelog