rpms/logjam/devel logjam.spec,1.13,1.14 logjam.desktop,1.3,NONE

[Tom Callaway (spot)]

Author: spot

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

Modified Files:
	logjam.spec 
Removed Files:
	logjam.desktop 
Log Message:


Actually fix dual desktop problem, patch included .desktop to make it useful.



Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- logjam.spec	6 Apr 2005 15:54:54 -0000	1.13
+++ logjam.spec	14 Apr 2005 14:21:14 -0000	1.14
@@ -2,14 +2,13 @@
 
 Name: logjam
 Version: 4.4.1
-Release: 6
+Release: 7
 Epoch: 1
 Summary: GTK2 client for LiveJournal
 License: GPL
 Group: User Interface/Desktops
 URL: http://logjam.danga.com/
 Source: http://logjam.danga.com/download/logjam-%{version}.tar.bz2
-Source1: logjam.desktop
 Requires: curl >= 7.9, gtkspell
 %if %{use_xmms}
 BuildRequires: xmms-devel
@@ -23,6 +22,7 @@
 Patch2: logjam-4.4.1-backdated.patch
 Patch3: logjam-4.4.1-gtkhtml3.6.patch
 Patch4: logjam-4.4.1-cleanups.patch
+Patch5: logjam-4.4.1-fedora-desktop.patch
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
@@ -58,14 +58,12 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 %makeinstall
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/applications/logjam.desktop
 %find_lang %{name}
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
 desktop-file-install --vendor fedora                    \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
   --add-category X-Fedora                               \
   --delete-original					\
-  %{SOURCE1}
+  $RPM_BUILD_ROOT/%{_datadir}/applications/logjam.desktop
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -84,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Apr 14 2005 Tom "spot" Callaway <tcallawa at redhat.com> 4.4.1-7
+- touch up package included .desktop file and use it.
+
 * Wed Apr  6 2005 Tom "spot" Callaway <tcallawa at redhat.com> 4.4.1-6
 - Fix dual .desktop file issue
 


--- logjam.desktop DELETED ---