rpms/mfiler2/F-8 mfiler2-3.2.3-use-external.patch, NONE, 1.1 mfiler2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/mfiler2/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28637/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	mfiler2-3.2.3-use-external.patch mfiler2.spec 
Log Message:
initial commit

mfiler2-3.2.3-use-external.patch:

--- NEW FILE mfiler2-3.2.3-use-external.patch ---
--- mfiler2-3.2.3/Makefile.in.external	2007-12-03 18:08:26.000000000 +0900
+++ mfiler2-3.2.3/Makefile.in	2007-12-06 23:37:28.000000000 +0900
@@ -15,15 +15,15 @@
 LIBRUBY=@LIBRUBY@
 INCRUBY=@INCRUBY@
 
-LIBONIG=onig-4.6.1/.libs/libonig.a
-INCONIG=-I onig-4.6.1
+LIBONIG=-lonig
+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@
 
 ################################################################################
@@ -55,7 +55,7 @@
 ###############################################################################
 # 実行ファイル
 ###############################################################################
-mfiler2: $(LIBONIG) $(LIBWKF) $(OBJ) config.h
+mfiler2: $(OBJ) config.h
 	$(CXX) -o mfiler2 $(CFLAGS) $(OBJ) $(LIBEXTRA) $(LIBCURSES) $(LIBMIGEMO) $(LIBRUBY) $(LIBWKF) $(LIBONIG)
 
 mattr: mattr.cpp
@@ -224,16 +224,4 @@
 	$(INSTALL) -m 644 etc/api.rb "$(sysconfdir)/api.rb"
 	$(INSTALL) -m 644 etc/keybind_fdlike.rb "$(sysconfdir)/keybind_fdlike.rb"
 	$(INSTALL) -m 644 etc/keybind_mfiler2.rb "$(sysconfdir)/keybind_mfiler2.rb"
-	$(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-3.2.3/isearch.cpp.external	2007-12-03 18:08:26.000000000 +0900
+++ mfiler2-3.2.3/isearch.cpp	2007-12-06 23:28:35.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);


--- NEW FILE mfiler2.spec ---
%{!?ruby_sitelib:	%define ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}

%define		rubyabi		1.8


Name:		mfiler2
Version:	3.2.3
Release:	2%{?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
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	cmigemo-devel
BuildRequires:	ncurses-devel
BuildRequires:	oniguruma-devel
BuildRequires:	wkf-devel

# ruby-devel requires ruby-libs but does not require ruby
BuildRequires:	ruby
BuildRequires:	ruby-devel
BuildRequires:	ruby(abi) = %{rubyabi}

Requires:	ruby
Requires:	ruby(abi) = %{rubyabi}

%description
Minnu's Filer2 is a two pane file manager under UNIX console.

%package	mdnd
Summary:	Drag and drop support for %{name}
Group:		Applications/Editors
Requires:	%{name} = %{version}-%{release}

Requires:	ruby(gtk2)

%description	mdnd
This package supports drag and drop usage for %{name}.


%prep
%setup -q
%patch0 -p1 -b .external
%{__sed} -i.strip -e 's| -s -m| -m|' Makefile.in

# Remove unneeded internal directories to make it sure that
# we are using external libraries
%{__rm} -rf \
	migemo-dic/ \
	onig*/ \
	wkf*/

%build
%configure \
	--sysconfdir=%{_sysconfdir}/%{name}
%{__make} %{?_smp_mflags} \
	CC="%{__cc} $RPM_OPT_FLAGS" \
	CXX="%{__cxx} $RPM_OPT_FLAGS"

%install
%{__rm} -rf $RPM_BUILD_ROOT

# Use %%makeinstall
%makeinstall \
	sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}/%{name} \
	INSTALL="%{__install} -c -p"


%clean
%{__rm} -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc	COPYING
%doc	GPL
%doc	README
%doc	index-en.html
%lang(ja)	%doc	README.utf8.jp
%lang(ja)	%doc	history.html
%lang(ja)	%doc	index.html
%lang(ja)	%doc	keybind*html
%lang(ja)	%doc	manual.html
%lang(ja)	%doc	shell.html

%config(noreplace)	%{_sysconfdir}/%{name}/
%{_bindir}/*
%exclude	%{_bindir}/mdnd

%files	mdnd
%defattr(-,root,root,-)
%{_bindir}/mdnd


%changelog
* Sat Dec  8 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.2.3-2
- Add missing CFLAGS

* Thu Dec  6 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.2.3-1
- Initial packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mfiler2/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Dec 2007 17:05:24 -0000	1.1
+++ .cvsignore	10 Dec 2007 17:41:50 -0000	1.2
@@ -0,0 +1 @@
+mfiler2-3.2.3.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mfiler2/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Dec 2007 17:05:24 -0000	1.1
+++ sources	10 Dec 2007 17:41:50 -0000	1.2
@@ -0,0 +1 @@
+8b7ab3bb56accbfd2184ef10dd0e2a86  mfiler2-3.2.3.tgz