rpms/florence/devel florence.spec,1.2,1.3 import.log,1.2,1.3

[Simon Wesp]

Author: cassmodiah

Update of /cvs/pkgs/rpms/florence/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15572/devel

Modified Files:
	florence.spec import.log 
Log Message:



Index: florence.spec
===================================================================
RCS file: /cvs/pkgs/rpms/florence/devel/florence.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- florence.spec	16 Sep 2008 14:51:29 -0000	1.2
+++ florence.spec	19 Nov 2008 11:29:59 -0000	1.3
@@ -1,11 +1,11 @@
 Name:           florence
 Version:        0.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Extensible scalable on-screen virtual keyboard for GNOME 
 
 Group:          User Interface/X Hardware Support
 License:        GPLv2+ and GFDL
-URL:            http://florence.sourceforge.net/english.html
+URL:            http://florence.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Patch0:         %{name}-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -63,8 +63,10 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
-desktop-file-install --vendor="fedora" \
-        --delete-original --remove-category="Application" \
+desktop-file-install \
+        --delete-original \
+        --remove-category="Application; X-GNOME-PersonalSettings" \
+        --add-category="Utility" \
         --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
         $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
 
@@ -120,7 +122,7 @@
 %doc COPYING README AUTHORS ChangeLog COPYING-DOCS NEWS
 %{_datadir}/%{name}/
 %{_bindir}/%{name}
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/%{name}.svg
 %{_datadir}/icons/hicolor/*/apps/%{name}.svg
 %{_datadir}/gnome/help/%{name}/
@@ -130,6 +132,10 @@
 
 
 %changelog
+* Wed Nov 19 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.3.0-2
+- Correct URL
+- Correct categories of desktop-file (Bug #472174)
+
 * Tue Sep 16 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.3.0-1
 - New upstream release 
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/florence/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	16 Sep 2008 14:51:29 -0000	1.2
+++ import.log	19 Nov 2008 11:29:59 -0000	1.3
@@ -1,2 +1,3 @@
 florence-0_2_3-2_fc9:HEAD:florence-0.2.3-2.src.rpm:1217698211
 florence-0_3_0-1_fc9:HEAD:florence-0.3.0-1.fc9.src.rpm:1221576651
+florence-0_3_0-2_fc10:HEAD:florence-0.3.0-2.fc10.src.rpm:1227094172