|
|
@@ -5,7 +5,7 @@
|
|
|
|
|
|
# Pass --without docs to rpmbuild if you don't want the documentation
|
|
|
Name: git
|
|
|
-Version: 2.15.1
|
|
|
+Version: 2.19.1
|
|
|
Release: 1%{?_dist_release}
|
|
|
Summary: Core git tools
|
|
|
Summary(ja): Core git ツール
|
|
|
@@ -158,7 +158,7 @@ Git revision tree visualiser.
|
|
|
Summary: Perl interface to Git
|
|
|
Summary(ja): Git の perl インタフェース
|
|
|
Group: Development/Libraries
|
|
|
-Requires: git = %{version}-%{release}, perl(Error)
|
|
|
+Requires: git = %{version}-%{release}, perl(Error), perl-MailTools
|
|
|
%if "%{?_dist_release}" == "vl4"
|
|
|
Requires: perl = %(rpm -q --qf '%%{epoch}:%%{version}' perl)
|
|
|
%else
|
|
|
@@ -210,7 +210,7 @@ chmod +x %{__perl_requires}
|
|
|
%build
|
|
|
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I%{_includedir/pcre}" \
|
|
|
ETC_GITCONFIG=/etc/gitconfig \
|
|
|
- USE_LIBPCRE=1 \
|
|
|
+ USE_LIBPCRE1=1 \
|
|
|
GITWEB_PROJECTROOT=/var/lib/git \
|
|
|
gitwebdir=/var/www/git \
|
|
|
prefix=%{_prefix} all %{!?_without_docs: doc}
|
|
|
@@ -223,8 +223,9 @@ popd
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \
|
|
|
prefix=%{_prefix} mandir=%{_mandir} \
|
|
|
+ perllibdir=%{perl_vendorlib} \
|
|
|
ETC_GITCONFIG=/etc/gitconfig \
|
|
|
- USE_LIBPCRE=1 \
|
|
|
+ USE_LIBPCRE1=1 \
|
|
|
NO_PYTHON=1 \
|
|
|
GITWEB_PROJECTROOT=/var/lib/git \
|
|
|
gitwebdir=/var/www/git \
|
|
|
@@ -234,9 +235,17 @@ pushd contrib/credential/gnome-keyring
|
|
|
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
|
|
|
popd
|
|
|
|
|
|
+# arch
|
|
|
+%if %{without arch}
|
|
|
+rm -f Documentation/git-archimport.txt
|
|
|
+rm -f %{buildroot}%{_libexecdir}/git-core/git-archimport
|
|
|
+rm -f %{buildroot}%{_mandir}/man1/git-archimport.1*
|
|
|
+rm -f %{buildroot}/Documentation/git-archimport.html
|
|
|
+%endif
|
|
|
+
|
|
|
+
|
|
|
# perl-Git
|
|
|
-# Error.pm provide by perl-Error package
|
|
|
-rm -rf $RPM_BUILD_ROOT%{perl_vendorlib}/Error.pm
|
|
|
+rm -rf $RPM_BUILD_ROOT%{perl_vendorlib}/FromCPAN
|
|
|
|
|
|
# emacs-git
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/git
|
|
|
@@ -293,7 +302,8 @@ install -m 755 contrib/diff-highlight/diff-highlight $RPM_BUILD_ROOT%{_bindir}/
|
|
|
install -d $RPM_BUILD_ROOT%{_includedir}/%{name}/xdiff
|
|
|
install *.h $RPM_BUILD_ROOT%{_includedir}/%{name}
|
|
|
install xdiff/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/xdiff
|
|
|
-install libgit.a $RPM_BUILD_ROOT%{_libdir}
|
|
|
+install -m0755 -d $RPM_BUILD_ROOT%{_libdir}
|
|
|
+install libgit.a $RPM_BUILD_ROOT%{_libdir}/
|
|
|
install xdiff/lib.a $RPM_BUILD_ROOT%{_libdir}/libgit_xdiff.a
|
|
|
|
|
|
# git-credential-gnome-keyring
|
|
|
@@ -437,6 +447,9 @@ fi
|
|
|
# No files for you!
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Nov 09 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.19.1-1
|
|
|
+- updated to 2.19.1.
|
|
|
+
|
|
|
* Wed Jan 17 2018 IWAI, Masaharu <iwaim.sub@gmail.com> 2.15.1-1
|
|
|
- update to 2.15.1
|
|
|
|
tomop