rpms/ibus-table-cangjie/devel ibus-table-cangjie.spec,1.4,1.5

Caius Chance cchance at fedoraproject.org
Wed Jul 1 05:22:01 UTC 2009


Author: cchance

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

Modified Files:
	ibus-table-cangjie.spec 
Log Message:
- Fixed that change into table directory for index creation.
- Added owned directories in file section.
- Removed bootstrap.
- Updated package dependencies.



Index: ibus-table-cangjie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-cangjie/devel/ibus-table-cangjie.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ibus-table-cangjie.spec	18 May 2009 14:16:20 -0000	1.4
+++ ibus-table-cangjie.spec	1 Jul 2009 05:21:31 -0000	1.5
@@ -1,8 +1,6 @@
-%bcond_without bootstrap
-
 Name:       ibus-table-cangjie
 Version:    1.1.0.20090309
-Release:    9%{?dist}
+Release:    10%{?dist}
 Summary:    Cang Jie input methods for ibus-table
 License:    Public Domain and GPLv2+ 
 Group:      System Environment/Libraries
@@ -13,12 +11,10 @@ Source1:    COPYING.tables
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
 
-# for noarch pkgconfig
-BuildRequires: ibus-table >= 1.1.0.20090220-5
-%if %{with bootstrap}
-BuildRequires:  gettext-devel >= 0.17, automake >= 1.10.2
-%endif
-Requires(post):   ibus-table > 1.1.0
+Requires:         ibus >= 1.1.0.20090609, ibus-table >= 1.1.0.20090610
+Requires(post):   ibus >= 1.1.0.20090609, ibus-table >= 1.1.0.20090610
+BuildRequires:    ibus >= 1.1.0.20090609, ibus-table >= 1.1.0.20090610
+BuildRequires:    gettext-devel >= 0.17, automake >= 1.10.1
 
 %description
 The package contains Cang Jie input methods for Table engine of IBus platform. 
@@ -29,45 +25,51 @@ The package contains Cang Jie input meth
 %__cp %{SOURCE1} tables/COPYING.tables
 
 %build
-export IBUS_TABLE_CREATEDB="%{_bindir}/ibus-table-createdb --no-create-index"
-%if %{with bootstrap}
+export IBUS_TABLE_CREATEDB="%{_bindir}/ibus-table-createdb -o"
 ./autogen.sh \
     --prefix=%{_prefix} \
-%else
-%configure \
-%endif
     --enable-cangjie5 \
     --enable-cangjie3 \
     --enable-quick5 \
     --enable-quick3
-make %{?_smp_mflags}
+%__make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-make DESTDIR=%{buildroot} NO_INDEX=true install INSTALL="install -p"
+%__rm -rf %{buildroot}
+make DESTDIR=%{buildroot} NO_INDEX=true INSTALL="install -p" install
 
 %clean
-rm -rf %{buildroot}
+%__rm -rf %{buildroot}
 
 %post
-%{_bindir}/ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/cangjie3.db
-%{_bindir}/ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/cangjie5.db
-%{_bindir}/ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/quick3.db
-%{_bindir}/ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/quick5.db
+cd %{_datadir}/ibus-table/tables/
+%{_bindir}/ibus-table-createdb -i -n cangjie3.db
+%{_bindir}/ibus-table-createdb -i -n cangjie5.db
+%{_bindir}/ibus-table-createdb -i -n quick3.db
+%{_bindir}/ibus-table-createdb -i -n quick5.db
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS icons/COPYING.icons tables/COPYING.tables README
-%{_datadir}/ibus-table/tables/cangjie3.db
-%{_datadir}/ibus-table/tables/cangjie5.db
-%{_datadir}/ibus-table/tables/quick3.db
-%{_datadir}/ibus-table/tables/quick5.db
+%dir %{_datadir}/ibus-table
+%dir %{_datadir}/ibus-table/icons
+%dir %{_datadir}/ibus-table/tables
+%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/cangjie3.db
+%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/cangjie5.db
+%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/quick3.db
+%verify(not md5 size mtime) %{_datadir}/ibus-table/tables/quick5.db
 %{_datadir}/ibus-table/icons/cangjie3.svg
 %{_datadir}/ibus-table/icons/cangjie5.svg
 %{_datadir}/ibus-table/icons/quick3.png
 %{_datadir}/ibus-table/icons/quick5.png
 
 %changelog
+* Wed Jul 01 2009 Caius 'kaio' Chance <k AT kaio.me> - 1.1.0.20090309-10.fc12
+- Fixed that change into table directory for index creation.
+- Added owned directories in file section.
+- Removed bootstrap.
+- Updated package dependencies.
+
 * Mon May 18 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090309-9.fc12
 - Rebuilt with no index during install, index creation during post-install.
 




More information about the fedora-extras-commits mailing list