rpms/logjam/devel logjam.spec,1.11,1.12

[Michael Schwendt]

On Wed, 6 Apr 2005 11:53:31 -0400, Tom Callaway (spot) wrote:

> Author: spot
> 
> Update of /cvs/extras/rpms/logjam/devel
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1145/devel
> 
> Modified Files:
> 	logjam.spec 
> Log Message:
> 
> bump to -6 to fix dual .desktop file issue.
> 
> 
> 
> Index: logjam.spec
> ===================================================================
> RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
> retrieving revision 1.11
> retrieving revision 1.12
> diff -u -r1.11 -r1.12
> --- logjam.spec	14 Mar 2005 00:28:25 -0000	1.11
> +++ logjam.spec	6 Apr 2005 15:53:29 -0000	1.12
> @@ -2,7 +2,7 @@
>  
>  Name: logjam
>  Version: 4.4.1
> -Release: 5
> +Release: 6
>  Epoch: 1
>  Summary: GTK2 client for LiveJournal
>  License: GPL
> @@ -58,11 +58,13 @@
>  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}
>  
>  %files -f %{name}.lang

The "rm" is good, but the "--delete-original" is not, since you don't want
to delete a %SOURCE file. ;)