1. photon
  2. Commit a70a2ce0f95e942a47a6f39cbc8f5b491dba1ed9
Browse code

Updated git to latest version , added perl bindings in subversion

Change-Id: I2d8d9164ff777fab711a483d5608443309805aac
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5838
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>

smaliakkal authored on 2018/10/03 02:11:54
Showing 2 changed files
SPECS/git/git.spec
History View file @ a70a2ce
... ... 
@@ -1,14 +1,14 @@
1 1 
 Summary:        Fast distributed version control system
2 2 
 Name:           git
3 
-Version:        2.14.2
4 
-Release:        2%{?dist}
3 
+Version:        2.19.0
4 
+Release:        1%{?dist}
5 5 
 License:        GPLv2
6 6 
 URL:            http://git-scm.com/
7 7 
 Group:          System Environment/Programming
8 8 
 Vendor:         VMware, Inc.
9 9 
 Distribution:   Photon
10 10 
 Source0:        https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.xz
11 
-%define sha1    git=9515fd4a068027f2c3d6ea9b8a8a298e990123a0
11 
+%define sha1    git=17f92df56588c58d2ebaacc5a47f677c8d8e7c61
12 12 
 BuildRequires:  curl-devel
13 13 
 BuildRequires:  python2
14 14 
 Requires:       openssl
... ... 
@@ -17,15 +17,16 @@ Requires:       expat
17 17 
 Requires:       perl-YAML
18 18 
 Requires:       perl-DBI
19 19 
 Requires:       perl-CGI
20 
+Requires:       subversion-perl
20 21
21 22 
 %description
22 
-Git is a free and open source, distributed version control system
23 
+Git is a free and open source, distributed version control system
23 24 
 designed to handle everything from small to very large projects with
24 
-speed and efficiency. Every Git clone is a full-fledged repository
25 
-with complete history and full revision tracking capabilities, not
26 
-dependent on network access or a central server. Branching and
25 
+speed and efficiency. Every Git clone is a full-fledged repository
26 
+with complete history and full revision tracking capabilities, not
27 
+dependent on network access or a central server. Branching and
27 28 
 merging are fast and easy to do. Git is used for version control of
28 
-files, much like tools such as Mercurial, Bazaar,
29 
+files, much like tools such as Mercurial, Bazaar,
29 30 
 Subversion-1.7.8, CVS-1.11.23, Perforce, and Team Foundation Server.
30 31
31 32 
 %package lang
... ... 
@@ -73,9 +74,8 @@ rm -rf %{buildroot}/*
73 73 
 %files
74 74 
 %defattr(-,root,root)
75 75 
 %{_bindir}/*
76 
-%{_libdir}/perl5/*
76 
+%{_datarootdir}/perl5/*
77 77 
 %{_libexecdir}/git-core/*
78 
-%{_mandir}/man3/*
79 78 
 %{_datarootdir}/git-core/*
80 79 
 %{_datarootdir}/git-gui/*
81 80 
 %{_datarootdir}/gitk/*
... ... 
@@ -83,7 +83,6 @@ rm -rf %{buildroot}/*
83 83 
 %{_datarootdir}/bash-completion/
84 84 
 #excluding git svn files
85 85 
 %exclude %{_libexecdir}/git-core/*svn*
86 
-%exclude %{_mandir}/man3/*:SVN:*
87 86 
 %exclude %{perl_sitelib}/Git/SVN
88 87 
 %exclude %{perl_sitelib}/Git/SVN.pm
89 88 
 %exclude /usr/lib/perl5/5.24.1/*/perllocal.pod
