rpms/mfiler3/F-11 .cvsignore, 1.15, 1.16 mfiler3.spec, 1.19, 1.20 sources, 1.16, 1.17

Sun Mar 7 08:48:14 UTC 2010

Author: mtasaka

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

Modified Files:
	.cvsignore mfiler3.spec sources 
Log Message:
No, for now I won't upgrade mfiler3 to 3.0.x on F-11...


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16

--- .cvsignore	7 Mar 2010 08:40:38 -0000	1.15
+++ .cvsignore	7 Mar 2010 08:48:13 -0000	1.16
@@ -1 +1 @@
-mfiler3-3.0.7.tgz
+mfiler3-2.1.3.tgz


Index: mfiler3.spec
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/F-11/mfiler3.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- mfiler3.spec	7 Mar 2010 08:40:38 -0000	1.19
+++ mfiler3.spec	7 Mar 2010 08:48:14 -0000	1.20
@@ -1,94 +1,88 @@
+%{!?ruby_sitelib:	%define ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
+%define			rubyabi			1.8
+
 Name:		mfiler3
-Version:	3.0.7
-Release:	2.respin1%{?dist}
+Version:	2.1.3
+Release:	2%{?dist}
 Summary:	Two pane file manager under UNIX console
 
 Group:		Applications/Editors
 License:	GPL+
 URL:		http://www.geocities.jp/daisuke530221jp/index3.html
-Source0:	http://ab25cq.web.fc2.com/%{name}-%{version}.tgz
+Source0:	http://www.geocities.jp/daisuke530221jp/%{name}-%{version}.tgz
 Source10:	mfiler3.sh
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Obsoletes but not Provides
-Obsoletes:	%{name}-mdnd < 3.0.0
-
 BuildRequires:	cmigemo-devel
-BuildRequires:	kitutuki-devel >= 0.9.5
+BuildRequires:	gc-devel
+BuildRequires:	libtar-devel
 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}
 
-# Patch0 no longer needed, configure not updated
-BuildRequires:	autoconf
-# For now...
-Requires:	kitutuki >= 0.9.5
+Requires:	ruby
+Requires:	ruby(abi) = %{rubyabi}
 
+# 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}
 
-%prep
-%setup -q
+Requires:	ruby(gtk2)
 
-%{__sed} -i.strip -e 's| -s -m| -m|' Makefile.in
-%{__sed} -i.stamp -e 's|\([ \t][ \t]*install \)|\1 -p |' Makefile.in
+%description	mdnd
+This package supports drag and drop usage for %{name}.
 
-# Fix error on creating mfiler.kio, will ask later
-%{__sed} -i.sig -e 's|kitutuki -c|kitutuki -rn -c|' Makefile.in
 
-# Patch0 no longer needed, configure not updated
-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
+%prep
+%setup -q -n %{name}
+%{__sed} -i.strip -e 's| -s -m| -m|' Makefile.in
+%{__sed} -i.debuginfo -e 's|-g -w||' configure
+
+# Remove unneeded internal directories to make it sure that
+# we are using external libraries
+%{__rm} -rf \
+	migemo-dic/ \
+	src/onig*/ \
 
 # Remove pre-compiled binary...
 %{__rm} -f \
 	mattr \
-	mfiler3
-
+	mkeycode \
+	mfiler3 \
+	mtar
 %{__rm} -f *.o
 
 %build
 %configure \
-	CC="gcc -I%{_includedir}/kitutuki" \
-	--sysconfdir=%{_libdir}/%{name} \
+	--sysconfdir=%{_sysconfdir}/%{name} \
 	--bindir=%{_libexecdir}/%{name} \
-	--with-migemo \
 	--with-system-migemodir=%{_datadir}/cmigemo
-
-# kill parallel make
-%{__make} -k \
-	docdir=%{_defaultdocdir}/%{name}-%{version}/
+%{__make} %{?_smp_mflags} -k \
+	CC="%{__cc} $RPM_OPT_FLAGS"
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 
-# make install DESTDIR=%%{buildroot}
-# Above does not work...
-rm -rf ./Trash
+# Use %%makeinstall
 %makeinstall \
-	sysconfdir=$RPM_BUILD_ROOT%{_libdir}/%{name} \
+	sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}/%{name} \
 	bindir=$RPM_BUILD_ROOT%{_libexecdir}/%{name} \
-	docdir=$(pwd)/Trash/
+	INSTALL="%{__install} -c -p"
 
 # 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
@@ -96,40 +90,19 @@ ln -sf ../../../%{_sysconfdir}/%{name}/m
 
 %files
 %defattr(-,root,root,-)
-%doc	AUTHORS
-%doc	GPL
-%lang(ja)	%doc	README.ja.txt
-%lang(ja)	%doc	usage.ja.txt
-%doc	usage.en.txt
+%doc	doc/
 
-%config(noreplace)	%{_sysconfdir}/%{name}
+%config(noreplace)	%{_sysconfdir}/%{name}/
 %{_bindir}/%{name}
 %{_libexecdir}/%{name}/
-%{_libdir}/%{name}/
-
-
-%changelog
-* Sun Mar  7 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.0.7-2.respin1
-- 3.0.7 respun (patch0 no longer needed)
-
-* Sat Mar  6 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.0.7-1
-- 3.0.7
+%exclude	%{_libexecdir}/%{name}/mdnd
 
-* 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
+%files	mdnd
+%defattr(-,root,root,-)
+%{_libexecdir}/%{name}/mdnd
 
-* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.3-3
-- F-12: Mass rebuild
 
+%changelog
 * Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.3-2
 - F-11: Mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mfiler3/F-11/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	7 Mar 2010 08:40:38 -0000	1.16
+++ sources	7 Mar 2010 08:48:14 -0000	1.17
@@ -1 +1 @@
-5b62a981f3cdd3afd10760375b6f075e  mfiler3-3.0.7.tgz
+d1637f5166bdef4b0314480b96f45828  mfiler3-2.1.3.tgz

