rpms/mfiler3/F-12 mfiler3-3.0.3-configure-migemo.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 mfiler3.spec, 1.19, 1.20 sources, 1.15, 1.16

Mon Mar 1 17:40:58 UTC 2010

Author: mtasaka

Update of /cvs/extras/rpms/mfiler3/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18266/F-12

Modified Files:
	.cvsignore mfiler3.spec sources 
Added Files:
	mfiler3-3.0.3-configure-migemo.patch 
Log Message:
* Tue Mar  2 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.0.6-1
- 3.0.6


mfiler3-3.0.3-configure-migemo.patch:
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mfiler3-3.0.3-configure-migemo.patch ---
--- mfiler3-3.0.3/configure.in.debug	2010-02-14 03:17:22.000000000 +0900
+++ mfiler3-3.0.3/configure.in	2010-02-20 04:47:56.000000000 +0900
@@ -16,7 +16,7 @@
 AC_ARG_WITH(migemo-dir,         [  --with-migemo-dir=DIR     set migemo directory ], [ MIGEMO_DIR="$with_val"  ], [ MIGEMO_DIR= ])
 AC_ARG_WITH(onig-dir,           [  --with-onig-dir=DIR       set oniguruma directory ], [ ONIG_DIR="$with_val"  ], [ ONIG_DIR= ])
 AC_ARG_WITH(kitutuki-dir,        [  --with-kitutuki-dir=DIR    set kitutuki directory ], [ KITUTUKI_DIR="$with_val"  ], [ KITUTUKI_DIR= ])
-AC_ARG_WITH(system-migemodir,[ --with-system-migemodir       specify the directory of system migemo dictionary. /usr/share/migemo, for example], [ if test -n "$withval" && test -n $LIBMIGEMO ; then echo "system-migemodir = $withval" SYSTEM_MIGEMODIR="$withval" AC_DEFINE_UNQUOTED(SYSTEM_MIGEMODIR, "$withval") fi ], [ SYSTEM_MIGEMODIR=/usr/share/cmigemo ] )
+AC_ARG_WITH(system-migemodir,[ --with-system-migemodir       specify the directory of system migemo dictionary. /usr/share/migemo, for example], [ if test -n "$withval" && test -n $LIBMIGEMO ; then echo "system-migemodir = $withval" ; SYSTEM_MIGEMODIR="$withval" ; { AC_DEFINE_UNQUOTED(SYSTEM_MIGEMODIR, "$withval") } ; fi ], [ SYSTEM_MIGEMODIR=/usr/share/cmigemo ] )
 
 if test $prefix = NONE
 then


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	8 Nov 2008 18:56:20 -0000	1.14
+++ .cvsignore	1 Mar 2010 17:40:58 -0000	1.15
@@ -1 +1 @@
-mfiler3-2.1.3.tgz
+mfiler3-3.0.6.tgz


Index: mfiler3.spec
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/F-12/mfiler3.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- mfiler3.spec	24 Jul 2009 18:50:35 -0000	1.19
+++ mfiler3.spec	1 Mar 2010 17:40:58 -0000	1.20
@@ -2,87 +2,99 @@
 %define			rubyabi			1.8
 
 Name:		mfiler3
-Version:	2.1.3
-Release:	3%{?dist}
+Version:	3.0.6
+Release:	1%{?dist}
 Summary:	Two pane file manager under UNIX console
 
 Group:		Applications/Editors
 License:	GPL+
 URL:		http://www.geocities.jp/daisuke530221jp/index3.html
-Source0:	http://www.geocities.jp/daisuke530221jp/%{name}-%{version}.tgz
+Source0:	http://ab25cq.web.fc2.com/%{name}-%{version}.tgz
 Source10:	mfiler3.sh
+## Patches not sent to the upstream, must do later
+# configure.in fix, need autoconf
+Patch0:		mfiler3-3.0.3-configure-migemo.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# Obsoletes but not Provides
+Obsoletes:	%{name}-mdnd < 3.0.0
+
 BuildRequires:	cmigemo-devel
-BuildRequires:	gc-devel
-BuildRequires:	libtar-devel
+BuildRequires:	kitutuki-devel >= 0.9.5
 BuildRequires:	ncurses-devel
 BuildRequires:	oniguruma-devel
-BuildRequires:	zlib-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}
+# Patch1
+BuildRequires:	autoconf
+# For now...
+Requires:	kitutuki >= 0.9.5
 
-# Requires:	lftp
 %description
 Minnu's Filer3 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 -n %{name}
