|
|
@@ -5,14 +5,14 @@
|
|
|
|
|
|
# Pass --without docs to rpmbuild if you don't want the documentation
|
|
|
Name: git
|
|
|
-Version: 2.2.1
|
|
|
+Version: 2.6.4
|
|
|
Release: 1%{?_dist_release}
|
|
|
Summary: Core git tools
|
|
|
Summary(ja): Core git ツール
|
|
|
License: GPLv2
|
|
|
Group: Development/Tools
|
|
|
URL: http://git-scm.com/
|
|
|
-Source: http://git-core.googlecode.com/files/%{name}-%{version}.tar.xz
|
|
|
+Source0: https://github.com/git/git/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
|
|
Source1: vine-default-git.el
|
|
|
Source2: git.xinetd
|
|
|
Source3: git.conf.httpd
|
|
|
@@ -25,7 +25,7 @@ Patch0: git-1.5-gitweb-home-link.patch
|
|
|
# Security
|
|
|
# none
|
|
|
|
|
|
-BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel,
|
|
|
+BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel
|
|
|
BuildRequires: expat-devel, gettext, asciidoc
|
|
|
BuildRequires: pcre-devel
|
|
|
BuildRequires: xmlto
|
|
|
@@ -195,7 +195,7 @@ sed -e '/perl(packed-refs)/d'
|
|
|
EOF
|
|
|
|
|
|
%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
|
|
|
-chmod +x %{__perl_requires}
|
|
|
+chmod +x %{__perl_requires}
|
|
|
|
|
|
%build
|
|
|
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
|
|
|
@@ -233,9 +233,9 @@ install -m644 contrib/emacs/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/git/
|
|
|
# install vine-default file
|
|
|
install -m644 %{SOURCE1} %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/git/
|
|
|
|
|
|
-# install script( bytecompile el and install elc , remove )
|
|
|
+# install script( bytecompile el and install elc , remove )
|
|
|
|
|
|
-%_installemacsenscript git %{SOURCE10}
|
|
|
+%_installemacsenscript git %{SOURCE10}
|
|
|
|
|
|
%_removeemacsenscript git %{SOURCE11}
|
|
|
|
|
|
@@ -278,13 +278,14 @@ install xdiff/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/xdiff
|
|
|
install libgit.a $RPM_BUILD_ROOT%{_libdir}
|
|
|
install xdiff/lib.a $RPM_BUILD_ROOT%{_libdir}/libgit_xdiff.a
|
|
|
|
|
|
+%find_lang %{name}
|
|
|
|
|
|
%clean
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
%post -n emacs-git
|
|
|
|
|
|
-# bytecompile and install
|
|
|
+# bytecompile and install
|
|
|
|
|
|
if [ "$1" = 2 ]; then
|
|
|
|
|
|
@@ -307,7 +308,7 @@ if [ "$1" = 0 ]; then
|
|
|
fi
|
|
|
|
|
|
|
|
|
-%files -f bin-man-doc-files
|
|
|
+%files -f bin-man-doc-files -f %{name}.lang
|
|
|
%defattr(-,root,root)
|
|
|
%{_bindir}/git
|
|
|
%{_bindir}/git-receive-pack
|
|
|
@@ -411,6 +412,10 @@ fi
|
|
|
# No files for you!
|
|
|
|
|
|
%changelog
|
|
|
+* Thu Dec 31 2015 IWAI Masaharu <iwaim.sub@gmail.com> 2.6.4-1
|
|
|
+- update to 2.6.4
|
|
|
+- add locale files
|
|
|
+
|
|
|
* Mon Dec 29 2014 IWAI Masaharu <iwaim.sub@gmail.com> 2.2.1-1
|
|
|
- update to 2.2.1
|
|
|
|
|
|
@@ -428,7 +433,7 @@ fi
|
|
|
- update to 1.8.5.2
|
|
|
|
|
|
* Thu Nov 28 2013 IWAI, Masaharu <iwaim.sub@gmail.com> 1.8.4.4-1
|
|
|
-- update to 1.8.4.4
|
|
|
+- update to 1.8.4.4
|
|
|
- new sub package: contrib
|
|
|
|
|
|
* Fri Feb 8 2013 IWAI, Masaharu <iwai@alib.jp> 1.8.1.3-1
|
|
|
@@ -459,10 +464,10 @@ fi
|
|
|
- new upstream release
|
|
|
|
|
|
* Fri May 25 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.7.10.2-1
|
|
|
-- new upstream release
|
|
|
+- new upstream release
|
|
|
|
|
|
* Sat May 05 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.7.10.1-1
|
|
|
-- new upstream release
|
|
|
+- new upstream release
|
|
|
|
|
|
* Wed Mar 30 2011 IWAI, Masaharu <iwai@alib.jp> 1.7.4.2-1
|
|
|
- new upstream release
|
|
|
@@ -611,7 +616,7 @@ fi
|
|
|
- git-1.5.4.2
|
|
|
|
|
|
* Mon Feb 11 2008 Jeremy Katz <katzj@redhat.com> - 1.5.4.1-2
|
|
|
-- Add upstream patch (e62a641de17b172ffc4d3a803085c8afbfbec3d1) to have
|
|
|
+- Add upstream patch (e62a641de17b172ffc4d3a803085c8afbfbec3d1) to have
|
|
|
gitweb rss feeds point be commitdiffs instead of commit
|
|
|
|
|
|
* Sun Feb 10 2008 James Bowes <jbowes@redhat.com> 1.5.4.1-1
|
iwaim