rpms/bzr/devel bzr.spec,1.52,1.53

[Henrik Nordström]

Author: hno

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

Modified Files:
	bzr.spec 
Log Message:
Backout unneededly complex rpm macro magics


Index: bzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr/devel/bzr.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- bzr.spec	24 Mar 2009 09:57:46 -0000	1.52
+++ bzr.spec	24 Mar 2009 10:03:41 -0000	1.53
@@ -5,8 +5,7 @@
 #   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)
-%define bzrmainver 1.13
-%define bzrsubver 1
+%define bzrver 1.13
 #define bzrrc rc1
 %define release 1
 
@@ -14,14 +13,14 @@
 %define subrelease %{?bzrrc:.}%{?bzrrc}
 
 Name:           bzr
-Version:        %{bzrmainver}%{?bzrsubver:.}%{?bzrsubver}
-Release:        %{release}%{?rpmsubrelease}%{?dist}
+Version:        %{bzrver}.1
+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}/%{bzrmainver}/%{version}%{?bzrrc}/+download/%{name}-%{version}%{?bzrrc}.tar.gz
+Source0:        https://launchpad.net/%{name}/%{bzrver}/%{version}%{?bzrrc}/+download/%{name}-%{version}%{?bzrrc}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel