Fix Licenses, move to Forge macros, enable tests

Signed-off-by: Filipe Rosset <rosset.filipe@gmail.com>

.gitignore

@@ -1,38 +1 @@
-xfce4-panel-4.6.4.tar.bz2
-/xfce4-panel-4.7.7.tar.bz2
-/xfce4-panel-4.8.0.tar.bz2
-/xfce4-panel-4.8.1.tar.bz2
-/xfce4-panel-4.8.2.tar.bz2
-/xfce4-panel-4.8.3.tar.bz2
-/xfce4-panel-4.8.4.tar.bz2
-/xfce4-panel-4.8.5.tar.bz2
-/xfce4-panel-4.8.6.tar.bz2
-/xfce4-panel-4.9.1.tar.bz2
-/xfce4-panel-4.9.2.tar.bz2
-/xfce4-panel-4.10.0.tar.bz2
-/xfce4-panel-4.10.1.tar.bz2
-/xfce4-panel-4.12.0.tar.bz2
-/xfce4-panel-4.12.1.tar.bz2
-/xfce4-panel-4.12.2.tar.bz2
-/xfce4-panel-4.13.3.tar.bz2
-/xfce4-panel-4.13.4.tar.bz2
-/xfce4-panel-4.13.5.tar.bz2
-/xfce4-panel-4.13.6.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.3.tar.bz2
-/xfce4-panel-4.14.4.tar.bz2
-/xfce4-panel-4.16.0.tar.bz2
-/xfce4-panel-4.16.1.tar.bz2
-/xfce4-panel-4.16.2.tar.bz2
-/xfce4-panel-4.16.3.tar.bz2
-/xfce4-panel-4.16.4.tar.bz2
-/xfce4-panel-4.16.5.tar.bz2
-/xfce4-panel-4.16.6.tar.bz2
-/xfce4-panel-4.18.1.tar.bz2
-/xfce4-panel-4.18.2.tar.bz2
-/xfce4-panel-4.18.3.tar.bz2
-/xfce4-panel-4.18.4.tar.bz2
-/xfce4-panel-4.18.5.tar.bz2
-/xfce4-panel-4.18.6.tar.bz2
+/xfce4-panel-*.tar.bz2

sources

@@ -1 +1 @@
-SHA512 (xfce4-panel-4.18.6.tar.bz2) = a1c4597bbbb72d2f3ef90abe0082abe3404e0ea7fa6027e26ca50e31e03645464ce3e0a72f4d927e84c5775a775e3a70f70e25bd3d2e4358da869f9c474e6174
+SHA512 (xfce4-panel-4.20.8.tar.bz2) = 00091b216251ca77b0777a672f5a4eca7009d19ee117212cd607d268ac66bc1b789bda606420a0b5213cab485a9eee1984a69f0e9bbd71c358b0683c6ceb4e8a

xfce4-panel.spec

@@ -1,4 +1,5 @@
-%global xfceversion 4.18
+%global xfceversion 4.20
+%global forgeurl https://gitlab.xfce.org/xfce/xfce4-panel
 
 %global namespc Libxfce4panel
 
@@ -10,34 +11,37 @@
 %global _with_vala 0
 
 Name:           xfce4-panel
-Version:        4.18.6
+Version:        4.20.8
+%forgemeta
 Release:        %autorelease
 Summary:        Next generation panel for Xfce
 
-License:        GPLv2+ and LGPLv2+
+License:        GPL-2.0-or-later AND LGPL-2.0-or-later
 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
+Source0:        %{forgesource}
 
 # clock icon taken from system-config-date, license is GPLv2+
 Source1:        xfce4-clock.png
 Source2:        xfce4-clock.svg
 
-BuildRequires:  make
-BuildRequires:  gcc-c++
-BuildRequires:  gtk3-devel
-BuildRequires:  libxfce4ui-devel >= %{xfceversion}
-BuildRequires:  xfconf-devel >= %{xfceversion}
-BuildRequires:  garcon-devel >= 0.6.0
-BuildRequires:  libxml2-devel >= 2.4.0
-BuildRequires:  startup-notification-devel
-BuildRequires:  exo-devel >= 0.3.93
-BuildRequires:  libwnck3-devel >= 3.14
-BuildRequires:  gettext
-BuildRequires:  intltool
 BuildRequires:  desktop-file-utils
