rpms/florence/F-9 .cvsignore, 1.4, 1.5 florence.spec, 1.4, 1.5 import.log, 1.4, 1.5 sources, 1.4, 1.5

[Simon Wesp]

Author: cassmodiah

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/florence/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Feb 2009 22:00:53 -0000	1.4
+++ .cvsignore	23 Mar 2009 19:34:47 -0000	1.5
@@ -1 +1 @@
-florence-0.3.3.tar.bz2
+florence-0.4.0.tar.bz2


Index: florence.spec
===================================================================
RCS file: /cvs/pkgs/rpms/florence/F-9/florence.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- florence.spec	23 Feb 2009 22:00:53 -0000	1.4
+++ florence.spec	23 Mar 2009 19:34:47 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           florence
-Version:        0.3.3
+Version:        0.4.0
 Release:        1%{?dist}
 Summary:        Extensible scalable on-screen virtual keyboard for GNOME 
 
@@ -47,7 +47,7 @@
 rm -f gconf-refresh
 ln -sf /bin/true gconf-refresh
 
-sed -i 's|Icon=florence.svg|Icon=florence|g' data/florence.desktop.in
+sed -i 's|Icon=%{name}.svg|Icon=%{name}|g' data/%{name}.desktop.in
 
 
 %build
@@ -57,23 +57,24 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=%{buildroot} INSTALL="install -p"
 
 desktop-file-install \
         --delete-original \
         --remove-category="Application" \
         --add-category="Utility" \
-        --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-        $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
+        --dir=%{buildroot}%{_datadir}/applications \
+        %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps 
+rm -rf %{buildroot}%{_datadir}/icons/
+mkdir -p %{buildroot}%{_datadir}/pixmaps/ 
 
 install -p -m 0644 data/%{name}.svg \
-    $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.svg
+    %{buildroot}%{_datadir}/pixmaps/%{name}.svg
 
 %find_lang %{name}
 
@@ -106,7 +107,7 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files -f %{name}.lang
@@ -115,7 +116,6 @@
 %{_datadir}/%{name}/
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/%{name}.svg
 %{_datadir}/pixmaps/%{name}.svg
 %{_datadir}/gnome/help/%{name}/
 %{_datadir}/omf/%{name}/
@@ -123,6 +123,9 @@
 
 
 %changelog
+* Mon Mar 23 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.4.0-1
+- New upstream release
+
 * Sun Feb 22 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.3.3-1
 - New upstream release
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/florence/F-9/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	23 Feb 2009 22:00:53 -0000	1.4
+++ import.log	23 Mar 2009 19:34:47 -0000	1.5
@@ -2,3 +2,4 @@
 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
+florence-0_4_0-1_fc10:F-9:florence-0.4.0-1.fc10.src.rpm:1237836822


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/florence/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Feb 2009 22:00:53 -0000	1.4
+++ sources	23 Mar 2009 19:34:47 -0000	1.5
@@ -1 +1 @@
-444b9f5b59ed7d0d93896f6867cc51d8  florence-0.3.3.tar.bz2
+14b882e82752d313ec226db8dcc87ea0  florence-0.4.0.tar.bz2