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

[Takao Fujiwara]

Author: fujiwara

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

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

Bumped to 0.1.0.20100630



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/input-pad/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	29 Jun 2010 07:06:59 -0000	1.6
+++ .cvsignore	30 Jun 2010 06:58:09 -0000	1.7
@@ -1 +1 @@
-input-pad-0.1.0.20100629.tar.gz
+input-pad-0.1.0.20100630.tar.gz


Index: input-pad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/input-pad/devel/input-pad.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- input-pad.spec	29 Jun 2010 07:16:17 -0000	1.6
+++ input-pad.spec	30 Jun 2010 06:58:09 -0000	1.7
@@ -13,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.20100629
+Version:    0.1.0.20100630
 Release:    2%{?dist}
 Summary:    On-screen Input Pad to Send Characters with Mouse
 License:    LGPLv2+
@@ -89,8 +95,14 @@ The input-pad-eek package contains eekbo
 
 %build
 %configure \
+%if ! %have_python_devel
+    --disable-python            \
+%endif
 %if %have_eek_devel
-    --enable-eek \
+    --enable-eek                \
+%endif
+%if %have_xtest_devel
+    --enable-xtest              \
 %endif
     --disable-static
 make %{?_smp_mflags}
@@ -99,22 +111,27 @@ make %{?_smp_mflags}
 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/xkeysend/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}-%sub_version/modules/xkeysend/*.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
 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
-%else
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}-%sub_version/modules/kbdui
-%endif
 
 %find_lang %{name}
 
@@ -129,10 +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 %{_libdir}/%{name}-%sub_version/modules/xkeysend
-%dir %{_libdir}/%{name}-%sub_version/modules/kbdui
+%dir %libinput_paddir
+%dir %moduledir
+%dir %xkeysenddir
+%dir %kbduidir
 %{_libdir}/libinput-pad.so.*
 %{_datadir}/%name
 %{_datadir}/pixmaps/input-pad.png
@@ -153,21 +170,18 @@ rm -rf $RPM_BUILD_ROOT
 %if %have_xtest_devel
 %files xtest
 %defattr(-,root,root,-)
-%{_libdir}/%{name}-%sub_version/modules/xkeysend/libinput-pad-xtest-gdk.so
+%xkeysenddir/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
+%kbduidir/libinput-pad-eek-gtk.so
 %endif
 
 %changelog
-* Tue Jun 29 2010 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 0.1.0.20100629-2
-- Fixed typo
-
-* Tue Jun 29 2010 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 0.1.0.20100629-1
-- Bumped to 0.1.0.20100629
+* 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/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	29 Jun 2010 07:06:59 -0000	1.6
+++ sources	30 Jun 2010 06:58:09 -0000	1.7
@@ -1 +1 @@
-4758b65e320ac546cf59fa1246abab52  input-pad-0.1.0.20100629.tar.gz
+4abdd2c50f00ed07fab1ed569768e860  input-pad-0.1.0.20100630.tar.gz