-BuildRequires:  gtk-doc
+BuildRequires:  exo-devel >= 0.3.93
+BuildRequires:  garcon-devel >= 0.6.0
+BuildRequires:  gcc
+BuildRequires:  gettext
 BuildRequires:  gobject-introspection-devel
+BuildRequires:  gtk-doc
+BuildRequires:  gtk-layer-shell-devel >= 0.7.0
+BuildRequires:  gtk3-devel
+BuildRequires:  libwnck3-devel >= 3.14
+BuildRequires:  libxfce4ui-devel >= %{xfceversion}
+BuildRequires:  libxfce4windowing-devel >= 4.20.6
+BuildRequires:  libxml2-devel >= 2.4.0
+BuildRequires:  meson
+BuildRequires:  startup-notification-devel
+BuildRequires:  xfce4-dev-tools
+BuildRequires:  xfconf-devel >= %{xfceversion}
 
 %if 0%{?fedora}
 BuildRequires:  libdbusmenu-gtk3-devel
@@ -61,9 +65,9 @@ This package includes the panel for the Xfce desktop environment.
 %package devel
 Summary:        Development headers for xfce4-panel
 Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig
-Requires:       libxfce4util-devel >= %{xfceversion}
 Requires:       libxfce4ui-devel >= %{xfceversion}
+Requires:       libxfce4util-devel >= %{xfceversion}
+Requires:       pkgconfig
 
 %description devel
 This package includes the header files you will need to build
@@ -71,29 +75,31 @@ plugins for xfce4-panel.
 
 
 %prep
-%autosetup -p1
+%forgeautosetup -p1
 
 # Fix icon in 'Add new panel item' dialog
 sed -i 's|Icon=office-calendar|Icon=xfce4-clock|g' plugins/clock/clock.desktop.in.in
 
 
 %build
-%configure --enable-gtk-doc --disable-static 
+%meson \
+  -Dgtk-doc=true \
+%if %{_with_vala}
+  -Dvala=enabled
+%else
+  -Dvala=disabled
+%endif
 
-# Remove rpaths
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+%meson_build
 
-# The LD_LIBRARY_PATH hack is needed for --enable-gtk-doc
-# because lt-libxfce4panel-scan is linked against libxfce4panel
-export LD_LIBRARY_PATH="`pwd`/libxfce4panel/.libs"
-
-%make_build
 
 %install
-%make_install
+%meson_install
 
-find %{buildroot} -name '*.la' -exec rm -f {} ';'
+# Rename invalid hye locale to hy
+if [ -d %{buildroot}%{_datadir}/locale/hye ]; then
+  mv %{buildroot}%{_datadir}/locale/hye %{buildroot}%{_datadir}/locale/hy
+fi
 
 %find_lang %{name}
 
@@ -104,15 +110,22 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/panel-preferences.de
 install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
 install -pm 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
 
+
+%check
+%meson_test
+
+
 %files -f %{name}.lang
 %license COPYING
 %doc AUTHORS ChangeLog NEWS
 %config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/default.xml
-%{_bindir}/*
+%{_bindir}/xfce4-panel
+%{_bindir}/xfce4-popup-applicationsmenu
+%{_bindir}/xfce4-popup-directorymenu
+%{_bindir}/xfce4-popup-windowmenu
 %{_libdir}/libxfce4panel-*.so.*
 %{_libdir}/xfce4/panel/
 %{_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
@@ -124,6 +137,7 @@ install -pm 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
 %files devel
 %{_libdir}/pkgconfig/*
 %{_libdir}/libxfce4panel-*.so
+%{_datadir}/gir-1.0/%{namespc}-2.0.gir
 %doc %{_datadir}/gtk-doc/html/libxfce4panel-*/
 %{_includedir}/xfce4/libxfce4panel-*/