rpms/florence/devel .cvsignore, 1.3, 1.4 florence.spec, 1.3, 1.4 import.log, 1.3, 1.4 sources, 1.3, 1.4

[Simon Wesp]

Author: cassmodiah

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/florence/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Sep 2008 14:51:29 -0000	1.3
+++ .cvsignore	18 Dec 2008 19:41:22 -0000	1.4
@@ -1 +1 @@
-florence-0.3.0.tar.bz2
+florence-0.3.1.tar.bz2


Index: florence.spec
===================================================================
RCS file: /cvs/pkgs/rpms/florence/devel/florence.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- florence.spec	19 Nov 2008 11:29:59 -0000	1.3
+++ florence.spec	18 Dec 2008 19:41:22 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           florence
-Version:        0.3.0
-Release:        2%{?dist}
+Version:        0.3.1
+Release:        1%{?dist}
 Summary:        Extensible scalable on-screen virtual keyboard for GNOME 
 
 Group:          User Interface/X Hardware Support
@@ -65,15 +65,15 @@
 
 desktop-file-install \
         --delete-original \
-        --remove-category="Application; X-GNOME-PersonalSettings" \
+        --remove-category="Application" \
         --add-category="Utility" \
         --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
         $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps 
 
 install -p -m 0644 data/%{name}.svg \
-    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+    $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.svg
 
 
 %pre
@@ -98,20 +98,10 @@
 export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
 
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
 
 %postun
 scrollkeeper-update -q || :
 
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi 
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -124,7 +114,7 @@
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/%{name}.svg
-%{_datadir}/icons/hicolor/*/apps/%{name}.svg
+%{_datadir}/pixmaps/%{name}.svg
 %{_datadir}/gnome/help/%{name}/
 %{_datadir}/omf/%{name}/
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
@@ -132,6 +122,10 @@
 
 
 %changelog
+* Wed Dec 18 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.3.1-1
+- New upstream release
+- Move installation of icon from highcolortheme to DATADIR/pixmaps
+
 * Wed Nov 19 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.3.0-2
 - Correct URL
 - Correct categories of desktop-file (Bug #472174)


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/florence/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	19 Nov 2008 11:29:59 -0000	1.3
+++ import.log	18 Dec 2008 19:41:22 -0000	1.4
@@ -1,3 +1,4 @@
 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
+florence-0_3_1-1_fc10:HEAD:florence-0.3.1-1.fc10.src.rpm:1229629275


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/florence/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Sep 2008 14:51:29 -0000	1.3
+++ sources	18 Dec 2008 19:41:22 -0000	1.4
@@ -1 +1 @@
-650aac6c6f206a33efa9e353d146964c  florence-0.3.0.tar.bz2
+0c354be92764e412411ec6a72e713759  florence-0.3.1.tar.bz2