rpms/libtabe/devel libtabe-db4.1.patch, NONE, 1.1 libtabe-db4.3.patch, NONE, 1.1 libtabe.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Bill Nottingham (notting) fedora-extras-commits at redhat.com
Fri May 27 02:59:33 UTC 2005


Author: notting

Update of /cvs/extras/rpms/libtabe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3340/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libtabe-db4.1.patch libtabe-db4.3.patch libtabe.spec 
Log Message:
auto-import libtabe-0.2.6-13 on branch devel from libtabe-0.2.6-13.src.rpm

libtabe-db4.1.patch:

--- NEW FILE libtabe-db4.1.patch ---
diff -uNr libtabe/src/tabe_tsidbint.c libtabe.mod/src/tabe_tsidbint.c
--- libtabe/src/tabe_tsidbint.c	2001-12-08 01:20:05.000000000 +1000
+++ libtabe.mod/src/tabe_tsidbint.c	2003-06-05 12:05:24.000000000 +1000
@@ -85,7 +85,7 @@
 #ifndef HAVE_DB3
       errno = db_open(db_name, DB_BTREE, DB_CREATE, 0644, NULL, NULL, &dbp);
 #else
-      errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_CREATE, 0644);
+      errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_CREATE, 0644);
 #endif
     }
   }
@@ -94,14 +94,14 @@
 #ifndef HAVE_DB3
       errno = db_open(db_name, DB_BTREE, DB_RDONLY, 0444, NULL, NULL, &dbp);
 #else
-      errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);
+      errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);
 #endif
     }
     else {
 #ifndef HAVE_DB3
       errno = db_open(db_name, DB_BTREE, 0, 0644, NULL, NULL, &dbp);
 #else
-      errno = dbp->open(dbp, db_name, NULL, DB_BTREE, 0, 0644);
+      errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, 0, 0644);
 #endif
     }
   }
diff -uNr libtabe/src/tabe_tsiyindbint.c libtabe.mod/src/tabe_tsiyindbint.c
--- libtabe/src/tabe_tsiyindbint.c	2001-12-08 01:20:05.000000000 +1000
+++ libtabe.mod/src/tabe_tsiyindbint.c	2003-06-05 12:05:49.000000000 +1000
@@ -88,7 +88,7 @@
 #ifndef HAVE_DB3
       errno = db_open(db_name, DB_BTREE, DB_CREATE, 0644, NULL, NULL, &dbp);
 #else
-      errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_CREATE, 0644);
+      errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_CREATE, 0644);
 #endif
     }
   }
@@ -97,14 +97,14 @@
 #ifndef HAVE_DB3
       errno = db_open(db_name, DB_BTREE, DB_RDONLY, 0444, NULL, NULL, &dbp);
 #else
-      errno = dbp->open(dbp, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);
+      errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, DB_RDONLY, 0444);
 #endif
     }
     else {
 #ifndef HAVE_DB3
       errno = db_open(db_name, DB_BTREE, 0, 0644, NULL, NULL, &dbp);
 #else
-      errno = dbp->open(dbp, db_name, NULL, DB_BTREE, 0, 0644);
+      errno = dbp->open(dbp, NULL, db_name, NULL, DB_BTREE, 0, 0644);
 #endif
     }
   }

libtabe-db4.3.patch:

--- NEW FILE libtabe-db4.3.patch ---
diff -uNr libtabe.orig/src/tabe_tsidbint.c libtabe/src/tabe_tsidbint.c
--- libtabe.orig/src/tabe_tsidbint.c	2004-11-14 06:09:24.183773000 +1000
+++ libtabe/src/tabe_tsidbint.c	2004-11-14 06:09:58.692526912 +1000
@@ -268,7 +268,7 @@
 #ifdef HAVE_DB3_STAT3
     errno = dbp->stat(dbp, &sp, 0);
 #else
