rpms/ibus-table/devel ibus-table-pkgconfig-noarch.patch, NONE, 1.1 ibus-table.spec, 1.14, 1.15 sources, 1.6, 1.7 ibus-table-0.1.1.20081014-4a.rhbz466430.patch, 1.1, NONE ibus-table-0.1.1.20081014-4b.rhbz466844.patch, 1.1, NONE

[Jens Petersen]

Author: petersen

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

Modified Files:
	ibus-table.spec sources 
Added Files:
	ibus-table-pkgconfig-noarch.patch 
Removed Files:
	ibus-table-0.1.1.20081014-4a.rhbz466430.patch 
	ibus-table-0.1.1.20081014-4b.rhbz466844.patch 
Log Message:
- make pkgconfig noarch with ibus-table-pkgconfig-noarch.patch
- fix license field: actually LGPL
- drop gettext-devel BR
- require ibus > 1.1.0



ibus-table-pkgconfig-noarch.patch:

--- NEW FILE ibus-table-pkgconfig-noarch.patch ---
diff -u ibus-table-1.1.0.20090220/ibus-table.pc.in\~ ibus-table-1.1.0.20090220/ibus-table.pc.in
--- ibus-table-1.1.0.20090220/ibus-table.pc.in~	2009-02-20 11:42:40.000000000 +1000
+++ ibus-table-1.1.0.20090220/ibus-table.pc.in	2009-03-06 11:45:18.001898774 +1000
@@ -1,6 +1,6 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@
+libdir=@datadir@
 datarootdir=@datarootdir@
 datadir=@datadir@
 

Diff finished.  Fri Mar  6 11:46:24 2009


Index: ibus-table.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/devel/ibus-table.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ibus-table.spec	4 Mar 2009 04:40:59 -0000	1.14
+++ ibus-table.spec	6 Mar 2009 02:07:54 -0000	1.15
@@ -1,19 +1,16 @@
 Name:       ibus-table
 Version:    1.1.0.20090220 
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    The Table engine for IBus platform
-License:    GPLv2+
+License:    LGPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
-
-BuildRequires:  gettext-devel
-BuildRequires:  ibus-devel
-
-Requires:   ibus
+BuildRequires:  ibus-devel > 1.1.0
+Requires:   ibus > 1.1.0
+Patch1:     ibus-table-pkgconfig-noarch.patch
 
 %description
 The package contains general Table engine for IBus platform.
@@ -27,17 +24,16 @@
 This package contains additional tables.
 
 %prep
-%setup -b0 -q
+%setup -q
+%patch1 -p1 -b .orig
 
 %build
-cd ../%{name}-%{version}
 %configure --disable-static --enable-additional
-
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=${RPM_BUILD_ROOT} NO_INDEX=true install
+make DESTDIR=${RPM_BUILD_ROOT} NO_INDEX=true install pkgconfigdir=%{_datadir}/pkgconfig
 
 %find_lang %{name}
 
@@ -57,7 +53,7 @@
 %dir %{_datadir}/%{name}/icons
 %dir %{_datadir}/%{name}/data
 %{_datadir}/ibus/component/table.xml
-%{_libdir}/pkgconfig/%{name}.pc
+%{_datadir}/pkgconfig/%{name}.pc
 %{_libexecdir}/ibus-engine-table
 %{_bindir}/%{name}-createdb
 %{_datadir}/%{name}/tables/template.txt
@@ -110,6 +106,12 @@
 %{_datadir}/%{name}/icons/latex.svg
 
 %changelog
+* Fri Mar  6 2009 Jens Petersen <petersen at redhat.com> - 1.1.0.20090220-5
+- make pkgconfig noarch with ibus-table-pkgconfig-noarch.patch
+- fix license field: actually LGPL
+- drop gettext-devel BR
+- require ibus > 1.1.0
+
 * Mon Mar 02 2009 Caius Chance <cchance at redhat.com> - 1.1.0.20090220-4.fc11
 - Rebuilt.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	4 Mar 2009 04:23:05 -0000	1.6
+++ sources	6 Mar 2009 02:07:54 -0000	1.7
@@ -1,2 +1 @@
-8c72c6ec97a0dcc822784e42ed6625c8  ibus-table-0.1.1.20081014.tar.gz
 8949db247404207879183915e04cf602  ibus-table-1.1.0.20090220.tar.gz


--- ibus-table-0.1.1.20081014-4a.rhbz466430.patch DELETED ---


--- ibus-table-0.1.1.20081014-4b.rhbz466844.patch DELETED ---