1. photon
  2. Commit 2d79f4a9adbbb04fdcedb0e5af092e44bf8a698f
Browse code

e2fsprogs: add -libs subpackage

krb5 depends on 2 libraries from e2fsprogs: libss and libcom_err.
Move them in the separate package.

Change-Id: Ibae94d02448163b9939f9ab0314a4d58a0439adf
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1700
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: suezzelur <anishs@vmware.com>

Alexey Makhalov authored on 2016/11/17 03:42:51
Showing 2 changed files
SPECS/e2fsprogs/e2fsprogs.spec
History View file @ 2d79f4a
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Contains the utilities for the ext2 file system
2 2 
 Name:		e2fsprogs
3 3 
 Version:	1.42.13
4 
-Release:	3%{?dist}
4 
+Release:	4%{?dist}
5 5 
 License:	GPLv2+
6 6 
 URL:		http://e2fsprogs.sourceforge.net
7 7 
 Group:		System Environment/Base
... ... 
@@ -9,9 +9,16 @@ Vendor:		VMware, Inc.
9 9 
 Distribution:	Photon
10 10 
 Source0:	http://prdownloads.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz
11 11 
 %define sha1 e2fsprogs=77d1412472ac5a67f8954166ec16c37616074c37
12 
+Requires:	%{name}-libs = %{version}-%{release}
12 13 
 %description
13 14 
 The E2fsprogs package contains the utilities for handling
14 15 
 the ext2 file system.
16 
+
17 
+%package	libs
18 
+Summary:	contains libraries used by other packages
19 
+%description	libs
20 
+It contains the libraries: libss and libcom_err
21 
+
15 22 
 %package	devel
16 23 
 Summary:	Header and development files for e2fsprogs
17 24 
 Requires:	%{name} = %{version}
... ... 
@@ -74,12 +81,8 @@ make %{?_smp_mflags} check
74 74 
 %{_sbindir}/filefrag
75 75 
 %{_sbindir}/e2freefrag
76 76 
 %{_sbindir}/mklost+found
77 
-/lib/libss.so.2
78 77 
 /lib/libext2fs.so.2.4
79 
-/lib/libcom_err.so.2.1
80 
-/lib/libss.so.2.0
81 78 
 /lib/libe2p.so.2.3
82 
-/lib/libcom_err.so.2
83 79 
 /lib/libe2p.so.2
84 80 
 /lib/libext2fs.so.2
85 81 
 /sbin/e2label
... ... 
@@ -101,10 +104,17 @@ make %{?_smp_mflags} check
101 101 
 /sbin/resize2fs
102 102 
 /sbin/fsck.ext2
103 103 
 /sbin/mkfs.ext3
104 
-%{_libdir}/libcom_err.so
105 104 
 %{_libdir}/libe2p.so
106 105 
 %{_libdir}/libext2fs.so
107 106
107 
+%files libs
108 
+/lib/libss.so.2
109 
+/lib/libcom_err.so.2.1
110 
+/lib/libss.so.2.0
111 
+/lib/libcom_err.so.2
112 
+%{_libdir}/libcom_err.so
113 
+%{_libdir}/libss.so
114 
+
108 115 
 %files devel
109 116 
 %{_includedir}/ss/ss_err.h
110 117 
 %{_includedir}/ss/ss.h
... ... 
@@ -129,8 +139,9 @@ make %{?_smp_mflags} check
129 129 
 %{_libdir}/pkgconfig/e2p.pc
130 130 
 %{_libdir}/libe2p.a
131 131 
 %{_libdir}/libext2fs.a
132 
-%{_libdir}/libss.so
133 132 
 %changelog
133 
+*   Wed Nov 16 2016 Alexey Makhalov <amakhalov@vmware.com> 1.42.13-4
134 
+-   Create libs subpackage for krb5
134 135 
 *   Tue Sep 20 2016 Alexey Makhalov <amakhalov@vmware.com> 1.42.13-3
135 136 
 -   Use symlinks - save a diskspace
136 137 
 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.42.13-2
SPECS/krb5/krb5.spec
History View file @ 2d79f4a
... ... 
@@ -12,7 +12,7 @@ Source0:	http://web.mit.edu/kerberos/www/dist/%{name}/%{version}/%{name}-%{versi
12 12 
 Patch0:         krb5-1.14-skip-unnecessary-mech-calls.patch
13 13 
 Patch1:         krb5-1.14-never-unload-mechanisms.patch
14 14 
 Requires:	openssl
15 
-Requires:	e2fsprogs
15 
+Requires:	e2fsprogs-libs
16 16 
 BuildRequires: 	openssl-devel
17 17 
 BuildRequires:	e2fsprogs-devel
18 18 
 %description
... ... 
@@ -95,6 +95,8 @@ rm -rf %{buildroot}/*
95 95 
 %{_datarootdir}/man/man5/.k5login.5.gz
96 96 
 %{_docdir}/%{name}-%{version}
97 97 
 %changelog
98 
+*	Wed Nov 16 2016 Alexey Makhalov <amakhalov@vmware.com> 1.14-5
99 
+-	Use e2fsprogs-libs as runtime deps
98 100 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.14-4
99 101 
 -	GA - Bump release of all rpms
100 102 
 * 	Mon Mar 21 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com>  1.14-3