Changeset 1088 for spec/trunk/SPECS/git.spec

Timestamp:

Apr 6, 2017, 11:53:13 AM (8 years ago)

Author:

dmik

Message:

spec: git: Release version 2.11.0-2.

File:

• spec/trunk/SPECS/git.spec (modified) (8 diffs)

spec/trunk/SPECS/git.spec

@@ -17 +17 @@
 Name:           git
 Version:        2.11.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
@@ -23 +23 @@
 URL:            https://git-scm.com/
 
-%define svn_url     http://svn.netlabs.org/repos/ports/git/trunk
-%define svn_rev     1885
-
-Source: %{name}-%{version}-r%{svn_rev}.zip
-
-BuildRequires: gcc make subversion zip
+%scm_source     svn http://svn.netlabs.org/repos/ports/git/trunk 2163
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54 +49 @@
 #Requires:       perl(Error)
 %if ! %{defined perl_bootstrap}
+# TODO Doesn't exist on OS/2 yet.
 #Requires:       perl(Term::ReadKey)
 %endif
@@ -85 +81 @@
 Requires:       perl-Git = %{version}-%{release}
 %if ! %{defined perl_bootstrap}
+# TODO Doesn't exist on OS/2 yet.
 #Requires:       perl(Term::ReadKey)
 %endif
@@ -167 +164 @@
 Requires:       perl(Digest::MD5)
 %if ! %{defined perl_bootstrap}
+# TODO Doesn't exist on OS/2 yet.
 #Requires:       perl(Term::ReadKey)
 %endif
@@ -280 +278 @@
 
 %prep
-%if %(sh -c 'if test -f "%{_sourcedir}/%{name}-%{version}-r%{svn_rev}.zip" ; then echo 1 ; else echo 0 ; fi')
-%setup -q
-%else
-%setup -n "%{name}-%{version}" -Tc
-svn export -r %{svn_rev} %{svn_url} . --force
-rm -f "%{_sourcedir}/%{name}-%{version}-r%{svn_rev}.zip"
-(cd .. && zip -SrX9 "%{_sourcedir}/%{name}-%{version}-r%{svn_rev}.zip" "%{name}-%{version}")
-%endif
+%scm_setup
 
 # Use these same options for every invocation of 'make'.
@@ -317 +308 @@
 %endif
 
+# Filter bogus perl requires
+# packed-refs comes from a comment in contrib/hooks/update-paranoid
+%{?perl_default_filter}
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}perl\\(packed-refs\\)
+%if ! %{defined perl_bootstrap}
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}perl\\(Term::ReadKey\\)
+%endif
+
 %build
 make %{?_smp_mflags} all
@@ -625 +624 @@
 
 %changelog
+* Thu Apr 6 2017 Dmitriy Kuminov <coding@dmik.org> 2.11.0-2
+- Make git add --interactive output use CRLFs on DOS-like platforms.
+- Remove a lot of outdated OS/2-specific code.
+- Make the .git directory truly hidden on OS/2.
+- Enable mmap support on OS/2.
+- Change vendor to bww bitwise works GmbH.
+
 * Tue Dec 13 2016 Dmitriy Kuminov <coding@dmik.org> 2.11.0-1
 - Update git to version 2.11.0.