rpms/bzr/devel .cvsignore, 1.32, 1.33 bzr.spec, 1.46, 1.47 sources, 1.32, 1.33

[Henrik Nordström]

Author: hno

Update of /cvs/pkgs/rpms/bzr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7011

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
bzr 1.12rc1 upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	19 Jan 2009 13:21:16 -0000	1.32
+++ .cvsignore	10 Feb 2009 19:42:47 -0000	1.33
@@ -1 +1 @@
-bzr-1.11.tar.gz
+bzr-1.12rc1.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/bzr.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- bzr.spec	19 Jan 2009 13:21:16 -0000	1.46
+++ bzr.spec	10 Feb 2009 19:42:47 -0000	1.47
@@ -1,17 +1,24 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 # bzr major versions uses two digits. Specify subreleases if any in Version:
-%define bzrver 1.11
+# release should be 0.N prerelases, N stable releases, starting at 1 on each
+# replace % in bzrrc line with # on stable releases
+%define bzrver 1.12
+%define bzrrc rc1
+%define release 0.1
+
+# Magics to get the dots in Release string correct per the above
+%define subrelease %{?bzrrc:.}%{?bzrrc}
 
 Name:           bzr
 Version:        %{bzrver}
-Release:        1%{?dist}
+Release:        %{release}%{?subrelease}%{?dist}
 Summary:        Friendly distributed version control system
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://www.bazaar-vcs.org/
-Source0:        https://launchpad.net/%{name}/%{bzrver}/%{version}/+download/%{name}-%{version}.tar.gz
+Source0:        https://launchpad.net/%{name}/%{version}/%{version}%{?bzrrc}/+download/%{name}-%{version}%{?bzrrc}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -36,7 +43,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}%{?bzrrc}
 
 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
@@ -80,6 +87,9 @@
 %endif
 
 %changelog
+* Tue Feb 10 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.12-0.1.rc1
+- Update to 1.12rc1
+
 * Mon Jan 19 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.11-1
 - Update to 1.11
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	19 Jan 2009 13:21:16 -0000	1.32
+++ sources	10 Feb 2009 19:42:47 -0000	1.33
@@ -1 +1 @@
-08f8e60cfd7a60e8a2552dee0df9a7e8  bzr-1.11.tar.gz
+34d77b8e234c9b028ab227ec58b4a409  bzr-1.12rc1.tar.gz