rpms/gwibber/devel .cvsignore, 1.15, 1.16 gwibber.spec, 1.25, 1.26 sources, 1.16, 1.17

[Tom Callaway]

Author: spot

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

Modified Files:
	.cvsignore gwibber.spec sources 
Log Message:
update to r339, main branch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	23 Apr 2009 01:47:41 -0000	1.15
+++ .cvsignore	2 Jun 2009 12:21:18 -0000	1.16
@@ -1 +1 @@
-gwibber-tte-288bzr.tar.gz
+gwibber-339bzr.tar.gz


Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/gwibber.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- gwibber.spec	23 Apr 2009 01:47:41 -0000	1.25
+++ gwibber.spec	2 Jun 2009 12:21:18 -0000	1.26
@@ -1,10 +1,10 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define bzr_rev 288
+%define bzr_rev 339
 
 Name:           gwibber
 Version:        0.9.1
-Release:        2.%{bzr_rev}bzr%{?dist}
+Release:        3.%{bzr_rev}bzr%{?dist}
 Epoch:          1
 Summary:        An open source microblogging client for GNOME developed with Python and GTK
 
@@ -13,11 +13,10 @@ License:        GPLv2+
 URL:            https://launchpad.net/gwibber
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-# We need the template-theme-engine branch, for modern webkit
-#  bzr branch -r %{bzr_rev} lp:~segphault/gwibber/template-theme-engine gwibber
+#  bzr branch -r %{bzr_rev} lp:gwibber gwibber
 #  rm -rf gwibber/.bzr*
-#  tar -czvf gwibber-tte-%{bzr_rev}bzr.tar.gz gwibber
-Source0:        %{name}-tte-%{bzr_rev}bzr.tar.gz
+#  tar -czvf gwibber-%{bzr_rev}bzr.tar.gz gwibber
+Source0:        %{name}-%{bzr_rev}bzr.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       libsoup python-mako
@@ -37,7 +36,6 @@ and GTK. It supports Twitter, Jaiku, Ide
 sed -i -e 's/version="0.7",/version="%{version}",/' setup.py
 sed -i -e '/^#! \?\//, 1d' $(find %{name} | grep "\.py$")
 
-
 %build
 %{__python} setup.py build
 
@@ -71,6 +69,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jun  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:0.9.1-3.339bzr
+- template theme engine merged onto main devel branch
+- move to r339
+
 * Wed Apr 22 2009 Ian Weller <ianweller at gmail.com> - 1:0.9.1-2.288bzr
 - Update to r288, gwibber will now scroll back to where it was before a refresh
 - Fix bugzilla.redhat.com/497108, add Requires: python-mako


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	23 Apr 2009 01:47:41 -0000	1.16
+++ sources	2 Jun 2009 12:21:18 -0000	1.17
@@ -1 +1 @@
-cc48423215f3ef53596b1e4eaa808bbc  gwibber-tte-288bzr.tar.gz
+1b5dbcd62a1a072926e65d2cebc18afc  gwibber-339bzr.tar.gz