rpms/blam/F-13 .cvsignore, 1.5, 1.6 blam.spec, 1.40, 1.41 sources, 1.5, 1.6 blam-1.8.5-gnome-print-sharp.patch, 1.1, NONE blam-CVE-2005-4790.patch, 1.1, NONE blam-fedora-people-in-default-collection.patch, 1.1, NONE blam-fix-PrintJob-ambiguous-reference.patch, 1.1, NONE blam-fix-THEME_DIR-path.patch, 1.1, NONE blam-xulrunner-configure.patch, 1.2, NONE blam-xulrunner.patch, 1.1, NONE

[alexlan]

Author: alexlan

Update of /cvs/extras/rpms/blam/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31844

Modified Files:
	.cvsignore blam.spec sources 
Removed Files:
	blam-1.8.5-gnome-print-sharp.patch blam-CVE-2005-4790.patch 
	blam-fedora-people-in-default-collection.patch 
	blam-fix-PrintJob-ambiguous-reference.patch 
	blam-fix-THEME_DIR-path.patch blam-xulrunner-configure.patch 
	blam-xulrunner.patch 
Log Message:
* Wed Mar 24 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.8.7-1
- Update from ancient 1.8.5 to upstream 1.8.7
- Uses webkit rather than gecko by default
- Drop unused patches (seem to be applied upstream) and cleanup spec
- Hopefully fixes #575583



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/blam/F-13/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	21 Jul 2008 13:48:58 -0000	1.5
+++ .cvsignore	24 Mar 2010 22:51:42 -0000	1.6
@@ -1 +1 @@
-blam-1.8.5.tar.bz2
+blam-1.8.7.tar.bz2


Index: blam.spec
===================================================================
RCS file: /cvs/extras/rpms/blam/F-13/blam.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- blam.spec	23 Mar 2010 13:23:31 -0000	1.40
+++ blam.spec	24 Mar 2010 22:51:45 -0000	1.41
@@ -1,11 +1,13 @@
 ## XXX: Hopefully Mono, Blam and multilib will play nicely soon...
 %define	_libdir			%{_prefix}/lib
 %define	dbus_sharp_min_version	0.60
-%define	gecko_version		1.9.2.2
+## not sure if a base version of webkit is necessary, but leave here
+## in case it is used later
+%define webkitgtk_ver 1.1.19 
 
 Name:		blam
-Version:	1.8.5
-Release:	23%{?dist}
+Version:	1.8.7
+Release:	1%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -14,14 +16,6 @@ URL:		http://www.cmartin.tk/blam.html
 
 Source0:	http://www.cmartin.tk/blam/%{name}-%{version}.tar.bz2
 
-#Patch0:		%{name}-fix-PrintJob-ambiguous-reference.patch
-#Patch1:		%{name}-fedora-people-in-default-collection.patch
-#Patch2:		%{name}-fix-THEME_DIR-path.patch
-#Patch3:		%{name}-CVE-2005-4790.patch
-Patch4:		%{name}-xulrunner.patch
-Patch5:         %{name}-xulrunner-configure.patch
-Patch6:		blam-1.8.5-gnome-print-sharp.patch
- 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ## Various Mono dependencies are not available for ppc64; see bug 241850.
 ExcludeArch:	ppc64 sparc64
@@ -31,8 +25,8 @@ ExcludeArch:	ppc64 sparc64
 ## being installed against the version we are expecting to.
 BuildRequires:	dbus-sharp-devel >= %{dbus_sharp_min_version}
 BuildRequires:	desktop-file-utils
-BuildRequires:	gecko-devel-unstable = %{gecko_version}
-BuildRequires:	gecko-sharp2-devel >= 0.12-6
+BuildRequires:  webkitgtk-devel
+BuildRequires:  webkit-sharp-devel
 BuildRequires:	gettext
 BuildRequires:	gnome-sharp-devel
 BuildRequires:  gnome-desktop-sharp-devel
@@ -44,8 +38,6 @@ BuildRequires:	perl(XML::Parser)
 BuildRequires:  intltool
 
 Requires:	dbus-sharp >= %{dbus_sharp_min_version}	
-Requires:	gecko-sharp2
-Requires:	gecko-libs = %{gecko_version}
 Requires:	gnome-sharp
 Requires:	mono-web
 
@@ -67,13 +59,6 @@ use and clean interface to stay up to da
 
 %prep
 %setup -q
-#patch0 -p0 -b .fix-PrintJob-ambiguous-reference-compile-error
-#patch1 -p0 -b .add-fedora-people-feed-to-default-collection.xml
-#patch2 -p0 -b .fix-THEME_DIR-path
-#patch3 -p1 -b .CVE-2005-4790
-%patch4 -p1 -b .xl
-%patch6 -p1 -b .gnomeprintsharp
-%patch5 -p1 -b .xlc
 
 %build
 export CFLAGS="%{optflags} -debug"
@@ -128,16 +113,20 @@ update-desktop-database &> /dev/null ||:
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_bindir}/*
-%exclude %{_libdir}/blam/*.la 
 %{_libdir}/blam
 %{_datadir}/blam
 %{_datadir}/applications/*
-%{_datadir}/pixmaps/*
 %{_datadir}/icons/hicolor/*/*/*.png
 %{_datadir}/icons/hicolor/*/*/*.svg
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Wed Mar 24 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.8.7-1
+- Update from ancient 1.8.5 to upstream 1.8.7
+- Uses webkit rather than gecko by default
+- Drop unused patches (seem to be applied upstream) and cleanup spec
+- Hopefully fixes #575583
+
 * Tue Mar 23 2010 Jan Horak <jhorak at redhat.com> - 1.8.5-23
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blam/F-13/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	21 Jul 2008 13:48:58 -0000	1.5
+++ sources	24 Mar 2010 22:51:45 -0000	1.6
@@ -1 +1 @@
-bb5f18ae5f7ec9ac682b93273cf6990c  blam-1.8.5.tar.bz2
+ecb4af421c93ae8e58087de4b00e6b35  blam-1.8.7.tar.bz2


--- blam-1.8.5-gnome-print-sharp.patch DELETED ---


--- blam-CVE-2005-4790.patch DELETED ---


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


--- blam-fix-PrintJob-ambiguous-reference.patch DELETED ---


--- blam-fix-THEME_DIR-path.patch DELETED ---


--- blam-xulrunner-configure.patch DELETED ---


--- blam-xulrunner.patch DELETED ---