rpms/mfiler2/devel mfiler2-4.0.0-use-external.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 mfiler2.spec, 1.1, 1.2 sources, 1.2, 1.3 mfiler2-3.2.3-use-external.patch, 1.1, NONE
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Tue Dec 11 12:37:59 UTC 2007
- Previous message (by thread): rpms/mfiler2/F-8 mfiler2-4.0.0-use-external.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 mfiler2.spec, 1.1, 1.2 sources, 1.2, 1.3 mfiler2-3.2.3-use-external.patch, 1.1, NONE
- Next message (by thread): rpms/pam_ssh/F-8 pam_ssh.spec,1.15,1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mtasaka
Update of /cvs/extras/rpms/mfiler2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31415/devel
Modified Files:
.cvsignore mfiler2.spec sources
Added Files:
mfiler2-4.0.0-use-external.patch
Removed Files:
mfiler2-3.2.3-use-external.patch
Log Message:
* Tue Dec 11 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.0-1
- 4.0.0
mfiler2-4.0.0-use-external.patch:
--- NEW FILE mfiler2-4.0.0-use-external.patch ---
--- mfiler2-4.0.0/Makefile.in.external 2007-12-11 18:40:23.000000000 +0900
+++ mfiler2-4.0.0/Makefile.in 2007-12-11 21:25:57.000000000 +0900
@@ -18,15 +18,15 @@
LIBONIG=@LIBONIG@
INCONIG=@INCONIG@
-COMPILED_LIBONIG=@COMPILED_LIBONIG@
+COMPILED_LIBONIG=-lonig
COMPILED_INCONIG=@COMPILED_INCONIG@
LIBMIGEMO=@LIBMIGEMO@
LIBEXTRA=@LIBEXTRA@
-LIBWKF=wkf-1.3.9/libwkf.a
-INCWKF=-I wkf-1.3.9
+LIBWKF=-lwkf
+INCWKF=
WKF_CONFIGURE=@WKF_CONFIGURE@
################################################################################
@@ -58,7 +58,7 @@
###############################################################################
# 実行ファイル
###############################################################################
-mfiler2: $(COMPILED_LIBONIG) $(LIBWKF) $(OBJ) config.h
+mfiler2: $(OBJ) config.h
$(CXX) -o mfiler2 $(CFLAGS) $(OBJ) $(LIBEXTRA) $(LIBCURSES) $(LIBMIGEMO) $(LIBRUBY) $(LIBWKF) $(LIBONIG) $(COMPILED_LIBONIG)
mattr: mattr.cpp
@@ -224,16 +224,4 @@
$(INSTALL) -s -m 755 mhitanykey $(bindir)
$(INSTALL) -m 644 etc/.mfiler "$(sysconfdir)"
$(INSTALL) -m 644 etc/*.rb "$(sysconfdir)"
- $(INSTALL) -m 644 migemo-dic/cp932/han2zen.dat "$(datadir)/mfiler/cp932"
- $(INSTALL) -m 644 migemo-dic/cp932/hira2kata.dat "$(datadir)/mfiler/cp932"
- $(INSTALL) -m 644 migemo-dic/cp932/migemo-dict "$(datadir)/mfiler/cp932"
- $(INSTALL) -m 644 migemo-dic/cp932/roma2hira.dat "$(datadir)/mfiler/cp932"
- $(INSTALL) -m 644 migemo-dic/euc-jp/han2zen.dat "$(datadir)/mfiler/euc-jp"
- $(INSTALL) -m 644 migemo-dic/euc-jp/hira2kata.dat "$(datadir)/mfiler/euc-jp"
- $(INSTALL) -m 644 migemo-dic/euc-jp/migemo-dict "$(datadir)/mfiler/euc-jp"
- $(INSTALL) -m 644 migemo-dic/euc-jp/roma2hira.dat "$(datadir)/mfiler/euc-jp"
- $(INSTALL) -m 644 migemo-dic/utf-8/han2zen.dat "$(datadir)/mfiler/utf-8"
- $(INSTALL) -m 644 migemo-dic/utf-8/hira2kata.dat "$(datadir)/mfiler/utf-8"
- $(INSTALL) -m 644 migemo-dic/utf-8/migemo-dict "$(datadir)/mfiler/utf-8"
- $(INSTALL) -m 644 migemo-dic/utf-8/roma2hira.dat "$(datadir)/mfiler/utf-8"
--- mfiler2-4.0.0/isearch.cpp.external 2007-12-11 18:40:24.000000000 +0900
+++ mfiler2-4.0.0/isearch.cpp 2007-12-11 21:20:13.000000000 +0900
@@ -276,66 +276,66 @@
gMigemo = migemo_open(NULL);
if(gKanjiCode == kUtf8) {
- sprintf(buf, "%s/mfiler/utf-8/migemo-dict", DATADIR);
+ sprintf(buf, "%s/cmigemo/utf-8/migemo-dict", DATADIR);
if(migemo_load(gMigemo, MIGEMO_DICTID_MIGEMO, buf) == MIGEMO_DICTID_INVALID) {
fprintf(stderr, "%s is not found\n", buf);
exit(1);
}
- sprintf(buf, "%s/mfiler/utf-8/roma2hira.dat", DATADIR);
+ sprintf(buf, "%s/cmigemo/utf-8/roma2hira.dat", DATADIR);
if(migemo_load(gMigemo, MIGEMO_DICTID_ROMA2HIRA, buf) == MIGEMO_DICTID_INVALID) {
fprintf(stderr, "%s is not found\n", buf);
exit(1);
}
- sprintf(buf, "%s/mfiler/utf-8/hira2kata.dat", DATADIR);
+ sprintf(buf, "%s/cmigemo/utf-8/hira2kata.dat", DATADIR);
if(migemo_load(gMigemo, MIGEMO_DICTID_HIRA2KATA, buf) == MIGEMO_DICTID_INVALID) {
fprintf(stderr, "%s is not found\n", buf);
exit(1);
}
- sprintf(buf, "%s/mfiler/utf-8/han2zen.dat", DATADIR);
+ sprintf(buf, "%s/cmigemo/utf-8/han2zen.dat", DATADIR);
if(migemo_load(gMigemo, MIGEMO_DICTID_HAN2ZEN, buf) == MIGEMO_DICTID_INVALID) {
fprintf(stderr, "%s is not found\n", buf);
exit(1);
}
}
else if(gKanjiCode == kEucjp) {
- sprintf(buf, "%s/mfiler/euc-jp/migemo-dict", DATADIR);
+ sprintf(buf, "%s/cmigemo/euc-jp/migemo-dict", DATADIR);
if(migemo_load(gMigemo, MIGEMO_DICTID_MIGEMO, buf) == MIGEMO_DICTID_INVALID) {
fprintf(stderr, "%s is not found\n", buf);
exit(1);
}
- sprintf(buf, "%s/mfiler/euc-jp/roma2hira.dat", DATADIR);
+ sprintf(buf, "%s/cmigemo/euc-jp/roma2hira.dat", DATADIR);
if(migemo_load(gMigemo, MIGEMO_DICTID_ROMA2HIRA, buf) == MIGEMO_DICTID_INVALID) {
fprintf(stderr, "%s is not found\n", buf);
exit(1);
}
- sprintf(buf, "%s/mfiler/euc-jp/hira2kata.dat", DATADIR);
+ sprintf(buf, "%s/cmigemo/euc-jp/hira2kata.dat", DATADIR);
if(migemo_load(gMigemo, MIGEMO_DICTID_HIRA2KATA, buf) == MIGEMO_DICTID_INVALID) {
fprintf(stderr, "%s is not found\n", buf);
exit(1);
}
- sprintf(buf, "%s/mfiler/euc-jp/han2zen.dat", DATADIR);
+ sprintf(buf, "%s/cmigemo/euc-jp/han2zen.dat", DATADIR);
if(migemo_load(gMigemo, MIGEMO_DICTID_HAN2ZEN, buf) == MIGEMO_DICTID_INVALID) {
fprintf(stderr, "%s is not found\n", buf);
exit(1);
}
}
else {
- sprintf(buf, "%s/mfiler/cp932/migemo-dict", DATADIR);
+ sprintf(buf, "%s/cmigemo/cp932/migemo-dict", DATADIR);
if(migemo_load(gMigemo, MIGEMO_DICTID_MIGEMO, buf) == MIGEMO_DICTID_INVALID) {
fprintf(stderr, "%s is not found\n", buf);
exit(1);
}
- sprintf(buf, "%s/mfiler/cp932/roma2hira.dat", DATADIR);
+ sprintf(buf, "%s/cmigemo/cp932/roma2hira.dat", DATADIR);
if(migemo_load(gMigemo, MIGEMO_DICTID_ROMA2HIRA, buf) == MIGEMO_DICTID_INVALID) {
fprintf(stderr, "%s is not found\n", buf);
exit(1);
}
- sprintf(buf, "%s/mfiler/cp932/hira2kata.dat", DATADIR);
+ sprintf(buf, "%s/cmigemo/cp932/hira2kata.dat", DATADIR);
if(migemo_load(gMigemo, MIGEMO_DICTID_HIRA2KATA, buf) == MIGEMO_DICTID_INVALID) {
fprintf(stderr, "%s is not found\n", buf);
exit(1);
}
- sprintf(buf, "%s/mfiler/cp932/han2zen.dat", DATADIR);
+ sprintf(buf, "%s/cmigemo/cp932/han2zen.dat", DATADIR);
if(migemo_load(gMigemo, MIGEMO_DICTID_HAN2ZEN, buf) == MIGEMO_DICTID_INVALID) {
fprintf(stderr, "%s is not found\n", buf);
exit(1);
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mfiler2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 10 Dec 2007 17:41:54 -0000 1.2
+++ .cvsignore 11 Dec 2007 12:37:23 -0000 1.3
@@ -1 +1 @@
-mfiler2-3.2.3.tgz
+mfiler2-4.0.0.tgz
Index: mfiler2.spec
===================================================================
RCS file: /cvs/extras/rpms/mfiler2/devel/mfiler2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mfiler2.spec 10 Dec 2007 17:41:54 -0000 1.1
+++ mfiler2.spec 11 Dec 2007 12:37:23 -0000 1.2
@@ -4,15 +4,15 @@
Name: mfiler2
-Version: 3.2.3
-Release: 2%{?dist}
+Version: 4.0.0
+Release: 1%{?dist}
Summary: Two pane file manager under UNIX console
Group: Applications/Editors
License: GPL+
URL: http://www.geocities.jp/daisuke530221jp/
Source0: http://www.geocities.jp/daisuke530221jp/%{name}-%{version}.tgz
-Patch0: mfiler2-3.2.3-use-external.patch
+Patch0: mfiler2-4.0.0-use-external.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmigemo-devel
@@ -97,6 +97,9 @@
%changelog
+* Tue Dec 11 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.0-1
+- 4.0.0
+
* Sat Dec 8 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.2.3-2
- Add missing CFLAGS
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mfiler2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 10 Dec 2007 17:41:54 -0000 1.2
+++ sources 11 Dec 2007 12:37:23 -0000 1.3
@@ -1 +1 @@
-8b7ab3bb56accbfd2184ef10dd0e2a86 mfiler2-3.2.3.tgz
+7fc9fdb4995fdd3089227e4dfb6afaf1 mfiler2-4.0.0.tgz
--- mfiler2-3.2.3-use-external.patch DELETED ---
- Previous message (by thread): rpms/mfiler2/F-8 mfiler2-4.0.0-use-external.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 mfiler2.spec, 1.1, 1.2 sources, 1.2, 1.3 mfiler2-3.2.3-use-external.patch, 1.1, NONE
- Next message (by thread): rpms/pam_ssh/F-8 pam_ssh.spec,1.15,1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list