rpms/bzrtools/EL-6 .cvsignore, 1.34, 1.35 bzrtools.spec, 1.53, 1.54 sources, 1.35, 1.36

[Toshio くらとみ]

Author: toshio

Update of /cvs/pkgs/rpms/bzrtools/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29264

Modified Files:
	.cvsignore bzrtools.spec sources 
Log Message:
2.1.0 build because RHEL6 has bzr-2.1.x



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/EL-6/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	26 Sep 2009 18:06:58 -0000	1.34
+++ .cvsignore	8 Jul 2010 18:07:34 -0000	1.35
@@ -1,2 +1,2 @@
-bzrtools-2.0.1.tar.gz
-bzrtools-2.0.1.tar.gz.sig
+bzrtools-2.1.0.tar.gz
+bzrtools-2.1.0.tar.gz.sig


Index: bzrtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/EL-6/bzrtools.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- bzrtools.spec	26 Sep 2009 18:06:59 -0000	1.53
+++ bzrtools.spec	8 Jul 2010 18:07:34 -0000	1.54
@@ -1,26 +1,30 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%endif
 
 # Oh the horrors of arch dependent noarch packages!
 # (bzrlib is arch dependent.  Thus bzrlib plugins are also arch dependent.)
-%define debug_package %{nil}
+%global debug_package %{nil}
 
-%define bzrver 2.0
-%define bzrnextver 2.1
+%global bzrver 2.1
+%global bzrnextver 2.2
 
 Name:           bzrtools
-Version:        %{bzrver}.1
-Release:        1%{?dist}
+Version:        %{bzrver}.0
+#global subtag  b1
+%global branch  trunk
+Release:        1%{?subtag:.}%{?subtag}%{?dist}
 Summary:        A collection of utilities and plugins for Bazaar-NG
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://bazaar-vcs.org/BzrTools
-Source0:        https://launchpad.net/bzrtools/stable/%{version}/+download/%{name}-%{version}.tar.gz
-Source1:        https://launchpad.net/bzrtools/stable/%{version}/+download/%{name}-%{version}.tar.gz.sig
+Source0:        https://launchpad.net/bzrtools/%{branch}/%{version}%{?subtag}/+download/%{name}-%{version}%{?subtag}.tar.gz
+Source1:        https://launchpad.net/bzrtools/%{branch}/%{version}%{?subtag}/+download/%{name}-%{version}%{?subtag}.tar.gz.sig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel
+BuildRequires:  python2-devel
 # Bzrtools is meant to work with a version of bzr that is the same major
 # version.  In addition to being incompatible with older bzr versions, it is 
 # also untested with bzrversion++ and may not work (depending on what has
@@ -68,11 +72,17 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc README NEWS COPYING
 %{python_sitearch}/bzrlib/plugins/bzrtools
-%if 0%{?fedora} > 8
+%if 0%{?fedora} > 8 || 0%{?rhel} > 5
 %{python_sitearch}/*.egg-info
 %endif
 
 %changelog
+* Fri Feb 05 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.1.0-1
+- Update to 2.1.0
+
+* Thu Oct 29 2009 Henrik Nordstrom <henrik at henriknordstrom.net> -  2.1.0-0.1.b1
+- Update to 2.1.0b1 for bzr 2.1.0b1
+
 * Sat Sep 26 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.0.1-1
 - Update to 2.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/EL-6/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	26 Sep 2009 18:06:59 -0000	1.35
+++ sources	8 Jul 2010 18:07:34 -0000	1.36
@@ -1,2 +1,2 @@
-a4a14e3ed4a6fa404123ee22662fa0a5  bzrtools-2.0.1.tar.gz
-d434fd716a4bfbd43eb2f7265bbfc037  bzrtools-2.0.1.tar.gz.sig
+eb4e6eec259d1e9222c0e73318719515  bzrtools-2.1.0.tar.gz
+481fb12b01c58e5a40fefafa83e53236  bzrtools-2.1.0.tar.gz.sig