!13 【编译失败处理】22.03:LTS:Next分支包编译失败

Merge pull request !13 from 王歌/openEuler-22.03-LTS-Next
add chrpath in BuildRequire
2022-01-12 08:52:50 +00:00 · 2022-01-12 12:12:19 +08:00 · 2021-09-09 12:55:48 +00:00 · 2021-09-09 14:13:39 +08:00 · 2020-05-13 16:26:46 +08:00 · 2020-05-11 14:12:32 +08:00
3 changed files with 36 additions and 3 deletions
--- a/6
+++ b/6
@ -0,0 +1,6 @@
+<constraints>
+  <linux><version>
+    <min>4.0</min>
+  </version></linux>
+</constraints>
+
--- a/esc.spec
+++ b/esc.spec
@ -1,6 +1,6 @@
 Name:		esc		
 Version:	1.1.2
-Release:	3
+Release:	6
 Summary:	esc embeds files into go programs and provides http		
 License:	GPL+
 URL:		https://github.com/mjibson/esc
@ -12,6 +12,7 @@ Source3:	esc.png
 BuildRequires:  glib2-devel atk-devel pkgconfig nspr-devel nss-devel nss-static
 BuildRequires:	pcsc-lite-devel desktop-file-utils dbus-glib-devel glib2-devel gcc-c++
 BuildRequires:  opensc gobject-introspection-devel gtk3-devel gjs-devel GConf2-devel
+BuildRequires:  chrpath

 Requires:	pcsc-lite nss nspr dbus opensc gjs gobject-introspection gtk3 glib2

@ -55,7 +56,17 @@ ln -s %{_datadir}/icons/hicolor/48x48/apps/esc.png usr/share/pixmaps/esc.png
 popd

 install -m 0755 %{SOURCE2} %{buildroot}/%{_datadir}/applications
-cp -a %{_mandir} %{buildroot}%{_mandir}
+
+chrpath -d %{buildroot}%{_libdir}/%{name}-%{version}/lib/libcoolkeymgr-1.0.so.0.0.0
+
+mkdir -p %{buildroot}/etc/ld.so.conf.d
+echo "/usr/local/lib" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig

 %files
 %defattr(-,root,root)
@ -69,11 +80,23 @@ cp -a %{_mandir} %{buildroot}%{_mandir}
 %{_datadir}/pixmaps/esc.png
 %{_datadir}/applications/esc.desktop
 %{_datadir}/icons/hicolor/48x48/apps/esc.png
+%config(noreplace) /etc/ld.so.conf.d/*

 %files help
 %defattr(-,root,root)
-%{_mandir}/*

 %changelog
+* Wed Jan 12 2022 Ge Wang <wangge20@huawei.com> - 1.1.2-6
+- Add chrpath in BuildRequire
+
+* Wed Sep 9 2021 caodongxia <caodongxia@huawei.com> - 1.1.2-5
+- Remove rpath
+
+* Sat Mar 21 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.1.2-4
+- Type: bugfix
+- ID: NA
+- SUG: NA
+- DESC: delete files in help package 
+
 * Thu Nov 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.1.2-3
 - Package init
--- a/esc.yaml
+++ b/esc.yaml
@ -0,0 +1,4 @@
+version_control: github
+src_repo: mjibson/esc
+tag_prefix: ^v
+seperator: .
Author	SHA1	Message	Date
openeuler-ci-bot	6401190877	!13 【编译失败处理】22.03:LTS:Next分支包编译失败 Merge pull request !13 from 王歌/openEuler-22.03-LTS-Next	2022-01-12 08:52:50 +00:00
wang--ge	a2e1eda947	add chrpath in BuildRequire	2022-01-12 12:12:19 +08:00
openeuler-ci-bot	cceed4f8ac	!5 remove rpath From: @caodongxia Reviewed-by: @small_leek Signed-off-by: @small_leek	2021-09-09 12:55:48 +00:00
caodongxia	09feeab25f	remove rpath	2021-09-09 14:13:39 +08:00
openeuler-ci-bot	51628bf7fc	!4 add yaml file Merge pull request !4 from Captain.Wei/master	2020-05-13 16:26:46 +08:00
Captain Wei	926873eaa5	add yaml file	2020-05-11 14:12:32 +08:00
openeuler-ci-bot	b170605d56	!2 optimization the spec Merge pull request !2 from huzunhao/master	2020-03-21 22:16:36 +08:00
songnannan	3966c1a3aa	delete files in help package	2020-03-21 18:48:57 +08:00
openeuler-ci-bot	1cd7120fd3	!1 Architecture select Merge pull request !1 from 严志华/master	2019-12-28 14:02:37 +08:00
yanzh_h	7f886da2b6	Architecture select	2019-12-28 11:39:54 +08:00