rpms/input-pad/F-13 .cvsignore, 1.3, 1.4 input-pad.spec, 1.2, 1.3 sources, 1.3, 1.4

[Takao Fujiwara]

Author: fujiwara

Update of /cvs/pkgs/rpms/input-pad/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16227

Modified Files:
	.cvsignore input-pad.spec sources 
Log Message:

Bumped to 0.1.0.20100630



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/input-pad/F-13/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	22 Jun 2010 06:14:12 -0000	1.3
+++ .cvsignore	30 Jun 2010 07:37:28 -0000	1.4
@@ -1 +1 @@
-input-pad-0.1.0.20100622.tar.gz
+input-pad-0.1.0.20100630.tar.gz


Index: input-pad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/input-pad/F-13/input-pad.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- input-pad.spec	22 Jun 2010 06:14:13 -0000	1.2
+++ input-pad.spec	30 Jun 2010 07:37:29 -0000	1.3
@@ -1,5 +1,7 @@
 %define have_python_devel 1
 %define have_xtest_devel  1
+# Not integrated yet
+%define have_eek_devel    0
 
 %if %have_python_devel
   %if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
@@ -11,8 +13,14 @@
 %define libxklavier_version     4.0
 %define libxml2_version         2.0
 
+%define libinput_paddir %{_libdir}/%{name}-%sub_version
+%define moduledir       %{_libdir}/%{name}-%sub_version/modules
+%define kbduidir        %{_libdir}/%{name}-%sub_version/modules/kbdui
+%define xkeysenddir     %{_libdir}/%{name}-%sub_version/modules/xkeysend
+
+
 Name:       input-pad
-Version:    0.1.0.20100622
+Version:    0.1.0.20100630
 Release:    1%{?dist}
 Summary:    On-screen Input Pad to Send Characters with Mouse
 License:    LGPLv2+
@@ -37,6 +45,9 @@ BuildRequires:  libXtst-devel
 BuildRequires:  python2-devel
 BuildRequires:  swig
 %endif
+%if %have_eek_devel
+BuildRequires:  eekboard-devel
+%endif
 
 %description
 The input pad is a tool to send a character on button to text applications.
@@ -66,25 +77,56 @@ Group:      System Environment/Libraries
 Requires:   %{name} = %{version}-%{release}
 
 %description xtest
-The input-pad-python package contains XTEST extension module
+The input-pad-xtest package contains XTEST extension module
+%endif
+
+%if %have_eek_devel
+%package eek
+Summary:    Input Pad with eekboard extension
+Group:      System Environment/Libraries
+Requires:   %{name} = %{version}-%{release}
+
+%description eek
+The input-pad-eek package contains eekboard extension module
 %endif
 
 %prep
 %setup -q
 
 %build
-%configure --disable-static
+%configure \
+%if ! %have_python_devel
+    --disable-python            \
+%endif
+%if %have_eek_devel
+    --enable-eek                \
+%endif
+%if %have_xtest_devel
+    --enable-xtest              \
+%endif
+    --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
+if [ ! -d $RPM_BUILD_ROOT%kbduidir ] ; then
+    mkdir -p $RPM_BUILD_ROOT%kbduidir
+fi
+if [ ! -d $RPM_BUILD_ROOT%xkeysenddir ] ; then
+    mkdir -p $RPM_BUILD_ROOT%xkeysenddir
+fi
+
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 %if %have_xtest_devel
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}-%sub_version/modules/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}-%sub_version/modules/*.a
+rm -f $RPM_BUILD_ROOT%xkeysenddir/*.la
+rm -f $RPM_BUILD_ROOT%xkeysenddir/*.a
+%endif
+%if %have_eek_devel
+rm -f $RPM_BUILD_ROOT%kbduidir/*.la
+rm -f $RPM_BUILD_ROOT%kbduidir/*.a
 %endif
 %if %have_python_devel
 rm -f $RPM_BUILD_ROOT%python_sitearch/%{name}-%sub_version/*.la
@@ -104,8 +146,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %{_bindir}/input-pad
-%dir %{_libdir}/%{name}-%sub_version
-%dir %{_libdir}/%{name}-%sub_version/modules
+%dir %libinput_paddir
+%dir %moduledir
+%dir %xkeysenddir
+%dir %kbduidir
 %{_libdir}/libinput-pad.so.*
 %{_datadir}/%name
 %{_datadir}/pixmaps/input-pad.png
@@ -126,10 +170,19 @@ rm -rf $RPM_BUILD_ROOT
 %if %have_xtest_devel
 %files xtest
 %defattr(-,root,root,-)
-%{_libdir}/%{name}-%sub_version/modules/libinput-pad-xtest-gdk.so
+%xkeysenddir/libinput-pad-xtest-gdk.so
+%endif
+
+%if %have_eek_devel
+%files eek
+%defattr(-,root,root,-)
+%kbduidir/libinput-pad-eek-gtk.so
 %endif
 
 %changelog
+* Tue Jun 29 2010 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 0.1.0.20100630-1
+- Bumped to 0.1.0.20100630
+
 * Tue Jun 22 2010 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 0.1.0.20100622-1
 - Bumped to 0.1.0.20100622
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/input-pad/F-13/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Jun 2010 06:14:13 -0000	1.3
+++ sources	30 Jun 2010 07:37:29 -0000	1.4
@@ -1 +1 @@
-fd1972db19179088a70accd85c9c48ac  input-pad-0.1.0.20100622.tar.gz
+4abdd2c50f00ed07fab1ed569768e860  input-pad-0.1.0.20100630.tar.gz