diff --git a/.gitignore b/.gitignore index 26de908..fbab13a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,5 +9,3 @@ xfce4-mount-plugin-0.5.5.tar.bz2 /xfce4-mount-plugin-1.1.4.tar.bz2 /xfce4-mount-plugin-1.1.5.tar.bz2 /xfce4-mount-plugin-1.1.6.tar.bz2 -/xfce4-mount-plugin-1.1.7.tar.bz2 -/xfce4-mount-plugin-1.2.0.tar.xz diff --git a/sources b/sources index 7cf80c8..86d12d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfce4-mount-plugin-1.2.0.tar.xz) = c67ce79daa6cdaf7b397d563952af3c013212888c60622c8609245e5da7ba2a9846fba63f2886a16acfb509b6b65b82b4bfc146e6933d843d8f0df68ed3f55b6 +SHA512 (xfce4-mount-plugin-1.1.6.tar.bz2) = 5f0d8c2ebf6528560c42b5dc1408a40bce8dfc4528f2a2ea1955774a8e5fab0cda9c81b052927c7dbd8675a5bbd104a208c657f473dc5258e049fa0b34af16a3 diff --git a/xfce4-mount-plugin.spec b/xfce4-mount-plugin.spec index 61c9634..eee1172 100644 --- a/xfce4-mount-plugin.spec +++ b/xfce4-mount-plugin.spec @@ -1,25 +1,25 @@ # Review: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=173549 %global _hardened_build 1 -%global minorversion 1.2 -%global xfceversion 4.20 +%global minorversion 1.1 +%global xfceversion 4.16 Name: xfce4-mount-plugin -Version: 1.2.0 +Version: 1.1.6 Release: %autorelease Summary: Mount/unmount utility for the Xfce panel -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later +License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} #VCS: git:git://git.xfce.org/panel-plugins/xfce4-diskperf-plugin -Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.xz +Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2 -BuildRequires: make +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: libxfce4ui-devel >= %{xfceversion} BuildRequires: xfce4-panel-devel >= %{xfceversion} -BuildRequires: meson +BuildRequires: gettext +BuildRequires: intltool Requires: xfce4-panel >= %{xfceversion} %description @@ -29,12 +29,14 @@ Mount and unmount filesystems from the Xfce panel. %autosetup %build -%meson -%meson_build +%configure --disable-static +%make_build %install -%meson_install +%make_install +# remove la file +find %{buildroot} -name '*.la' -exec rm -f {} ';' # make sure debuginfo is generated properly chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so @@ -43,7 +45,7 @@ chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so %files -f %{name}.lang -%doc AUTHORS README +%doc AUTHORS ChangeLog %license COPYING %{_libdir}/xfce4/panel/plugins/*.so %{_datadir}/xfce4/panel/plugins/*.desktop