Browse code

tboot: Resolved conflict issue

Resolved conflict issue with filesystem package while installing the package

Change-Id: I4b6da678f6161a4ac97a223cc20cd56461d75eb1
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5500
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>

Ankit Jain authored on 2018/08/17 00:41:52
Showing 1 changed files
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:    Trusted pre-kernel module and tools.
2 2
 Name:       tboot
3 3
 Version:    1.9.5
4
-Release:    2%{?dist}
4
+Release:    3%{?dist}
5 5
 License:    BSD
6 6
 URL:        https://sourceforge.net/projects/tboot/
7 7
 Group:      System Environment/Security
... ...
@@ -28,11 +28,15 @@ make debug=y DESTDIR=%{buildroot} install
28 28
 
29 29
 %files
30 30
 %defattr(-,root,root)
31
-/boot/*
32
-/usr/*
31
+/boot/%{name}.gz
32
+/boot/%{name}-syms
33
+%{_prefix}/sbin
34
+%{_mandir}
33 35
 %exclude %{_sysconfdir}
34 36
 
35 37
 %changelog
38
+*   Thu Aug 16 2018 Ankit Jain <ankitja@vmware.com> 1.9.5-3
39
+-   Resolved conflict while installing the package
36 40
 *   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.9.5-2
37 41
 -   Ensure non empty debuginfo
38 42
 *   Thu Mar 2 2017 Alexey Makhalov <amakhalov@vmware.com> 1.9.5-1