Browse Source

update to 2.5.0

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6251 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 13 years ago
parent
commit
c86095c670
1 changed files with 9 additions and 18 deletions
  1. 9 18
      b/bzr/bzr-vl.spec

+ 9 - 18
b/bzr/bzr-vl.spec

@@ -6,24 +6,22 @@
 #   Version: bzr version, add subrelease version here
 #   bzrrc: release candidate version, if any, line starts with % for rc, # for stable releas (no %).
 #   release: rpm subrelease (0.N for rc candidates, N for stable releases)
-%define bzrmajor 2.3.1
-#define bzrrc rc1
-%define release 1
+%define bzrmajor 2.5.0
 
 # Magics to get the dots in Release string correct per the above
 %define subrelease %{?bzrrc:.}%{?bzrrc}
 
 Name:           bzr
 Version:        %{bzrmajor}
-Release:        %{release}%{?subrelease}%{?_dist_release}
+Release:        1%{?_dist_release}
 Summary:        Friendly distributed version control system
 Summary(ja):    bzr - 分散型バージョン管理システム
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://www.bazaar-vcs.org/
-Source0:        https://launchpad.net/%{name}/%{bzrmajor}/%{version}%{?bzrrc}/+download/%{name}-%{version}%{?bzrrc}.tar.gz
-Source1:        https://launchpad.net/%{name}/%{bzrmajor}/%{version}%{?bzrrc}/+download/%{name}-%{version}%{?bzrrc}.tar.gz.sig
+Source0:        https://launchpad.net/%{name}/%{bzrmajor}/%{version}/+download/%{name}-%{version}.tar.gz
+Source1:        https://launchpad.net/%{name}/%{bzrmajor}/%{version}/+download/%{name}-%{version}.tar.gz.sig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel zlib-devel
@@ -34,13 +32,6 @@ Requires:   python-paramiko
 # Workaround Bug #230223 otherwise this would be a soft dependency
 Requires:   python-pycurl
 
-# ElementTree is part of python2.5 on FC7+
-# This is also needed for EL-5
-#if 0%{?fedora} <= 6
-#BuildRequires:   python-elementtree
-#Requires:   python-elementtree
-#endif
-
 Vendor: Project Vine
 Distribution: Vine Linux
 
@@ -51,7 +42,7 @@ a user-friendly reimplementation of GNU Arch.
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?bzrrc}
+%setup -q -n %{name}-%{version}
 
 sed -i '1{/#![[:space:]]*\/usr\/bin\/\(python\|env\)/d}' bzrlib/_patiencediff_py.py
 sed -i '1{/#![[:space:]]*\/usr\/bin\/\(python\|env\)/d}' bzrlib/weave.py
@@ -88,13 +79,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/bzr
 %{_mandir}/man1/*
 %{python_sitearch}/bzrlib/
-%{_sysconfdir}/bash_completion.d/
-
-#if 0%{?fedora} > 8
 %{python_sitearch}/*.egg-info
-#endif
+%{_sysconfdir}/bash_completion.d/
 
 %changelog
+* Mon May 28 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 2.5.0-1
+- new upstream release 
+
 * Thu Mar 31 2011 IWAI, Masaharu <iwai@alib.jp> 2.3.1-1
 - new upstream release
 - add Vendor and Distribution tags