rpms/logjam/devel logjam.desktop,1.1,1.2 logjam.spec,1.1,1.2

[Tom Callaway (spot)]

Author: spot

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

Modified Files:
	logjam.desktop logjam.spec 
Log Message:
Requested cleanups


Index: logjam.desktop
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logjam.desktop	9 Feb 2005 23:17:20 -0000	1.1
+++ logjam.desktop	10 Feb 2005 05:31:38 -0000	1.2
@@ -4,4 +4,6 @@
 Type=Application
 Exec=/usr/bin/logjam
 Icon=/usr/share/pixmaps/gnome-log.png
-Categories=Application;Network;X-Red-Hat-Base;
+Categories=Application;Network;X-Fedora-Extras;
+Comment=LiveJournal Client
+GenericName=LiveJournal Client


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logjam.spec	9 Feb 2005 23:17:20 -0000	1.1
+++ logjam.spec	10 Feb 2005 05:31:38 -0000	1.2
@@ -1,19 +1,19 @@
 Name: logjam
 Version: 4.4.0
 Summary: The GTK2-client for LiveJournal
-Release: 3
+Release: 4
 Source: http://logjam.danga.com/download/logjam-%{version}.tar.bz2
 Source1: logjam.desktop
-Prereq: curl >= 7.9, gtk2, gtkspell, xmms, gtkhtml3
-BuildRequires: curl-devel, gtk2-devel, gtkspell-devel, xmms-devel, gtkhtml3-devel
+Requires: curl >= 7.9, gtk2, gtkspell, xmms, gtkhtml3, librsvg2, gettext
+BuildRequires: curl-devel, gtk2-devel, gtkspell-devel, xmms-devel, gtkhtml3-devel 
+BuildRequires: gettext-devel, desktop-file-utils, aspell-devel, librsvg2-devel
 URL: http://logjam.danga.com/
 Patch0: logjam-4.4.0-compilefix.patch
+Patch1: logjam-4.4.0-gtkhtml3.1.patch
 Epoch: 1
 
 License: GPL
-Group: X11/Applications
-Vendor: Evan Martin <evan at livejournal.com>
-Packager: Tom "spot" Callaway <tcallawa at redhat.com>
+Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/logjam-%{version}.root
 Obsoletes: loserjabber, logjam-gnome
 
@@ -21,28 +21,31 @@
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
 
 %prep
-%setup -n %{name}-%{version}
+%setup -n %{name}-%{version} -q
 %patch0 -p1 -b .compilefix
+%patch1 -p1 -b .gtkhtml31
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" ; export CFLAGS
 %configure
-%__make
+make
 
 %install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 %makeinstall
 %find_lang %{name}
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
-cp %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/applications
-
+desktop-file-install --vendor fedora                    \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
+  --add-category X-Fedora-Extras                        \
+  %{SOURCE1}
 
 %files -f %{name}.lang
 %defattr(-,root,root)
 %{_bindir}/logjam
 %{_bindir}/logjam-xmms-client
 %{_mandir}/man1/logjam.1.gz
-%{_datadir}/applications/logjam.desktop
+%{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/logjam*
 %doc doc/README COPYING doc/TODO 
 
@@ -50,6 +53,19 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Feb  9 2005 Tom "spot" Callaway <tcallawa at redhat.com> 4.4.0-4
+- use make, not %__make
+- no need to export CFLAGS first
+- BuildRequires aspell-devel, desktop-file-utils
+- change PreReq to Requires
+- delete $RPM_BUILD_ROOT first
+- use desktop-file-install to install logjam.desktop
+- nuke Vendor and Packager lines
+- add patch to look for gtkhtml3.1
+- modify logjam.desktop to refer to X-Fedora-Extras
+- add Comment and GenericName to logjam.desktop
+- change Group to User Interface/Desktops
+
 * Thu Feb  3 2005 Tom "spot" Callaway <tcallawa at redhat.com>
 - fc3 cleanup