-    errno = dbp->stat(dbp, &sp, NULL, 0);
+    errno = dbp->stat(dbp, NULL, &sp, 0);
 #endif
     if (!errno) {
 #ifndef HAVE_DB3
diff -uNr libtabe.orig/src/tabe_tsiyindbint.c libtabe/src/tabe_tsiyindbint.c
--- libtabe.orig/src/tabe_tsiyindbint.c	2004-11-14 06:09:24.185772000 +1000
+++ libtabe/src/tabe_tsiyindbint.c	2004-11-14 06:10:15.002047488 +1000
@@ -271,7 +271,7 @@
 #ifdef HAVE_DB3_STAT3
     errno = dbp->stat(dbp, &sp, 0);
 #else
-    errno = dbp->stat(dbp, &sp, NULL, 0);
+    errno = dbp->stat(dbp, NULL, &sp, 0);
 #endif
     if (!errno) {
 #ifndef HAVE_DB3


--- NEW FILE libtabe.spec ---
Summary: Chinese lexicons library for xcin-2.5.3
Name: libtabe
Version: 0.2.6
Release: 13
License: Redistributable
Group: User Interface/X
Source0: ftp://xcin.linux.org.tw/pub/xcin/libtabe/devel/%{name}-%{version}.tar.gz 
Source1: libtabe-ia64-tsi.db
Source2: libtabe-ia64-yin.db
#DB4.1
Patch0: libtabe-db4.1.patch
#DB4.3
Patch1: libtabe-db4.3.patch
URL: http://libtabe.sourceforge.net/
Buildroot: %{_tmppath}/%{name}-root
Requires: db4 >= 4.1
BuildRequires: db4-devel
BuildRequires: xorg-x11-devel
Obsoletes: libtabe-tsi

%description
Chinese lexicons library for xcin-2.5's bimsphone input method.

%package devel
Summary: Header files and libraries for developing apps which will use libtabe
Group: Development/Libraries
Requires: %{name} = %{version}

%description devel
Chinese lexicons library for xcin-2.5's bimsphone input method.

%prep
%setup -q -n libtabe
%patch -p1 -b .db41
%patch1 -p1 -b .db43

%build
%ifarch ia64 alpha s390 s390x
cp /usr/share/libtool/config.sub $RPM_BUILD_DIR/libtabe/script
cp /usr/share/libtool/config.guess $RPM_BUILD_DIR/libtabe/script
%endif
CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
%configure --enable-shared --datadir=%{_libdir}/libtabe
make
%ifarch ia64
cp %{SOURCE1} $RPM_BUILD_DIR/libtabe/src/tsi-src/tsi.db
cp %{SOURCE2} $RPM_BUILD_DIR/libtabe/src/tsi-src/yin.db
%endif

%install
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT

%makeinstall datadir=$RPM_BUILD_ROOT/%{_libdir}/libtabe

# make link so that xcin-2.5 can use yin.db and tsi.db
mkdir -p $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/X11/xcin/tab/big5
ln -sf ../../../../../../%{_lib}/libtabe/tsi.db \
	$RPM_BUILD_ROOT/usr/X11R6/%{_lib}/X11/xcin/tab/big5/tsi.db
ln -sf ../../../../../../%{_lib}/libtabe/yin.db \
	$RPM_BUILD_ROOT/usr/X11R6/%{_lib}/X11/xcin/tab/big5/yin.db
mkdir -p $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/X11/xcin/tab/utf-8
ln -sf ../../../../../../%{_lib}/libtabe/tsi.db \
	$RPM_BUILD_ROOT/usr/X11R6/%{_lib}/X11/xcin/tab/utf-8/tsi.db
ln -sf ../../../../../../%{_lib}/libtabe/yin.db \
	$RPM_BUILD_ROOT/usr/X11R6/%{_lib}/X11/xcin/tab/utf-8/yin.db

# remove unpackaged files from the buildroot
rm -f $RPM_BUILD_ROOT%{_libdir}/{libbims.la,libtabe.la}
%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
%doc COPYING  doc/libtabe.sgml
%{_libdir}/libtabe
%{_libdir}/*.so.*
%{_bindir}/*
%dir /usr/X11R6/%{_lib}/X11/xcin/tab/big5/
%dir /usr/X11R6/%{_lib}/X11/xcin/tab/utf-8/
/usr/X11R6/%{_lib}/X11/xcin/tab/big5/yin.db
/usr/X11R6/%{_lib}/X11/xcin/tab/big5/tsi.db
/usr/X11R6/%{_lib}/X11/xcin/tab/utf-8/yin.db
/usr/X11R6/%{_lib}/X11/xcin/tab/utf-8/tsi.db
%files devel
%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/*.a

%clean 
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT

%changelog
* Thu Mar 17 2005 Leon Ho <llch at redhat.com>
- rebuilt

* Sat Nov 13 2004 Leon Ho <llch at redhat.com>
- fix db->stat() for db4 4.3
- rebuilt for db4-4.3

* Mon Nov 01 2004 Leon Ho <llch at redhat.com>
- add ownership on /usr/X11R6/%{_lib}/X11/xcin/tab/{big5,utf-8}

* Mon Nov 01 2004 Leon Ho <llch at redhat.com>
- add BuildRequires: xorg-x11-devel

* Wed Oct 13 2004 Leon Ho <llch at redhat.com>
- moved /usr/share/tabe/* to %{_libdir}/libtabe for multilib

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu Oct 23 2003 Leon Ho <llch at redhat.com>
- fixes for utf-8

* Wed Jun 05 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu Jun 05 2003 Leon Ho <llch at redhat.com>
- fix two sources for compiling in db 4.1

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Wed Nov 27 2002 Tim Powers <timp at redhat.com> 0.2.6-2
- removed unpackaged files from the buildroot
- lib64'ize

* Mon Jul 22 2002 Leon Ho <llch at redhat.com> 
- 0.2.6

* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Wed May 27 2002 Leon Ho <llch at redhat.com> 
- fixes for new toolchains

* Wed Apr 03 2002 Leon Ho <llch at redhat.com> 
- correct the path for xcin db

* Tue Mar 26 2002 Nalin Dahyabhai <nalin at redhat.com> 0.2.4a-9
- move buildroot to be below %%{_tmppath}
- rebuild in new environment
- use FHS macros

* Wed Mar 06 2002 Leon Ho <llch at redhat.com>
- fixes the writable

* Tue Feb 26 2002 Leon Ho <llch at redhat.com>
- rebuild to Hampton

* Tue Jan 29 2002 Leon Ho <llch at redhat.com>
- fix db4 incompat.
- build against new set of tools

* Tue Nov 27 2001 Leon Ho <llch at redhat.com>
- build against 7.2-tcsc

* Tue Oct 29 2001 Chung-Yen Chang <candyz at linux.org.tw>
- update to 0.2.4a

* Sat Oct 20 2001 Yukihiro Nakai <ynakai at redhat.com>
- db2 is fixed for ia64, so now we can use ia64 native database.

* Wed Jun 27 2001 Florian La Roche <Florian.LaRoche at redhat.de>
- add s390,s390x

* Tue Jun 26 2001 Yukihiro Nakai <ynakai at redhat.com>
- Add Requires line

* Tue Jun 19 2001 Yukihiro Nakai <ynakai at redhat.com>
- Support for Alpha

* Mon Jun 18 2001 Yukihiro Nakai <ynakai at redhat.com>
- Add ia64 fix

* Sun Dec 17 2000 Jason Wilson <jwilson at redhat.com>
- Fixed release tag

* Sat Dec 17 2000 David Joo <djoo at redht.com>
- Added %post and %postun script
- Changed Group

* Tue Dec 05 2000 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 0.2
- add tsiadd.c-1203 patch
- Add URL Requires BuildRequires
- split packages

* Mon Oct 30 2000 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 0.1.9

* Mon Oct 16 2000 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 0.1.8

* Sun Oct 08 2000 Chung-Yen Chang <candyz at cle.linux.org.tw>
- update to 0.1.7

* Mon Sep 04 2000 Chung-Yen Chang <candyz at cle.linux.org.tw>
- change xcin tab dir

* Fri Apr 21 2000 Andrew Lee <andrew at cle.linux.org.tw>
- rebuild for redhat-6.2
- change xcin directory to /usr/X11R6/lib/X11/xcin/

* Tue Feb 29 2000 Chih-Wei Huang <cwhuang at linux.org.tw>
- 0.1-2

* Fri Feb 18 2000 Andrew Lee <andrew at cle.linux.org.tw>
- 0.1_0.1-1.diff

* Sat Feb 12 2000 Andrew Lee <andrew at cle.linux.org.tw>
- libtabe-0.1-20000209.diff thanks to jouston <jouston at i18n.linux.org.tw>

* Tue Feb 09 2000 Andrew Lee <andrew at cle.linux.org.tw>
- libtabe-0.1-20000208.diff

* Thu Feb 04 2000 Andrew Lee <andrew at cle.linux.org.tw>
- add libtabe.diff.20000202

* Tue Jan 25 2000 Andrew Lee <andrew at cle.linux.org.tw>
- add bimsphone module patch

* Mon Jan 24 2000 Andrew Lee <andrew at cle.linux.org.tw>
- update libtabe-0.1

* Wed Dec 15 1999 Andrew Lee <andrew at cle.linux.org.tw>
- update libtabe-0.1-pre8

* Thu Nov 29 1999 Andrew Lee <andrew at cle.linux.org.tw>
- update libtabe-0.1-pre7

* Thu Nov 25 1999 Andrew Lee <andrew at cle.linux.org.tw>
- rebuild for Mandrake
- update libtabe-0.1-pre6

* Thu Aug 26 1999 Cheng Yuan-Cheng <platin at linux.org.tw>
- rebuild for libtabe-0.1-pre2
- a indepent package with tsiyin-src and tabe library..

* Sat Jun 19 1999 Cheng Yuan-Cheng <platin at cle.linux.org.tw>
- from libtabe-tsi-src.tar.gz for xcin-2.5.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtabe/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 May 2005 02:53:31 -0000	1.1
+++ .cvsignore	27 May 2005 02:59:30 -0000	1.2
@@ -0,0 +1,3 @@
+libtabe-0.2.6.tar.gz
+libtabe-ia64-tsi.db
+libtabe-ia64-yin.db


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtabe/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 May 2005 02:53:31 -0000	1.1
+++ sources	27 May 2005 02:59:30 -0000	1.2
@@ -0,0 +1,3 @@
+924814d598b1f02ecf596bf598363b1b  libtabe-0.2.6.tar.gz
+684e9a18f7425b14a196a36e0aacf8d8  libtabe-ia64-tsi.db
+2878509d39f8a699bb45d06e90a2bba8  libtabe-ia64-yin.db




More information about the scm-commits mailing list