rpms/qbzr/EL-6 .cvsignore, 1.3, 1.4 qbzr.spec, 1.2, 1.3 sources, 1.3, 1.4 qbzr-localedir.patch, 1.1, NONE

[Toshio くらとみ]

Author: toshio

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

Modified Files:
	.cvsignore qbzr.spec sources 
Removed Files:
	qbzr-localedir.patch 
Log Message:

* Tue Jul 6 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.19-0.3.b2
- Update to beta and drop our patches which have been merged upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbzr/EL-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Apr 2010 23:27:48 -0000	1.3
+++ .cvsignore	8 Jul 2010 17:54:33 -0000	1.4
@@ -1 +1 @@
-qbzr-0.18.5.tar.gz
+qbzr-0.19b2.tar.gz


Index: qbzr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbzr/EL-6/qbzr.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qbzr.spec	12 Apr 2010 23:27:49 -0000	1.2
+++ qbzr.spec	8 Jul 2010 17:54:34 -0000	1.3
@@ -3,17 +3,14 @@
 %endif
 
 Name:           qbzr
-Version:        0.18.5
-Release:        1%{?dist}
+Version:        0.19
+Release:        0.3.b2%{?dist}
 Summary:        Bazaar plugin for Qt interface to most Bazaar operations
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://wiki.bazaar-vcs.org/QBzr
-Source0:        http://launchpad.net/qbzr/0.18/%{version}/+download/qbzr-%{version}.tar.gz
-# Patch to find locales in the system localedir
-# Submitted upstream https://bugs.launchpad.net/qbzr/+bug/542429
-Patch0:         qbzr-localedir.patch
+Source0:        http://launchpad.net/qbzr/trunk/0.19b2/+download/qbzr-%{version}b2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -34,7 +31,6 @@ programs looking to implement a GUI inte
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1 -b .localedir
 
 cd docs
 dos2unix -k exception_reporting.txt index.txt gettext_usage.txt \
@@ -65,11 +61,23 @@ rm -rf %{buildroot}
 %files -f qbzr.lang
 %defattr(-,root,root,-)
 %doc AUTHORS.txt COPYING.txt NEWS.txt docs
+%if 0%{?fedora} || 0%{?rhel} > 5
 %{python_sitelib}/*egg-info
+%endif
 %{python_sitelib}/bzrlib/plugins/qbzr/
 
 
 %changelog
+* Tue Jul 6 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.19-0.3.b2
+- Update to beta and drop our patches which have been merged upstream
+
+* Wed Jun 9 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.19-0.2.b1
+- Bring in a patch from 0.19 trunk that forward ports bugfixes from the 0.18
+  branch
+
+* Mon Apr 12 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.19-0.1.b1
+- Update to 0.19 releases which are compat with bzr-2.1+
+
 * Sun Apr 11 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.18.5-1
 - Upstream update
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbzr/EL-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Apr 2010 23:27:49 -0000	1.3
+++ sources	8 Jul 2010 17:54:34 -0000	1.4
@@ -1 +1 @@
-1c17f142dc82214c7e72ed78fd35723a  qbzr-0.18.5.tar.gz
+1814bf970dbc8885bba130829a35f413  qbzr-0.19b2.tar.gz


--- qbzr-localedir.patch DELETED ---