packages: dic/dic.spec - rename mc subpackage to mc-plugin-dic - mcextfs pl...

[uzsolt]

Author: uzsolt                       Date: Sun Apr 11 15:40:33 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rename mc subpackage to mc-plugin-dic
- mcextfs plugin placed to libdir/mc/extfs.d
- 'post mc' unneeded
- rel up

---- Files affected:
packages/dic:
   dic.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: packages/dic/dic.spec
diff -u packages/dic/dic.spec:1.10 packages/dic/dic.spec:1.11
--- packages/dic/dic.spec:1.10	Sun Feb 28 15:09:40 2010
+++ packages/dic/dic.spec	Sun Apr 11 17:40:28 2010
@@ -3,10 +3,10 @@
 Summary(hu.UTF-8):	Dic egy egyszerű, konzolos lemez katalogizáló
 Name:		dic
 Version:	0.7
-Release:	2
+Release:	3
 License:	GPL v2
 Group:		Applications
-Source0:	http://dl.sourceforge.net/dic/%{name}-%{version}.tar.bz2
+Source0:	http://downloads.sourceforge.net/dic/%{name}-%{version}.tar.bz2
 # Source0-md5:	c604751a05298dad2492189e1f31ec21
 Source1:	%{name}-bash-completion
 URL:		http://dic.sourceforge.net/
@@ -17,8 +17,6 @@
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		mcextfs		%{_datadir}/mc/extfs/extfs.ini
-
 %description
 Dic is a simple, console-based disk catalogizer. It can easily add
 disks to the catalog, search in the catalog, search for files,
@@ -30,18 +28,19 @@
 lemezeket a katalógushoz, kereshetsz a katalógusban, fájlok után,
 automatikusan átmásolhatod a fájlokat kézi navigálás nélkül, stb.
 
-%package mc
+%package -n mc-plugin-dic
 Summary:	Extfs plugin for Midnight Commander
 Summary(hu.UTF-8):	Extfs plugin Midnight Commander-hez
 Group:		Applications/Shells
 Requires:	%{name} = %{version}-%{release}
 Requires:	mc
+Obsoletes:	dic-dic
 
-%description mc
+%description -n mc-plugin-dic
 Extfs plugin for Midnight Commander. In the running Midnight Commander
 type "cd #mcdic".
 
-%description mc -l hu.UTF-8
+%description -n mc-plugin-dic -l hu.UTF-8
 Extfs plugin Midnight Commander-hez. A futó Midnight Commander-ben
 gépeld be a "cd #mcdic" sort!
 
@@ -79,8 +78,8 @@
 install man/dic.1 $RPM_BUILD_ROOT%{_mandir}/man1
 install man/dic.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5
 
-install -d $RPM_BUILD_ROOT%{_datadir}/mc/extfs
-install build/scripts-2.6/mcdic $RPM_BUILD_ROOT%{_datadir}/mc/extfs
+install -d $RPM_BUILD_ROOT%{_libdir}/mc/extfs.d
+install build/scripts-2.6/mcdic $RPM_BUILD_ROOT%{_libdir}/mc/extfs.d
 
 install -d $RPM_BUILD_ROOT/etc/bash_completion.d
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/bash_completion.d/dic
@@ -98,25 +97,26 @@
 %attr(755,root,root) %{_bindir}/*dic
 %{py_sitescriptdir}/*
 
-%files mc
+%files -n mc-plugin-dic
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_datadir}/mc/extfs/mcdic
+%attr(755,root,root) %{_libdir}/mc/extfs.d/mcdic
 
 %files -n bash-completion-%{name}
 %defattr(644,root,root,755)
 /etc/bash_completion.d/%{name}
 
-%post mc
-if [ -f %{mcextfs} ]; then
-	grep -q mcdic %{mcextfs} || echo -e "\n# dic disk catalogizer\nmcdic:\n" >> %{mcextfs}
-fi
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2010/04/11 15:40:28  uzsolt
+- rename mc subpackage to mc-plugin-dic
+- mcextfs plugin placed to libdir/mc/extfs.d
+- 'post mc' unneeded
+- rel up
+
 Revision 1.10  2010/02/28 14:09:40  uzsolt
 - mc subpackage requires dic
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dic/dic.spec?r1=1.10&r2=1.11&f=u