+%setup -q
+
 %{__sed} -i.strip -e 's| -s -m| -m|' Makefile.in
-%{__sed} -i.debuginfo -e 's|-g -w||' configure
+%{__sed} -i.stamp -e 's|\([ \t][ \t]*install \)|\1 -p |' Makefile.in
 
-# Remove unneeded internal directories to make it sure that
-# we are using external libraries
-%{__rm} -rf \
-	migemo-dic/ \
-	src/onig*/ \
+# Fix error on creating mfiler.kio, will ask later
+%{__sed} -i.sig -e 's|kitutuki -c|kitutuki -rn -c|' Makefile.in
+
+%patch0 -p1 -b .cf
+autoconf
+sed -i -e '/CFLAGS=/s| -O| %{optflags}|' configure
+
+for f in \
+	*.ja.txt
+do
+	iconv -f EUC-JP -t UTF-8 $f > $f.utf8
+	touch -r ${f}{,.utf8}
+	mv -f ${f}{.utf8,}
+done
 
 # Remove pre-compiled binary...
 %{__rm} -f \
 	mattr \
-	mkeycode \
-	mfiler3 \
-	mtar
+	mfiler3
+
 %{__rm} -f *.o
 
 %build
 %configure \
-	--sysconfdir=%{_sysconfdir}/%{name} \
+	CC="gcc -I%{_includedir}/kitutuki" \
+	--sysconfdir=%{_libdir}/%{name} \
 	--bindir=%{_libexecdir}/%{name} \
+	--with-migemo \
 	--with-system-migemodir=%{_datadir}/cmigemo
-%{__make} %{?_smp_mflags} -k \
-	CC="%{__cc} $RPM_OPT_FLAGS"
+
+# kill parallel make
+%{__make} -k \
+	docdir=%{_defaultdocdir}/%{name}-%{version}/
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 
-# Use %%makeinstall
+# make install DESTDIR=%%{buildroot}
+# Above does not work...
+rm -rf ./Trash
 %makeinstall \
-	sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}/%{name} \
+	sysconfdir=$RPM_BUILD_ROOT%{_libdir}/%{name} \
 	bindir=$RPM_BUILD_ROOT%{_libexecdir}/%{name} \
-	INSTALL="%{__install} -c -p"
+	docdir=$(pwd)/Trash/
 
 # Install wrapper script
 %{__mkdir_p} $RPM_BUILD_ROOT%{_bindir}
 %{__install} -cpm 0755 %SOURCE10 $RPM_BUILD_ROOT%{_bindir}/%{name}
 
+# Move mfiler3.ksh to %%{_sysconfdir}/%{name}
+mkdir -p %{buildroot}%{_sysconfdir}/%{name}
+mv %{buildroot}%{_libdir}/%{name}/mfiler3.ksh \
+	%{buildroot}%{_sysconfdir}/%{name}
+ln -sf ../../../%{_sysconfdir}/%{name}/mfiler3.ksh \
+	%{buildroot}%{_libdir}/%{name}/
+
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -90,19 +102,30 @@ This package supports drag and drop usag
 
 %files
 %defattr(-,root,root,-)
-%doc	doc/
+%doc	AUTHORS
+%doc	GPL
+%lang(ja)	%doc	README.ja.txt
+%lang(ja)	%doc	usage.ja.txt
 
-%config(noreplace)	%{_sysconfdir}/%{name}/
+%config(noreplace)	%{_sysconfdir}/%{name}
 %{_bindir}/%{name}
 %{_libexecdir}/%{name}/
-%exclude	%{_libexecdir}/%{name}/mdnd
-
-%files	mdnd
-%defattr(-,root,root,-)
-%{_libexecdir}/%{name}/mdnd
+%{_libdir}/%{name}/
 
 
 %changelog
+* Tue Mar  2 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.0.6-1
+- 3.0.6
+
+* Thu Feb 25 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.0.5-1
+- Update to 3.0.5
+
+* Tue Feb 23 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.0.4-1
+- Update to 3.0.4
+
+* Sat Feb 20 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.0.3-1
+- Update to 3.0.3
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.3-3
 - F-12: Mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	8 Nov 2008 18:56:20 -0000	1.15
+++ sources	1 Mar 2010 17:40:58 -0000	1.16
@@ -1 +1 @@
-d1637f5166bdef4b0314480b96f45828  mfiler3-2.1.3.tgz
+506271496dca2ee462c31b3d754a0115  mfiler3-3.0.6.tgz

