1. photon
  2. Commit 242c40f5fa700125ec382b9d48d0a76b46da3d5e
Browse code

Update man-db, mkinitcpio and mercurial packages

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

michellewang-ubuntu authored on 2017/04/20 12:30:05
Showing 3 changed files
SPECS/man-db/man-db.spec
History View file @ 242c40f
... ... 
@@ -1,14 +1,14 @@
1 1 
 Summary:	Programs for finding and viewing man pages
2 2 
 Name:		man-db
3 
-Version:	2.7.5
4 
-Release:	5%{?dist}
3 
+Version:	2.7.6
4 
+Release:	1%{?dist}
5 5 
 License:	GPLv2+
6 6 
 URL:		http://www.nongnu.org/man-db
7 7 
 Group:		Applications/System
8 8 
 Vendor:		VMware, Inc.
9 9 
 Distribution: Photon
10 
-Source0:		%{name}-%{version}.tar.gz
11 
-%define sha1 man-db=dbd822f8c6743da9fad95e0bac919b8f844d9264
10 
+Source0:		%{name}-%{version}.tar.xz
11 
+%define sha1 man-db=919dcb34d604faac9b18a38ead07f457d0dab501
12 12 
 Requires:	libpipeline
13 13 
 Requires:	gdbm
14 14 
 Requires:	xz
... ... 
@@ -18,10 +18,12 @@ BuildRequires:	libpipeline
18 18 
 BuildRequires:	gdbm
19 19 
 BuildRequires:	xz
20 20 
 BuildRequires: 	groff
21 
+
21 22 
 %description
22 23 
 The Man-DB package contains programs for finding and viewing man pages.
24 
+
23 25 
 %prep
24 
-%setup -q
26 
+%setup -qn %{name}-%{version}.1
25 27 
 %build
26 28 
 ./configure \
27 29 
 	--prefix=%{_prefix} \
... ... 
@@ -32,7 +34,9 @@ The Man-DB package contains programs for finding and viewing man pages.
32 32 
 	--with-vgrind=%{_bindir}/vgrind \
33 33 
 	--with-grap=%{_bindir}/grap \
34 34 
 	--disable-silent-rules
35 
+
35 36 
 make %{?_smp_mflags}
37 
+
36 38 
 %install
37 39 
 make DESTDIR=%{buildroot} install
38 40 
 find %{buildroot}%{_libdir} -name '*.la' -delete
... ... 
@@ -42,7 +46,6 @@ find %{buildroot}%{_libdir} -name '*.la' -delete
42 42 
 make %{?_smp_mflags} check
43 43
44 44 
 %pre
45 
-
46 45 
 getent group man >/dev/null || groupadd -r man
47 46 
 getent passwd man >/dev/null || useradd -c "man" -d /var/cache/man -g man \
48 47 
         -s /bin/false -M -r man
... ... 
@@ -66,7 +69,10 @@ fi
66 66 
 %{_defaultdocdir}/%{name}-%{version}/*
67 67 
 %{_mandir}/*/*
68 68 
 %{_libdir}/tmpfiles.d/man-db.conf
69 
+
69 70 
 %changelog
71 
+*       Fri Mar 31 2017 Michelle Wang <michellew@vmware.com> 2.7.6-1
72 
+-       Update package version
70 73 
 *       Mon Oct 03 2016 ChangLee <changlee@vmware.com> 2.7.5-5
71 74 
 -       Modified check
72 75 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.7.5-4
SPECS/mercurial/mercurial.spec
History View file @ 242c40f
... ... 
@@ -1,21 +1,14 @@
1 1 
 Summary:    A free, distributed source control management tool.
2 2 
 Name:       mercurial
3 
-Version:    3.7.1
4 
-Release:    6%{?dist}
3 
+Version:    4.1
4 
+Release:    1%{?dist}
5 5 
 License:    GPLv2+
6 6 
 URL:        https://www.ruby-lang.org/en/
7 7 
 Group:      System Environment/Security
