Browse code

Add curl-devel subpackages.

Change-Id: I21b0dff8ac9f8c7df86b01b7d092203c5483df69
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1872
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Priyesh Padmavilasom <ppadmavilasom@vmware.com>

xiaolin-vmware authored on 2016/12/20 16:42:42
Showing 11 changed files
... ...
@@ -1,14 +1,14 @@
1 1
 Summary:        An URL retrieval utility and library
2 2
 Name:           curl
3 3
 Version:        7.51.0
4
-Release:        3%{?dist}
4
+Release:        4%{?dist}
5 5
 License:        MIT
6 6
 URL:            http://curl.haxx.se
7 7
 Group:          System Environment/NetworkingLibraries
8 8
 Vendor:         VMware, Inc.
9 9
 Distribution:   Photon
10 10
 Source0:        http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
11
-%define sha1 curl=19bf2c1e60a513910355cc9769c6371ea2ff5d1f
11
+%define sha1    curl=19bf2c1e60a513910355cc9769c6371ea2ff5d1f
12 12
 BuildRequires:  ca-certificates
13 13
 BuildRequires:  openssl-devel
14 14
 BuildRequires:  krb5-devel
... ...
@@ -25,6 +25,12 @@ DICT, LDAP, LDAPS and FILE. Its ability to both download and
25 25
 upload files can be incorporated into other programs to support
26 26
 functions like streaming media.
27 27
 
28
+%package devel
29
+Summary:    Libraries and header files for curl
30
+Requires:   %{name} = %{version}-%{release}
31
+%description devel
32
+Static libraries and header files for the support library for curl
33
+
28 34
 %prep
29 35
 %setup -q
30 36
 sed -i '/--static-libs)/{N;s#echo .*#echo #;}' curl-config.in
