diff --git a/mingw64-filesystem.spec b/mingw64-filesystem.spec index 43bf421..1cf8064 100644 --- a/mingw64-filesystem.spec +++ b/mingw64-filesystem.spec @@ -33,8 +33,8 @@ Source5: mingw64-find-provides.sh Source6: mingw64-scripts.sh Source7: mingw64-rpmlint.config Source8: mingw64-install-post.sh -Requires: rpm Requires: mingw64-cross-breakpad-tools +Requires: rpm BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch #!BuildIgnore: post-build-checks @@ -59,12 +59,12 @@ sed 's/@VERSION@/%{version}/' < %{SOURCE4} > mingw64-find-requires.sh mkdir -p %{buildroot} mkdir -p %{buildroot}%{_prefix}/lib -install -m 755 %{SOURCE6} %{buildroot}%{_prefix}/lib/mingw64-scripts +install -m 755 %{SOURCE6} %{buildroot}%{_libexecdir}/mingw64-scripts mkdir -p %{buildroot}%{_bindir} pushd %{buildroot}%{_bindir} for i in mingw64-configure mingw64-make mingw64-cmake ; do - ln -s %{_prefix}/lib/mingw64-scripts $i + ln -s %{_libexecdir}/mingw64-scripts $i done popd @@ -110,11 +110,11 @@ mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/man mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/man/man{1,2,3,4,5,6,7,8,9,n} # NB. NOT _libdir -mkdir -p %{buildroot}%{_prefix}/lib/rpm -install -m 0755 %{SOURCE3} %{buildroot}%{_prefix}/lib/rpm -install -m 0755 mingw64-find-requires.sh %{buildroot}%{_prefix}/lib/rpm -install -m 0755 %{SOURCE5} %{buildroot}%{_prefix}/lib/rpm -install -m 0755 %{SOURCE8} %{buildroot}%{_prefix}/lib/rpm +mkdir -p %{buildroot}%{_libexecdir}/rpm +install -m 0755 %{SOURCE3} %{buildroot}%{_libexecdir}/rpm +install -m 0755 mingw64-find-requires.sh %{buildroot}%{_libexecdir}/rpm +install -m 0755 %{SOURCE5} %{buildroot}%{_libexecdir}/rpm +install -m 0755 %{SOURCE8} %{buildroot}%{_libexecdir}/rpm %files %defattr(-,root,root,-) @@ -123,8 +123,8 @@ install -m 0755 %{SOURCE8} %{buildroot}%{_prefix}/lib/rpm %{_sysconfdir}/profile.d/mingw64.sh %{_sysconfdir}/rpmlint/mingw64-rpmlint.config %{_bindir}/mingw64-* -%{_prefix}/lib/mingw64-scripts +%{_libexecdir}/mingw64-scripts %{_prefix}/x86_64-w64-mingw32/ -%{_prefix}/lib/rpm/mingw64-* +%{_libexecdir}/rpm/mingw64-* %changelog