rpms/drivel/F-7 drivel-2.1.1-desktop.patch, NONE, 1.1 drivel.spec, 1.10, 1.11

[Paul W. Frields (pfrields)]

Author: pfrields

Update of /cvs/pkgs/rpms/drivel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15686

Modified Files:
	drivel.spec 
Added Files:
	drivel-2.1.1-desktop.patch 
Log Message:
Sync to fixes in devel/ branch

drivel-2.1.1-desktop.patch:

--- NEW FILE drivel-2.1.1-desktop.patch ---
diff -uNr drivel-orig/data/gnome-drivel.desktop.in drivel/data/gnome-drivel.desktop.in
--- drivel-orig/data/gnome-drivel.desktop.in	2007-11-30 20:10:54.000000000 -0500
+++ drivel/data/gnome-drivel.desktop.in	2007-12-02 15:36:17.000000000 -0500
@@ -6,8 +6,8 @@
 Exec=drivel %U
 Terminal=false
 Type=Application
-Icon=drivel-48.png
-MimeType=application/x-drivel
+Icon=drivel-48
+MimeType=application/x-drivel;
 Categories=GTK;GNOME;Application;Network;
 StartupNotify=true
 X-GNOME-Bugzilla-Bugzilla=GNOME


Index: drivel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drivel/F-7/drivel.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- drivel.spec	2 Dec 2007 19:18:17 -0000	1.10
+++ drivel.spec	2 Dec 2007 21:28:24 -0000	1.11
@@ -4,7 +4,7 @@
 Summary: A journal or "blog" client
 Name: drivel
 Version: 2.1.1
-Release: 0.1.%{cvsdate}svn%{?dist}
+Release: 0.2.%{cvsdate}svn%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 Url: http://www.dropline.net/drivel
@@ -15,18 +15,20 @@
 Source1: drivel-nukemd5.sh
 Patch0: drivel-2.1.1-openssl.patch
 Patch1: drivel-2.1.1-proxyuri.patch
+Patch2: drivel-2.1.1-desktop.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: scrollkeeper
 BuildRequires: gtkspell-devel 
 BuildRequires: libgnomeprint22-devel
 BuildRequires: libxml2-devel
-BuildRequires: rhythmbox
+BuildRequires: dbus-glib-devel
 BuildRequires: GConf2-devel
 BuildRequires: gnome-vfs2-devel
 BuildRequires: libbonobo-devel
 BuildRequires: libgnome-devel
 BuildRequires: libgnomeui-devel
 BuildRequires: gtksourceview-devel
+BuildRequires: libsoup-devel
 BuildRequires: curl-devel
 BuildRequires: gettext
 BuildRequires: libtool
@@ -50,11 +52,12 @@
 %setup -q %{?cvsdate:-n %{name}}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{?cvsdate:./autogen.sh}
 %configure --disable-schemas-install --disable-mime-update --disable-desktop-update --with-curl-libraries=%{_libdir} --disable-static
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -126,6 +129,10 @@
 %config %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Sun Dec  2 2007 Paul W. Frields <stickster at gmail.com> - 2.1.1-0.2.20071130svn
+- Fix some BuildRequires
+- Patch .desktop file to meet standards
+
 * Fri Nov 30 2007 Paul W. Frields <stickster at gmail.com> - 2.1.1-0.1.20071130svn
 - Update to latest SVN
 - Use OpenSSL library instead of beecrypt for MD5