Browse Source

git 2.0.1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8686 ec354946-7b23-47d6-9f5a-488ba84defc7
iwaim 10 years ago
parent
commit
d74a4ad80c
1 changed files with 11 additions and 5 deletions
  1. 11 5
      g/git/git-vl.spec

+ 11 - 5
g/git/git-vl.spec

@@ -1,16 +1,18 @@
+%bcond_with arch
+
 %define prereq_ge()  %(LC_ALL="C" rpm -q --queryformat 'PreReq:%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
 %define emacsen_pkgdir /usr/lib/emacsen-common/packages
 
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
-Version: 	1.9.2
+Version: 	2.0.1
 Release:        1%{?_dist_release}
 Summary:  	Core git tools
 Summary(ja):	Core git ツール
 License: 	GPLv2
 Group: 		Development/Tools
 URL: 		http://git-scm.com/
-Source: 	http://git-core.googlecode.com/files/%{name}-%{version}.tar.bz2
+Source: 	http://git-core.googlecode.com/files/%{name}-%{version}.tar.xz
 Source1:	vine-default-git.el
 Source2:	git.xinetd
 Source3:	git.conf.httpd
@@ -54,7 +56,7 @@ Group:		Development/Tools
 Requires:	git = %{version}-%{release}
 Requires:	git-svn = %{version}-%{release}
 Requires:	git-cvs = %{version}-%{release}
-%if "%{?_dist_release}" != "vl4"
+%if "%{?_dist_release}" != "vl4" && %{with arch}
 Requires:	git-arch = %{version}-%{release}
 %endif
 Requires:	git-email = %{version}-%{release}
@@ -114,7 +116,7 @@ Requires:       git = %{version}-%{release}
 %description contrib
 Git contrib tools
 
-%if "%{?_dist_release}" != "vl4"
+%if "%{?_dist_release}" != "vl4" && %{with arch}
 %package arch
 Summary:        Git tools for importing Arch repositories
 Summary(ja):    Arch リポジトリを git へインポートするためのツール
@@ -339,7 +341,7 @@ fi
 %doc diff-highlight/README.diff-highlight
 %{_bindir}/diff-highlight
 
-%if "%{?_dist_release}" != "vl4"
+%if "%{?_dist_release}" != "vl4" && %{with arch}
 %files arch
 %defattr(-,root,root)
 %doc Documentation/git-archimport.txt
@@ -409,6 +411,10 @@ fi
 # No files for you!
 
 %changelog
+* Thu Jun 26 2014 IWAI, Masaharu <iwaim.sub@gmail.com> 2.0.1-1
+- update to 2.0.1
+- add "%%bcond_with arch": no create git-arch sub package by default
+
 * Fri Apr 18 2014 2014 Daisuke SUZUKI <daisuke@linux.or.jp> 1.9.2-1
 - update to 1.9.2