rpms/blam/devel blam-fedora-people-in-default-collection.patch, NONE, 1.1 blam.spec, 1.6, 1.7 blam-fix-default-theme-base-href.patch, 1.1, NONE

[Peter Gordon (pgordon)]

Author: pgordon

Update of /cvs/extras/rpms/blam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24664

Modified Files:
	blam.spec 
Added Files:
	blam-fedora-people-in-default-collection.patch 
Removed Files:
	blam-fix-default-theme-base-href.patch 
Log Message:
* Wed Apr 04 2007 Peter Gordon <peter at thecodergeek.com> - 1.8.3-2
- (Note to self: Don't fix it if it's not broken.) Drop unnecessary default
  theme fix:
  - fix-default-theme-base-href.patch
- Add patch to put the Fedora People feed into the default collection.xml:
  + fedora-people-in-default-collection.patch


blam-fedora-people-in-default-collection.patch:

--- NEW FILE blam-fedora-people-in-default-collection.patch ---
--- collection.xml.old	2007-04-04 22:20:24.000000000 -0700
+++ collection.xml	2007-04-04 22:21:01.000000000 -0700
@@ -1,4 +1,5 @@
 <ChannelCollection>
+    <Channel Name="Fedora People" Url="http://planet.fedoraproject.org/rss20.xml"/>
     <Channel Name="Imendio News" Url="http://www.imendio.com/archive/index.rss"/>
     <Channel Name="Planet GNOME" Url="http://planet.gnome.org/rss20.xml"/>
 	


Index: blam.spec
===================================================================
RCS file: /cvs/extras/rpms/blam/devel/blam.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- blam.spec	8 Mar 2007 21:45:39 -0000	1.6
+++ blam.spec	5 Apr 2007 05:26:22 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:		blam
 Version:	1.8.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -12,7 +12,7 @@
 
 Source0:	http://www.cmartin.tk/blam/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-fix-PrintJob-ambiguous-reference.patch
-Patch1:		%{name}-fix-default-theme-base-href.patch
+Patch1:		%{name}-fedora-people-in-default-collection.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -50,7 +50,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .fix-PrintJob-ambiguous-reference-compile-error
-%patch1 -p0 -b .fix-default-theme-base-href
+%patch1 -p0 -b .add-fedora-people-feed-to-default-collection.xml
 
 
 %build
@@ -114,6 +114,13 @@
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Wed Apr 04 2007 Peter Gordon <peter at thecodergeek.com> - 1.8.3-2
+- (Note to self: Don't fix it if it's not broken.) Drop unnecessary default
+  theme fix:
+  - fix-default-theme-base-href.patch
+- Add patch to put the Fedora People feed into the default collection.xml:
+  + fedora-people-in-default-collection.patch
+
 * Wed Mar 07 2007 Peter Gordon <peter at thecodergeek.com> - 1.8.3-1
 - Unorphan, since Carlos Martín Nieto has picked upstream development.
 - Update to new upstream release (1.8.3)


--- blam-fix-default-theme-base-href.patch DELETED ---