|
|
@@ -3,7 +3,7 @@
|
|
|
|
|
|
# Pass --without docs to rpmbuild if you don't want the documentation
|
|
|
Name: git
|
|
|
-Version: 1.7.12
|
|
|
+Version: 1.8.0
|
|
|
Release: 1%{?_dist_release}
|
|
|
Summary: Core git tools
|
|
|
Summary(ja): Core git ツール
|
|
|
@@ -14,6 +14,7 @@ Source: %{name}-%{version}.tar.gz
|
|
|
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
|
|
|
@@ -24,6 +25,7 @@ Patch0: git-1.5-gitweb-home-link.patch
|
|
|
|
|
|
BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel,
|
|
|
BuildRequires: expat-devel, gettext, asciidoc
|
|
|
+BuildRequires: pcre-devel
|
|
|
BuildRequires: xmlto
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
|
|
|
@@ -177,6 +179,8 @@ Header files for git-core.
|
|
|
%build
|
|
|
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
|
|
|
ETC_GITCONFIG=/etc/gitconfig \
|
|
|
+ USE_LIBPCRE=1 \
|
|
|
+ GITWEB_PROJECTROOT=/var/lib/git \
|
|
|
gitwebdir=/var/www/git \
|
|
|
prefix=%{_prefix} all %{!?_without_docs: doc}
|
|
|
|
|
|
@@ -185,7 +189,9 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \
|
|
|
prefix=%{_prefix} mandir=%{_mandir} \
|
|
|
ETC_GITCONFIG=/etc/gitconfig \
|
|
|
+ USE_LIBPCRE=1 \
|
|
|
NO_PYTHON=1 \
|
|
|
+ GITWEB_PROJECTROOT=/var/lib/git \
|
|
|
gitwebdir=/var/www/git \
|
|
|
INSTALLDIRS=vendor install %{!?_without_docs: install-doc}
|
|
|
|
|
|
@@ -212,12 +218,19 @@ install -m644 %{SOURCE1} %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
|
|
|
|
|
|
%_removeemacsenscript git %{SOURCE11}
|
|
|
|
|
|
+mkdir -p $RPM_BUILD_ROOT/%{_var}/lib/git
|
|
|
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d
|
|
|
install -m 644 %SOURCE2 $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/git
|
|
|
+perl -p \
|
|
|
+ -e "s|\@GITCOREDIR\@|%{_libexecdir}/git-core|g;" \
|
|
|
+ -e "s|\@BASE_PATH\@|%{_var}/lib/git|g;" \
|
|
|
+ %{SOURCE3} > %{buildroot}%{_sysconfdir}/xinetd.d/git
|
|
|
|
|
|
## for gitweb sub package
|
|
|
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d
|
|
|
install -m 0644 %SOURCE3 $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/git.conf
|
|
|
+sed "s|@PROJECTROOT@|%{_var}/lib/git|g" \
|
|
|
+ %{SOURCE4} > %{buildroot}%{_sysconfdir}/gitweb.conf
|
|
|
|
|
|
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
|
|
|
find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
|
|
|
@@ -347,6 +360,7 @@ fi
|
|
|
|
|
|
%files daemon
|
|
|
%defattr(-,root,root)
|
|
|
+%{_var}/lib/git
|
|
|
%{_libexecdir}/git-core/git-daemon
|
|
|
%config(noreplace)%{_sysconfdir}/xinetd.d/git
|
|
|
/srv/git
|
|
|
@@ -355,6 +369,7 @@ fi
|
|
|
%defattr(-,root,root)
|
|
|
%doc gitweb/README
|
|
|
/var/www/git/
|
|
|
+%config(noreplace)%{_sysconfdir}/gitweb.conf
|
|
|
%config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf
|
|
|
|
|
|
%files devel
|
|
|
@@ -368,6 +383,12 @@ fi
|
|
|
# No files for you!
|
|
|
|
|
|
%changelog
|
|
|
+* Mon Oct 29 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.8.0-1
|
|
|
+- new upstream release
|
|
|
+- enable libpcre support, add BR: pcre-devel
|
|
|
+- add /etc/gitweb.conf
|
|
|
+- add /var/lib/git for PROJECTROOT
|
|
|
+
|
|
|
* Mon Sep 3 2012 IWAI, Masaharu <iwai@alib.jp> 1.7.12-1
|
|
|
- new upstream release
|
|
|
|
daisuke