From 7b6222284fea8629e02ff3021009b69e4abf2e7c Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 25 Nov 2019 16:41:17 -0600 Subject: [PATCH 1/5] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From cb287b7165867040156e8af83106022653ed1ae8 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Fri, 29 May 2020 18:18:47 -0400 Subject: [PATCH 2/5] Update to 4.14.4 --- .gitignore | 1 + sources | 2 +- xfce4-panel.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1018f24..260d060 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ xfce4-panel-4.6.4.tar.bz2 /xfce4-panel-4.13.7.tar.bz2 /xfce4-panel-4.14.0.tar.bz2 /xfce4-panel-4.14.1.tar.bz2 +/xfce4-panel-4.14.4.tar.bz2 diff --git a/sources b/sources index 77e2576..7d4d28f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfce4-panel-4.14.1.tar.bz2) = 1c86362489677f2e04cf3b98dbc1a80b4998335c00a47d256e741446f00437ad04539041648848eca1f45fa1fa70974ca6cf65cb7f762a79a46c16484557e400 +SHA512 (xfce4-panel-4.14.4.tar.bz2) = 5ae7c7acf0254fdc3f5eaccf75d7c12699ab8147322f231af7bd17b1238b8c25a96d628dada9caa086fc8fde2b7dc4030a38eb7b863b290f9e069193b3728d85 diff --git a/xfce4-panel.spec b/xfce4-panel.spec index 2cd810d..584bc3a 100644 --- a/xfce4-panel.spec +++ b/xfce4-panel.spec @@ -1,7 +1,7 @@ %global xfceversion 4.14 Name: xfce4-panel -Version: 4.14.1 +Version: 4.14.4 Release: 1%{?dist} Summary: Next generation panel for Xfce @@ -153,6 +153,9 @@ install -pm 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ %{_includedir}/xfce4/libxfce4panel-*/ %changelog +* Fri May 29 2020 Mukundan Ragavan - 4.14.4-1 +- Update to 4.14.4 + * Wed Sep 25 2019 Mukundan Ragavan - 4.14.1-1 - Update to 4.14.1 From e45d41960ecbf200c80ba8c40697aa9c2ea117bc Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 19:04:29 +0000 Subject: [PATCH 3/5] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From 4bb5c92cfa9425e430a552ed8e454fc9f2fcdd84 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Sat, 31 Jul 2021 09:19:44 -0400 Subject: [PATCH 4/5] Update to 4.16.3 --- xfce4-panel-4.8.2-defaults.patch | 18 ------- xfce4-panel.spec | 89 +++++++++++--------------------- 2 files changed, 31 insertions(+), 76 deletions(-) delete mode 100644 xfce4-panel-4.8.2-defaults.patch diff --git a/xfce4-panel-4.8.2-defaults.patch b/xfce4-panel-4.8.2-defaults.patch deleted file mode 100644 index f1e76fd..0000000 --- a/xfce4-panel-4.8.2-defaults.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- xfce4-panel-4.8.2.orig/migrate/default.xml 2011-02-25 21:58:41.000000000 +0100 -+++ xfce4-panel-4.8.2/migrate/default.xml 2011-03-08 17:32:41.422505698 +0100 -@@ -13,6 +13,7 @@ - - - -+ - - - -@@ -38,6 +39,7 @@ - - - -+ - - - diff --git a/xfce4-panel.spec b/xfce4-panel.spec index 584bc3a..d20ccc6 100644 --- a/xfce4-panel.spec +++ b/xfce4-panel.spec @@ -1,22 +1,28 @@ -%global xfceversion 4.14 +%global xfceversion 4.16 + +%global namespc Libxfce4panel + +%global __provides_exclude_from ^%{_libdir}/xfce4/panel/plugins/.*\\.so$ +# vapigen failed with vala 0.47: +# https://bugzilla.xfce.org/show_bug.cgi?id=16426 +# It is safe to disable vapigen by now, since no package in Fedora requires the +# vapi +%global _with_vala 0 Name: xfce4-panel -Version: 4.14.4 +Version: 4.16.3 Release: 1%{?dist} Summary: Next generation panel for Xfce License: GPLv2+ and LGPLv2+ URL: http://www.xfce.org/ -#VCS git:git://git.xfce.org/xfce/xfce4-panel Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2 # clock icon taken from system-config-date, license is GPLv2+ Source1: xfce4-clock.png Source2: xfce4-clock.svg -## Downstream patches -# FIXME: do the patch once SIG has decided about a panel layout -## Patch10: xfce4-panel-4.8.2-defaults.patch +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: gtk3-devel BuildRequires: libxfce4ui-devel >= %{xfceversion} @@ -31,40 +37,18 @@ BuildRequires: intltool BuildRequires: desktop-file-utils BuildRequires: gtk-doc BuildRequires: gobject-introspection-devel -BuildRequires: vala +BuildRequires: libdbusmenu-gtk3-devel -# xfce4-iconbox isn't in Xfce 4.4 -Obsoletes: xfce4-iconbox <= 4.2.3-4.fc6 -# xfce4-systray isn't in Xfce 4.4 -Obsoletes: xfce4-systray <= 4.2.3-3.fc6 -# xfce4-toys isn't in Xfce 4.4 -Obsoletes: xfce4-toys <= 4.2.3-3.fc6 -# xfce4-trigger-launcher isn't in Xfce 4.4 -Obsoletes: xfce4-trigger-launcher <= 4.2.3-3.fc6 -# xfce4-showdesktop-plugin isn't in Xfce 4.4 -Obsoletes: xfce4-showdesktop-plugin <= 0.4.0-7.fc6 -# xfce4-taskbar-plugin isn't in Xfce 4.4 -Obsoletes: xfce4-taskbar-plugin <= 0.2.2-7.fc6 -# xfce4-windowlist-plugin isn't in Xfce 4.4 -Obsoletes: xfce4-windowlist-plugin <= 0.1.0-7.fc6 -# xfce4-xmms-plugin isn't in F11 -Obsoletes: xfce4-xmms-plugin <= 0.5.1-3.fc11 -# xfce4-volstatus-icon isn't in F15 -Obsoletes: xfce4-volstatus-icon <= 0.1.0-7.fc15 -# xfce4-stopwatch-plugin isn't in F15 -Obsoletes: xfce4-stopwatch-plugin <= 0.2.0-3.fc15 -# xfce4-xfapplet-plugin isn't in F15 -Obsoletes: xfce4-xfapplet-plugin <= 0.1.0-10.fc15 -# xfce4-radio-plugin isn't in f22 -Obsoletes: xfce4-radio-plugin <= 0.5.1-10.fc22 -# xfce4-quicklauncher-plugin isn't in f22 -Obsoletes: xfce4-quicklauncher-plugin <= 1.9.4-20.fc22 -# xfce4-modemlights-plugin isn't in f22 -Obsoletes: xfce4-modemlights-plugin <= 0.1.3.99-18.fc22 -# xfce4-xfswitch-plugin isn't in f22 -Obsoletes: xfce4-xfswitch-plugin <= 0.0.1-13.fc22 -# xfce4-wmdock-plugin isn't in f22 -Obsoletes: xfce4-wmdock-plugin <= 0.3.4-12.fc22 +%if %{_with_vala} +BuildRequires: vala +%endif + +# obsolete old plugins +Obsoletes: orage < 4.12.1-17.fc34 +Obsoletes: xfce4-embed-plugin < 1.6.0-13.fc34 +Obsoletes: xfce4-cellmodem-plugin < 0.0.5-29.fc34 +Obsoletes: xfce4-kbdleds-plugins < 0.0.6-20.fc34 +Obsoletes: xfce4-hardware-monitor-plugin < 1.6.0-11 %description This package includes the panel for the Xfce desktop environment. @@ -83,7 +67,6 @@ plugins for xfce4-panel. %prep %setup -q -#patch10 -p1 -b .default # Fix icon in 'Add new panel item' dialog sed -i 's|Icon=office-calendar|Icon=xfce4-clock|g' plugins/clock/clock.desktop.in.in @@ -105,19 +88,8 @@ export LD_LIBRARY_PATH="`pwd`/libxfce4panel/.libs" %install %make_install -# fix permissions for installed libs -chmod 755 %{buildroot}%{_libdir}/*.so - find %{buildroot} -name '*.la' -exec rm -f {} ';' -# remove duplicate docs -rm -f %{buildroot}%{_docdir}/xfce4-panel/README.gtkrc-2.0 - -# FIXME: We need to own these dirs until all plugins are ported to Xfce 4.8 -mkdir -p %{buildroot}%{_libexecdir}/xfce4/panel-plugins -mkdir -p %{buildroot}%{_libdir}/xfce4/panel-plugins -mkdir -p %{buildroot}%{_datadir}/xfce4/panel-plugins - %find_lang %{name} desktop-file-validate %{buildroot}/%{_datadir}/applications/panel-desktop-handler.desktop @@ -129,22 +101,20 @@ install -pm 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ %files -f %{name}.lang %license COPYING -%doc AUTHORS ChangeLog NEWS README docs/README.gtkrc-2.0 +%doc AUTHORS ChangeLog NEWS %config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/default.xml %{_bindir}/* %{_libdir}/libxfce4panel-*.so.* %{_libdir}/xfce4/panel/ -%{_libdir}/girepository-1.0/libxfce4panel-2.0.typelib -%{_datadir}/gir-1.0/libxfce4panel-2.0.gir +%{_libdir}/girepository-1.0/%{namespc}-2.0.typelib +%{_datadir}/gir-1.0/%{namespc}-2.0.gir %{_datadir}/icons/hicolor/*/*/* %{_datadir}/xfce4/panel/ %{_datadir}/applications/*.desktop +%if %{_with_vala} %{_datadir}/vala/vapi/libxfce4panel-2.0.deps %{_datadir}/vala/vapi/libxfce4panel-2.0.vapi -# FIXME: Remove these when no longer needed -%dir %{_libexecdir}/xfce4/panel-plugins/ -%dir %{_libdir}/xfce4/panel-plugins -%dir %{_datadir}/xfce4/panel-plugins +%endif %files devel %{_libdir}/pkgconfig/* @@ -153,6 +123,9 @@ install -pm 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ %{_includedir}/xfce4/libxfce4panel-*/ %changelog +* Sat Jul 31 2021 Mukundan Ragavan - 4.16.3-1 +- Update to 4.16.3 + * Fri May 29 2020 Mukundan Ragavan - 4.14.4-1 - Update to 4.14.4 From ff8e021fc2c45516f18a4e6be088f9a244109886 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Sat, 31 Jul 2021 09:31:06 -0400 Subject: [PATCH 5/5] Update to 4.16.3 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 260d060..293e818 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ xfce4-panel-4.6.4.tar.bz2 /xfce4-panel-4.14.0.tar.bz2 /xfce4-panel-4.14.1.tar.bz2 /xfce4-panel-4.14.4.tar.bz2 +/xfce4-panel-4.16.3.tar.bz2 diff --git a/sources b/sources index 7d4d28f..8feeb15 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfce4-panel-4.14.4.tar.bz2) = 5ae7c7acf0254fdc3f5eaccf75d7c12699ab8147322f231af7bd17b1238b8c25a96d628dada9caa086fc8fde2b7dc4030a38eb7b863b290f9e069193b3728d85 +SHA512 (xfce4-panel-4.16.3.tar.bz2) = 08ac27d59a4e08229e170a1c7ffb7a981ae1d3ab1548850cd815a0de64c47d1c20d69f6585c2ec9890b060483bfd569fc52ebd88db0d1264ebca00c1b0bb38fa