rpms/bouml/F-8 bouml.spec,1.10,1.11

[Debarshi Ray (rishi)]

Author: rishi

Update of /cvs/pkgs/rpms/bouml/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10608

Modified Files:
	bouml.spec 
Log Message:
Fixed Spec file in F-8.

 Modified Files:
 	bouml.spec 



Index: bouml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-8/bouml.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bouml.spec	13 Nov 2007 16:47:08 -0000	1.10
+++ bouml.spec	25 Nov 2007 14:14:08 -0000	1.11
@@ -1,7 +1,13 @@
+%if 0%{?fc7}
+  %define _remove_encoding
+%else
+  %define _remove_encoding --remove-key Encoding
+%endif
+
 Summary:	UML2 tool box to specify and generate code in C++, Java, IDL and PHP
 Name:		bouml
 Version:	3.3.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://bouml.free.fr/
@@ -23,6 +29,8 @@
 diagrams, object diagrams, use case diagrams, component diagrams, state
 diagrams, activity diagrams, component diagrams and deployment diagrams.
 
+The documentation for this package is in %{name}-doc.
+
 %prep
 %setup -q -n %{name}_%{version}
 
@@ -44,15 +52,15 @@
   ln -s ../%{_lib}/%{name}/projectSynchro projectSynchro
 popd
 
-desktop-file-install --remove-key Encoding --vendor fedora --delete-original \
+desktop-file-install %{_remove_encoding} --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-desktop-file-install --remove-key Encoding --vendor fedora --delete-original \
+desktop-file-install %{_remove_encoding} --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/projectControl.desktop
 
-desktop-file-install --remove-key Encoding --vendor fedora --delete-original \
+desktop-file-install %{_remove_encoding} --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/projectSynchro.desktop
 
@@ -97,6 +105,9 @@
 %{_libdir}/%{name}/*
 
 %changelog
+* Sun Nov 25 2007 Debarshi Ray <rishi at fedoraproject.org> - 3.3.1-2
+- Removed Encoding from Desktop Entry for all distributions, except Fedora 7.
+
 * Tue Nov 13 2007 Debarshi Ray <rishi at fedoraproject.org> - 3.3.1-1
 - Version bump to 3.3.1.
 - Removed Encoding from Desktop Entry.