|
|
@@ -6,7 +6,7 @@
|
|
|
# Pass --without docs to rpmbuild if you don't want the documentation
|
|
|
Name: git
|
|
|
Version: 2.10.2
|
|
|
-Release: 1%{?_dist_release}
|
|
|
+Release: 2%{?_dist_release}
|
|
|
Summary: Core git tools
|
|
|
Summary(ja): Core git ツール
|
|
|
License: GPLv2
|
|
|
@@ -29,6 +29,10 @@ BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel
|
|
|
BuildRequires: expat-devel, gettext, asciidoc
|
|
|
BuildRequires: pcre-devel
|
|
|
BuildRequires: xmlto
|
|
|
+
|
|
|
+# git-credential-gnome-keyring
|
|
|
+BuildRequires: glib2-devel libgnome-keyring-devel
|
|
|
+
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
|
|
|
Requires: perl-Git = %{version}-%{release}
|
|
|
@@ -222,6 +226,10 @@ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \
|
|
|
gitwebdir=/var/www/git \
|
|
|
INSTALLDIRS=vendor install %{!?_without_docs: install-doc}
|
|
|
|
|
|
+pushd contrib/credential/gnome-keyring
|
|
|
+make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
|
|
|
+popd
|
|
|
+
|
|
|
# perl-Git
|
|
|
# Error.pm provide by perl-Error package
|
|
|
rm -rf $RPM_BUILD_ROOT%{perl_vendorlib}/Error.pm
|
|
|
@@ -284,6 +292,11 @@ 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
|
|
|
|
|
|
+# git-credential-gnome-keyring
|
|
|
+pushd contrib/credential/gnome-keyring
|
|
|
+%__install -m0755 git-credential-gnome-keyring $RPM_BUILD_ROOT%{_libexecdir}/git-core
|
|
|
+popd
|
|
|
+
|
|
|
%find_lang %{name}
|
|
|
|
|
|
%clean
|
|
|
@@ -322,6 +335,7 @@ fi
|
|
|
%{_bindir}/git-upload-pack
|
|
|
%{_bindir}/git-shell
|
|
|
%{_datadir}/git-core/
|
|
|
+%exclude %{_libexecdir}/git-core/git-credential-gnome-keyring
|
|
|
%doc README.md COPYING Documentation/*.txt contrib/hooks
|
|
|
%{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css}
|
|
|
%{!?_without_docs: %doc Documentation/howto Documentation/technical}
|
|
|
@@ -347,6 +361,7 @@ fi
|
|
|
%defattr(-,root,root)
|
|
|
%doc contrib/diff-highlight/README.diff-highlight
|
|
|
%{_bindir}/diff-highlight
|
|
|
+%{_libexecdir}/git-core/git-credential-gnome-keyring
|
|
|
|
|
|
%if "%{?_dist_release}" != "vl4" && %{with arch}
|
|
|
%files arch
|
|
|
@@ -418,6 +433,9 @@ fi
|
|
|
# No files for you!
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Nov 18 2016 IWAI, Masaharu <iwaim.sub@gmail.com> 2.10.2-2
|
|
|
+- include git-credential-gnome-keyring in contrib subpackage
|
|
|
+
|
|
|
* 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)
|
iwaim