|
|
@@ -4,23 +4,23 @@
|
|
|
%define emacsen_pkgdir /usr/lib/emacsen-common/packages
|
|
|
|
|
|
# Pass --without docs to rpmbuild if you don't want the documentation
|
|
|
-Name: git
|
|
|
-Version: 2.8.2
|
|
|
-Release: 1%{?_dist_release}
|
|
|
-Summary: Core git tools
|
|
|
-Summary(ja): Core git ツール
|
|
|
-License: GPLv2
|
|
|
-Group: Development/Tools
|
|
|
-URL: http://git-scm.com/
|
|
|
-Source0: https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.xz
|
|
|
-Source1: vine-default-git.el
|
|
|
-Source2: git.xinetd
|
|
|
-Source3: git.conf.httpd
|
|
|
-Source4: gitweb.conf.in
|
|
|
-Source10: %{name}-install.sh
|
|
|
-Source11: %{name}-remove.sh
|
|
|
-Source12: git-init.el
|
|
|
-Patch0: git-1.5-gitweb-home-link.patch
|
|
|
+Name: git
|
|
|
+Version: 2.10.2
|
|
|
+Release: 1%{?_dist_release}
|
|
|
+Summary: Core git tools
|
|
|
+Summary(ja): Core git ツール
|
|
|
+License: GPLv2
|
|
|
+Group: Development/Tools
|
|
|
+URL: http://git-scm.com/
|
|
|
+Source0: https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.xz
|
|
|
+Source1: vine-default-git.el
|
|
|
+Source2: git.xinetd
|
|
|
+Source3: git.conf.httpd
|
|
|
+Source4: gitweb.conf.in
|
|
|
+Source10: %{name}-install.sh
|
|
|
+Source11: %{name}-remove.sh
|
|
|
+Source12: git-init.el
|
|
|
+Patch0: git-1.5-gitweb-home-link.patch
|
|
|
|
|
|
# Security
|
|
|
# none
|
|
|
@@ -185,6 +185,12 @@ Header files for git-core.
|
|
|
%prep
|
|
|
%setup -q
|
|
|
%patch0 -p1
|
|
|
+
|
|
|
+# for pcre-8.12
|
|
|
+%if %{?_dist_release} == "vl6"
|
|
|
+%{__perl} -pi -e "s|#include <pcre.h>|#include <pcre/pcre.h>|" grep.h
|
|
|
+%endif
|
|
|
+
|
|
|
%__mv contrib/diff-highlight/README contrib/diff-highlight/README.diff-highlight
|
|
|
|
|
|
# Filter bogus perl requires
|
|
|
@@ -198,7 +204,7 @@ EOF
|
|
|
chmod +x %{__perl_requires}
|
|
|
|
|
|
%build
|
|
|
-make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
|
|
|
+make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I%{_includedir/pcre}" \
|
|
|
ETC_GITCONFIG=/etc/gitconfig \
|
|
|
USE_LIBPCRE=1 \
|
|
|
GITWEB_PROJECTROOT=/var/lib/git \
|
|
|
@@ -316,7 +322,7 @@ fi
|
|
|
%{_bindir}/git-upload-pack
|
|
|
%{_bindir}/git-shell
|
|
|
%{_datadir}/git-core/
|
|
|
-%doc README COPYING Documentation/*.txt contrib/hooks
|
|
|
+%doc README.md COPYING Documentation/*.txt contrib/hooks
|
|
|
%{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css}
|
|
|
%{!?_without_docs: %doc Documentation/howto Documentation/technical}
|
|
|
%{_sysconfdir}/bash_completion.d
|
|
|
@@ -412,6 +418,10 @@ fi
|
|
|
# No files for you!
|
|
|
|
|
|
%changelog
|
|
|
+* Mon Nov 14 2016 Toshiaki Ara <ara_t@384.jp> 2.10.2-1
|
|
|
+- update to 2.10.2
|
|
|
+- fix build error using pcre-8.12 (Vine6)
|
|
|
+
|
|
|
* Sun May 8 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.8.2-1
|
|
|
- update to 2.8.2.
|
|
|
|
ara_t