[gnome-power-manager/wip/hughsie/meson] f
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-power-manager/wip/hughsie/meson] f
- Date: Wed, 30 Nov 2016 17:52:18 +0000 (UTC)
commit 89d8a7196a6e185bbbf8b820caf929355a8d0670
Author: Richard Hughes <richard hughsie com>
Date: Wed Nov 30 17:46:55 2016 +0000
f
contrib/gnome-power-manager.spec.in | 8 ++++----
meson.build | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/contrib/gnome-power-manager.spec.in b/contrib/gnome-power-manager.spec.in
index 8ec317e..58f3f34 100644
--- a/contrib/gnome-power-manager.spec.in
+++ b/contrib/gnome-power-manager.spec.in
@@ -14,10 +14,10 @@ BuildRequires: gettext
BuildRequires: libtool
BuildRequires: cairo-devel
BuildRequires: upower-devel >= 0.9.0
-BuildRequires: intltool
BuildRequires: glib2-devel >= 2.25.9
BuildRequires: gtk3-devel >= 2.91.3
BuildRequires: docbook-utils
+BuildRequires: meson
# obsolete sub-package
Obsoletes: gnome-power-manager-extra <= 2.30.1
@@ -31,11 +31,11 @@ displaying icons and handling user callbacks in an interactive GNOME session.
%setup -q
%build
-%configure
-make
+%meson
+%meson_build
%install
-%make_install
+%meson_install
%find_lang %name --with-gnome
diff --git a/meson.build b/meson.build
index 85712fb..6ba714d 100644
--- a/meson.build
+++ b/meson.build
@@ -97,7 +97,7 @@ if archiver.found()
run_target('dist',
# git config tar.tar.xz.command "xz -c"
command: ['git', 'archive',
- '--prefix=' + meson.project_name() + '/',
+ '--prefix=' + meson.project_name() + '-' + meson.project_version() + '/',
'HEAD',
'--format=tar.xz',
'--output',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]