8 8 
 Vendor:     VMware, Inc.
9 9 
 Distribution: Photon
10 10 
 Source0:    http://mercurial.selenic.com/release/%{name}-%{version}.tar.gz
11 
-%define sha1 mercurial=8ce55b297c6a62e987657498746eeca870301ffb
12 
-Patch0:   hg-CVE-2016-3068.patch
13 
-Patch1:   hg-CVE-2016-3069-1.patch
14 
-Patch2:   hg-CVE-2016-3069-2.patch
15 
-Patch3:   hg-CVE-2016-3069-3.patch
16 
-Patch4:   hg-CVE-2016-3069-4.patch
17 
-Patch5:   hg-CVE-2016-3069-5.patch
18 
-Patch6:   hg-CVE-2016-3105.patch
11 
+%define sha1 mercurial=d5f88e05cbbd8f13dd5fc4004433f54435fc27c8
19 12 
 BuildRequires: python2
20 13 
 BuildRequires: python2-libs
21 14 
 BuildRequires: python2-devel
... ... 
@@ -26,13 +19,6 @@ Mercurial is written in Python and is used by projects such as Mozilla and Vim.
26 26
27 27 
 %prep
28 28 
 %setup -q
29 
-%patch0 -p1
30 
-%patch1 -p1
31 
-%patch2 -p1
32 
-%patch3 -p1
33 
-%patch4 -p1
34 
-%patch5 -p1
35 
-%patch6 -p1
36 29 
 %build
37 30 
 make build
38 31
... ... 
@@ -64,6 +50,8 @@ rm -rf %{buildroot}/*
64 64 
 %{python_sitelib}/*
65 65
66 66 
 %changelog
67 
+*   Fri Mar 31 2017 Michelle Wang <michellew@vmware.com> 4.1-1
68 
+-   Update package version
67 69 
 *   Mon Jan 22 2017 Xiaolin Li <xiaolinl@vmware.com> 3.7.1-6
68 70 
 -   Install with setup.py.
69 71 
 *   Tue Nov 22 2016 Xiaolin Li <xiaolinl@vmware.com> 3.7.1-5
SPECS/mkinitcpio/mkinitcpio.spec
History View file @ 242c40f
... ... 
@@ -1,14 +1,14 @@
1 1 
 Summary:    Modular initramfs image creation utility
2 2 
 Name:       mkinitcpio
3 
-Version:    19
4 
-Release:    2%{?dist}
3 
+Version:    23
4 
+Release:    1%{?dist}
5 5 
 License:    GPLv2
6 6 
 URL:        https://projects.archlinux.org/mkinitcpio.git/
7 7 
 Group:      System Environment/Development
8 8 
 Vendor:     VMware, Inc.
9 9 
 Distribution:   Photon
10 10 
 Source0:    https://projects.archlinux.org/mkinitcpio.git/snapshot/%{name}-%{version}.tar.gz
11 
-%define sha1 mkinitcpio=3fef28312965d7cc254b6ac1ea38be16dcb46bf9
11 
+%define sha1 mkinitcpio=4459418eb423b2699e798c4523a59cc07a567a98
12 12 
 BuildRequires: asciidoc
13 13 
 BuildRequires: python2-libs
14 14 
 BuildRequires: python-xml
... ... 
@@ -46,8 +46,10 @@ make DESTDIR=%{buildroot} install
46 46 
 /usr/share/*
47 47
48 48 
 %changelog
49 
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 19-2
50 
--	GA - Bump release of all rpms
49 
+*   Fri Mar 31 2017 Michelle Wang <michellew@vmware.com> 23-1
50 
+-   Update package version
51 
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 19-2
52 
+-   GA - Bump release of all rpms
51 53 
 *   Tue Feb 23 2016 Kumar Kaushik <kaushikk@vmware.com> 19-1
52 54 
 -   Updated to new version.
53 55 
 *   Sat Jul 11 2015 Touseef Liaqat <tliaqat@vmware.com> 18-2