rpms/fvkbd/F-12 .cvsignore, 1.2, 1.3 fvkbd-fixdesktop.patch, 1.1, 1.2 fvkbd.spec, 1.3, 1.4 sources, 1.2, 1.3 workarea.patch, 1.1, NONE

[Peter Robinson]

Author: pbrobinson

Update of /cvs/pkgs/rpms/fvkbd/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8889

Modified Files:
	.cvsignore fvkbd-fixdesktop.patch fvkbd.spec sources 
Removed Files:
	workarea.patch 
Log Message:
- Update to new 0.2.2 upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fvkbd/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Nov 2009 21:43:24 -0000	1.2
+++ .cvsignore	11 Jul 2010 09:41:43 -0000	1.3
@@ -1 +1 @@
-fvkbd-0.1.6.tar.bz2
+fvkbd-0.2.2.tar.bz2

fvkbd-fixdesktop.patch:
 fvkbd-gtk.desktop.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: fvkbd-fixdesktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/fvkbd/F-12/fvkbd-fixdesktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fvkbd-fixdesktop.patch	19 Nov 2009 21:47:32 -0000	1.1
+++ fvkbd-fixdesktop.patch	11 Jul 2010 09:41:44 -0000	1.2
@@ -1,11 +1,8 @@
---- fvkbd-0.1.6/app/gtk/fvkbd-gtk.desktop.in.orig	2009-11-15 09:59:11.000000000 +0000
-+++ fvkbd-0.1.6/app/gtk/fvkbd-gtk.desktop.in	2009-11-15 09:59:58.000000000 +0000
-@@ -1,8 +1,7 @@
- [Desktop Entry]
--Version=@VERSION@
--Name=keyboard
-+Name=Free Virtual Keyboard
- Comment=Free Virtual Keyboard
+--- fvkbd-0.2.2/app/gtk/fvkbd-gtk.desktop.in.orig	2010-07-11 08:07:54.959627125 +0100
++++ fvkbd-0.2.2/app/gtk/fvkbd-gtk.desktop.in	2010-07-11 08:08:11.585309017 +0100
+@@ -3,6 +3,6 @@
+ _Name=Soft Keyboard
+ _Comment=A Flexible On Screen Virtual Keyboard
  Exec=fvkbd-gtk -l keyboard-s.xml
 -Categories=GTK;Application;Utility
 +Categories=GTK;Application;Utility;


Index: fvkbd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fvkbd/F-12/fvkbd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- fvkbd.spec	12 Jan 2010 09:23:50 -0000	1.3
+++ fvkbd.spec	11 Jul 2010 09:41:44 -0000	1.4
@@ -1,14 +1,20 @@
+# Tarfile created using git
+# git clone git://gitorious.org/fvkbd/fvkbd.git
+# git archive --format=tar --prefix=fvkbd-%{version}/ %{git_version} | bzip2 > %{name}-%{version}.tar.bz2
+%define git_version 348b3a9
+%define tarfile %{name}-%{version}.tar.bz2
+
 Name:          fvkbd
-Version:       0.1.6
-Release:       4%{?dist}
+Version:       0.2.2
+Release:       1%{?dist}
 Summary:       Free Virtual Keyboard
 
 Group:         System Environment/Libraries
 License:       LGPLv2
-URL:           http://www.moblin.org/
-Source0:       http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
+URL:           http://gitorious.org/fvkbd/pages/Home
+# vc           http://gitorious.org/fvkbd/fvkbd/commits/master
+Source0:       %{tarfile}
 Patch0:        fvkbd-fixdesktop.patch
-Patch1:        workarea.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: clutter-devel
@@ -37,8 +43,7 @@ Files for development with %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .fixdesktop
-%patch1 -p1 -b .workarea
+%patch0 -p1 -b .fixdesktop.patch
 
 # run autogen.sh until we have a proper release, but don't run configure twice.
 sed -i '/configure/d' autogen.sh
@@ -57,6 +62,8 @@ desktop-file-validate %{buildroot}/%{_da
 #Remove libtool archives.
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
+%find_lang %{name}
+
 %clean
 rm -rf %{buildroot}
 
@@ -64,22 +71,25 @@ rm -rf %{buildroot}
 
 %postun -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS
 %{_bindir}/fvkbd-gtk
-%{_libdir}/libfvkbd-0.1.so.*
-%{_libdir}/libfvkbd-gtk-0.1.so.*
+%{_libdir}/libfvkbd-0.2.so.*
+%{_libdir}/libfvkbd-gtk-0.2.so.*
 %{_datadir}/applications/fvkbd-gtk.desktop
 %{_datadir}/pixmaps/fvkbd-gtk.png
 %{_datadir}/fvkbd/
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/libfvkbd-0.1.so
-%{_libdir}/libfvkbd-gtk-0.1.so
+%{_libdir}/libfvkbd-0.2.so
+%{_libdir}/libfvkbd-gtk-0.2.so
 
 %changelog
+* Sun Jul 12 2010 Peter Robinson <pbrobinson at gmail.com> 0.2.2-1
+- Update to new 0.2.2 upstream release
+
 * Tue Jan 12 2010 Peter Robinson <pbrobinson at gmail.com> 0.1.6-4
 - Add patch to fix crash on x86_64 platforms
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fvkbd/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Nov 2009 21:43:24 -0000	1.2
+++ sources	11 Jul 2010 09:41:44 -0000	1.3
@@ -1 +1 @@
-fc35635582c84cf7a0f46865a5b80c50  fvkbd-0.1.6.tar.bz2
+56bb175c20d7f24e94cf66c78e150080  fvkbd-0.2.2.tar.bz2


--- workarea.patch DELETED ---