rpms/bouml/F-7 bouml.spec,1.11,1.12
Debarshi Ray (rishi)
fedora-extras-commits at redhat.com
Sun Nov 25 14:16:42 UTC 2007
Author: rishi
Update of /cvs/pkgs/rpms/bouml/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10720
Modified Files:
bouml.spec
Log Message:
Fixed Spec file in F-7.
Modified Files:
bouml.spec
Index: bouml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouml/F-7/bouml.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- bouml.spec 13 Nov 2007 17:47:27 -0000 1.11
+++ bouml.spec 25 Nov 2007 14:16:10 -0000 1.12
@@ -1,3 +1,9 @@
+%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
@@ -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 --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 --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 --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,8 +105,8 @@
%{_libdir}/%{name}/*
%changelog
-* Tue Nov 13 2007 Debarshi Ray <rishi at fedoraproject.org> - 3.3.1-2
-- Retained Encoding in Desktop Entry for Fedora 7.
+* 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.
More information about the scm-commits
mailing list