rpms/anthy/FC-4 anthy-7900-fix-undef-non-weak-symbol.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 anthy.spec, 1.13, 1.14 sources, 1.8, 1.9

[Akira Tagoh (tagoh)]

Author: tagoh

Update of /cvs/extras/rpms/anthy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6933

Modified Files:
	.cvsignore anthy.spec sources 
Added Files:
	anthy-7900-fix-undef-non-weak-symbol.patch 
Log Message:
* Wed Jul 12 2006 Akira TAGOH <tagoh at redhat.com> - 7900-1
- New upstream release.
- anthy-7900-fix-undef-non-weak-symbol.patch: fixed the undefined non-weak
  symbols issue. (#198180)
- use make install DESTDIR=... instead of %%makeinstall.

anthy-7900-fix-undef-non-weak-symbol.patch:

--- NEW FILE anthy-7900-fix-undef-non-weak-symbol.patch ---
diff -ruN -x autom4te.cache -x '*a' -x '*o' -x 'config*' -x .libs -x .deps -x Makefile -x Makefile.in -x 'anthy*' -x '*elc' -x depgraph -x test anthy-7900.orig/src-main/Makefile.am anthy-7900/src-main/Makefile.am
--- anthy-7900.orig/src-main/Makefile.am	2006-05-13 18:29:05.000000000 +0900
+++ anthy-7900/src-main/Makefile.am	2006-07-12 09:50:52.000000000 +0900
@@ -4,7 +4,7 @@
 
 lib_LTLIBRARIES = libanthy.la
 
-libanthy_la_LIBADD = ../src-splitter/libsplit.la ../src-ordering/libordering.la -lm
+libanthy_la_LIBADD = ../src-splitter/libsplit.la ../src-ordering/libordering.la -lm ../src-diclib/libdiclib.la ../src-worddic/libanthydic.la
 libanthy_la_LDFLAGS = -version-info 1:0:1
 
 libanthy_la_SOURCES = \
diff -ruN -x autom4te.cache -x '*a' -x '*o' -x 'config*' -x .libs -x .deps -x Makefile -x Makefile.in -x 'anthy*' -x '*elc' -x depgraph -x test anthy-7900.orig/src-util/Makefile.am anthy-7900/src-util/Makefile.am
--- anthy-7900.orig/src-util/Makefile.am	2006-06-02 00:10:55.000000000 +0900
+++ anthy-7900/src-util/Makefile.am	2006-07-12 09:49:05.000000000 +0900
@@ -22,5 +22,6 @@
 lib_LTLIBRARIES = libanthyinput.la
 libanthyinput_la_SOURCES = input.c rkconv.c rkhelper.c\
  rkconv.h rkmap.h rkhelper.h
+libanthyinput_la_LIBADD = ../src-main/libanthy.la ../src-worddic/libanthydic.la
 
 pkgdata_DATA = typetab dic-tool-usage.txt


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/anthy/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	24 Apr 2006 01:36:02 -0000	1.8
+++ .cvsignore	12 Jul 2006 03:39:11 -0000	1.9
@@ -9,3 +9,4 @@
 anthy-7100b.tar.gz
 anthy_gcanna_ut-20051002.tar.bz2
 anthy-7500b.tar.gz
+anthy-7900.tar.gz


Index: anthy.spec
===================================================================
RCS file: /cvs/extras/rpms/anthy/FC-4/anthy.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- anthy.spec	24 Apr 2006 01:33:17 -0000	1.13
+++ anthy.spec	12 Jul 2006 03:39:11 -0000	1.14
@@ -1,18 +1,19 @@
-%define	version		7500b
 %define	gcanna_ver	20051002
 
 Name:		anthy
-Version:	%{version}
+Version:	7900
 Release:	1%{?dist}
 License:	GPL
 URL:		http://sourceforge.jp/projects/anthy/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	automake autoconf
 BuildRequires:	emacs xemacs
 
 Source0:	http://prdownloads.sourceforge.jp/anthy/9723/anthy-%{version}.tar.gz
 Source1:	anthy-init.el
 Source2:	http://www.geocities.jp/ep3797/snapshot/tmp/anthy_gcanna_ut-%{gcanna_ver}.tar.bz2
 Patch2:		anthy-gcanna-nakaguro.patch
+Patch3:		anthy-7900-fix-undef-non-weak-symbol.patch
 
 Summary:	Japanese character set input library
 Group:		System Environment/Libraries
@@ -53,16 +54,20 @@
 %prep
 %setup -q -a 2
 %patch2 -p1
+%patch3 -p1 -b .non-weak
+# need to regenerate Makefile for patch3
+automake
+autoconf
 
 %build
 %configure
 cp anthy_gcanna_ut-%{gcanna_ver}/gcanna.ctd cannadic/
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 ## for anthy-el
 %__mkdir_p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
@@ -111,6 +116,12 @@
 %{_datadir}/xemacs/site-packages/lisp/site-start.d/anthy-init.el
 
 %changelog
+* Wed Jul 12 2006 Akira TAGOH <tagoh at redhat.com> - 7900-1
+- New upstream release.
+- anthy-7900-fix-undef-non-weak-symbol.patch: fixed the undefined non-weak
+  symbols issue. (#198180)
+- use make install DESTDIR=... instead of %%makeinstall.
+
 * Mon Apr 24 2006 Akira TAGOH <tagoh at redhat.com> - 7500b-1
 - New upstream release.
 - anthy-gcanna-nakaguro.patch: added a word to dictionary to convert nakaguro to slash.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/anthy/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	24 Apr 2006 01:36:02 -0000	1.8
+++ sources	12 Jul 2006 03:39:11 -0000	1.9
@@ -1,2 +1,2 @@
 d0f6128b6e000e85764abbc030399db7  anthy_gcanna_ut-20051002.tar.bz2
-ed3ce5d4332751ee3f4befe843c8ebb8  anthy-7500b.tar.gz
+356467305997191acd353d1c7e4e5d92  anthy-7900.tar.gz