rpms/bzrtools/devel .cvsignore, 1.37, 1.38 bzrtools.spec, 1.57, 1.58 sources, 1.38, 1.39

[Toshio くらとみ]

Author: toshio

Update of /cvs/pkgs/rpms/bzrtools/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25658

Modified Files:
	.cvsignore bzrtools.spec sources 
Log Message:
We're going to build bzr-2.1.x for EPEL-5.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	7 Apr 2010 06:56:04 -0000	1.37
+++ .cvsignore	12 Apr 2010 18:32:57 -0000	1.38
@@ -1,2 +1,2 @@
-bzrtools-2.2.0.tar.gz
-bzrtools-2.2.0.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/devel/bzrtools.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- bzrtools.spec	7 Apr 2010 06:56:05 -0000	1.57
+++ bzrtools.spec	12 Apr 2010 18:32:57 -0000	1.58
@@ -1,18 +1,20 @@
-%{!?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.2
-%define bzrnextver 2.3
+%global bzrver 2.1
+%global bzrnextver 2.2
 
 Name:           bzrtools
 Version:        %{bzrver}.0
-#define subtag  b1
-%define branch  stable
-Release:        2%{?subtag:.}%{?subtag}%{?dist}
+#global subtag  b1
+%global branch  trunk
+Release:        1%{?subtag:.}%{?subtag}%{?dist}
 Summary:        A collection of utilities and plugins for Bazaar-NG
 
 Group:          Development/Tools
@@ -70,16 +72,13 @@ 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
-* Wed Apr 07 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.2.0-2
-- Update to 2.2.0
-
-* Wed Feb 17 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.1.0-2
-- Rebuild due to dependency changes
+* Mon Apr 12 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 2.1.0-2
+- spec cleanups for new python guidelines
 
 * Fri Feb 05 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.1.0-1
 - Update to 2.1.0


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	7 Apr 2010 06:56:05 -0000	1.38
+++ sources	12 Apr 2010 18:32:57 -0000	1.39
@@ -1,2 +1,2 @@
-8a05bb1d7d2a53bbcecf1b486fa06f76  bzrtools-2.2.0.tar.gz
-bf3f0b5cf2ac6bc870364b911267c8e8  bzrtools-2.2.0.tar.gz.sig
+eb4e6eec259d1e9222c0e73318719515  bzrtools-2.1.0.tar.gz
+481fb12b01c58e5a40fefafa83e53236  bzrtools-2.1.0.tar.gz.sig