... ... 
@@ -92,6 +91,8 @@ rm -rf %{buildroot}/*
92 92 
 %defattr(-,root,root)
93 93
94 94 
 %changelog
95 
+*   Tue Oct 02 2018 Siju Maliakkal <smaliakkal@vmware.com> 2.19.0-1
96 
+-   Update to latest version
95 97 
 *   Tue Jul 31 2018 Ajay Kaher <akaher@vmware.com> 2.14.2-2
96 98 
 -   Excluded the perllocal.pod for aarch64.
97 99 
 *   Thu Oct 12 2017 Anish Swaminathan <anishs@vmware.com> 2.14.2-1
... ... 
@@ -100,7 +101,7 @@ rm -rf %{buildroot}/*
100 100 
 -   Fix make check with non-root mode.
101 101 
 *   Wed May 31 2017 Xiaolin Li <xiaolinl@vmware.com> 2.9.3-3
102 102 
 -   Remove python2 from requires.
103 
-*   Tue Apr 17 2017 Robert Qi <qij@vmware.com> 2.9.3-2
103 
+*   Mon Apr 17 2017 Robert Qi <qij@vmware.com> 2.9.3-2
104 104 
 -   Update since perl version got updated.
105 105 
 *   Mon Apr 10 2017 Danut Moraru <dmoraru@vmware.com> 2.9.3-1
106 106 
 -   Updated to version 2.9.3
SPECS/subversion/subversion.spec
History View file @ a70a2ce
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        The Apache Subversion control system
2 2 
 Name:           subversion
3 3 
 Version:        1.10.2
4 
-Release:        2%{?dist}
4 
+Release:        3%{?dist}
5 5 
 License:        Apache License 2.0
6 6 
 URL:            http://subversion.apache.org/
7 7 
 Group:          Utilities/System
... ... 
@@ -21,6 +21,7 @@ BuildRequires:  expat-devel
21 21 
 BuildRequires:  serf-devel
22 22 
 BuildRequires:  lz4
23 23 
 BuildRequires:  utf8proc-devel
24 
+BuildRequires:  swig
24 25 
 Requires:       utf8proc
25 26
26 27 
 %description
... ... 
@@ -32,6 +33,14 @@ Requires:   %{name} = %{version}
32 32 
 %description    devel
33 33 
  subversion-devel package contains header files, libraries.
34 34
35 
+%package    perl
36 
+Summary:    Allows Perl scripts to directly use Subversion repositories.
37 
+Requires:   perl
38 
+Requires:   %{name} = %{version}
39 
+%description    perl
40 
+Provides Perl (SWIG) support for Subversion version control system.
41 
+
42 
+
35 43 
 %prep
36 44 
 %setup -q
37 45
... ... 
@@ -44,10 +53,16 @@ Requires:   %{name} = %{version}
44 44
45 45 
 make %{?_smp_mflags}
46 46
47 
+# For Perl bindings
48 
+make  %{?_smp_mflags} swig-pl
49 
+
47 50 
 %install
48 
-make -j1 DESTDIR=%{buildroot} install
51 
+make -j1 DESTDIR=%{buildroot} install
49 52 
 %find_lang %{name}
50 53
54 
+# For Perl bindings
55 
+make -j1 DESTDIR=%{buildroot} install-swig-pl
56 
+
51 57 
 %check
52 58 
 # subversion expect nonroot user to run tests
53 59 
 chmod g+w . -R
... ... 
@@ -68,7 +83,18 @@ sudo -u test make check && userdel test -r -f
68 68 
 %{_datadir}/pkgconfig/*.pc
69 69 
 %exclude %{_libdir}/debug/
70 70
71 
+%files perl
72 
+%defattr(-,root,root)
73 
+%{perl_sitearch}/SVN
74 
+%{perl_sitearch}/auto/SVN
75 
+%{_libdir}/libsvn_swig_perl*so*
76 
+%{_libdir}/perl5/*
77 
+%{_mandir}/man3/SVN*
78 
+
79 
+
71 80 
 %changelog
81 
+*   Tue Oct 02 2018 Siju Maliakkal <smaliakkal@vmware.com> 1.10.2-3
82 
+-   Added Perl bindings
72 83 
 *   Fri Sep 21 2018 Ankit Jain <ankitja@vmware.com> 1.10.2-2
73 84 
 -   Added utf8proc as Requires.
74 85 
 *   Wed Sep 19 2018 Ankit Jain <ankitja@vmware.com> 1.10.2-1