Browse code
Splitted the "file" rpm package (PR 2009847)
Change-Id: I88fbfbe74737fff5087eb6a01e3fad36f124b8db
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4532
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
dthaluru authored on 2017/12/20 05:07:50Showing 2 changed files
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Contains a utility for determining file types |
| 2 | 2 |
Name: file |
| 3 | 3 |
Version: 5.30 |
| 4 |
-Release: 2%{?dist}
|
|
| 4 |
+Release: 3%{?dist}
|
|
| 5 | 5 |
License: BSD |
| 6 | 6 |
URL: http://www.darwinsys.com/file |
| 7 | 7 |
Group: Applications/File |
| ... | ... |
@@ -10,10 +10,17 @@ Distribution: Photon |
| 10 | 10 |
Source0: ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
|
| 11 | 11 |
%define sha1 file=276051cd2c438d4e7a321c4422a5b3bc850fd747 |
| 12 | 12 |
Patch0: file-5.30-keep-not-stripped-last.patch |
| 13 |
+Requires: %{name}-libs = %{version}-%{release}
|
|
| 14 |
+Conflicts: toybox |
|
| 13 | 15 |
%description |
| 14 | 16 |
The package contains a utility for determining the type of a |
| 15 | 17 |
given file or files |
| 16 | 18 |
|
| 19 |
+%package libs |
|
| 20 |
+Summary: Library files for file |
|
| 21 |
+%description libs |
|
| 22 |
+It contains the libraries to run the application. |
|
| 23 |
+ |
|
| 17 | 24 |
%package devel |
| 18 | 25 |
Summary: Header and development files for file |
| 19 | 26 |
Requires: %{name} = %{version}-%{release}
|
| ... | ... |
@@ -35,14 +42,18 @@ find %{buildroot}%{_libdir} -name '*.la' -delete
|
| 35 | 35 |
%check |
| 36 | 36 |
make %{?_smp_mflags} check
|
| 37 | 37 |
|
| 38 |
-%post -p /sbin/ldconfig |
|
| 39 |
-%postun -p /sbin/ldconfig |
|
| 38 |
+%post libs -p /sbin/ldconfig |
|
| 39 |
+%postun libs -p /sbin/ldconfig |
|
| 40 |
+ |
|
| 40 | 41 |
%files |
| 41 | 42 |
%defattr(-,root,root) |
| 42 | 43 |
%{_bindir}/*
|
| 43 |
-%{_libdir}/*.so.*
|
|
| 44 | 44 |
%{_mandir}/*man1/*
|
| 45 | 45 |
%{_mandir}/*man4/*
|
| 46 |
+ |
|
| 47 |
+%files libs |
|
| 48 |
+%defattr(-,root,root) |
|
| 49 |
+%{_libdir}/*.so.*
|
|
| 46 | 50 |
%{_datarootdir}/misc/magic.mgc
|
| 47 | 51 |
|
| 48 | 52 |
%files devel |
| ... | ... |
@@ -51,6 +62,9 @@ make %{?_smp_mflags} check
|
| 51 | 51 |
%{_mandir}/*man3/*
|
| 52 | 52 |
|
| 53 | 53 |
%changelog |
| 54 |
+* Fri Dec 15 2017 Divya Thaluru <dthaluru@vmware.com> 5.30-3 |
|
| 55 |
+- Added seperate package for libraries |
|
| 56 |
+- Added toybox as conflict package |
|
| 54 | 57 |
* Fri Jun 23 2017 Xiaolin Li <xiaolinl@vmware.com> 5.30-2 |
| 55 | 58 |
- Add devel package. |
| 56 | 59 |
* Tue Apr 04 2017 Chang Lee <changlee@vmware.com> 5.30-1 |
| ... | ... |
@@ -123,6 +123,7 @@ class constants(object): |
| 123 | 123 |
"glibc-tools", |
| 124 | 124 |
"zlib", |
| 125 | 125 |
"zlib-devel", |
| 126 |
+ "file-libs", |
|
| 126 | 127 |
"file", |
| 127 | 128 |
"binutils", |
| 128 | 129 |
"binutils-devel", |
| ... | ... |
@@ -260,6 +261,7 @@ class constants(object): |
| 260 | 260 |
"xz-libs", |
| 261 | 261 |
"sqlite", |
| 262 | 262 |
"sqlite-libs", |
| 263 |
+ "file-libs", |
|
| 263 | 264 |
"rpm-libs"] |
| 264 | 265 |
|
| 265 | 266 |
# List of packages that will be installed in addition for each |