rpms/florence/F-10 .cvsignore, 1.6, 1.7 florence.spec, 1.6, 1.7 import.log, 1.6, 1.7 sources, 1.6, 1.7

[Simon Wesp]

Author: cassmodiah

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/florence/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	23 Mar 2009 19:33:08 -0000	1.6
+++ .cvsignore	13 Jun 2009 19:19:22 -0000	1.7
@@ -1 +1 @@
-florence-0.4.0.tar.bz2
+florence-0.4.2.tar.bz2


Index: florence.spec
===================================================================
RCS file: /cvs/pkgs/rpms/florence/F-10/florence.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- florence.spec	23 Mar 2009 19:33:08 -0000	1.6
+++ florence.spec	13 Jun 2009 19:19:22 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           florence
-Version:        0.4.0
-Release:        1%{?dist}
+Version:        0.4.2
+Release:        0.1%{?dist}
 Summary:        Extensible scalable on-screen virtual keyboard for GNOME 
 
 Group:          User Interface/X Hardware Support
@@ -9,18 +9,20 @@ URL:            http://florence.sourcefo
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+
+BuildRequires:    gtk2-devel
 BuildRequires:    libxml2-devel
 BuildRequires:    libglade2-devel
 BuildRequires:    at-spi-devel
 BuildRequires:    librsvg2-devel
 BuildRequires:    cairo-devel
 BuildRequires:    libgnome-devel
-BuildRequires:    gtk2-devel
 BuildRequires:    GConf2-devel
 BuildRequires:    desktop-file-utils
 BuildRequires:    scrollkeeper
-BuildRequires:    gettext
-BuildRequires:    libxml++-devel
+BuildRequires:    intltool
+BuildRequires:    libnotify-devel
+#BuildRequires:    libXtst-devel
 Requires(pre):    GConf2
 Requires(preun):  GConf2
 Requires(post):   scrollkeeper
@@ -47,11 +49,12 @@ to help disabled people having difficult
 rm -f gconf-refresh
 ln -sf /bin/true gconf-refresh
 
-sed -i 's|Icon=%{name}.svg|Icon=%{name}|g' data/%{name}.desktop.in
+sed -i 's|Icon=%{name}.svg|Icon=%{name}|g' data/%{name}.desktop.in.in
 
 
 %build
-%configure
+%configure \
+      --without-xtst \
 
 make %{?_smp_mflags} 
 
@@ -59,7 +62,7 @@ make %{?_smp_mflags} 
 %install
 rm -rf %{buildroot}
 
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
 make install DESTDIR=%{buildroot} INSTALL="install -p"
 
@@ -70,7 +73,6 @@ desktop-file-install \
         --dir=%{buildroot}%{_datadir}/applications \
         %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
-rm -rf %{buildroot}%{_datadir}/icons/
 mkdir -p %{buildroot}%{_datadir}/pixmaps/ 
 
 install -p -m 0644 data/%{name}.svg \
@@ -115,14 +117,20 @@ rm -rf %{buildroot}
 %doc AUTHORS ChangeLog COPYING COPYING-DOCS NEWS README 
 %{_datadir}/%{name}/
 %{_bindir}/%{name}
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/pixmaps/%{name}.svg
+%{_datadir}/applications/%{name}.*
 %{_datadir}/gnome/help/%{name}/
 %{_datadir}/omf/%{name}/
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
+%{_datadir}/pixmaps/%{name}.svg
 
 
 %changelog
+* Sat Jun 13 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.4.2-0.1
+- Update to an unofficial prerelease (upstream sent it via email)
+
+* Tue Jun 02 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.4.1-1
+- New upstream release
+
 * Mon Mar 23 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.4.0-1
 - New upstream release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/florence/F-10/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	23 Mar 2009 19:33:08 -0000	1.6
+++ import.log	13 Jun 2009 19:19:22 -0000	1.7
@@ -4,3 +4,4 @@ florence-0_3_0-2_fc10:F-10:florence-0.3.
 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
 florence-0_4_0-1_fc10:F-10:florence-0.4.0-1.fc10.src.rpm:1237836697
+florence-0_4_2-0_1_fc11:F-10:florence-0.4.2-0.1.fc11.src.rpm:1244920732


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/florence/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	23 Mar 2009 19:33:08 -0000	1.6
+++ sources	13 Jun 2009 19:19:22 -0000	1.7
@@ -1 +1 @@
-14b882e82752d313ec226db8dcc87ea0  florence-0.4.0.tar.bz2
+c2953d70f6c44bde8feb27cdd70a3356  florence-0.4.2.tar.bz2