Drop explicit file listings
After some subpackages have been merged/dropped, the file listings were only used to filter out hgk. That was overly complex. It is simpler to just be explicit. This also fixes the hgk .pyc not being packaged together with the .py file. This change was isolated and documented (and obfuscated?) by Mads Kiilerich.
This commit is contained in:
parent
f962933f8a
commit
cb3bef4989
@ -151,7 +151,7 @@ popd
|
||||
%endif
|
||||
|
||||
%install
|
||||
%{python3} setup.py install -O1 --root %{buildroot} --prefix %{_prefix} --record=%{name}.files
|
||||
%{python3} setup.py install -O1 --root %{buildroot} --prefix %{_prefix}
|
||||
make install-doc DESTDIR=%{buildroot} MANDIR=%{_mandir}
|
||||
|
||||
# Overrule setup.py policy "c" for module usage: always allow rust extension (if available)
|
||||
@ -164,15 +164,6 @@ install -D -m 755 -pv rust/target/release/librusthg.so \
|
||||
%{buildroot}%{python3_sitearch}/mercurial/rustext%{python3_ext_suffix}
|
||||
%endif
|
||||
|
||||
grep -v -e 'hgk.py*' \
|
||||
-e "%{python3_sitearch}/mercurial/" \
|
||||
-e "%{python3_sitearch}/hgext/" \
|
||||
-e "%{python3_sitearch}/hgext3rd/" \
|
||||
-e "%{python3_sitearch}/hgdemandimport/" \
|
||||
-e "%{_bindir}" \
|
||||
< %{name}.files > %{name}-base.files
|
||||
grep 'hgk.py*' < %{name}.files > %{name}-hgk.files
|
||||
|
||||
install -D -m 755 contrib/hgk %{buildroot}%{_libexecdir}/mercurial/hgk
|
||||
install -m 755 contrib/hg-ssh %{buildroot}%{_bindir}
|
||||
|
||||
@ -221,16 +212,17 @@ rm -rf %{buildroot}%{python3_sitearch}/mercurial/locale
|
||||
%{__python3} %{_rpmconfigdir}/redhat/pathfix.py -pni "%{python3}" %{buildroot}%{_bindir}/hg-ssh
|
||||
|
||||
|
||||
%files -f %{name}-base.files -f hg.lang
|
||||
%files -f hg.lang
|
||||
%doc CONTRIBUTORS COPYING doc/README doc/hg*.html hgweb.cgi contrib/hgweb.fcgi contrib/hgweb.wsgi
|
||||
%doc %attr(644,root,root) %{_mandir}/man?/hg*
|
||||
%doc %attr(644,root,root) contrib/*.svg
|
||||
%dir %{python3_sitearch}/%{name}-*-py*.egg-info
|
||||
%dir %{_sysconfdir}/mercurial
|
||||
%dir %{_sysconfdir}/mercurial/hgrc.d
|
||||
%{bash_completions_dir}/hg
|
||||
%{zsh_completions_dir}/_hg
|
||||
%pycached %exclude %{python3_sitearch}/hgext/hgk.py
|
||||
%exclude %{python3_sitearch}/mercurial/rustext%{python3_ext_suffix}
|
||||
%{python3_sitearch}/mercurial-%{version}-py%{python3_version}.egg-info/
|
||||
%{python3_sitearch}/mercurial/
|
||||
%{python3_sitearch}/hgext/
|
||||
%{python3_sitearch}/hgext3rd/
|
||||
@ -242,8 +234,9 @@ rm -rf %{buildroot}%{python3_sitearch}/mercurial/locale
|
||||
|
||||
%config(noreplace) %{_sysconfdir}/mercurial/hgrc.d/certs.rc
|
||||
|
||||
%files hgk -f %{name}-hgk.files
|
||||
%files hgk
|
||||
%{_libexecdir}/mercurial/
|
||||
%pycached %{python3_sitearch}/hgext/hgk.py
|
||||
%config(noreplace) %{_sysconfdir}/mercurial/hgrc.d/hgk.rc
|
||||
|
||||
%files chg
|
||||
|
Loading…
Reference in New Issue
Block a user