Browse code

sshfs : Upgrade to latest version

Upgrade the sshfs package to latest version.
Also update the fuse3 package to latest version
as fuse3 latest version is required by sshfs.

Change-Id: Iad6e0156221ef871e82d9283e24a3b926baef672
Signed-off-by: srinidhira0 <srinidhir@vmware.com>
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5805
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Tapas Kundu <tkundu@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>

srinidhira0 authored on 2018/09/25 04:42:57
Showing 3 changed files
... ...
@@ -1,14 +1,17 @@
1 1
 Summary:        File System in Userspace (FUSE) utilities
2 2
 Name:           fuse3
3
-Version:        3.0.1
4
-Release:        2%{?dist}
3
+Version:        3.2.6
4
+Release:        1%{?dist}
5 5
 License:        GPL+
6 6
 Url:            http://fuse.sourceforge.net/
7 7
 Group:          System Environment/Base
8 8
 Vendor:         VMware, Inc.
9 9
 Distribution:   Photon
10
-Source0:        https://github.com/libfuse/libfuse/releases/download/fuse-%{version}/fuse-%{version}.tar.gz
11
-%define sha1    fuse=9362ce52c17c2865ba47f9d4fcb9f054c38bd1fc
10
+Source0:        https://github.com/libfuse/libfuse/archive/%{name}-%{version}.tar.gz
11
+%define sha1    fuse3=cd2e28231751d2854afdec9efc0380ef294efa3f
12
+BuildRequires:  meson >= 0.38.0
13
+BuildRequires:  python-pytest
14
+BuildRequires:  systemd-devel
12 15
 
13 16
 %description
14 17
 With FUSE3 it is possible to implement a fully functional filesystem in a
... ...
@@ -18,41 +21,46 @@ userspace program.
18 18
 Summary:        Header and development files
19 19
 Group:          Development/Libraries
20 20
 Requires:       %{name} = %{version}
21
+Requires:	systemd-devel
21 22
 
22 23
 %description    devel
23 24
 It contains the libraries and header files to create fuse applications.
24 25
 
25 26
 %prep
26
-%setup -q -n fuse-%{version}
27
+%setup -q -n fuse3-%{version}
27 28
 
28 29
 %build
29
-./configure --prefix=%{_prefix} --disable-static INIT_D_PATH=/tmp/init.d &&
30
-make %{?_smp_mflags}
30
+mkdir build &&
31
+cd    build &&
32
+meson --prefix=%{_prefix} .. &&
33
+ninja -C ./
31 34
 
32 35
 %install
33
-mkdir -p %{buildroot}%{_libdir}/%{name}
34
-make install \
35
-    prefix=%{buildroot}%{_prefix}
36
+cd build
37
+DESTDIR=%{buildroot}/ ninja -C ./ install
36 38
 
37
-install -v -m755 -d /usr/share/doc/%{name}-%{version} &&
38
-install -v -m644    doc/kernel.txt \
39
-                    /usr/share/doc/%{name}-%{version}
40
-find %{buildroot} -name '*.la' -delete
39
+#%check
40
+#cd build
41
+#python3 -m pytest test/
41 42
 
42 43
 %files
43 44
 %defattr(-, root, root)
