rpms/florence/F-9 .cvsignore, 1.3, 1.4 florence.spec, 1.3, 1.4 import.log, 1.3, 1.4 sources, 1.3, 1.4 florence-desktop.patch, 1.1, NONE

Mon Feb 23 22:01:23 UTC 2009

Author: cassmodiah

Update of /cvs/pkgs/rpms/florence/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28992/F-9

Modified Files:
	.cvsignore florence.spec import.log sources 
Removed Files:
	florence-desktop.patch 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/florence/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4

--- .cvsignore	16 Sep 2008 14:54:19 -0000	1.3
+++ .cvsignore	23 Feb 2009 22:00:53 -0000	1.4
@@ -1 +1 @@
-florence-0.3.0.tar.bz2
+florence-0.3.3.tar.bz2


Index: florence.spec
===================================================================
RCS file: /cvs/pkgs/rpms/florence/F-9/florence.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- florence.spec	19 Nov 2008 11:34:03 -0000	1.3
+++ florence.spec	23 Feb 2009 22:00:53 -0000	1.4
@@ -1,13 +1,12 @@
 Name:           florence
-Version:        0.3.0
-Release:        2%{?dist}
+Version:        0.3.3
+Release:        1%{?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
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Patch0:         %{name}-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    libxml2-devel
@@ -20,6 +19,8 @@
 BuildRequires:    GConf2-devel
 BuildRequires:    desktop-file-utils
 BuildRequires:    scrollkeeper
+BuildRequires:    gettext
+BuildRequires:    libxml++-devel
 Requires(pre):    GConf2
 Requires(preun):  GConf2
 Requires(post):   scrollkeeper
@@ -42,18 +43,17 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .desktop
 
 rm -f gconf-refresh
 ln -sf /bin/true gconf-refresh
 
+sed -i 's|Icon=florence.svg|Icon=florence|g' data/florence.desktop.in
+
 
 %build
-export CFLAGS
 %configure
 
-make %{?_smp_mflags} \
-     CFLAGS="${RPM_OPT_FLAGS} -Werror-implicit-function-declaration"
+make %{?_smp_mflags} 
 
 
 %install
@@ -65,15 +65,17 @@
 
 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
+
+%find_lang %{name}
 
 
 %pre
@@ -98,40 +100,39 @@
 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
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYING README AUTHORS ChangeLog COPYING-DOCS NEWS
+%doc AUTHORS ChangeLog COPYING COPYING-DOCS NEWS README 
 %{_datadir}/%{name}/
 %{_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
 
 
-
 %changelog
+* Sun Feb 22 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.3.3-1
+- New upstream release
+
+* Mon Jan 26 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.3.2-1
+- New upstream release
+
+* 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/F-9/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	19 Nov 2008 11:34:03 -0000	1.3
+++ import.log	23 Feb 2009 22:00:53 -0000	1.4
@@ -1,3 +1,4 @@
 florence-0_2_3-2_fc9:F-9:florence-0.2.3-2.src.rpm:1217685399
 florence-0_3_0-1_fc9:F-9:florence-0.3.0-1.fc9.src.rpm:1221576823
 florence-0_3_0-2_fc10:F-9:florence-0.3.0-2.fc10.src.rpm:1227094380
+florence-0_3_3-1_fc10:F-9:florence-0.3.3-1.fc10.src.rpm:1235426336


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/florence/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Sep 2008 14:54:19 -0000	1.3
+++ sources	23 Feb 2009 22:00:53 -0000	1.4
@@ -1 +1 @@
-650aac6c6f206a33efa9e353d146964c  florence-0.3.0.tar.bz2
+444b9f5b59ed7d0d93896f6867cc51d8  florence-0.3.3.tar.bz2


--- florence-desktop.patch DELETED ---


