rpms/ibus-table-quick/devel .cvsignore, 1.2, 1.3 Makefile, 1.1, 1.2 ibus-table-quick.spec, 1.1, 1.2 sources, 1.2, 1.3

[cchance]

Author: cchance

Update of /cvs/pkgs/rpms/ibus-table-quick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2288

Modified Files:
	.cvsignore Makefile ibus-table-quick.spec sources 
Log Message:
Updated source with intro of Quick Classic table.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-quick/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Aug 2009 04:58:24 -0000	1.2
+++ .cvsignore	2 Sep 2009 05:12:05 -0000	1.3
@@ -1 +1 @@
-ibus-table-quick-1.2.0.20090720.tar.gz
+ibus-table-quick-1.2.0.20090902.tar.gz


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-quick/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	24 Jul 2009 19:17:23 -0000	1.1
+++ Makefile	2 Sep 2009 05:12:05 -0000	1.2
@@ -1,7 +1,7 @@
 # Makefile for source rpm: ibus-table-quick
 # $Id$
 NAME := ibus-table-quick
-SPECFILE = $(firstword $(wildcard *.spec))
+SPECFILE = ibus-table-quick.spec
 
 define find-makefile-common
 for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done


Index: ibus-table-quick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-quick/devel/ibus-table-quick.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ibus-table-quick.spec	7 Aug 2009 04:58:24 -0000	1.1
+++ ibus-table-quick.spec	2 Sep 2009 05:12:05 -0000	1.2
@@ -1,7 +1,13 @@
-Name:       ibus-table-quick
-Version:    1.2.0.20090720
-Release:    2%{?dist}
-Summary:    Quick input methods for ibus-table
+%define  fwname   ibus
+%define  engname  table
+%define  tabname  quick
+%define  appname  %{fwname}-%{engname}
+%define  appdir   %{_datadir}/%{appname}
+
+Name:       %{appname}-%{tabname}
+Version:    1.2.0.20090902
+Release:    1%{?dist}
+Summary:    %{tabname} table for %{appname}
 License:    Public Domain and GPLv2+ 
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
@@ -11,12 +17,12 @@ Source1:    COPYING.tables
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
 
-Requires:         ibus >= 1.2, ibus-table >= 1.2
-Requires(post):   ibus >= 1.2, ibus-table >= 1.2
-BuildRequires:    ibus >= 1.2, ibus-table >= 1.2
+Requires:         %{appname} >= 1.2, %{appname} >= 1.2
+Requires(post):   %{appname} >= 1.2, %{appname} >= 1.2
+BuildRequires:    %{appname} >= 1.2, %{appname} >= 1.2
 
 %description
-The package contains Quick input methods for Table engine of IBus platform. 
+The package contains %{tabname} table for %{appname}.
 
 %prep
 %setup -q
@@ -27,8 +33,9 @@ The package contains Quick input methods
 export IBUS_TABLE_CREATEDB="%{_bindir}/ibus-table-createdb -o"
 %configure \
     --prefix=%{_prefix} \
+    --enable-quick3 \
     --enable-quick5 \
-    --enable-quick3
+    --enable-quickclassic
 %__make %{?_smp_mflags}
 
 %install
@@ -39,23 +46,30 @@ make DESTDIR=%{buildroot} NO_INDEX=true 
 %__rm -rf %{buildroot}
 
 %post
-cd %{_datadir}/ibus-table/tables/
+cd %{_datadir}/%{appname}/tables/
 %{_bindir}/ibus-table-createdb -i -n quick3.db
 %{_bindir}/ibus-table-createdb -i -n quick5.db
+%{_bindir}/ibus-table-createdb -i -n quick-classic.db
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS icons/COPYING.icons tables/COPYING.tables README
-%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/quick5.db
-%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/quick3.db
-%{_datadir}/ibus-table/icons/quick5.png
-%{_datadir}/ibus-table/icons/quick3.png
+%{appdir}/tables/quick3.db
+%{appdir}/tables/quick5.db
+%{appdir}/tables/quick-classic.db
+%{appdir}/icons/quick3.png
+%{appdir}/icons/quick5.png
+%{appdir}/icons/quick-classic.png
 
 %changelog
-* Wed Jul 22 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090720-2.fc12
+* Wed Sep 02 2009 Caius 'kaio' Chance <k at kaio.me> - 1.2.0.20090902-1.fc12
+- Updated source w/ intro of Quick Classic table.
+- Macro'ed .spec file.
+
+* Wed Jul 22 2009 Caius 'kaio' Chance <k at kaio.me> - 1.2.0.20090720-2.fc12
 - Removed unneccessary BuildRequires.
 - Removed unneccessary owned directories.
 - Changed autogen.sh to configure.
 
-* Mon Jul 20 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.2.0.20090720-1.fc12
+* Mon Jul 20 2009 Caius 'kaio' Chance <k at kaio.me> - 1.2.0.20090720-1.fc12
 - Separated from ibus-table-cangjie to ibus-table-quick.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-quick/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Aug 2009 04:58:24 -0000	1.2
+++ sources	2 Sep 2009 05:12:05 -0000	1.3
@@ -1 +1 @@
-12a8505b00bb976b914d7e9191049243  ibus-table-quick-1.2.0.20090720.tar.gz
+488c33d4ae2b35aa82764cb746fe4cb4  ibus-table-quick-1.2.0.20090902.tar.gz