rpms/input-pad/devel .cvsignore, 1.5, 1.6 input-pad.spec, 1.4, 1.5 sources, 1.5, 1.6

[Takao Fujiwara]

Author: fujiwara

Update of /cvs/pkgs/rpms/input-pad/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9789

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

Bumped to 0.1.0.20100629



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/input-pad/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	23 Jun 2010 04:39:40 -0000	1.5
+++ .cvsignore	29 Jun 2010 07:06:59 -0000	1.6
@@ -1 +1 @@
-input-pad-0.1.0.20100623.tar.gz
+input-pad-0.1.0.20100629.tar.gz


Index: input-pad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/input-pad/devel/input-pad.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- input-pad.spec	23 Jun 2010 04:39:40 -0000	1.4
+++ input-pad.spec	29 Jun 2010 07:06:59 -0000	1.5
@@ -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)
@@ -12,7 +14,7 @@
 %define libxml2_version         2.0
 
 Name:       input-pad
-Version:    0.1.0.20100623
+Version:    0.1.0.20100629
 Release:    1%{?dist}
 Summary:    On-screen Input Pad to Send Characters with Mouse
 License:    LGPLv2+
@@ -37,6 +39,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,14 +71,28 @@ 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_eek_devel
+    --enable-eek \
+%endif
+    --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -83,13 +102,17 @@ make install DESTDIR=$RPM_BUILD_ROOT INS
 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%{_libdir}/%{name}-%sub_version/modules/xkeysend/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}-%sub_version/modules/xkeysend/*.a
 %endif
 %if %have_python_devel
 rm -f $RPM_BUILD_ROOT%python_sitearch/%{name}-%sub_version/*.la
 rm -f $RPM_BUILD_ROOT%python_sitearch/%{name}-%sub_version/*.a
 %endif
+%if %have_eek_devel
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}-%sub_version/modules/kbdui/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}-%sub_version/modules/kbdui/*.a
+%endif
 
 %find_lang %{name}
 
@@ -106,6 +129,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/input-pad
 %dir %{_libdir}/%{name}-%sub_version
 %dir %{_libdir}/%{name}-%sub_version/modules
+%dir %{_libdir}/%{name}-%sub_version/modules/xkeysend
+%dir %{_libdir}/%{name}-%sub_version/modules/kbdui
 %{_libdir}/libinput-pad.so.*
 %{_datadir}/%name
 %{_datadir}/pixmaps/input-pad.png
@@ -126,18 +151,21 @@ rm -rf $RPM_BUILD_ROOT
 %if %have_xtest_devel
 %files xtest
 %defattr(-,root,root,-)
-%{_libdir}/%{name}-%sub_version/modules/libinput-pad-xtest-gdk.so
+%{_libdir}/%{name}-%sub_version/modules/xkeysend/libinput-pad-xtest-gdk.so
+%endif
+
+%if %have_eek_devel
+%files eek
+%defattr(-,root,root,-)
+%{_libdir}/%{name}-%sub_version/modules/kbdui/libinput-pad-eek-gtk.so
 %endif
 
 %changelog
-* Wed Jun 23 2010 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 0.1.0.20100623-1
-- Fixed main loop.
+* Tue Jun 29 2010 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 0.1.0.20100629-1
+- Bumped to 0.1.0.20100629
 
 * Tue Jun 22 2010 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 0.1.0.20100622-1
 - Bumped to 0.1.0.20100622
 
-* Tue Jun 15 2010 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 0.1.0.20100615-1
-- Replaced s/input_pad_window_new_with_paddir/input_pad_window_set_paddir/
-
 * Mon Jun 14 2010 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 0.1.0.20100614-1
 - Initial Implementation. Bug 599316


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/input-pad/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	23 Jun 2010 04:39:40 -0000	1.5
+++ sources	29 Jun 2010 07:06:59 -0000	1.6
@@ -1 +1 @@
-465cae236641bce6926324dc69e52fbe  input-pad-0.1.0.20100623.tar.gz
+4758b65e320ac546cf59fa1246abab52  input-pad-0.1.0.20100629.tar.gz