- mc plugins in libexec

[packages/dic.git] / dic.spec

diff --git a/dic.spec b/dic.spec
index ab4df497e33670301ca941f85c6e40b619f4123a..ad3fe633b8e281bcbc7a7f4c0920ea541f43e8af 100644 (file)
--- a/dic.spec
+++ b/dic.spec
@@ -2,18 +2,17 @@ Summary:      Dic is a simple, console-based disk catalogizer
 Summary(hu.UTF-8):     Dic egy egyszerű, konzolos lemez katalogizáló
 Name:          dic
 Version:       0.7
-Release:       3
+Release:       8
 License:       GPL v2
 Group:         Applications
 Source0:       http://downloads.sourceforge.net/dic/%{name}-%{version}.tar.bz2
 # Source0-md5: c604751a05298dad2492189e1f31ec21
 Source1:       %{name}-bash-completion
 URL:           http://dic.sourceforge.net/
-BuildRequires: python-devel
+BuildRequires: python-devel >= 1:2.7
 BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.219
+BuildRequires: rpmbuild(macros) >= 1.710
 Requires:      python-modules
-BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -49,6 +48,9 @@ Summary(hu.UTF-8):    Bash automatikus kiegészítés dic-hez
 Group:         Applications/Shells
 Requires:      %{name} = %{version}-%{release}
 Requires:      bash-completion
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
 
 %description -n bash-completion-%{name}
 Bash-completion to dic.
@@ -60,28 +62,25 @@ Bash automatikus kiegészítés dic-hez.
 %setup -q
 
 %build
-export CFLAGS="%{rpmcflags}"
-%{__python} setup.py build
+%py_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install \
-       --optimize=2 \
-       --root=$RPM_BUILD_ROOT
+%py_install
 
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 %py_postclean
 
 install -d $RPM_BUILD_ROOT%{_mandir}/man{1,5}
-install man/dic.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install man/dic.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5
+cp -a man/dic.1 $RPM_BUILD_ROOT%{_mandir}/man1
+cp -a man/dic.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5
 
-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%{_libexecdir}/mc/extfs.d
+install -p build/scripts-2.7/mcdic $RPM_BUILD_ROOT%{_libexecdir}/mc/extfs.d
 
 install -d $RPM_BUILD_ROOT/etc/bash_completion.d
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/bash_completion.d/dic
+cp -a %{SOURCE1} $RPM_BUILD_ROOT/etc/bash_completion.d/dic
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -98,7 +97,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n mc-plugin-dic
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/mc/extfs.d/mcdic
+%attr(755,root,root) %{_libexecdir}/mc/extfs.d/mcdic
 
 %files -n bash-completion-%{name}
 %defattr(644,root,root,755)