Browse code

Add expect package, copy spec from dev branch, bring also tcl fixes to 1.0

Change-Id: Ieee82a4b750d1fa497ffa4e1720900e1034abc45
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3655
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>

Danut Moraru authored on 2017/08/25 04:48:48
Showing 2 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,62 @@
0
+Summary:        Expect is a tool for automating interactive applications
1
+Name:           expect
2
+Version:        5.45
3
+Release:        2%{?dist}
4
+License:        GPLv2+
5
+URL:            https://sourceforge.net/projects/expect
6
+Source0:        http://prdownloads.sourceforge.net/expect/expect5.45.tar.gz
7
+%define sha1    expect=e634992cab35b7c6931e1f21fbb8f74d464bd496
8
+Group:          Development/Tools
9
+Vendor:         VMware, Inc.
10
+Distribution:   Photon
11
+Requires:       tcl
12
+BuildRequires:  tcl-devel
13
+%description
14
+Expect is a tool for automating interactive applications such as
15
+telnet, ftp, passwd, fsck, rlogin, tip, etc. Expect is also useful
16
+for testing these same applications.
17
+
18
+%package devel
19
+Summary: Headers and development libraries for expect
20
+Group: Development/Libraries
21
+Requires: %{name} = %{version}-%{release}
22
+Requires: tcl-devel
23
+
24
+%description devel
25
+Headers and development libraries for expect
26
+
27
+%prep
28
+%setup -q -n %{name}%{version}
29
+
30
+%build
31
+./configure \
32
+    --prefix=%{_prefix} \
33
+    --mandir=/usr/share/man
34
+
35
+make %{?_smp_mflags}
36
+%install
37
+make DESTDIR=%{buildroot} install
38
+
39
+%check
40
+make %{?_smp_mflags} test
41
+
42
+%files
43
+%defattr(-,root,root)
44
+%{_bindir}/*
45
+%{_libdir}/*
46
+%exclude %{_libdir}/debug
47
+%{_mandir}/man1/*
48
+
49
+%files devel
50
+%defattr(-,root,root)
51
+%{_includedir}/*
52
+%{_mandir}/man3/*
53
+
54
+
55
+%changelog
56
+*   Thu Aug 24 2017 Danut Moraru <dmoraru@vmware.com> 5.45-2
57
+-   Copied spec from dev branch
58
+*   Tue Aug 8 2017 Alexey Makhalov <amakhalov@vmware.com> 5.45-2
59
+-   Fix %check section
60
+*   Wed Jul 12 2017 Alexey Makhalov <amakhalov@vmware.com> 5.45-1
61
+-   Initial build. First version
... ...
@@ -1,7 +1,8 @@
1 1
 Summary:        Tool Command Language - the language and library.
2 2
 Name:           tcl
3 3
 Version:        8.6.6
4
-Release:        1%{?dist}
4
+%define majorver 8.6
5
+Release:        2%{?dist}
5 6
 URL:            http://tcl.sourceforge.net/
6 7
 License:        LGPLv2+
7 8
 Group:          System Environment/Libraries
... ...
@@ -38,13 +39,40 @@ cd unix
38 38
        --mandir=%{_mandir}  \
39 39
        --enable-threads     \
40 40
        --enable-shared      \
41
+       --disable-static     \
41 42
        --enable-symbols
42 43
 make %{?_smp_mflags}
43 44
 
44 45
 %install
45 46
 [ %{buildroot} != "/"] && rm -rf %{buildroot}/*
47
+make DESTDIR=%{buildroot} install -C unix
48
+
49
+ln -s tclsh%{majorver} %{buildroot}%{_bindir}/tclsh
50
+
51
+# for linking with -lib%%{name}
52
+ln -s lib%{name}%{majorver}.so %{buildroot}%{_libdir}/lib%{name}.so
53
+
54
+mkdir -p %{buildroot}/%{_libdir}/%{name}%{majorver}
55
+
56
+# postgresql and maybe other packages too need tclConfig.sh
57
+# paths don't look at /usr/lib for efficiency, so we symlink into tcl8.6 for now
58
+ln -s %{_libdir}/%{name}Config.sh %{buildroot}/%{_libdir}/%{name}%{majorver}/%{name}Config.sh
59
+
60
+mkdir -p %{buildroot}/%{_includedir}/%{name}-private/{generic,unix}
61
+find generic unix -name "*.h" -exec cp -p '{}' %{buildroot}/%{_includedir}/%{name}-private/'{}' ';'
62
+( cd %{buildroot}/%{_includedir}
63
+	for i in *.h ; do
64
+				[ -f %{buildroot}/%{_includedir}/%{name}-private/generic/$i ] && ln -sf ../../$i %{buildroot}/%{_includedir}/%{name}-private/generic ;
65
+					done
66
+					)
67
+
68
+# remove buildroot traces
69
+sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{buildroot}/%{_libdir}/%{name}Config.sh
70
+rm -rf %{buildroot}/%{_datadir}/%{name}%{majorver}/ldAix
71
+
72
+%check
46 73
 cd unix
47
-make DESTDIR=%{buildroot} install
74
+make test
48 75
 
49 76
 %post -p /sbin/ldconfig
50 77
 %postun -p /sbin/ldconfig
... ...
@@ -53,23 +81,28 @@ make DESTDIR=%{buildroot} install
53 53
 %defattr(-,root,root)
54 54
 %{_bindir}/*
55 55
 %{_libdir}/libtcl8.6.so
56
+%{_libdir}/libtcl.so
57
+%{_libdir}/tcl8.6/*
58
+%{_libdir}/tcl8/*
59
+%{_libdir}/tclConfig.sh
60
+%{_libdir}/tclooConfig.sh
56 61
 %{_mandir}/man1/*
57 62
 
58
-
59 63
 %files devel
60 64
 %defattr(-,root,root)
61 65
 %{_includedir}/*
62 66
 %{_libdir}/pkgconfig/tcl.pc
63
-%{_libdir}/tcl8.6/*
64
-%{_libdir}/tcl8/*
65
-%{_libdir}/tclConfig.sh
66
-%{_libdir}/tclooConfig.sh
67
-%{_libdir}/libtclstub8.6.a
67
+/%{_libdir}/libtclstub8.6.a
68 68
 %{_mandir}/mann/*
69 69
 %{_mandir}/man3/*
70 70
 
71 71
 
72
-
73 72
 %changelog
73
+*   Mon Aug 28 2017 Danut Moraru <dmoraru@vmware.com> 8.6.6-2
74
+-   Ported previous change from dev to 1.0 branch
75
+*   Thu Jul 13 2017 Alexey Makhalov <amakhalov@vmware.com>  8.6.6-2
76
+-   Package more files (private headers, etc). Took install section from
77
+    Fedora: http://pkgs.fedoraproject.org/cgit/rpms/tcl.git/tree/tcl.spec
78
+-   Move init.tcl and other *.tck files to the main package
74 79
 *   Wed Apr 12 2017 Xiaolin Li <xiaolinl@vmware.com>  8.6.6-1
75 80
 -   Initial build.  First version