From ad61247b369b90b1c2148090d183d35dbc83381d Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 20 Apr 2008 12:17:53 +0000 Subject: [PATCH 1/7] Initialize branch F-9 for anthy --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From db5ad5eec821d0f717eb2b4d2d0ef4e652fc4656 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Fri, 27 Jun 2008 10:11:26 +0000 Subject: [PATCH 2/7] - Fix a segfault with some words containing vu. (#452779) --- anthy-9100e-fix-segfault-vu.patch | 56 +++++++++++++++++++++++++++++++ anthy.spec | 7 +++- 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 anthy-9100e-fix-segfault-vu.patch diff --git a/anthy-9100e-fix-segfault-vu.patch b/anthy-9100e-fix-segfault-vu.patch new file mode 100644 index 0000000..213610b --- /dev/null +++ b/anthy-9100e-fix-segfault-vu.patch @@ -0,0 +1,56 @@ +diff -pruN anthy-9100e.orig/src-splitter/metaword.c anthy-9100e/src-splitter/metaword.c +--- anthy-9100e.orig/src-splitter/metaword.c 2007-06-18 08:27:38.000000000 +0900 ++++ anthy-9100e/src-splitter/metaword.c 2008-06-27 11:53:55.000000000 +0900 +@@ -17,6 +17,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -158,6 +159,18 @@ get_surrounding_text(struct splitter_con + xs_post->len = post_len; + } + ++static int ++count_vu(xstr *xs) ++{ ++ int i, r = 0; ++ for (i = 0; i < xs->len; i++) { ++ if (xs->str[i] == KK_VU) { ++ r++; ++ } ++ } ++ return r; ++} ++ + /* + * 複合語であるwlからn番めの部分を取り出してmwにする + */ +@@ -177,8 +190,12 @@ make_compound_nth_metaword(struct splitt + get_surrounding_text(sc, wl, &xs_pre, &xs_post); + + for (i = 0; i <= nth; ++i) { ++ xstr part; + from += len; + len = anthy_compound_get_nth_segment_len(ce, i); ++ part.str = sc->ce[from].c; ++ part.len = len; ++ len -= count_vu(&part); + if (i == 0) { + len += xs_pre.len; + } +@@ -742,7 +759,11 @@ make_metaword_with_depchar(struct splitt + int len = mw ? mw->len : 0; + + /* metawordの直後の文字の種類を調べる */ +- int type = anthy_get_xchar_type(*sc->ce[from + len].c); ++ int type; ++ if (sc->char_count <= from + len) { ++ return; ++ } ++ type = anthy_get_xchar_type(*sc->ce[from + len].c); + if (!(type & XCT_SYMBOL) && + !(type & XCT_PART)) { + return; diff --git a/anthy.spec b/anthy.spec index 997b106..a182473 100644 --- a/anthy.spec +++ b/anthy.spec @@ -1,6 +1,6 @@ Name: anthy Version: 9100e -Release: 2%{?dist} +Release: 3%{?dist} # The entire source code is LGPLv2+ and dictionaries is GPLv2. License: LGPLv2+ and GPLv2 URL: http://sourceforge.jp/projects/anthy/ @@ -11,6 +11,7 @@ BuildRequires: xemacs Source0: http://prdownloads.sourceforge.jp/anthy/29142/anthy-%{version}.tar.gz Source1: anthy-init.el +Patch0: anthy-9100e-fix-segfault-vu.patch Summary: Japanese character set input library Group: System Environment/Libraries @@ -50,6 +51,7 @@ character set on XEmacs. %prep %setup -q #-a 2 +%patch0 -p1 -b 0-vu #cp alt-cannadic-%{altcannadicver}/* alt-cannadic/ %build @@ -112,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xemacs/site-packages/lisp/site-start.d/anthy-init.el %changelog +* Fri Jun 27 2008 Akira TAGOH - 9100e-3 +- Fix a segfault with some words containing vu. (#452779) + * Tue Feb 12 2008 Akira TAGOH - 9100e-2 - Rebuild for gcc-4.3. From 790b624c9c5563a8eb9717b51e837f7d6e8863f6 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 10 Feb 2009 12:18:17 +0000 Subject: [PATCH 3/7] - New upstream release. --- anthy-9100e-fix-segfault-vu.patch | 56 -------- anthy.spec | 211 ++++++++++++++++++++++++------ 2 files changed, 171 insertions(+), 96 deletions(-) delete mode 100644 anthy-9100e-fix-segfault-vu.patch diff --git a/anthy-9100e-fix-segfault-vu.patch b/anthy-9100e-fix-segfault-vu.patch deleted file mode 100644 index 213610b..0000000 --- a/anthy-9100e-fix-segfault-vu.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -pruN anthy-9100e.orig/src-splitter/metaword.c anthy-9100e/src-splitter/metaword.c ---- anthy-9100e.orig/src-splitter/metaword.c 2007-06-18 08:27:38.000000000 +0900 -+++ anthy-9100e/src-splitter/metaword.c 2008-06-27 11:53:55.000000000 +0900 -@@ -17,6 +17,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -158,6 +159,18 @@ get_surrounding_text(struct splitter_con - xs_post->len = post_len; - } - -+static int -+count_vu(xstr *xs) -+{ -+ int i, r = 0; -+ for (i = 0; i < xs->len; i++) { -+ if (xs->str[i] == KK_VU) { -+ r++; -+ } -+ } -+ return r; -+} -+ - /* - * 複合語であるwlからn番めの部分を取り出してmwにする - */ -@@ -177,8 +190,12 @@ make_compound_nth_metaword(struct splitt - get_surrounding_text(sc, wl, &xs_pre, &xs_post); - - for (i = 0; i <= nth; ++i) { -+ xstr part; - from += len; - len = anthy_compound_get_nth_segment_len(ce, i); -+ part.str = sc->ce[from].c; -+ part.len = len; -+ len -= count_vu(&part); - if (i == 0) { - len += xs_pre.len; - } -@@ -742,7 +759,11 @@ make_metaword_with_depchar(struct splitt - int len = mw ? mw->len : 0; - - /* metawordの直後の文字の種類を調べる */ -- int type = anthy_get_xchar_type(*sc->ce[from + len].c); -+ int type; -+ if (sc->char_count <= from + len) { -+ return; -+ } -+ type = anthy_get_xchar_type(*sc->ce[from + len].c); - if (!(type & XCT_SYMBOL) && - !(type & XCT_PART)) { - return; diff --git a/anthy.spec b/anthy.spec index a182473..282a1d1 100644 --- a/anthy.spec +++ b/anthy.spec @@ -1,17 +1,38 @@ +%define use_utf8_dict 1 +%define pkg anthy + +%if %($(pkg-config emacs); echo $?) +%define emacs_version 22.1 +%define emacs_lispdir %{_datadir}/emacs/site-lisp +%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d +%else +%define emacs_version %(pkg-config emacs --modversion) +%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir) +%define emacs_startdir %(pkg-config emacs --variable sitestartdir) +%endif + +%if %($(pkg-config xemacs); echo $?) +%define xemacs_version 21.5 +%define xemacs_lispdir %{_datadir}/xemacs/site-packages +%define xemacs_startdir %{_datadir}/emacs/site-packages/site-start.d +%else +%define xemacs_version %(pkg-config xemacs --modversion) +%define xemacs_lispdir %(pkg-config xemacs --variable sitepkglispdir) +%define xemacs_startdir %(pkg-config xemacs --variable sitestartdir) +%endif + Name: anthy -Version: 9100e -Release: 3%{?dist} +Version: 9100h +Release: 1%{?dist} # The entire source code is LGPLv2+ and dictionaries is GPLv2. License: LGPLv2+ and GPLv2 URL: http://sourceforge.jp/projects/anthy/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: automake autoconf -BuildRequires: emacs +BuildRequires: emacs emacs-el BuildRequires: xemacs -Source0: http://prdownloads.sourceforge.jp/anthy/29142/anthy-%{version}.tar.gz +Source0: http://osdn.dl.sourceforge.jp/anthy/37336/anthy-%{version}.tar.gz Source1: anthy-init.el -Patch0: anthy-9100e-fix-segfault-vu.patch Summary: Japanese character set input library Group: System Environment/Libraries @@ -31,32 +52,115 @@ Requires: anthy = %{version}-%{release} The anthy-devel package contains the development files which is needed to build the programs which uses Anthy. -%package el -Summary: Emacs Lisp files to use Anthy on Emacs +%package -n emacs-%{pkg} +Summary: Compiled elisp files to run Anthy under GNU Emacs Group: System Environment/Libraries -Requires: emacs +Requires: emacs(bin) >= %{emacs_version} Requires: anthy = %{version}-%{release} -%description el -The anthy-el package contains the emacs lisp to be able to input Japanese -character set on Emacs. +Obsoletes: anthy-el < 9100g-1 +Provides: anthy-el = %{version}-%{release} -%package el-xemacs -Summary: Emacs Lisp files to use Anthy on XEmacs +%description -n emacs-%{pkg} +This package contains the byte compiled elisp packages to run Anthy with GNU +Emacs. + +%package -n emacs-%{pkg}-el +Summary: Elisp source files for Anthy under GNU Emacs Group: System Environment/Libraries -Requires: xemacs +Requires: emacs-%{pkg} = %{version}-%{release} + +%description -n emacs-%{pkg}-el +This package contains the elisp source files for Anthy under GNU Emacs. You +do not need to install this package to run Anthy. Install the emacs-%{pkg} +package to use Anthy with GNU Emacs. + +%package -n xemacs-%{pkg} +Summary: Compiled elisp files to run Anthy under XEmacs +Group: System Environment/Libraries +Requires: xemacs(bin) >= %{xemacs_version} Requires: anthy = %{version}-%{release} -%description el-xemacs -The anthy-el-xemacs package contains the emacs lisp to be able to input Japanese -character set on XEmacs. +Obsoletes: anthy-el-xemacs < 9100g-1 +Provides: anthy-el-xemacs = %{version}-%{release} + +%description -n xemacs-%{pkg} +This package contains the byte compiled elisp packages to use Anthy with +XEmacs. + +%package -n xemacs-%{pkg}-el +Summary: Elisp source files for Anthy under XEmacs +Group: System Environment/Libraries +Requires: xemacs-%{pkg} = %{version}-%{release} + +%description -n xemacs-%{pkg}-el +This package contains the elisp source files for Anthy under XEmacs. You do +not need to install this package to run Anthy. Install the xemacs-%{pkg} +package to use Anthy with XEmacs. + %prep %setup -q #-a 2 -%patch0 -p1 -b 0-vu -#cp alt-cannadic-%{altcannadicver}/* alt-cannadic/ + +%if %{use_utf8_dict} +function normalize_extra_dict() { + sed -e 's/^\([^ ]*\)t[ ]*\(#[A-Z0-9\*]*\)[ ]*\([^ ]*\)$/\1 \2 \3/g' $1 > $1.norm +} +function dict_conv() { + iconv -f euc-jp -t utf-8 $1 > $1.utf8 +} +function gen_dict_args() { + if ! test -f $RPM_BUILD_DIR/%{name}-%{version}/mkworddic/dict.args.in-orig; then + cp -a $RPM_BUILD_DIR/%{name}-%{version}/mkworddic/dict.args.in{,-orig} + fi + cat <<_EOF_ >> $RPM_BUILD_DIR/%{name}-%{version}/mkworddic/dict.args.in +# Generated by rpm script +set_input_encoding utf8 +read @top_srcdir@/alt-cannadic/gcanna.ctd.utf8 +read @top_srcdir@/alt-cannadic/gcannaf.ctd.utf8 +read @top_srcdir@/alt-cannadic/gtankan.ctd.utf8 +read @top_srcdir@/alt-cannadic/extra/g-jiritu-34.t.norm +read @top_srcdir@/alt-cannadic/extra/gc-fullname-34.t.norm +read @top_srcdir@/alt-cannadic/extra/gt-tankanji_kanji-34.t.norm +read @top_srcdir@/alt-cannadic/extra/gt-tankanji_hikanji-34.t.norm +read @top_srcdir@/alt-cannadic/extra/gf-fuzoku-34.t.norm +read @top_srcdir@/mkworddic/adjust.t.utf8 +read @top_srcdir@/mkworddic/compound.t.utf8 +read @top_srcdir@/mkworddic/extra.t.utf8 +read @top_srcdir@/mkworddic/utf8.t +read @top_srcdir@/alt-cannadic/g_fname.t +# +build_reverse_dict +set_dict_encoding utf8 +read_uc @top_srcdir@/mkworddic/udict +write anthy.wdic +done +_EOF_ +touch -r $RPM_BUILD_DIR/%{name}-%{version}/mkworddic/dict.args.in{-orig,} +} + +( + cd alt-cannadic + for i in gcanna.ctd gcannaf.ctd gtankan.ctd; do + dict_conv $i + done + cd extra + for i in g-jiritu-34.t gc-fullname-34.t gf-fuzoku-34.t gt-tankanji_hikanji-34.t gt-tankanji_kanji-34.t; do + normalize_extra_dict $i + done +);( + cd mkworddic + for i in adjust.t compound.t extra.t udict zipcode.t; do + dict_conv $i + done +) +gen_dict_args +%endif + %build %configure --disable-static -make %{?_smp_mflags} +# fix rpath issue +sed -ie 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' libtool +LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/src-main/.libs:$RPM_BUILD_DIR/%{name}-%{version}/src-worddic/.libs make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -64,19 +168,19 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # remove unnecessary files -rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.la +rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.{la,a} -## for anthy-el -%__mkdir_p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d +## for emacs-anthy +%__mkdir_p $RPM_BUILD_ROOT%{emacs_startdir} +install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{emacs_startdir} -## for anthy-el-xemacs -%__mkdir_p $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d +## for xemacs-anthy +%__mkdir_p $RPM_BUILD_ROOT%{xemacs_startdir} +install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{xemacs_startdir} pushd $RPM_BUILD_DIR/%{name}-%{version}/src-util make clean -make EMACS=xemacs lispdir="\${datadir}/xemacs/xemacs-packages/lisp/anthy" -make install-lispLISP DESTDIR=$RPM_BUILD_ROOT EMACS=xemacs lispdir="\${datadir}/xemacs/xemacs-packages/lisp/anthy" +make EMACS=xemacs lispdir="%{xemacs_lispdir}/%{pkg}" +make install-lispLISP DESTDIR=$RPM_BUILD_ROOT EMACS=xemacs lispdir="%{xemacs_lispdir}/%{pkg}" popd %clean @@ -87,7 +191,7 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig %files -%defattr (-, root, root) +%defattr (-, root, root, -) %doc AUTHORS COPYING ChangeLog DIARY NEWS README %{_bindir}/* %{_sysconfdir}/* @@ -95,25 +199,52 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/anthy/ %files devel -%defattr (-, root, root) +%defattr (-, root, root, -) %doc doc/DICLIB doc/DICUTIL doc/GLOSSARY doc/GRAMMAR doc/GUIDE.english doc/ILIB doc/LEARNING doc/LIB doc/MISC doc/POS doc/SPLITTER doc/TESTING doc/protocol.txt %{_includedir}/* %{_libdir}/lib*.so %{_libdir}/pkgconfig -%files el -%defattr (-, root, root) +%files -n emacs-%{pkg} +%defattr(-, root, root, -) %doc doc/ELISP -%{_datadir}/emacs/site-lisp/anthy/ -%{_datadir}/emacs/site-lisp/site-start.d/anthy-init.el +%{emacs_lispdir}/%{pkg}/*.elc +%{emacs_startdir}/*.el +%dir %{emacs_lispdir}/%{pkg} -%files el-xemacs -%defattr (-, root, root) +%files -n emacs-%{pkg}-el +%defattr(-, root, root, -) +%{emacs_lispdir}/%{pkg}/*.el + +%files -n xemacs-%{pkg} +%defattr(-, root, root, -) %doc doc/ELISP -%{_datadir}/xemacs/xemacs-packages/lisp/anthy/ -%{_datadir}/xemacs/site-packages/lisp/site-start.d/anthy-init.el +%{xemacs_lispdir}/%{pkg}/*.elc +%{xemacs_startdir}/*.el +%dir %{xemacs_lispdir}/%{pkg} + +%files -n xemacs-%{pkg}-el +%defattr(-, root, root, -) +%{xemacs_lispdir}/%{pkg}/*.el + %changelog +* Tue Feb 10 2009 Akira TAGOH - 9100h-1 +- New upstream release. + +* Fri Feb 6 2009 Akira TAGOH - 9100g-2 +- Apply a patch reported upstream to fix dictionary's indexing. + +* Wed Feb 4 2009 Akira TAGOH - 9100g-1 +- New upstream release. +- convert all words in dictionaries to UTF-8. +- Rename anthy-el and anthy-el-xemacs to emacs-anthy{,-el} and xemacs-anthy{,-el}. +- Fix RPATH issue. +- Support words for JIS X 0213:2004 in dictionary. (#195437) + +* Fri Nov 21 2008 Akira TAGOH - 9100e-4 +- Fix a source URL. + * Fri Jun 27 2008 Akira TAGOH - 9100e-3 - Fix a segfault with some words containing vu. (#452779) From 57e9d685bcdc0cf599cd2ad18fb70209c7449e3e Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 10 Feb 2009 12:23:23 +0000 Subject: [PATCH 4/7] *** empty log message *** --- .cvsignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.cvsignore b/.cvsignore index 49facb2..d28ec5d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -36,3 +36,4 @@ anthy-9100b.tar.gz alt-cannadic-070918.tar.bz2 anthy-9100d.tar.gz anthy-9100e.tar.gz +anthy-9100h.tar.gz diff --git a/sources b/sources index 7465866..d6bb126 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1c328986005e61f503adc118909e12ac anthy-9100e.tar.gz +1f558ff7ed296787b55bb1c6cf131108 anthy-9100h.tar.gz From 2277854ebf6a48ee0bd33a70d30c0f4283573368 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Mon, 11 May 2009 09:45:39 +0000 Subject: [PATCH 5/7] - Take off the ownership of %%{_libdir}/pkgconfig. (#499663) - Add R: pkgconfig to -devel. --- anthy.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/anthy.spec b/anthy.spec index 282a1d1..88f38f6 100644 --- a/anthy.spec +++ b/anthy.spec @@ -23,7 +23,7 @@ Name: anthy Version: 9100h -Release: 1%{?dist} +Release: 4%{?dist} # The entire source code is LGPLv2+ and dictionaries is GPLv2. License: LGPLv2+ and GPLv2 URL: http://sourceforge.jp/projects/anthy/ @@ -48,6 +48,7 @@ So Anthy is secure than other conversion server. Summary: Header files and library for developing programs which uses Anthy Group: Development/Libraries Requires: anthy = %{version}-%{release} +Requires: pkgconfig %description devel The anthy-devel package contains the development files which is needed to build the programs which uses Anthy. @@ -203,7 +204,7 @@ rm -rf $RPM_BUILD_ROOT %doc doc/DICLIB doc/DICUTIL doc/GLOSSARY doc/GRAMMAR doc/GUIDE.english doc/ILIB doc/LEARNING doc/LIB doc/MISC doc/POS doc/SPLITTER doc/TESTING doc/protocol.txt %{_includedir}/* %{_libdir}/lib*.so -%{_libdir}/pkgconfig +%{_libdir}/pkgconfig/*.pc %files -n emacs-%{pkg} %defattr(-, root, root, -) @@ -229,6 +230,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 11 2009 Akira TAGOH - 9100h-4 +- Take off the ownership of %%{_libdir}/pkgconfig. (#499663) +- Add R: pkgconfig to -devel. + +* Mon Feb 23 2009 Fedora Release Engineering - 9100h-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Feb 10 2009 Akira TAGOH - 9100h-1 - New upstream release. From 5a90f6439bc4487b8ebb8010c4d413c899e8e0c9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:27:53 +0000 Subject: [PATCH 6/7] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 089fda7..7457a53 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: anthy -# $Id: Makefile,v 1.1 2005/07/29 05:34:35 tagoh Exp $ +# $Id: Makefile,v 1.2 2007/10/15 18:35:48 notting Exp $ NAME := anthy SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 2b47ae9cd6ebdceb23fba5ae16ac016eac70158d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 10:02:22 +0000 Subject: [PATCH 7/7] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 7457a53..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: anthy -# $Id: Makefile,v 1.2 2007/10/15 18:35:48 notting Exp $ -NAME := anthy -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9