Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package file for openSUSE:Factory checked in
at 2022-08-28 13:12:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/file (Old)
and /work/SRC/openSUSE:Factory/.file.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "file"
Sun Aug 28 13:12:08 2022 rev:130 rq:999552 version:5.42
Changes:
--------
--- /work/SRC/openSUSE:Factory/file/file.changes 2022-07-29
16:46:53.638485071 +0200
+++ /work/SRC/openSUSE:Factory/.file.new.2083/file.changes 2022-08-28
13:12:09.676520020 +0200
@@ -1,0 +2,7 @@
+Thu Aug 25 19:31:39 UTC 2022 - Callum Farmer <gm...@opensuse.org>
+
+- Move magic files to /usr/share/file from /usr/share/misc, and
+ then create symlinks from /usr/share/misc back to /usr/share/file
+ as per FHS 3.0
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ file.spec ++++++
--- /var/tmp/diff_new_pack.YEhQbS/_old 2022-08-28 13:12:10.524522184 +0200
+++ /var/tmp/diff_new_pack.YEhQbS/_new 2022-08-28 13:12:10.532522205 +0200
@@ -66,6 +66,7 @@
Patch42: file-boo1201350.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir /etc
+%global magicdir %{_datadir}/file
%global _miscdir %{_datadir}/misc
%description
@@ -138,7 +139,7 @@
rm -f ltcf-c.sh ltconfig ltmain.sh
autoreconf -fiv
export CFLAGS="%{optflags} -DHOWMANY=69632 -fPIE $(pkg-config libseccomp
--cflags)"
-%configure --disable-silent-rules --datadir=%{_miscdir} \
+%configure --disable-silent-rules --datadir=%{magicdir} \
--disable-static \
--enable-fsect-man5
make %{?_smp_mflags} pkgdatadir='$(datadir)' LDFLAGS="-pie"
@@ -150,8 +151,11 @@
make DESTDIR=%{buildroot} install pkgdatadir='$(datadir)'
rm -vf %{buildroot}%{_sysconfdir}/magic
echo '# Localstuff: file(1) magic(5) for locally observed files' >
%{buildroot}%{_sysconfdir}/magic
-echo '# global magic file is %{_miscdir}/magic(.mgc)' >>
%{buildroot}%{_sysconfdir}/magic
+echo '# global magic file is %{magicdir}/magic(.mgc)' >>
%{buildroot}%{_sysconfdir}/magic
# Does not build
+mkdir -p %{buildroot}%{_miscdir}
+ln -s %{magicdir}/magic %{buildroot}%{_miscdir}/magic
+ln -s %{magicdir}/magic.mgc %{buildroot}%{_miscdir}/magic.mgc
%if %{with decore}
install -s dcore %{buildroot}%{_bindir}
%endif
@@ -182,6 +186,9 @@
%config(noreplace) %{_sysconfdir}/magic
%{_miscdir}/magic
%{_miscdir}/magic.mgc
+%dir %{magicdir}
+%{magicdir}/magic
+%{magicdir}/magic.mgc
%doc %{_mandir}/man5/magic.5.gz
%files
