Update to 3.25.4

- Switch to the meson build system
This commit is contained in:
Kalev Lember 2017-07-31 22:59:08 +01:00
parent ac111c0b43
commit d440aee9e5
3 changed files with 18 additions and 24 deletions

1
.gitignore vendored
View File

@ -49,3 +49,4 @@ gnome-disk-utility-2.30.1.tar.bz2
/gnome-disk-utility-3.24.0.tar.xz
/gnome-disk-utility-3.24.1.tar.xz
/gnome-disk-utility-3.25.2.tar.xz
/gnome-disk-utility-3.25.4.tar.xz

View File

@ -1,11 +1,6 @@
# Only enable if using patches that touches configure.ac,
# Makefile.am or other build system related files
#
%global enable_autoreconf 0
Name: gnome-disk-utility
Version: 3.25.2
Release: 2%{?dist}
Version: 3.25.4
Release: 1%{?dist}
Summary: Disks
License: GPLv2+
@ -16,10 +11,9 @@ BuildRequires: /usr/bin/appstream-util
BuildRequires: desktop-file-utils
BuildRequires: docbook-style-xsl
BuildRequires: gettext
BuildRequires: gnome-common
BuildRequires: intltool
# for xsltproc
BuildRequires: libxslt
BuildRequires: meson
BuildRequires: pkgconfig(dvdread)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gnome-settings-daemon)
@ -34,12 +28,6 @@ BuildRequires: pkgconfig(udisks2)
Requires: udisks2
%if 0%{?enable_autoreconf}
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
%endif
%description
This package contains the Disks and Disk Image Mounter applications.
Disks supports partitioning, file system creation, encryption,
@ -50,20 +38,21 @@ fstab/crypttab editing, ATA SMART and other features
%build
%if 0%{?enable_autoreconf}
autoreconf --force --install
%endif
%configure
make V=1 %{?_smp_mflags}
%meson
%meson_build
%install
%make_install
%meson_install
%find_lang %{name}
# Rename misnamed appdata file
mv %{buildroot}%{_datadir}/metainfo/org.gnome.DiskUtility.metainfo.xml \
%{buildroot}%{_datadir}/metainfo/org.gnome.DiskUtility.appdata.xml
%check
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/org.gnome.DiskUtility.appdata.xml
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.gnome.DiskUtility.appdata.xml
desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
@ -91,19 +80,23 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%license COPYING
%{_bindir}/gnome-disks
%{_bindir}/gnome-disk-image-mounter
%{_datadir}/appdata/org.gnome.DiskUtility.appdata.xml
%{_datadir}/applications/org.gnome.DiskUtility.desktop
%{_datadir}/applications/gnome-disk-image-mounter.desktop
%{_datadir}/applications/gnome-disk-image-writer.desktop
%{_datadir}/dbus-1/services/org.gnome.DiskUtility.service
%{_datadir}/glib-2.0/schemas/org.gnome.Disks.gschema.xml
%{_datadir}/icons/hicolor/*/apps/gnome-disks*
%{_datadir}/metainfo/org.gnome.DiskUtility.appdata.xml
%{_mandir}/man1/*
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.DiskUtilityNotify.desktop
%{_libexecdir}/gsd-disk-utility-notify
%changelog
* Mon Jul 31 2017 Kalev Lember <klember@redhat.com> - 3.25.4-1
- Update to 3.25.4
- Switch to the meson build system
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.25.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (gnome-disk-utility-3.25.2.tar.xz) = ab1838c55c24dd52041f8195e45f893ab3ba31d37cb9c9ac9521fa36e9b93fd9489d07ad40b226ade4a6b909a8938520d28f44225559d3e7b6fd4e0fae371728
SHA512 (gnome-disk-utility-3.25.4.tar.xz) = 7e61c2e4238cf2c14225dc0f0817f736ca8cc97cd4924f9cc5200db523f988da0c4bad5d58052fb6d0410c6c1c5a6d5bcedaf80c8e9335baff9ea3cab5c39e6b