rpms/bzr/F-11 .cvsignore, 1.38, 1.39 bzr.spec, 1.56, 1.57 sources, 1.38, 1.39

[Henrik Nordström]

Author: hno

Update of /cvs/pkgs/rpms/bzr/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32208

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
1.14.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-11/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	9 Apr 2009 00:26:37 -0000	1.38
+++ .cvsignore	2 May 2009 06:56:32 -0000	1.39
@@ -1 +1 @@
-bzr-1.14rc1.tar.gz
+bzr-1.14.1.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-11/bzr.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- bzr.spec	11 Apr 2009 20:40:00 -0000	1.56
+++ bzr.spec	2 May 2009 06:56:32 -0000	1.57
@@ -1,26 +1,17 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-# All package versioning is found here:
-# the actual version is composed from these below, including leading 0 for release candidates
-#   bzrver:  main bzr version
-#   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)
+# bzr major versions uses two digits. Specify subreleases if any in Version:
 %define bzrver 1.14
-%define bzrrc rc1
-%define release 0.2
-
-# Magics to get the dots in Release string correct per the above
-%define subrelease %{?bzrrc:.}%{?bzrrc}
 
 Name:           bzr
-Version:        %{bzrver}
-Release:        %{release}%{?subrelease}%{?dist}
+Version:        %{bzrver}.1
+Release:        1%{?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}%{?bzrrc}/+download/%{name}-%{version}%{?bzrrc}.tar.gz
+Source0:        https://launchpad.net/%{name}/%{bzrver}/%{version}/+download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel zlib-devel
@@ -45,7 +36,7 @@ a user-friendly reimplementation of GNU 
 
 
 %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
@@ -89,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat May 02 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.14.1-1
+- Update to 1.14.1
+
 * Sat Apr 11 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 1.14-0.2.rc1
 - Correct build dependencies
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/F-11/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- sources	9 Apr 2009 00:26:37 -0000	1.38
+++ sources	2 May 2009 06:56:32 -0000	1.39
@@ -1 +1 @@
-a488eb6f01a693148d02e4e71d75b7b5  bzr-1.14rc1.tar.gz
+198a66c4ecc4aeebf6f6ac8b1e68c064  bzr-1.14.1.tar.gz