Author: baggins Date: Fri Jul 15 12:36:44 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel 2 - fix build conflict with installed chasen-devel
---- Files affected: packages/mana: mana.spec (1.2 -> 1.3) , mana-chasen.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/mana/mana.spec diff -u packages/mana/mana.spec:1.2 packages/mana/mana.spec:1.3 --- packages/mana/mana.spec:1.2 Fri Jul 15 14:00:50 2011 +++ packages/mana/mana.spec Fri Jul 15 14:36:39 2011 @@ -11,13 +11,14 @@ #Summary(pl.UTF-8): - Name: mana Version: 0.2.1 -Release: 1 +Release: 2 License: GPL v2 Group: Applications Source0: http://dl.sourceforge.jp/shinji/20514/%{name}-%{version}.tar.bz2 # Source0-md5: 3a173e9c6047ed18ae8080cfcd38f3a4 Patch0: %{name}-DESTDIR.patch Patch1: %{name}-change_scheme_dir.patch +Patch2: %{name}-chasen.patch URL: http://sourceforge.jp/projects/shinji/ BuildRequires: gdbm-devel BuildRequires: glib2-devel @@ -39,8 +40,15 @@ %setup -q %patch0 -p1 %patch1 -p0 +%patch2 -p1 + +mv lib/{,mana-}chasen.h %build +%{__libtoolize} +%{__aclocal} +%{__autoconf} +%{__automake} %configure %{__make} -j1 @@ -71,6 +79,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.3 2011/07/15 12:36:39 baggins +- rel 2 +- fix build conflict with installed chasen-devel + Revision 1.2 2011/07/15 12:00:50 baggins - added bootstrap bcond ================================================================ Index: packages/mana/mana-chasen.patch diff -u /dev/null packages/mana/mana-chasen.patch:1.1 --- /dev/null Fri Jul 15 14:36:44 2011 +++ packages/mana/mana-chasen.patch Fri Jul 15 14:36:39 2011 @@ -0,0 +1,47 @@ +--- mana-0.2.1/lib/Makefile.am~ 2005-06-27 23:42:39.000000000 +0200 ++++ mana-0.2.1/lib/Makefile.am 2011-07-15 14:19:57.548606876 +0200 +@@ -1,7 +1,7 @@ +-noinst_HEADERS = chasen.h +-noinst_LIBRARIES = libchasen.a ++noinst_HEADERS = mana-chasen.h ++noinst_LIBRARIES = libmanachasen.a + +-libchasen_a_SOURCES = block.c chadic.h chalib.c chalib.h chasen.h connect.c \ ++libmanachasen_a_SOURCES = block.c chadic.h chalib.c chalib.h mana-chasen.h connect.c \ + dartsdic.cpp dartsdic.h getid.c getopt.c grammar.c \ + init.c iotool.c jfgets.c katuyou.c lisp.c \ + literal.c literal.h mmap.c parse.c print.c \ +--- mana-0.2.1/lib/chalib.h~ 2004-06-04 19:21:08.000000000 +0200 ++++ mana-0.2.1/lib/chalib.h 2011-07-15 14:20:31.103606862 +0200 +@@ -8,7 +8,7 @@ + #define __CHALIB_H__ + + #include "chadic.h" +-#include "chasen.h" ++#include "mana-chasen.h" + + #if defined _WIN32 && ! defined __CYGWIN__ + #define strcasecmp stricmp +--- mana-0.2.1/mana/Makefile~ 2011-07-15 14:15:48.803606932 +0200 ++++ mana-0.2.1/mana/Makefile 2011-07-15 14:21:31.485606855 +0200 +@@ -7,9 +7,9 @@ + LIBDIRS = ../gdbm ../schoca/lib ../lib + INCDIRS = ../gdbm ../schoca/lib ../lib .. + LIBS = gdbm schoca +-CLIBS = gdbm gdbm_compat chasen ++CLIBS = gdbm gdbm_compat manachasen + PACKS = unix +-LINK = $(LIBTOOL) --mode=link \ ++LINK = $(LIBTOOL) --mode=link --tag=CC \ + $(CXX) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ + OCAMLLDFLAGS = -verbose -cc "$(LINK)" + OCAMLBLDFLAGS = -g -verbose -cc "$(LINK)" +--- mana-0.2.1/mkchadic/Makefile.am~ 2004-02-03 12:47:47.000000000 +0100 ++++ mana-0.2.1/mkchadic/Makefile.am 2011-07-15 14:24:10.776606815 +0200 +@@ -1,5 +1,5 @@ + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(includedir) +-LDADD = $(top_builddir)/lib/libchasen.a ++LDADD = $(top_builddir)/lib/libmanachasen.a + DEFS = -DRCPATH=\""$(RCPATH)\"" @DEFS@ + + LINK = $(LIBTOOL) --mode=link \ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mana/mana.spec?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
