packages: dic/dic.spec - unify bash-completion package name - strict intern...

[glen]

Author: glen                         Date: Sun Aug  9 15:40:55 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unify bash-completion package name
- strict internal deps

---- Files affected:
packages/dic:
   dic.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/dic/dic.spec
diff -u packages/dic/dic.spec:1.8 packages/dic/dic.spec:1.9
--- packages/dic/dic.spec:1.8	Fri Aug  7 20:42:09 2009
+++ packages/dic/dic.spec	Sun Aug  9 17:40:49 2009
@@ -1,6 +1,4 @@
 # $Revision$, $Date$
-# TODO:
-# - maybe create bash-completion
 Summary:	Dic is a simple, console-based disk catalogizer
 Summary(hu.UTF-8):	Dic egy egyszerű, konzolos lemez katalogizáló
 Name:		dic
@@ -19,7 +17,7 @@
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define	mcextfs %{_datadir}/mc/extfs/extfs.ini
+%define		mcextfs		%{_datadir}/mc/extfs/extfs.ini
 
 %description
 Dic is a simple, console-based disk catalogizer. It can easily add
@@ -46,16 +44,17 @@
 Extfs plugin Midnight Commander-hez. A futó Midnight Commander-ben
 gépeld be a "cd #mcdic" sort!
 
-%package bash-completion
+%package -n bash-completion-%{name}
 Summary:	bash-completion to dic
 Summary(hu.UTF-8):	Bash automatikus kiegészítés dic-hez
 Group:		Applications/Shells
-Requires:	%{name}
+Requires:	%{name} = %{version}-%{release}
+Requires:	bash-completion
 
-%description bash-completion
+%description -n bash-completion-%{name}
 Bash-completion to dic.
 
-%description bash-completion -l hu.UTF-8
+%description -n bash-completion-%{name} -l hu.UTF-8
 Bash automatikus kiegészítés dic-hez.
 
 %prep
@@ -82,8 +81,8 @@
 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%{_sysconfdir}/bash_completion.d
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/dic
+install -d $RPM_BUILD_ROOT/etc/bash_completion.d
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/bash_completion.d/dic
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -102,9 +101,9 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_datadir}/mc/extfs/mcdic
 
-%files bash-completion
+%files -n bash-completion-%{name}
 %defattr(644,root,root,755)
-%{_sysconfdir}/bash_completion.d/%{name}
+/etc/bash_completion.d/%{name}
 
 %post mc
 if [ -f %{mcextfs} ]; then
@@ -117,6 +116,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2009/08/09 15:40:49  glen
+- unify bash-completion package name
+- strict internal deps
+
 Revision 1.8  2009/08/07 18:42:09  uzsolt
 - bash-completion subpackage
 
@@ -129,7 +132,7 @@
 - %post fix
 
 Revision 1.5  2009/07/22 10:17:41  uzsolt
-- %%post mc
+- %post mc
 - verbose description to mc subpackage
 
 Revision 1.4  2009/07/21 18:26:55  uzsolt
@@ -146,4 +149,3 @@
 
 Revision 1.1  2009/06/27 17:41:55  uzsolt
 - initial
-
================================================================

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