|
@@ -5,11 +5,11 @@
|
|
|
|
|
|
# Pass --without docs to rpmbuild if you don't want the documentation
|
|
|
Name: git
|
|
|
-Version: 2.26.2
|
|
|
+Version: 2.30.1
|
|
|
Release: 1%{?_dist_release}
|
|
|
Summary: Core git tools
|
|
|
Summary(ja): Core git ツール
|
|
|
-Group: Development/Tools
|
|
|
+Group: programming
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
|
Packager: iwaim
|
|
@@ -54,14 +54,15 @@ The git rpm installs the core tools with minimal dependencies. To
|
|
|
install all git packages, including tools for integrating with other
|
|
|
SCMs, install the git-all meta-package.
|
|
|
|
|
|
+
|
|
|
%package all
|
|
|
Summary: Meta-package to pull in all git tools
|
|
|
Summary(ja): すべての git ツール
|
|
|
-Group: Development/Tools
|
|
|
+Group: programming
|
|
|
Requires: git = %{version}-%{release}
|
|
|
Requires: git-svn = %{version}-%{release}
|
|
|
Requires: git-cvs = %{version}-%{release}
|
|
|
-%if "%{?_dist_release}" != "vl4" && %{with arch}
|
|
|
+%if %{with arch}
|
|
|
Requires: git-arch = %{version}-%{release}
|
|
|
%endif
|
|
|
Requires: git-email = %{version}-%{release}
|
|
@@ -82,15 +83,16 @@ This is a dummy package which brings in all subpackages.
|
|
|
%package daemon
|
|
|
Summary: Git protocol daemon
|
|
|
Summary(ja): Git プロトコルデーモン
|
|
|
-Group: Development/Tools
|
|
|
+Group: programming,servers
|
|
|
Requires: git = %{version}-%{release}
|
|
|
%description daemon
|
|
|
The git daemon for supporting git:// access to git repositories
|
|
|
|
|
|
+
|
|
|
%package -n gitweb
|
|
|
Summary: Simple web interface to git repositories
|
|
|
Summary(ja): git リポジトリへのシンプルな Web インタフェース
|
|
|
-Group: Development/Tools
|
|
|
+Group: programming,servers
|
|
|
Requires: git = %{version}-%{release}
|
|
|
|
|
|
%description -n gitweb
|
|
@@ -100,32 +102,35 @@ Simple web interface to track changes in git repositories
|
|
|
%package svn
|
|
|
Summary: Git tools for importing Subversion repositories
|
|
|
Summary(ja): Subversion リポジトリを git へインポートするためのツール
|
|
|
-Group: Development/Tools
|
|
|
+Group: programming
|
|
|
Requires: git = %{version}-%{release}, subversion, perl(Term::ReadKey)
|
|
|
Requires: perl(SVN::Core)
|
|
|
%description svn
|
|
|
Git tools for importing Subversion repositories.
|
|
|
|
|
|
+
|
|
|
%package cvs
|
|
|
Summary: Git tools for importing CVS repositories
|
|
|
Summary(ja): CVS リポジトリを git へインポートするためのツール
|
|
|
-Group: Development/Tools
|
|
|
+Group: programming
|
|
|
Requires: git = %{version}-%{release}, cvs, cvsps
|
|
|
%description cvs
|
|
|
Git tools for importing CVS repositories.
|
|
|
|
|
|
+
|
|
|
%package contrib
|
|
|
Summary: Git contrib tools
|
|
|
-Group: Development/Tools
|
|
|
+Group: programming
|
|
|
Requires: git = %{version}-%{release}
|
|
|
%description contrib
|
|
|
Git contrib tools
|
|
|
|
|
|
-%if "%{?_dist_release}" != "vl4" && %{with arch}
|
|
|
+
|
|
|
+%if %{with arch}
|
|
|
%package arch
|
|
|
Summary: Git tools for importing Arch repositories
|
|
|
Summary(ja): Arch リポジトリを git へインポートするためのツール
|
|
|
-Group: Development/Tools
|
|
|
+Group: programming
|
|
|
Requires: git = %{version}-%{release}, tla
|
|
|
%description arch
|
|
|
Git tools for importing Arch repositories.
|
|
@@ -134,69 +139,69 @@ Git tools for importing Arch repositories.
|
|
|
%package email
|
|
|
Summary: Git tools for sending email
|
|
|
Summary(ja): Eメールを送るための git ツール
|
|
|
-Group: Development/Tools
|
|
|
+Group: programming
|
|
|
Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release}
|
|
|
%description email
|
|
|
Git tools for sending email.
|
|
|
|
|
|
+
|
|
|
%package gui
|
|
|
Summary: Git GUI tool
|
|
|
Summary(ja): Git の GUI ツール
|
|
|
-Group: Development/Tools
|
|
|
+Group: programming
|
|
|
Requires: git = %{version}-%{release}, tk
|
|
|
%description gui
|
|
|
Git GUI tool.
|
|
|
|
|
|
+
|
|
|
%package -n gitk
|
|
|
Summary: Git revision tree visualiser
|
|
|
Summary(ja): Git リビジョンツリー可視化ツール
|
|
|
-Group: Development/Tools
|
|
|
+Group: programming
|
|
|
Requires: git = %{version}-%{release}, tk
|
|
|
%description -n gitk
|
|
|
Git revision tree visualiser.
|
|
|
|
|
|
+
|
|
|
%package -n perl-Git
|
|
|
Summary: Perl interface to Git
|
|
|
Summary(ja): Git の perl インタフェース
|
|
|
-Group: Development/Libraries
|
|
|
+Group: programming
|
|
|
Requires: git = %{version}-%{release}, perl(Error), perl-MailTools
|
|
|
-%if "%{?_dist_release}" == "vl4"
|
|
|
-Requires: perl = %(rpm -q --qf '%%{epoch}:%%{version}' perl)
|
|
|
-%else
|
|
|
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
|
|
|
-%endif
|
|
|
#BuildRequires: perl(Error), perl(ExtUtils::MakeMaker)
|
|
|
|
|
|
%description -n perl-Git
|
|
|
Perl interface to Git.
|
|
|
|
|
|
+
|
|
|
%package -n emacs-git
|
|
|
-Summary: Git version control system support for Emacs
|
|
|
-Summary(ja): Emacs の Git サポート
|
|
|
-Group: Applications/Editors
|
|
|
-Requires: git = %{version}-%{release}, emacsen-common
|
|
|
+Summary: Git version control system support for Emacs
|
|
|
+Summary(ja): Emacs の Git サポート
|
|
|
+Group: programming
|
|
|
+Requires: git = %{version}-%{release}, emacsen-common
|
|
|
|
|
|
%description -n emacs-git
|
|
|
%{summary}.
|
|
|
|
|
|
+
|
|
|
%package devel
|
|
|
Summary: Header files for git-core
|
|
|
Summary(ja): git-core 用ヘッダファイル
|
|
|
-Group: Development/Libraries
|
|
|
+Group: programming
|
|
|
|
|
|
%description devel
|
|
|
Header files for git-core.
|
|
|
|
|
|
+
|
|
|
+%debug_package
|
|
|
+
|
|
|
+
|
|
|
%prep
|
|
|
%setup -q
|
|
|
%patch0 -p1
|
|
|
%patch1000 -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
|
|
@@ -209,6 +214,7 @@ EOF
|
|
|
%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
|
|
|
chmod +x %{__perl_requires}
|
|
|
|
|
|
+
|
|
|
%build
|
|
|
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I%{_includedir/pcre}" \
|
|
|
ETC_GITCONFIG=/etc/gitconfig \
|
|
@@ -221,6 +227,7 @@ pushd contrib/diff-highlight
|
|
|
make diff-highlight
|
|
|
popd
|
|
|
|
|
|
+
|
|
|
%install
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \
|
|
@@ -245,7 +252,6 @@ rm -f %{buildroot}%{_mandir}/man1/git-archimport.1*
|
|
|
rm -f %{buildroot}/Documentation/git-archimport.html
|
|
|
%endif
|
|
|
|
|
|
-
|
|
|
# perl-Git
|
|
|
rm -rf $RPM_BUILD_ROOT%{perl_vendorlib}/FromCPAN
|
|
|
|
|
@@ -265,7 +271,6 @@ install -m644 %{SOURCE1} %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
|
|
|
# install script( bytecompile el and install elc , remove )
|
|
|
|
|
|
%_installemacsenscript git %{SOURCE10}
|
|
|
-
|
|
|
%_removeemacsenscript git %{SOURCE11}
|
|
|
|
|
|
mkdir -p $RPM_BUILD_ROOT/%{_var}/lib/git
|
|
@@ -315,31 +320,24 @@ popd
|
|
|
|
|
|
%find_lang %{name}
|
|
|
|
|
|
+
|
|
|
%clean
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
+
|
|
|
%post -n emacs-git
|
|
|
|
|
|
# bytecompile and install
|
|
|
-
|
|
|
if [ "$1" = 2 ]; then
|
|
|
-
|
|
|
%_emacsenPackageRemove git
|
|
|
-
|
|
|
fi
|
|
|
-
|
|
|
%_addemacsenlist git
|
|
|
-
|
|
|
%_emacsenPackageInstall git
|
|
|
|
|
|
%preun -n emacs-git
|
|
|
-
|
|
|
if [ "$1" = 0 ]; then
|
|
|
-
|
|
|
%_emacsenPackageRemove git
|
|
|
-
|
|
|
%_removeemacsenlist git
|
|
|
-
|
|
|
fi
|
|
|
|
|
|
|
|
@@ -380,7 +378,7 @@ fi
|
|
|
%{_bindir}/diff-highlight
|
|
|
%{_libexecdir}/git-core/git-credential-gnome-keyring
|
|
|
|
|
|
-%if "%{?_dist_release}" != "vl4" && %{with arch}
|
|
|
+%if %{with arch}
|
|
|
%files arch
|
|
|
%defattr(-,root,root)
|
|
|
%doc Documentation/git-archimport.txt
|
|
@@ -445,11 +443,14 @@ fi
|
|
|
%{_libdir}/libgit.a
|
|
|
%{_libdir}/libgit_xdiff.a
|
|
|
|
|
|
-
|
|
|
%files all
|
|
|
# No files for you!
|
|
|
|
|
|
+
|
|
|
%changelog
|
|
|
+* Mon Mar 01 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.30.1-1
|
|
|
+- updated to 2.30.1.
|
|
|
+
|
|
|
* Fri May 01 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.26.2-1
|
|
|
- updated to 2.26.2.
|
|
|
|