rpms/emacs
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Eliminate "file listed twice" warings during RPM build

Browse Source
This commit is contained in:
Peter Oliver 2023-04-14 23:19:42 +01:00
parent 1670e57f63
commit f151e68f40
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
emacs.spec
View File

@ -385,9 +385,8 @@ rm -f *-filelist {common,el}-*-files
( TOPDIR=${PWD} ( TOPDIR=${PWD}
cd %{buildroot} cd %{buildroot}
find .%{_datadir}/emacs/%{version}/lisp \ find .%{_datadir}/emacs/%{version}/lisp .%{site_lisp} \
.%{_datadir}/emacs/%{version}/lisp/leim \ \( -type f -name '*.elc' -fprint $TOPDIR/common-lisp-none-elc-files \) -o \( -type d -fprintf $TOPDIR/common-lisp-dir-files "%%%%dir %%p\n" \) -o \( -name '*.el.gz' -fprint $TOPDIR/el-bytecomped-files -o -fprint $TOPDIR/common-not-comped-files \)
.%{_datadir}/emacs/site-lisp \( -type f -name '*.elc' -fprint $TOPDIR/common-lisp-none-elc-files \) -o \( -type d -fprintf $TOPDIR/common-lisp-dir-files "%%%%dir %%p\n" \) -o \( -name '*.el.gz' -fprint $TOPDIR/el-bytecomped-files -o -fprint $TOPDIR/common-not-comped-files \)
) )
@ -402,8 +401,7 @@ echo "%{_infodir}/info*" >> info-filelist
# Put the lists together after filtering ./usr to /usr # Put the lists together after filtering ./usr to /usr
sed -i -e "s|\.%{_prefix}|%{_prefix}|" *-files sed -i -e "s|\.%{_prefix}|%{_prefix}|" *-files
cat common-*-files > common-filelist grep -vhE '%{site_lisp}(|/(default\.el|site-start\.d|site-start\.el))$' {common,el}-*-files > common-filelist
cat el-*-files common-lisp-dir-files > el-filelist
# Remove old icon # Remove old icon
rm %{buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document23.svg rm %{buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document23.svg
@ -507,7 +505,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
%attr(0755,-,-) %ghost %{_bindir}/emacs %attr(0755,-,-) %ghost %{_bindir}/emacs
%attr(0755,-,-) %ghost %{_bindir}/emacs-nox %attr(0755,-,-) %ghost %{_bindir}/emacs-nox
%files common -f common-filelist -f el-filelist -f info-filelist %files common -f common-filelist -f info-filelist
%config(noreplace) %{_sysconfdir}/skel/.emacs %config(noreplace) %{_sysconfdir}/skel/.emacs
%{_rpmconfigdir}/macros.d/macros.emacs %{_rpmconfigdir}/macros.d/macros.emacs
%license etc/COPYING %license etc/COPYING
@ -529,8 +527,8 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
%{emacs_libexecdir}/hexl %{emacs_libexecdir}/hexl
%{emacs_libexecdir}/rcs2log %{emacs_libexecdir}/rcs2log
%{_userunitdir}/emacs.service %{_userunitdir}/emacs.service
%attr(0644,root,root) %config(noreplace) %{_datadir}/emacs/site-lisp/default.el %attr(0644,root,root) %config(noreplace) %{site_lisp}/default.el
%attr(0644,root,root) %config %{_datadir}/emacs/site-lisp/site-start.el %attr(0644,root,root) %config %{site_lisp}/site-start.el
%{pkgconfig}/emacs.pc %{pkgconfig}/emacs.pc
%files terminal %files terminal
@ -546,6 +544,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
%{_includedir}/emacs-module.h %{_includedir}/emacs-module.h
%changelog %changelog
* Fri Apr 14 2023 Peter Oliver <rpm@mavit.org.uk> - 1:28.2-5
- Eliminate "file listed twice" warings during RPM build.
* Fri Feb 10 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 1:28.2-5 * Fri Feb 10 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 1:28.2-5
- Use webkit2gtk-4.1 - Use webkit2gtk-4.1