... ...
@@ -60,15 +66,22 @@ rm -rf %{buildroot}/*
60 60
 %files
61 61
 %defattr(-,root,root)
62 62
 %{_bindir}/*
63
-%{_libdir}/*.so*
63
+%{_libdir}/*.so.*
64
+%{_mandir}/man1/*
65
+
66
+%files devel
67
+%defattr(-,root,root)
68
+%{_libdir}/*.so
64 69
 %{_libdir}/pkgconfig/*
65 70
 %{_includedir}/*
66
-%{_mandir}/man1/*
67 71
 %{_mandir}/man3/*
68 72
 %{_datarootdir}/aclocal/libcurl.m4
69 73
 %{_docdir}/%{name}-%{version}
70 74
 
75
+
71 76
 %changelog
77
+*   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 7.51.0-4
78
+-   Added -devel subpackage.
72 79
 *   Wed Nov 30 2016 Xiaolin Li <xiaolinl@vmware.com> 7.51.0-3
73 80
 -   Enable sftp support.
74 81
 *   Thu Nov 24 2016 Alexey Makhalov <amakhalov@vmware.com> 7.51.0-2
... ...
@@ -1,9 +1,9 @@
1 1
 Summary:        cve-check-tool, as its name suggests, is a tool for checking known (public) CVEs.
2 2
 Name:           cve-check-tool
3 3
 Version:        5.6.4.1
4
-Release:        5%{?dist}
4
+Release:        6%{?dist}
5 5
 Source0:        cve-check-tool-%{version}.tar.gz
6
-%define sha1 cve-check-tool=880719673907f5e69ece5180e762611fa66f4ae2
6
+%define sha1    cve-check-tool=880719673907f5e69ece5180e762611fa66f4ae2
7 7
 Source1:        packages-mapping.cfg
8 8
 Patch0:         0001-New-option-r-to-select-a-report-plugin.patch
9 9
 Patch1:         0002-Alternative-csv-output.patch
... ...
@@ -11,19 +11,19 @@ Patch2:         0003-Add-N-M-mapping-support.-Invert-key-values.patch
11 11
 Patch3:         0004-Mapping-supports-vendor-product-combination.patch
12 12
 License:        GPLv2
13 13
 URL:            https://github.com/ikeydoherty/cve-check-tool
14
-Vendor:	        VMware, Inc.
15
-Distribution:	Photon
14
+Vendor:         VMware, Inc.
15
+Distribution:   Photon
16 16
 # We always run autogen.sh
17
-BuildRequires: autoconf
18
-BuildRequires: automake
19
-BuildRequires: libtool
20
-BuildRequires: json-glib-devel
21
-BuildRequires: check
22
-BuildRequires: libxml2-devel
23
-BuildRequires: sqlite-devel
24
-BuildRequires: curl
25
-BuildRequires: openssl-devel
26
-Requires:      curl
17
+BuildRequires:  autoconf
18
+BuildRequires:  automake
19
+BuildRequires:  libtool
20
+BuildRequires:  json-glib-devel
21
+BuildRequires:  check
22
+BuildRequires:  libxml2-devel
23
+BuildRequires:  sqlite-devel
24
+BuildRequires:  curl-devel
25
+BuildRequires:  openssl-devel
26
+Requires:       curl
27 27
 
28 28
 %global security_hardening nonow
29 29
 
... ...
@@ -60,6 +60,8 @@ rm -rf %{buildroot}/*
60 60
 %doc %{_mandir}/man1/*
61 61
 
62 62
 %changelog
63
+*   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 5.6.4.1-6
64
+-   BuildRequires curl-devel.
63 65
 *   Wed Nov 16 2016 Alexey Makhalov <ppadmavilasom@vmware.com> 5.6.4.1-5
64 66
 -   Use sqlite-devel
65 67
 *   Thu Nov 10 2016 Alexey Makhalov <amakhalov@vmware.com> 5.6.4.1-4
... ...
@@ -1,29 +1,29 @@
1 1
 %global security_hardening none
2
-Summary:	The Behavioral Activity Monitor With Container Support
3
-Name:		falco
4
-Version:	0.2.0
5
-Release:	5%{?kernelsubrelease}%{?dist}
6
-License:	GPLv2	  
7
-URL:		http://www.sysdig.org/falco/
8
-Group:		Applications/System	
9
-Vendor:		VMware, Inc.
10
-Distribution:	Photon
11
-Source0:	https://github.com/draios/%{name}/archive/%{name}-%{version}.tar.gz
12
-%define sha1 falco=c40840c6dcbd25fd1d0bf8aa2d1f77b1f5a7cde2
13
-Source1:	https://github.com/draios/sysdig/archive/sysdig-0.10.1.tar.gz
14
-%define sha1 sysdig=272b95ad02be4d194bba66d360ff935084d9c842
2
+Summary:        The Behavioral Activity Monitor With Container Support
3
+Name:           falco
4
+Version:        0.2.0
5
+Release:        6%{?kernelsubrelease}%{?dist}
6
+License:        GPLv2     
7
+URL:            http://www.sysdig.org/falco/
8
+Group:          Applications/System 
9
+Vendor:         VMware, Inc.
10
+Distribution:   Photon
11
+Source0:        https://github.com/draios/%{name}/archive/%{name}-%{version}.tar.gz
12
+%define sha1    falco=c40840c6dcbd25fd1d0bf8aa2d1f77b1f5a7cde2
13
+Source1:        https://github.com/draios/sysdig/archive/sysdig-0.10.1.tar.gz
14
+%define sha1    sysdig=272b95ad02be4d194bba66d360ff935084d9c842
15 15
 Source2:        http://stedolan.github.io/jq/download/linux64/jq
16
-%define sha1 jq=e820e9e91c9cce6154f52949a3b2a451c4de8af4
16
+%define sha1    jq=e820e9e91c9cce6154f52949a3b2a451c4de8af4
17 17
 Source3:        http://libvirt.org/sources/libvirt-2.0.0.tar.xz
18
-%define sha1 libvirt=9a923b06df23f7a5526e4ec679cdadf4eb35a38f
18
+%define sha1    libvirt=9a923b06df23f7a5526e4ec679cdadf4eb35a38f
19 19
 
20
-BuildRequires:	cmake
21
-BuildRequires:	openssl-devel
22
-BuildRequires:	curl
23
-BuildRequires:	zlib-devel
24
-BuildRequires:	ncurses-devel
20
+BuildRequires:  cmake
21
+BuildRequires:  openssl-devel
22
+BuildRequires:  curl-devel
23
+BuildRequires:  zlib-devel
24
+BuildRequires:  ncurses-devel
25 25
 BuildRequires:  automake
26
-BuildRequires:	linux-devel = %{KERNEL_VERSION}-%{KERNEL_RELEASE}
26
+BuildRequires:  linux-devel = %{KERNEL_VERSION}-%{KERNEL_RELEASE}
27 27
 BuildRequires:  autoconf 
28 28
 BuildRequires:  libgcrypt 
29 29
 BuildRequires:  sysdig
... ...
@@ -31,13 +31,13 @@ BuildRequires:  git
31 31
 BuildRequires:  lua-devel
32 32
 BuildRequires:  libyaml-devel
33 33
 BuildRequires:  linux-api-headers
34
-Requires:	zlib
35
-Requires:	ncurses
36
-Requires:	openssl
37
-Requires:	curl
38
-Requires:	libyaml
39
-Requires:	lua
40
-Requires:	sysdig
34
+Requires:       zlib
35
+Requires:       ncurses
36
+Requires:       openssl
37
+Requires:       curl
38
+Requires:       libyaml
39
+Requires:       lua
40
+Requires:       sysdig
41 41
 
42 42
 %description
43 43
 Sysdig falco is an open source, behavioral activity monitor designed to detect anomalous activity in your applications. Falco lets you continuously monitor and detect container, application, host, and network activity... all in one place, from one source of data, with one set of customizable rules. 
... ...
@@ -78,6 +78,8 @@ rm -rf %{buildroot}/*
78 78
 %{_datadir}/*
79 79
 
80 80
 %changelog
81
+*   Mon Dec 19 2016 Xiaolin Li <xiaolinl@vmware.com> 0.2.0-6
82
+-   BuildRequires curl-devel
81 83
 *   Thu Dec 15 2016 Alexey Makhalov <amakhalov@vmware.com> 0.2.0-5
82 84
 -   Fix building for linux-4.9
83 85
 *   Wed Nov 30 2016 Alexey Makhalov <amakhalov@vmware.com> 0.2.0-4
... ...
@@ -1,24 +1,24 @@
1
-Summary:	Fast distributed version control system
2
-Name:		git
3
-Version:	2.8.1
4
-Release:	6%{?dist}
5
-License:	GPLv2
6
-URL:		http://git-scm.com/
7
-Group:		System Environment/Programming
8
-Vendor:		VMware, Inc.
9
-Distribution:	Photon
10
-Source0:	https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.xz
11
-%define sha1 git=fc97f987bbdc9dc302a525047bf8a014f6574f92
12
-BuildRequires:  curl
13
-BuildRequires:	python2
14
-BuildRequires:	python2-libs
15
-BuildRequires:	openssl-devel
16
-Requires:	python2
17
-Requires:	openssl
18
-Requires:	curl
19
-Requires:	expat
20
-Requires:	perl-YAML
21
-Requires:	perl-DBI
1
+Summary:        Fast distributed version control system
2
+Name:           git
3
+Version:        2.8.1
4
+Release:        7%{?dist}
5
+License:        GPLv2
6
+URL:            http://git-scm.com/
7
+Group:          System Environment/Programming
8
+Vendor:         VMware, Inc.
9
+Distribution:   Photon
10
+Source0:        https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.xz
11
+%define sha1    git=fc97f987bbdc9dc302a525047bf8a014f6574f92
12
+BuildRequires:  curl-devel
13
+BuildRequires:  python2
14
+BuildRequires:  python2-libs
15
+BuildRequires:  openssl-devel
16
+Requires:       python2
17
+Requires:       openssl
18
+Requires:       curl
19
+Requires:       expat
20
+Requires:       perl-YAML
21
+Requires:       perl-DBI
22 22
 Requires:       perl-CGI
23 23
 
24 24
 %description
... ...
@@ -42,13 +42,13 @@ These are the additional language files of git.
42 42
 %setup -q
43 43
 %build
44 44
 ./configure \
45
-	CFLAGS="%{optflags}" \
46
-	CXXFLAGS="%{optflags}" \
47
-	--prefix=%{_prefix} \
48
-	--bindir=%{_bindir} \
49
-	--libdir=%{_libdir} \
50
-	--libexec=%{_libexecdir} \
51
-	--with-gitconfig=/etc/gitconfig
45
+    CFLAGS="%{optflags}" \
46
+    CXXFLAGS="%{optflags}" \
47
+    --prefix=%{_prefix} \
48
+    --bindir=%{_bindir} \
49
+    --libdir=%{_libdir} \
50
+    --libexec=%{_libexecdir} \
51
+    --with-gitconfig=/etc/gitconfig
52 52
 make %{?_smp_mflags} CFLAGS="%{optflags}" CXXFLAGS="%{optflags}"
53 53
 %install
54 54
 [ %{buildroot} != "/"] && rm -rf %{buildroot}/*
... ...
@@ -92,6 +92,8 @@ rm -rf %{buildroot}/*
92 92
 %defattr(-,root,root)
93 93
 
94 94
 %changelog
95
+*   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 2.8.1-7
96
+-   BuildRequires curl-devel.
95 97
 *   Fri Aug 19 2016 Alexey Makhalov <amakhalov@vmware.com> 2.8.1-6
96 98
 -   Add bash completion file
97 99
 *   Thu May 26 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2.8.1-5
... ...
@@ -2,36 +2,36 @@
2 2
 %define _unpackaged_files_terminate_build 0
3 3
 %define librepo_name %{name}-%{name}
4 4
 
5
-Summary:       	Repodata downloading library
6
-Name:          	librepo
7
-Version:       	1.7.17
8
-Release:       	4%{?dist}
9
-License:       	LGPLv2+
10
-URL:           	https://github.com/Tojaj/librepo/
11
-Group:         	System Environment/Libraries
12
-Source0:       	%{name}-%{version}.tar.gz
13
-%define sha1 librepo=e96b735393cd830caca49fe3bf7da767f22d8a8a
5
+Summary:        Repodata downloading library
6
+Name:           librepo
7
+Version:        1.7.17
8
+Release:        5%{?dist}
9
+License:        LGPLv2+
10
+URL:            https://github.com/Tojaj/librepo/
11
+Group:          System Environment/Libraries
12
+Source0:        %{name}-%{version}.tar.gz
13
+%define sha1    librepo=e96b735393cd830caca49fe3bf7da767f22d8a8a
14 14
 Source1:        pygpgme-0.3.tar.gz
15
-%define sha1 pygpgme=f8df35bd2705ac2e1642209fba732e6a42d03fd4
16
-Vendor:		VMware, Inc.
17
-Distribution:	Photon
18
-Requires:	curl, gpgme, libassuan, libgpg-error
19
-Requires:	expat
20
-Requires:	glib
21
-BuildRequires:	cmake
22
-BuildRequires:	glib-devel
23
-BuildRequires:	check
24
-BuildRequires:	expat
25
-BuildRequires:	curl
26
-BuildRequires:	python2-devel
27
-BuildRequires:	python2-libs
28
-BuildRequires:	python2-tools
29
-BuildRequires:	gpgme-devel
30
-BuildRequires:	openssl-devel
31
-BuildRequires:	attr-devel
32
-
15
+%define sha1    pygpgme=f8df35bd2705ac2e1642209fba732e6a42d03fd4
16
+Vendor:         VMware, Inc.
17
+Distribution:   Photon
18
+Requires:       curl, gpgme, libassuan, libgpg-error
19
+Requires:       expat
20
+Requires:       glib
33 21
 Requires:       openssl
34 22
 
23
+BuildRequires:  cmake
24
+BuildRequires:  glib-devel
25
+BuildRequires:  check
26
+BuildRequires:  expat
27
+BuildRequires:  curl-devel
28
+BuildRequires:  python2-devel
29
+BuildRequires:  python2-libs
30
+BuildRequires:  python2-tools
31
+BuildRequires:  gpgme-devel
32
+BuildRequires:  openssl-devel
33
+BuildRequires:  attr-devel
34
+
35 35
 %description
36 36
 A library providing C and Python (libcURL like) API for downloading 
37 37
 linux repository metadata and packages
... ...
@@ -39,6 +39,7 @@ linux repository metadata and packages
39 39
 %package devel
40 40
 Summary: package config and headers for librepo
41 41
 Requires: librepo
42
+Requires: curl-devel
42 43
 Provides: pkgconfig(librepo)
43 44
 
44 45
 %description devel
... ...
@@ -85,17 +86,19 @@ PYTHONPATH=`readlink -f ./librepo/python/python2/` nosetests -s -v tests/python/
85 85
 %{_includedir}/librepo/*.h
86 86
 
87 87
 %changelog
88
-* Thu Nov 24 2016 Alexey Makhalov <amakhalov@vmware.com> 1.7.1-4
89
-- BuildRequired attr-devel.
90
-* Thu Oct 06 2016 ChangLee <changlee@vmware.com> 1.7.1-3
91
-- Modified %check
92
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.7.17-2
93
-- GA - Bump release of all rpms
94
-* Fri Jan 22 2016 Xiaolin Li <xiaolinl@vmware.com> 1.7.17-1
95
-- Updated to version 1.7.17
96
-* Wed Jun 17 2015 Anish Swaminathan <anishs@vmware.com> 1.7.15-1
97
-- Updated version and split devel package.
98
-* Tue Dec 30 2014 Priyesh Padmavilasom <ppadmavilasom@vmware.com>
99
-- initial specfile.
88
+*   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 1.7.1-5
89
+-   BuildRequires curl-devel.
90
+*   Thu Nov 24 2016 Alexey Makhalov <amakhalov@vmware.com> 1.7.1-4
91
+-   BuildRequired attr-devel.
92
+*   Thu Oct 06 2016 ChangLee <changlee@vmware.com> 1.7.1-3
93
+-   Modified %check
94
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.7.17-2
95
+-   GA - Bump release of all rpms
96
+*   Fri Jan 22 2016 Xiaolin Li <xiaolinl@vmware.com> 1.7.17-1
97
+-   Updated to version 1.7.17
98
+*   Wed Jun 17 2015 Anish Swaminathan <anishs@vmware.com> 1.7.15-1
99
+-   Updated version and split devel package.
100
+*   Tue Dec 30 2014 Priyesh Padmavilasom <ppadmavilasom@vmware.com>
101
+-   initial specfile.
100 102
 
101 103
 # EOF
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:        Mesos
2 2
 Name:           mesos
3 3
 Version:        1.1.0
4
-Release:        1%{?dist}
4
+Release:        2%{?dist}
5 5
 License:        Apache
6 6
 URL:            http://mesos.apache.org
7 7
 Group:          Applications/System
... ...
@@ -11,7 +11,7 @@ Source0:        http://www.apache.org/dist/%{name}/%{version}/%{name}-%{version}
11 11
 %define sha1    mesos=5ea8f46cdb5c1b96fdce19120655c8df15732a60
12 12
 BuildRequires:  openjre >= 1.8.0.45
13 13
 BuildRequires:  openjdk >= 1.8.0.45
14
-BuildRequires:  curl
14
+BuildRequires:  curl-devel
15 15
 BuildRequires:  apache-maven >= 3.3.3
16 16
 BuildRequires:  apr-devel >= 1.5.2
17 17
 BuildRequires:  apr >= 1.5.2
... ...
@@ -98,6 +98,8 @@ find %{buildroot}%{_libdir} -name '*.la' -delete
98 98
 %exclude %{_libdir}/debug/
99 99
 
100 100
 %changelog
101
+*   Thu Dec 15 2016 Xiaolin Li <xiaolinl@vmware.com> 1.1.0-2
102
+-   BuildRequires curl-devel.
101 103
 *   Tue Dec 13 2016 Xiaolin Li <xiaolinl@vmware.com> 1.1.0-1
102 104
 -   Updated to version 1.1.0
103 105
 *   Wed Nov 16 2016 Alexey Makhalov <ppadmavilasom@vmware.com> 0.28.2-3
... ...
@@ -1,25 +1,25 @@
1
-Summary:    A cloud-init implementation in C.
2
-Name:       micro-config-drive
3
-Version:    25
4
-Release:    2%{?dist}
5
-Group:      Development/Tools
6
-License:    GPL-3.0
7
-URL:        https://github.com/clearlinux/micro-config-drive
8
-Source0:    https://github.com/clearlinux/micro-config-drive/releases/download/v%{version}/%{name}-%{version}.tar.xz
9
-%define sha1 micro-config-drive=11945b6c13e5f5e126bc12906c69cc057026bc28
10
-BuildRequires:    e2fsprogs-devel
11
-BuildRequires:    shadow
12
-BuildRequires:    check
13
-BuildRequires:    glib-devel
14
-BuildRequires:    json-glib-devel
15
-BuildRequires:    curl
16
-BuildRequires:    parted
17
-BuildRequires:    libyaml-devel
18
-BuildRequires:    systemd-devel
19
-Requires:    json-glib
20
-Requires:    glib
21
-Requires:    libyaml
22
-Requires:    parted
1
+Summary:        A cloud-init implementation in C.
2
+Name:           micro-config-drive
3
+Version:        25
4
+Release:        3%{?dist}
5
+Group:          Development/Tools
6
+License:        GPL-3.0
7
+URL:            https://github.com/clearlinux/micro-config-drive
8
+Source0:        https://github.com/clearlinux/micro-config-drive/releases/download/v%{version}/%{name}-%{version}.tar.xz
9
+%define sha1    micro-config-drive=11945b6c13e5f5e126bc12906c69cc057026bc28
10
+BuildRequires:  e2fsprogs-devel
11
+BuildRequires:  shadow
12
+BuildRequires:  check
13
+BuildRequires:  glib-devel
14
+BuildRequires:  json-glib-devel
15
+BuildRequires:  curl-devel
16
+BuildRequires:  parted
17
+BuildRequires:  libyaml-devel
18
+BuildRequires:  systemd-devel
19
+Requires:       json-glib
20
+Requires:       glib
21
+Requires:       libyaml
22
+Requires:       parted
23 23
 
24 24
 %description
25 25
 A cloud-init for Clear Linux* Project for Intel Architecture.
... ...
@@ -58,7 +58,9 @@ rm -rf $RPM_BUILD_ROOT
58 58
 %doc /usr/share/man/man5/*
59 59
 
60 60
 %changelog
61
-*    Fri Nov 18 2016 Anish Swaminathan <anishs@vmware.com>  25-2
62
--    Change systemd dependency
63
-*    Wed Aug 3 2016 Divya Thaluru <dthaluru@vmware.com> 25-1
64
--    Initial version
61
+*   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 25-3
62
+-   BuildRequires curl-devel.
63
+*   Fri Nov 18 2016 Anish Swaminathan <anishs@vmware.com>  25-2
64
+-   Change systemd dependency
65
+*   Wed Aug 3 2016 Divya Thaluru <dthaluru@vmware.com> 25-1
66
+-   Initial version
... ...
@@ -1,11 +1,11 @@
1 1
 Summary:        Open Source Security Compliance Solution
2 2
 Name:           openscap
3 3
 Version:        1.2.10
4
-Release:        1%{?dist}
4
+Release:        2%{?dist}
5 5
 License:        GPL2+
6 6
 URL:            https://www.open-scap.org
7 7
 Source0:        https://github.com/OpenSCAP/openscap/releases/download/%{version}/openscap-%{version}.tar.gz
8
-%define sha1 openscap=d75375b87afa7032de659ee36258caf2bc6a2b7f
8
+%define sha1    openscap=d75375b87afa7032de659ee36258caf2bc6a2b7f
9 9
 Group:          System Environment/Libraries
10 10
 Vendor:         VMware, Inc.
11 11
 Distribution:   Photon
... ...
@@ -19,9 +19,11 @@ BuildRequires:  libselinux-devel libcap-devel
19 19
 BuildRequires:  util-linux-devel
20 20
 BuildRequires:  bzip2-devel
21 21
 BuildRequires:  XML-XPath
22
-BuildRequires:  curl
22
+BuildRequires:  curl-devel
23 23
 BuildRequires:  popt-devel
24 24
 BuildRequires:  python2-devel
25
+Requires:       curl
26
+Requires:       popt
25 27
 %description
26 28
 SCAP is a multi-purpose framework of specifications that supports automated configuration, vulnerability and patch checking, technical control compliance activities, and security measurement.
27 29
 OpenSCAP has received a NIST certification for its support of SCAP 1.2.
... ...
@@ -93,5 +95,7 @@ make %{?_smp_mflags} -k check
93 93
 %{_libdir}/python2.7/*
94 94
 
95 95
 %changelog
96
+*   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 1.2.10-2
97
+-   BuildRequires curl-devel.
96 98
 *   Tue Sep 6 2016 Xiaolin Li <xiaolinl@vmware.com> 1.2.10-1
97 99
 -   Initial build. First version
... ...
@@ -7,18 +7,18 @@
7 7
 Summary:        Perl extension interface for libcurl
8 8
 Name:           perl-WWW-Curl
9 9
 Version:        4.17
10
-Release:        3%{?dist}
10
+Release:        4%{?dist}
11 11
 License:        MIT
12 12
 Group:          Development/Libraries
13 13
 URL:            http://search.cpan.org/dist/WWW-Curl/
14 14
 Source0:        http://search.cpan.org/CPAN/authors/id/S/SZ/SZBALINT/WWW-Curl-%{version}.tar.gz
15
-%define sha1 WWW-Curl=8ec7b7b39bd653539671fb02fbb7d0ff4863e636
15
+%define sha1    WWW-Curl=8ec7b7b39bd653539671fb02fbb7d0ff4863e636
16 16
 Vendor:         VMware, Inc.
17 17
 Distribution:   Photon
18 18
 BuildRequires:  perl
19 19
 BuildRequires:  perl-Module-Install
20 20
 BuildRequires:  perl-YAML-Tiny
21
-BuildRequires:  curl
21
+BuildRequires:  curl-devel
22 22
 Requires:       perl
23 23
 Requires:       curl
24 24
 %description
... ...
@@ -63,6 +63,8 @@ make test
63 63
 %{_mandir}/man3/*
64 64
 
65 65
 %changelog
66
+*   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 4.17-4
67
+-   BuildRequires curl-devel.
66 68
 *   Thu Sep 15 2016 Xiaolin Li <xiaolinl@vmware.com> 4.17-3
67 69
 -   Build WWW-Curl with curl 7.50.3
68 70
 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.17-2
... ...
@@ -2,22 +2,22 @@
2 2
 
3 3
 Name:           pycurl
4 4
 Version:        7.21.5
5
-Release:        4%{?dist}
5
+Release:        5%{?dist}
6 6
 Summary:        A Python interface to libcurl
7 7
 Group:          Development/Languages
8 8
 License:        LGPLv2+ and an MIT/X
9 9
 URL:            http://pycurl.sourceforge.net/
10 10
 Source0:        http://pycurl.sourceforge.net/download/pycurl-%{version}.tar.gz
11
-%define sha1 pycurl=60865d22fc715ca5197117ea3ad32413d3c7402e
12
-Vendor:		VMware, Inc.
13
-Distribution:	Photon
14
-Provides:	pycurl
15
-Requires:	python2
16
-BuildRequires:	openssl-devel
17
-BuildRequires:	python2-devel
18
-BuildRequires:	python2-libs
19
-BuildRequires: 	curl
20
-Requires: 	curl
11
+%define sha1    pycurl=60865d22fc715ca5197117ea3ad32413d3c7402e
12
+Vendor:         VMware, Inc.
13
+Distribution:   Photon
14
+Provides:       pycurl
15
+BuildRequires:  openssl-devel
16
+BuildRequires:  python2-devel
17
+BuildRequires:  python2-libs
18
+BuildRequires:  curl-devel
19
+Requires:       curl
20
+Requires:       python2
21 21
 %description
22 22
 PycURL is a Python interface to libcurl. PycURL can be used to fetch
23 23
 objects identified by a URL from a Python program, similar to the
... ...
@@ -25,8 +25,8 @@ urllib Python module. PycURL is mature, very fast, and supports a lot
25 25
 of features.
26 26
 
27 27
 %package doc
28
-Summary:	Documentation and examples for pycurl
29
-Requires:	%{name} = %{version}
28
+Summary:    Documentation and examples for pycurl
29
+Requires:   %{name} = %{version}
30 30
 
31 31
 %description doc
32 32
 Documentation and examples for pycurl
... ...
@@ -66,15 +66,17 @@ rm -rf %{buildroot}
66 66
 %doc COPYING-LGPL COPYING-MIT RELEASE-NOTES.rst ChangeLog README.rst examples doc tests
67 67
 
68 68
 %changelog
69
-*       Mon Oct 10 2016 ChangLee <changlee@vmware.com> 7.21.5-4
70
--       Modified %check
71
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 7.21.5-3
72
--	GA - Bump release of all rpms
73
-*	Fri Apr 29 2016 Divya Thaluru <dthaluru@vmware.com> 7.21.5-2
74
--	Removing prebuilt binaries
75
-*	Thu Jan 21 2016 Anish Swaminathan <anishs@vmware.com> 7.21.5-1
76
--	Upgrade version
77
-*	Mon Jul 6 2015 Alexey Makhalov <amakhalov@vmware.com> 7.19.5.1-2
78
--	Added Doc subpackage. Removed chmod a-x for examples.
79
-*	Sat Jan 24 2015 Touseef Liaqat <tliaqat@vmware.com> 7.19.5.1
80
--	Initial build.	First version
69
+*   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 7.21.5-5
70
+-   BuildRequires curl-devel.
71
+*   Mon Oct 10 2016 ChangLee <changlee@vmware.com> 7.21.5-4
72
+-   Modified %check
73
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 7.21.5-3
74
+-   GA - Bump release of all rpms
75
+*   Fri Apr 29 2016 Divya Thaluru <dthaluru@vmware.com> 7.21.5-2
76
+-   Removing prebuilt binaries
77
+*   Thu Jan 21 2016 Anish Swaminathan <anishs@vmware.com> 7.21.5-1
78
+-   Upgrade version
79
+*   Mon Jul 6 2015 Alexey Makhalov <amakhalov@vmware.com> 7.19.5.1-2
80
+-   Added Doc subpackage. Removed chmod a-x for examples.
81
+*   Sat Jan 24 2015 Touseef Liaqat <tliaqat@vmware.com> 7.19.5.1
82
+-   Initial build.  First version
... ...
@@ -1,26 +1,26 @@
1 1
 %global security_hardening none
2
-Summary:	Sysdig is a universal system visibility tool with native support for containers.
3
-Name:		sysdig
4
-Version:	0.10.1
5
-Release:	4%{?kernelsubrelease}%{?dist}
6
-License:	GPLv2	  
7
-URL:		http://www.sysdig.org/
8
-Group:		Applications/System	
9
-Vendor:		VMware, Inc.
10
-Distribution:	Photon
11
-Source0:	https://github.com/draios/sysdig/archive/%{name}-%{version}.tar.gz
12
-%define sha1 sysdig=272b95ad02be4d194bba66d360ff935084d9c842
13
-BuildRequires:	cmake 
2
+Summary:        Sysdig is a universal system visibility tool with native support for containers.
3
+Name:           sysdig
4
+Version:        0.10.1
5
+Release:        5%{?kernelsubrelease}%{?dist}
6
+License:        GPLv2
7
+URL:            http://www.sysdig.org/
8
+Group:          Applications/System
9
+Vendor:         VMware, Inc.
10
+Distribution:   Photon
11
+Source0:        https://github.com/draios/sysdig/archive/%{name}-%{version}.tar.gz
12
+%define sha1    sysdig=272b95ad02be4d194bba66d360ff935084d9c842
13
+BuildRequires:  cmake 
14 14
 BuildRequires:  linux-devel = %{KERNEL_VERSION}-%{KERNEL_RELEASE}
15
-BuildRequires:	openssl-devel
16
-BuildRequires:	curl
17
-BuildRequires:	zlib-devel
18
-BuildRequires:	ncurses-devel
19
-Requires:   linux = %{KERNEL_VERSION}-%{KERNEL_RELEASE}
20
-Requires:	zlib
21
-Requires:	ncurses
22
-Requires:	openssl
23
-Requires:	curl
15
+BuildRequires:  openssl-devel
16
+BuildRequires:  curl-devel
17
+BuildRequires:  zlib-devel
18
+BuildRequires:  ncurses-devel
19
+Requires:       linux = %{KERNEL_VERSION}-%{KERNEL_RELEASE}
20
+Requires:       zlib
21
+Requires:       ncurses
22
+Requires:       openssl
23
+Requires:       curl
24 24
 
25 25
 %description
26 26
  Sysdig is open source, system-level exploration: capture system state and activity from a running Linux instance, then save, filter and analyze. Sysdig is scriptable in Lua and includes a command line interface and a powerful interactive UI, csysdig, that runs in your terminal
... ...
@@ -37,11 +37,11 @@ mkdir build
37 37
 cd build
38 38
 
39 39
 cmake \
40
-	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
41
-	-DUSE_BUNDLED_OPENSSL=OFF \
42
-	-DUSE_BUNDLED_CURL=OFF \
43
-	-DUSE_BUNDLED_ZLIB=OFF \
44
-	-DUSE_BUNDLED_NCURSES=OFF ..
40
+    -DCMAKE_INSTALL_PREFIX=%{_prefix} \
41
+    -DUSE_BUNDLED_OPENSSL=OFF \
42
+    -DUSE_BUNDLED_CURL=OFF \
43
+    -DUSE_BUNDLED_ZLIB=OFF \
44
+    -DUSE_BUNDLED_NCURSES=OFF ..
45 45
 
46 46
 make KERNELDIR="/lib/modules/%{KERNEL_VERSION}-%{KERNEL_RELEASE}/build"
47 47
 
... ...
@@ -73,6 +73,8 @@ rm -rf %{buildroot}/*
73 73
 /lib/modules/%{KERNEL_VERSION}-%{KERNEL_RELEASE}/extra/sysdig-probe.ko
74 74
 
75 75
 %changelog
76
+*   Mon Dec 19 2016 Xiaolin Li <xiaolinl@vmware.com> 0.10.1-5
77
+-   BuildRequires curl-devel
76 78
 *   Thu Dec 15 2016 Alexey Makhalov <amakhalov@vmware.com> 0.10.1-4
77 79
 -   Fix building for linux-4.9
78 80
 *   Wed Nov 30 2016 Alexey Makhalov <amakhalov@vmware.com> 0.10.1-3