44
-%{_libdir}/libfuse3.so.*
45
-%{_libdir}/udev/rules.d/*
45
+%{_libdir}/libfuse3.so*
46
+/lib/udev/rules.d/*
46 47
 %{_bindir}/*
48
+%{_sysconfdir}/fuse*
47 49
 %{_datadir}/man/*
48 50
 %{_sbindir}/mount.fuse3
51
+%exclude %{_sysconfdir}/init.d/fuse3
49 52
 
50 53
 %files devel
51 54
 %{_includedir}/*
52 55
 %{_libdir}/pkgconfig/fuse3.pc
53
-%{_libdir}/libfuse3.so
56
+%{_libdir}/libfuse3.so*
54 57
 
55 58
 %changelog
59
+*   Mon Sep 24 2018 Srinidhi Rao <srinidhir@vmware.com> 3.2.6-1
60
+-   Update to version 3.2.6.
56 61
 *   Wed Jul 05 2017 Xiaolin Li <xiaolinl@vmware.com> 3.0.1-2
57 62
 -   Move pkgconfig folder to devel package.
58 63
 *   Mon Apr 17 2017 Danut Moraru <dmoraru@vmware.com> 3.0.1-1
... ...
@@ -1,40 +1,51 @@
1 1
 Summary:	fuse filesystem to access remote ssh servers
2 2
 Name:           sshfs
3
-Version:        2.9
3
+Version:        3.5.0
4 4
 Release:        1%{?dist}
5 5
 License:        GPLv2
6 6
 Url:		https://github.com/libfuse/sshfs
7 7
 Group:		Filesystemd tools
8 8
 Vendor:		VMware, Inc.
9 9
 Distribution:	Photon
10
-Source0:        https://github.com/libfuse/sshfs/releases/download/%{name}_%{version}/%{name}-%{version}.tar.gz
10
+Source0:        https://github.com/libfuse/sshfs/archive/%{name}-%{version}.tar.gz
11 11
 Requires:	fuse >= 2.3
12
-Requires:	glib >= 2.0
13
-BuildRequires:	glib-devel >= 2.0
14
-BuildRequires:  fuse-devel >= 2.3
15
-%define sha1 sshfs=57d2d600c0cdf7cb48a8cd0dbcdcfd99309fb04b
12
+Requires:	fuse3 >= 3.0.0
13
+Requires:	glib > 2.0
14
+BuildRequires:  fuse3-devel >= 3.0.0
15
+BuildRequires:  meson >= 0.38.0
16
+
17
+%define sha1 sshfs=18263ec29d4542320e52dd5390b64ca12efe536f
16 18
 %description
17 19
 This is a usermode fuse client to mount remote filesystems through SSH File Transfer Protocol.
18 20
 
19 21
 %prep
20
-%setup -q
22
+%setup -q -n sshfs-sshfs-3.5.0
21 23
 %build
22
-autoreconf -i
23
-./configure --prefix=%{_prefix}
24
-make %{?_smp_mflags}
24
+mkdir build &&
25
+cd build &&
26
+meson --prefix=%{_prefix} .. &&
27
+ninja
25 28
 
26 29
 %install
27
-make install prefix=%{buildroot}%{_prefix}
30
+cd build
31
+DESTDIR=%{buildroot}/ ninja install
32
+
33
+#%check
34
+#cd build
35
+#python3 -m pytest test/
28 36
 
29 37
 %files
30 38
 %defattr(-, root, root)
31 39
 %{_bindir}/*
32
-%{_datadir}/man/*
33
-
40
+%{_sbindir}/*
41
+%exclude %{_libdir}
42
+%exclude %{_prefix}/src
34 43
 
35 44
 %changelog
36
-*	Mon Apr 17 2017 Danut Moraru <dmoraru@vmware.com> 2.9-1
37
--	Updated to version 2.9
38
-*	Fri Nov 04 2016 Sharath George <sharathg@vmware.com> 2.8-1
39
--	Initial commit.
45
+*       Mon Oct 08 2018 Srinidhi Rao <srinidhir@vmware.com> 3.5.0-1
46
+-       Updated to version 3.5.0
47
+*       Mon Apr 17 2017 Danut Moraru <dmoraru@vmware.com> 2.9-1
48
+-       Updated to version 2.9
49
+*       Fri Nov 04 2016 Sharath George <sharathg@vmware.com> 2.8-1
50
+-       Initial commit.
40 51
 
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:          Systemd-239
2 2
 Name:             systemd
3 3
 Version:          239
4
-Release:          3%{?dist}
4
+Release:          4%{?dist}
5 5
 License:          LGPLv2+ and GPLv2+ and MIT
6 6
 URL:              http://www.freedesktop.org/wiki/Software/systemd/
7 7
 Group:            System Environment/Security
... ...
@@ -54,6 +54,7 @@ Systemd is an init replacement with better process control and security
54 54
 %package devel
55 55
 Summary:        Development headers for systemd
56 56
 Requires:       %{name} = %{version}-%{release}
57
+Requires:    glib-devel
57 58
 
58 59
 %description devel
59 60
 Development headers for developing applications linking to libsystemd
... ...
@@ -243,6 +244,8 @@ rm -rf %{buildroot}/*
243 243
 %files lang -f %{name}.lang
244 244
 
245 245
 %changelog
246
+*    Mon Oct 08 2018 Srinidhi Rao <srinidhir@vmware.com> 239-4
247
+-    Add glib-devel as a Requirement to systemd-devel
246 248
 *    Fri Sep 21 2018 Alexey Makhalov <amakhalov@vmware.com> 239-3
247 249
 -    Fix compilation issue against glibc-2.28
248 250
 *    Tue Sep 18 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 239-2