git 1.7.3.1-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2062 ec354946-7b23-47d6-9f5a-488ba84defc7

g/git/git-init.el

@@ -0,0 +1,16 @@
+;;
+;; git-init.el
+;;
+;;      for Vine Linux with emacsen-common
+;;      IWAI, Masaharu <iwai@alib.jp>
+
+(defcustom vine-default-git t
+  "A boolean for vine-default-git"
+  :type 'boolean)
+
+(add-hook 'vine-default-setup-hook
+          (lambda()
+            (if vine-default-git
+                (require 'vine-default-git))))
+
+;;; end of file

g/git/git-install.sh

@@ -6,6 +6,7 @@ set -e
 FLAVOR=$1
 PACKAGE="git"
 
+SOURCES="git.el git-blame.el"
 
 if [ "X${FLAVOR}" = "X" ]; then
     echo Need argument to determin FLAVOR of emacs;
@@ -37,11 +38,11 @@ case "${FLAVOR}" in
         # Byte compile them
         (cd ${ELCDIR}
             ${FLAVOR} -batch -q -no-site-file \
-                      -f batch-byte-compile *.el > CompilationLog 2>&1
+                      -f batch-byte-compile ${SOURCES} > CompilationLog 2>&1
-            rm -f *.el
+            rm -f ${SOURCES}
         )
         gzip -9 ${ELCDIR}/CompilationLog
-        cp -a ${ELDIR}/${STARTFILE} ${STARTDIR}/55${STARTFILE}
+        ln -sf ${ELDIR}/${STARTFILE} ${STARTDIR}/55${STARTFILE}
         echo " done."
         #
         ;;

g/git/git-vl.spec

@@ -3,24 +3,24 @@
 
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
-Version: 	1.7.1
+Version: 	1.7.3.1
-Release:        2%{?_dist_release}
+Release:        1%{?_dist_release}
 Summary:  	Core git tools
 Summary(ja):	Core git ツール
 License: 	GPLv2
 Group: 		Development/Tools
 URL: 		http://git-scm.com/
 Source: 	http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2
-Source1:	git-init.el
+Source1:	vine-default-git.el
 Source2:	git.xinetd
 Source3:	git.conf.httpd
 Source10:       %{name}-install.sh
 Source11:       %{name}-remove.sh
+Source12:	git-init.el
 Patch0:		git-1.5-gitweb-home-link.patch
-# Patch10:	git-1.6_git-daemon-fix.patch
 
 # Security
-Patch100:	git-1.7.x-CVE-2010-2542.patch
+# none
 
 BuildRequires:	zlib-devel >= 1.2, openssl-devel, curl-devel, 
 BuildRequires:  expat-devel, gettext, asciidoc
@@ -34,7 +34,7 @@ Obsoletes:	git-core <= 1.5.4.3
 
 Vendor: 	Project Vine
 Distribution: 	Vine Linux
-# Packager: 	
+Packager: 	iwaim
 
 %description
 Git is a fast, scalable, distributed revision control system with an
@@ -174,13 +174,10 @@ Header files for git-core.
 %setup -q
 %patch0 -p1
 
-# %patch10 -p1 -b .git-daemon-fix
-
-%patch100 -p1 -b .CVE-2010-2542
-
 %build
 make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
      ETC_GITCONFIG=/etc/gitconfig \
+     gitwebdir=/var/www/git \
      prefix=%{_prefix} all %{!?_without_docs: doc}
 
 %install
@@ -189,7 +186,8 @@ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \
      prefix=%{_prefix} mandir=%{_mandir} \
      ETC_GITCONFIG=/etc/gitconfig \
      NO_PYTHON=1 \
-     INSTALLDIRS=vendor install %{!?_without_docs: install-doc}
+     gitwebdir=/var/www/git \
+     INSTALLDIRS=vendor install install-gitweb %{!?_without_docs: install-doc}
 
 # perl-Git
 # Error.pm provide by perl-Error package
@@ -205,8 +203,8 @@ mkdir -p $RPM_BUILD_ROOT%{emacsen_pkgdir}/remove
 # install el files
 install -m644 contrib/emacs/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/git/
 
-# install site-start file
+# install vine-default file
-install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/git/
+install -m644 %{SOURCE1} %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/git/
 
 # install  script( bytecompile el and install elc , remove )   
 
@@ -216,9 +214,8 @@ install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/git/
 
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d
 install -m 644 %SOURCE2 $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/git
-mkdir -p $RPM_BUILD_ROOT/var/www/git
+
-install -m 644 -t $RPM_BUILD_ROOT/var/www/git gitweb/*.png gitweb/*.css
+## for gitweb sub package
-install -m 755 -t $RPM_BUILD_ROOT/var/www/git gitweb/gitweb.cgi
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d
 install -m 0644 %SOURCE3 $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/git.conf
 
@@ -356,6 +353,7 @@ fi
 
 %files -n gitweb
 %defattr(-,root,root)
+%doc gitweb/README
 /var/www/git/
 %config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf
 
@@ -370,6 +368,16 @@ fi
 # No files for you!
 
 %changelog
+* Fri Oct  1 2010 IWAI, Masaharu <iwai@alib.jp> 1.7.3.1-1
+- new upstream release
+- drop CVE-2010-2542 patch (Patch100): upstream fixed
+- apply vine-default
+ - rename Source1: git-init.el -> vine-default-git.el
+ - add new git-init.el file (Source12)
+ - update git-install.sh
+- update %%build and %%install section for gitweb subpackage
+- add README in gitweb subpackage
+
 * Tue Sep 28 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.7.1-2
 - add Patch100 for fix CVE-2010-2542 (BOF in is_git_directory)
 

g/git/vine-default-git.el

@@ -1,5 +1,22 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;  -*- coding: utf-8-unix -*-
+;;  FSF Emacs 23 用 Vine Linux git 設定
+;;    IWAI, Masaharu <iwai@alib.jp>
+;;      $Id$
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; git の設定
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
 ;; Git VC backend
 (add-to-list 'vc-handled-backends 'GIT t)
 (autoload 'git-status "git" "GIT mode." t)
 (autoload 'git-blame-mode "git-blame"
  	"Minor mode for incremental blame for Git." t)
+
+(provide 'vine-default-git)
+
+;; Local Variables:
+;; mode: emacs-lisp
+;; End: