Browse code

Remove packages: GConf2 and XML-XPath

Change-Id: I3ebac5dc1e4a5c0115dde7e159d396968ddccc8c
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2642
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Xiaolin Li <xiaolinl@vmware.com>

Alexey Makhalov authored on 2017/05/05 17:36:59
Showing 3 changed files
1 1
deleted file mode 100644
... ...
@@ -1,49 +0,0 @@
1
-Summary:        GConf2
2
-Name:           GConf2
3
-Version:        3.2.6
4
-Release:        1%{?dist}
5
-License:        GPL2+
6
-URL:            http://download.gnome.org/sources/GConf/3.2/
7
-Source0:        http://download.gnome.org/sources/GConf/3.2/GConf-%{version}.tar.xz
8
-%define sha1 GConf=a90d3ac08dc454f927c8d3024f52d4d57e3ff613
9
-Group:          System Environment/Base
10
-Vendor:         VMware, Inc.
11
-Distribution:   Photon
12
-#BuildArch:     noarch
13
-BuildRequires:  glib-devel
14
-BuildRequires:  libxml2-devel
15
-BuildRequires:  dbus-devel
16
-BuildRequires:  dbus-glib-devel
17
-BuildRequires:  libxslt-devel
18
-BuildRequires:  intltool
19
-BuildRequires:  autoconf automake libtool
20
-%description
21
-GConf is a system for storing application preferences. It is intended for user preferences; not configuration of something like Apache, or arbitrary data storage.
22
-%prep
23
-%setup -qn GConf-%{version}
24
-%build
25
-./configure --prefix=/usr \
26
-            --sysconfdir=/etc \
27
-            --disable-orbit \
28
-            --disable-static
29
-make %{?_smp_mflags}
30
-%install
31
-make DESTDIR=%{buildroot} install
32
-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
33
-find %{buildroot} -name '*.la' -delete
34
-
35
-%check
36
-pushd tests
37
-make %{?_smp_mflags}
38
-popd
39
-
40
-%files
41
-%defattr(-,root,root)
42
-%exclude %{_libdir}/debug
43
-%exclude /usr/src/debug
44
-%{_sysconfdir}/*
45
-/usr/*
46
-
47
-%changelog
48
-*   Tue Sep 6 2016 Xiaolin Li <xiaolinl@vmware.com> 3.2.6-1
49
--   Initial build. First version
50 1
deleted file mode 100644
... ...
@@ -1,37 +0,0 @@
1
-Summary:        XML-XPath perl module
2
-Name:           XML-XPath
3
-Version:        1.40
4
-Release:        1%{?dist}
5
-License:        GPL+
6
-URL:            http://search.cpan.org/~toddr/%{name}-%{version}/
7
-Source0:        https://cpan.metacpan.org/authors/id/M/MA/MANWAR/%{name}-%{version}.tar.gz
8
-%define sha1 XML-XPath=a373c9d071a6c675c77320a905053baa5e7a99ff
9
-Group:          Development/Tools
10
-Vendor:         VMware, Inc.
11
-Distribution:   Photon
12
-BuildArch:      noarch
13
-BuildRequires:  XML-Parser
14
-%description
15
-This module aims to comply exactly to the XPath specification at http://www.w3.org/TR/xpath and yet allow extensions to be added in the form of functions. Modules such as XSLT and XPointer may need to do this as they support functionality beyond XPath.
16
-%prep
17
-%setup -q
18
-%build
19
-perl Makefile.PL --prefix=%{_prefix}
20
-make %{?_smp_mflags}
21
-%install
22
-make DESTDIR=%{buildroot} install
23
-
24
-%check
25
-make %{?_smp_mflags} -k test
26
-
27
-%files
28
-%defattr(-,root,root)
29
-%{_bindir}/xpath
30
-%{_libdir}/perl5/*
31
-%{_mandir}/man3/*
32
-%{_mandir}/man1/*
33
-%changelog
34
-*   Fri Apr 7 2017 Alexey Makhalov <amakhalov@vmware.com> 1.40-1
35
--   Version update
36
-*   Tue Sep 6 2016 Xiaolin Li <xiaolinl@vmware.com> 1.37-1
37
--   Initial build. First version
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:        Open Source Security Compliance Solution
2 2
 Name:           openscap
3 3
 Version:        1.2.14
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
... ...
@@ -9,7 +9,6 @@ Source0:        https://github.com/OpenSCAP/openscap/releases/download/%{version
9 9
 Group:          System Environment/Libraries
10 10
 Vendor:         VMware, Inc.
11 11
 Distribution:   Photon
12
-#BuildArch:     noarch
13 12
 BuildRequires:  swig libxml2-devel libxslt-devel XML-Parser
14 13
 BuildRequires:  rpm-devel
15 14
 BuildRequires:  libgcrypt-devel
... ...
@@ -18,7 +17,6 @@ BuildRequires:  libacl-devel
18 18
 BuildRequires:  libselinux-devel libcap-devel
19 19
 BuildRequires:  util-linux-devel
20 20
 BuildRequires:  bzip2-devel
21
-BuildRequires:  XML-XPath
22 21
 BuildRequires:  curl-devel
23 22
 BuildRequires:  popt-devel
24 23
 BuildRequires:  python2-devel
... ...
@@ -95,6 +93,8 @@ make %{?_smp_mflags} -k check
95 95
 %{_libdir}/python2.7/*
96 96
 
97 97
 %changelog
98
+*   Fri May 5 2017 Alexey Makhalov <amakhalov@vmware.com> 1.2.14-2
99
+-   Remove BuildRequires XML-XPath.
98 100
 *   Mon Mar 27 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.2.14-1
99 101
 -   Update to latest version.
100 102
 *   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 1.2.10-2