Change-Id: Ia61e5ea31f101d94332b75d9f639cbaf91a50fdf
Signed-off-by: Shreenidhi Shedi <shreenidhi.shedi@broadcom.com>
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/c/photon/+/23772
| ... | ... |
@@ -39,7 +39,7 @@ as well as switch between sets, and rollback from A to B. |
| 39 | 39 |
|
| 40 | 40 |
%install |
| 41 | 41 |
mkdir -p %{buildroot}{%{_sbindir},%{_sysconfdir},%{_unitdir},%{_docdir}}
|
| 42 |
-cp %{SOURCE0} %{buildroot}%{_sbindir}
|
|
| 42 |
+install -D -p -m 0755 %{SOURCE0} %{buildroot}%{_sbindir}
|
|
| 43 | 43 |
cp %{SOURCE1} %{buildroot}%{_sysconfdir}
|
| 44 | 44 |
cp %{SOURCE2} %{buildroot}%{_unitdir}
|
| 45 | 45 |
cp %{SOURCE3} %{buildroot}%{_docdir}
|
| 48 | 48 |
old mode 100755 |
| 49 | 49 |
new mode 100644 |
| ... | ... |
@@ -1,16 +1,19 @@ |
| 1 |
-Summary: cifs client utils |
|
| 2 |
-Name: cifs-utils |
|
| 3 |
-Version: 7.0 |
|
| 4 |
-Release: 1%{?dist}
|
|
| 5 |
-License: GPLv3 |
|
| 6 |
-URL: http://wiki.samba.org/index.php/LinuxCIFS_utils |
|
| 7 |
-Group: Applications/Nfs-utils-client |
|
| 1 |
+Summary: cifs client utils |
|
| 2 |
+Name: cifs-utils |
|
| 3 |
+Version: 7.0 |
|
| 4 |
+Release: 1%{?dist}
|
|
| 5 |
+License: GPLv3 |
|
| 6 |
+URL: http://wiki.samba.org/index.php/LinuxCIFS_utils |
|
| 7 |
+Group: Applications/Nfs-utils-client |
|
| 8 |
+Vendor: VMware, Inc. |
|
| 9 |
+Distribution: Photon |
|
| 10 |
+ |
|
| 8 | 11 |
Source0: https://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-%{version}.tar.bz2
|
| 9 | 12 |
%define sha512 cifs-utils=4c57741af0c4567a78f352c73caca998881666a5ed36536275cfa775efd66ff1a44ebe539a8ed96c409c5b08a1378266964ce667a27e9fc7f2d43999c63dd0eb |
| 10 |
-Vendor: VMware, Inc. |
|
| 11 |
-Distribution: Photon |
|
| 13 |
+ |
|
| 12 | 14 |
BuildRequires: libcap-ng-devel |
| 13 | 15 |
BuildRequires: libtalloc-devel |
| 16 |
+ |
|
| 14 | 17 |
Requires: libcap-ng |
| 15 | 18 |
|
| 16 | 19 |
%description |
| ... | ... |
@@ -19,7 +22,7 @@ Cifs-utils, a package of utilities for doing and managing mounts of the Linux CI |
| 19 | 19 |
%package devel |
| 20 | 20 |
Summary: The libraries and header files needed for Cifs-Utils development. |
| 21 | 21 |
Group: Development/Libraries |
| 22 |
-Requires: cifs-utils = %{version}-%{release}
|
|
| 22 |
+Requires: %{name} = %{version}-%{release}
|
|
| 23 | 23 |
|
| 24 | 24 |
%description devel |
| 25 | 25 |
Provides header files needed for Cifs-Utils development. |
| ... | ... |
@@ -29,16 +32,17 @@ Provides header files needed for Cifs-Utils development. |
| 29 | 29 |
|
| 30 | 30 |
%build |
| 31 | 31 |
%configure \ |
| 32 |
- ROOTSBINDIR=/usr/sbin \ |
|
| 32 |
+ ROOTSBINDIR=%{_sbindir} \
|
|
| 33 | 33 |
--disable-pam \ |
| 34 |
- --disable-systemd && |
|
| 34 |
+ --disable-systemd |
|
| 35 |
+ |
|
| 35 | 36 |
%make_build |
| 36 | 37 |
|
| 37 | 38 |
%install |
| 38 |
-%make_install |
|
| 39 |
+%make_install %{?_smp_mflags}
|
|
| 39 | 40 |
|
| 40 | 41 |
%check |
| 41 |
-make %{?_smp_mflags} check
|
|
| 42 |
+%make_build check |
|
| 42 | 43 |
|
| 43 | 44 |
%files |
| 44 | 45 |
%defattr(-,root,root) |
| ... | ... |
@@ -67,7 +71,7 @@ make %{?_smp_mflags} check
|
| 67 | 67 |
- Upgraded to version 6.8 |
| 68 | 68 |
* Thu Apr 06 2017 Anish Swaminathan <anishs@vmware.com> 6.7-1 |
| 69 | 69 |
- Upgraded to version 6.7 |
| 70 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 6.4-2 |
|
| 71 |
-- GA - Bump release of all rpms |
|
| 72 |
-* Mon Jan 25 2016 Divya Thaluru <dthaluru@vmware.com> 6.4-1 |
|
| 73 |
-- Initial build. First version. |
|
| 70 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 6.4-2 |
|
| 71 |
+- GA - Bump release of all rpms |
|
| 72 |
+* Mon Jan 25 2016 Divya Thaluru <dthaluru@vmware.com> 6.4-1 |
|
| 73 |
+- Initial build. First version. |
| ... | ... |
@@ -42,11 +42,6 @@ sh ./makeconf.sh |
| 42 | 42 |
mkdir -p %{buildroot}%{_libdir}/%{name}
|
| 43 | 43 |
%make_install %{?_smp_mflags}
|
| 44 | 44 |
|
| 45 |
-install -v -m755 -d %{_docdir}/%{name}-%{version}
|
|
| 46 |
- |
|
| 47 |
-install -v -m644 doc/{how-fuse-works,kernel.txt} \
|
|
| 48 |
- %{_docdir}/%{name}-%{version}
|
|
| 49 |
- |
|
| 50 | 45 |
%files |
| 51 | 46 |
%defattr(-,root,root) |
| 52 | 47 |
%{_libdir}/libfuse.so.*
|
| ... | ... |
@@ -33,21 +33,21 @@ userspace program. |
| 33 | 33 |
%package devel |
| 34 | 34 |
Summary: Header and development files |
| 35 | 35 |
Group: Development/Libraries |
| 36 |
-Requires: %{name} = %{version}
|
|
| 36 |
+Requires: %{name} = %{version}-%{release}
|
|
| 37 | 37 |
Requires: systemd-devel |
| 38 | 38 |
|
| 39 | 39 |
%description devel |
| 40 | 40 |
It contains the libraries and header files to create fuse applications. |
| 41 | 41 |
|
| 42 | 42 |
%prep |
| 43 |
-%autosetup -n libfuse-fuse-%{version}
|
|
| 43 |
+%autosetup -p1 -n libfuse-fuse-%{version}
|
|
| 44 | 44 |
|
| 45 | 45 |
%build |
| 46 | 46 |
export LANG=en_US.UTF-8 |
| 47 | 47 |
export LC_ALL=en_US.UTF-8 |
| 48 | 48 |
|
| 49 | 49 |
CONFIGURE_OPTS=( |
| 50 |
- --prefix=/usr |
|
| 50 |
+ --prefix=%{_usr}
|
|
| 51 | 51 |
-D examples=false |
| 52 | 52 |
) |
| 53 | 53 |
|
| ... | ... |
@@ -171,7 +171,7 @@ install -vdm 755 %{buildroot}%{_libdir}/locale
|
| 171 | 171 |
cp -v ../%{name}-%{version}/nscd/nscd.conf %{buildroot}%{_sysconfdir}/nscd.conf
|
| 172 | 172 |
# Install locale generation script and config file |
| 173 | 173 |
cp -v %{SOURCE2} %{buildroot}%{_sysconfdir}
|
| 174 |
-cp -v %{SOURCE1} %{buildroot}%{_sbindir}
|
|
| 174 |
+install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_sbindir}
|
|
| 175 | 175 |
# Remove unwanted cruft |
| 176 | 176 |
rm -rf %{buildroot}%{_infodir}
|
| 177 | 177 |
# Install configuration files |
| ... | ... |
@@ -224,7 +224,6 @@ popd |
| 224 | 224 |
mv %{buildroot}/sbin/* %{buildroot}/%{_sbindir}
|
| 225 | 225 |
rmdir %{buildroot}/sbin
|
| 226 | 226 |
|
| 227 |
-%if 0%{?with_check}
|
|
| 228 | 227 |
%check |
| 229 | 228 |
cd %{_builddir}/glibc-build
|
| 230 | 229 |
make %{?_smp_mflags} check ||:
|
| ... | ... |
@@ -253,7 +252,6 @@ grep "^FAIL: nptl/tst-eintr1" tests.sum >/dev/null && n=$((n+1)) ||: |
| 253 | 253 |
|
| 254 | 254 |
# check for exact 'n' failures |
| 255 | 255 |
[ $(grep ^FAIL tests.sum | wc -l) -ne $n ] && exit 1 ||: |
| 256 |
-%endif |
|
| 257 | 256 |
|
| 258 | 257 |
%post -p /sbin/ldconfig |
| 259 | 258 |
%postun -p /sbin/ldconfig |
| ... | ... |
@@ -88,6 +88,13 @@ cp %{SOURCE1} %{SOURCE2} %{buildroot}%{_bindir}
|
| 88 | 88 |
cp %{SOURCE3} %{buildroot}%{_sysconfdir}/auto_livepatch
|
| 89 | 89 |
cp %{SOURCE4} %{buildroot}%{_sysconfdir}/gen_livepatch/build-rpm.spec
|
| 90 | 90 |
|
| 91 |
+chmod +x %{buildroot}%{_bindir}/*
|
|
| 92 |
+ |
|
| 93 |
+%{_fixperms} %{buildroot}/*
|
|
| 94 |
+ |
|
| 95 |
+%clean |
|
| 96 |
+rm -rf %{buildroot}
|
|
| 97 |
+ |
|
| 91 | 98 |
%files |
| 92 | 99 |
%defattr(-,root,root,-) |
| 93 | 100 |
%{_sbindir}/kpatch
|
| ... | ... |
@@ -16,7 +16,7 @@ Source0: https://github.com/p11-glue/p11-kit/releases/download/%{version}/%{name
|
| 16 | 16 |
Source1: update-ca-trust |
| 17 | 17 |
|
| 18 | 18 |
BuildRequires: gcc |
| 19 |
-BuildRequires: libtasn1-devel >= 2.3 |
|
| 19 |
+BuildRequires: libtasn1-devel |
|
| 20 | 20 |
BuildRequires: libffi-devel |
| 21 | 21 |
BuildRequires: gettext |
| 22 | 22 |
BuildRequires: gtk-doc |
| ... | ... |
@@ -96,17 +96,15 @@ Update CA trust tool |
| 96 | 96 |
mkdir -p %{buildroot}%{_sysconfdir}/pkcs11/modules \
|
| 97 | 97 |
%{buildroot}%{_ca_trust_dir}/extracted/{pem,openssl,java,edk2}
|
| 98 | 98 |
|
| 99 |
-cp -p %{SOURCE1} %{buildroot}%{_bindir}/update-ca-trust
|
|
| 99 |
+install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/update-ca-trust
|
|
| 100 | 100 |
|
| 101 | 101 |
mv %{buildroot}%{_sysconfdir}/pkcs11/pkcs11.conf.example \
|
| 102 | 102 |
%{buildroot}%{_sysconfdir}/pkcs11/pkcs11.conf
|
| 103 | 103 |
|
| 104 | 104 |
rm -rf %{buildroot}%{_datadir}/gtk-doc
|
| 105 | 105 |
|
| 106 |
-%if 0%{?with_check}
|
|
| 107 | 106 |
%check |
| 108 | 107 |
%make_build check |
| 109 |
-%endif |
|
| 110 | 108 |
|
| 111 | 109 |
%clean |
| 112 | 110 |
rm -rf %{buildroot}/*
|