!3 libwnck3: change the install dir in mesonbuild

Merge pull request !3 from orange-snn/master
This commit is contained in:
openeuler-ci-bot 2020-01-17 17:00:24 +08:00 committed by Gitee
commit d549d46e80
2 changed files with 29 additions and 8 deletions

View File

@ -1,13 +1,27 @@
diff -uNrp a/meson.build b/meson.build
--- a/meson.build 2019-01-08 22:59:43.000000000 +0800
+++ b/meson.build 2019-12-26 18:58:15.039200278 +0800
@@ -86,8 +86,7 @@ foreach pc: [PACKAGE_NAME, PACKAGE_NAME
endif
From 1a3cfa6af724341476475935f6c992f5a68f62e2 Mon Sep 17 00:00:00 2001
From: songnannan <songnannan2@huawei.com>
Date: Fri, 17 Jan 2020 15:15:27 +0800
Subject: [PATCH] fix bug about install dir in mesonbuild
---
meson.build | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 9960a78..d2263eb 100644
--- a/meson.build
+++ b/meson.build
@@ -87,7 +87,9 @@ foreach pc: [PACKAGE_NAME, PACKAGE_NAME + '-uninstalled']
configure_file(input: pc + '.pc.in',
output: pc + '.pc',
- configuration: pc_conf,
configuration: pc_conf,
- install_dir: install_path)
+ configuration: pc_conf)
+ install: not pc.contains('-uninstalled'),
+ install_dir: join_paths(libdir, 'pkgconfig'),
+ )
endforeach
subdir('libwnck')
--
1.8.3.1

View File

@ -1,6 +1,6 @@
Name: libwnck3
Version: 3.31.4
Release: 2
Release: 3
Summary: Window Navigator Construction Kit
URL: http://download.gnome.org/sources/libwnck/
Source0: http://download.gnome.org/sources/libwnck/3.24/libwnck-%{version}.tar.xz
@ -47,6 +47,7 @@ The %{name}-devel package contains libraries and header files for %{name}.
%files devel
%defattr(-,root,root)
%{_libdir}/pkgconfig/*
%{_includedir}/libwnck-3.0/*
%{_datadir}/gir-1.0/Wnck-3.0.gir
@ -56,6 +57,12 @@ The %{name}-devel package contains libraries and header files for %{name}.
%doc %{_datadir}/gtk-doc/*
%changelog
* Fri Jan 17 2020 openEuler Buildteam <buildteam@openeuler.org> - 3.31.4-3
- Type:bugfix
- Id:NA
- SUG:NA
- DESC:change the install dir in mesonbuild
* Thu Dec 26 2019 openEuler Buildteam <buildteam@openeuler.org> - 3.31.4-2
- Type:bugfix
- Id:NA