diff --git a/perl-File-ShareDir.spec b/perl-File-ShareDir.spec
index 9357614..7f76bf1 100644
--- a/perl-File-ShareDir.spec
+++ b/perl-File-ShareDir.spec
@@ -1,18 +1,21 @@
 Name:           perl-File-ShareDir
 Version:        1.03
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Locate per-dist and per-module shared files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/File-ShareDir/
 Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/File-ShareDir-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+BuildRequires:  perl(constant)
+BuildRequires:  perl(Carp)
 BuildRequires:  perl(Class::Inspector) >= 1.12
+BuildRequires:  perl(Exporter)
 BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
+BuildRequires:  perl(File::Spec)
 BuildRequires:  perl(Test::More) >= 0.47
 Requires:       perl(Class::Inspector) >= 1.12
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 %{?perl_default_filter}
 %global __requires_exclude %{?__requires_exclude}|perl\\(Class::Inspector\\)$
@@ -27,36 +30,33 @@ available to the larger Perl community.
 %setup -q -n File-ShareDir-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
-%{_fixperms} $RPM_BUILD_ROOT/*
+make pure_install PERL_INSTALL_ROOT=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} \;
+find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
+%{_fixperms} %{buildroot}/*
 chmod 644 share/sample.txt
 chmod 644 share/subdir/sample.txt
-rm -rf $RPM_BUILD_ROOT/blib/lib/auto/share/dist/File-ShareDir/
-rm -rf $RPM_BUILD_ROOT/blib/lib/auto/share/module/File-ShareDir/test_file.txt
+rm -rf %{buildroot}/blib/lib/auto/share/dist/File-ShareDir/
+rm -rf %{buildroot}/blib/lib/auto/share/module/File-ShareDir/test_file.txt
 
 %check
 make test AUTOMATED_TESTING=1
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %doc Changes LICENSE README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Tue Oct 23 2012 Petr Šabata <contyk@redhat.com> - 1.03-7
+- Modernize specfile
+- Specify all dependencies
+- Drop command macros
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.03-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild