[xvkbd/f18: 2/2] New version.

[Christopher Meng]

commit 03664405203579bf9d0db6ef4ca799c4989507a3
Author: Christopher Meng <rpm at cicku.me>
Date:   Tue Jul 16 09:30:07 2013 +0800

    New version.

 .gitignore |    1 +
 sources    |    1 +
 xvkbd.spec |   62 ++++++++++++++++++++++++++---------------------------------
 3 files changed, 29 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 40de495..ff4d6f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 xvkbd-3.2.tar.gz
 /xvkbd-3.2.tar.gz
+/xvkbd-3.5.tar.gz
diff --git a/sources b/sources
index 6581395..965ac41 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 1bce8d6c27e6e7df92ec09b414f82dad  xvkbd-3.2.tar.gz
+f7344982d985be925c7a708110e20497  xvkbd-3.5.tar.gz
diff --git a/xvkbd.spec b/xvkbd.spec
index c85e8b4..dade150 100644
--- a/xvkbd.spec
+++ b/xvkbd.spec
@@ -1,23 +1,19 @@
-Summary:       Virtual Keyboard for X Window System
-Name:          xvkbd
-Version:       3.2
-Release:       7%{?dist}
-License:       GPLv2+
-Group:         User Interface/X
-Source0:       http://homepage3.nifty.com/tsato/xvkbd/%{name}-%{version}.tar.gz
-URL:           http://homepage3.nifty.com/tsato/xvkbd/index.html
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: desktop-file-utils
-BuildRequires: libX11-devel
-BuildRequires: Xaw3d-devel >= 1.5E-1
-BuildRequires: libXaw-devel
-BuildRequires: libXtst-devel
-BuildRequires: imake
-Source1:       %{name}.desktop
+Name:           xvkbd
+Version:        3.5
+Release:        1%{?dist}
+Summary:        Virtual Keyboard for X Window System
+License:        GPLv2+
+URL:            http://homepage3.nifty.com/tsato/xvkbd/index.html
+Source0:        http://homepage3.nifty.com/tsato/xvkbd/%{name}-%{version}.tar.gz
+BuildRequires:  desktop-file-utils
+BuildRequires:  imake
+BuildRequires:  libX11-devel
+BuildRequires:  libXaw-devel
+BuildRequires:  libXtst-devel
+BuildRequires:  Xaw3d-devel
+Source1:        %{name}.desktop
 # The following icon is licensed under CC BY-SA 3.0.
-Source2:       http://jaist.dl.sourceforge.jp/xvkbd-fedora/45742/%{name}.png
-Patch0:        %{name}-3.2-fix-warn.patch
-Patch1:        %{name}-3.2-fix-warn-64bit.patch
+Source2:        http://jaist.dl.sourceforge.jp/xvkbd-fedora/45742/%{name}.png
 
 %description
 xvkbd is a virtual (graphical) keyboard program for X Window System
@@ -29,32 +25,25 @@ characters specified as the command line option to another client.
 
 %prep
 %setup -q
-%patch0 -p1 -b .3.2-fix-warn
-%patch1 -p1 -b .3.2-fix-warn-64bit
 
 %build
 xmkmf -a
 # Installed "normal" files should have 0644 permission, not 0444 permission.
 # So I modify Makefile directly.
-%{__sed} -i.mode -e 's|-m 0444|-m 0644|' Makefile
-%{__make} CCOPTIONS="%{optflags}" %{?_smp_mflags}
+sed -i.mode -e 's|-m 0444|-m 0644|' Makefile
+make CCOPTIONS="%{optflags}" %{?_smp_mflags}
 
 %install
-%{__rm} -rf %{buildroot}
 # By default this installs some file under /usr/lib/X11/app-defaults,
 # even on 64 bit architecture. So I had to add "LIBDIR=%{_libdir}/X11".
-%{__make} LIBDIR=%{_libdir}/X11 DESTDIR=%{buildroot} INSTALLFLAGS="-c -p" \
+make LIBDIR=%{_libdir}/X11 DESTDIR=%{buildroot} INSTALLFLAGS="-c -p" \
           install install.man
-%{__rm} -rf %{buildroot}%{_libdir}/X11/app-defaults
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
-%{__install} -d -m 755 %{buildroot}%{_datadir}/pixmaps
-%{__install} -D -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/pixmaps
-
-%clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}%{_libdir}/X11/app-defaults
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{S:1}
+install -d -m 755 %{buildroot}%{_datadir}/pixmaps
+install -D -m 644 -p %{S:2} %{buildroot}%{_datadir}/pixmaps
 
 %files
-%defattr(-,root,root,-)
 %doc README
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
@@ -63,6 +52,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Mon Jul 15 2013 Christopher Meng <rpm at cicku.me> - 3.5-1
+- Update to 3.5.
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
@@ -81,7 +73,7 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 * Sat Aug 28 2010 Akio Idehara <zbe64533 at gmail.com> 3.2-2
 - Rebuild for F14
 
-* Thu May 18 2010 Akio Idehara <zbe64533 at gmail.com> 3.2-1
+* Tue May 18 2010 Akio Idehara <zbe64533 at gmail.com> 3.2-1
 - Update to 3.2
 
 * Sun Feb 28 2010 Akio Idehara <zbe64533 at gmail.com> 3.1-5
@@ -100,7 +92,7 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 * Wed Feb 3 2010 Akio Idehara <zbe64533 at gmail.com> 3.1-1
 - Update to 3.1
 
-* Sun Feb 1 2010 Akio Idehara <zbe64533 at gmail.com> 3.0-6
+* Mon Feb 1 2010 Akio Idehara <zbe64533 at gmail.com> 3.0-6
 - Change Icon size
 
 * Sun Jan 24 2010 Akio Idehara <zbe64533 at gmail.com> 3.0-5