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

[Simon Wesp]

Author: cassmodiah

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/florence/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Dec 2008 19:43:22 -0000	1.4
+++ .cvsignore	23 Feb 2009 20:41:39 -0000	1.5
@@ -1 +1 @@
-florence-0.3.1.tar.bz2
+florence-0.3.3.tar.bz2


Index: florence.spec
===================================================================
RCS file: /cvs/pkgs/rpms/florence/F-10/florence.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- florence.spec	18 Dec 2008 19:43:22 -0000	1.4
+++ florence.spec	23 Feb 2009 20:41:39 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           florence
-Version:        0.3.1
+Version:        0.3.3
 Release:        1%{?dist}
 Summary:        Extensible scalable on-screen virtual keyboard for GNOME 
 
@@ -7,7 +7,6 @@
 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
@@ -75,6 +75,8 @@
 install -p -m 0644 data/%{name}.svg \
     $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.svg
 
+%find_lang %{name}
+
 
 %pre
 if [ "$1" -gt 1 ]; then
@@ -107,9 +109,9 @@
 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
@@ -120,8 +122,13 @@
 %{_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


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/florence/F-10/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	18 Dec 2008 19:43:22 -0000	1.4
+++ import.log	23 Feb 2009 20:41:39 -0000	1.5
@@ -2,3 +2,4 @@
 florence-0_3_0-1_fc9:HEAD:florence-0.3.0-1.fc9.src.rpm:1221576651
 florence-0_3_0-2_fc10:F-10:florence-0.3.0-2.fc10.src.rpm:1227094273
 florence-0_3_1-1_fc10:F-10:florence-0.3.1-1.fc10.src.rpm:1229629404
+florence-0_3_3-1_fc10:F-10:florence-0.3.3-1.fc10.src.rpm:1235421424


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/florence/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 Dec 2008 19:43:22 -0000	1.4
+++ sources	23 Feb 2009 20:41:40 -0000	1.5
@@ -1 +1 @@
-0c354be92764e412411ec6a72e713759  florence-0.3.1.tar.bz2
+444b9f5b59ed7d0d93896f6867cc51d8  florence-0.3.3.tar.bz2


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