pool/file
SHA256
5
0
Fork 2
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 999290 from home:gmbr3:Active

Browse Source 
- 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

OBS-URL: https://build.opensuse.org/request/show/999290
OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=252
This commit is contained in:
Dr. Werner Fink 2022-08-27 11:04:28 +00:00 committed by Git OBS Bridge
parent ef3ad93517
commit 1e466fead7
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
file.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Aug 25 19:31:39 UTC 2022 - Callum Farmer <gmbr3@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
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 13 11:01:16 UTC 2022 - Dr. Werner Fink <werner@suse.de> Wed Jul 13 11:01:16 UTC 2022 - Dr. Werner Fink <werner@suse.de>

11
file.spec
View File

@ -66,6 +66,7 @@ Patch39: file-5.28-btrfs-image.dif
Patch42: file-boo1201350.patch Patch42: file-boo1201350.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir /etc %global _sysconfdir /etc
%global magicdir %{_datadir}/file
%global _miscdir %{_datadir}/misc %global _miscdir %{_datadir}/misc
%description %description
@ -138,7 +139,7 @@ rm -f Magdir/*,v Magdir/*~
rm -f ltcf-c.sh ltconfig ltmain.sh rm -f ltcf-c.sh ltconfig ltmain.sh
autoreconf -fiv autoreconf -fiv
export CFLAGS="%{optflags} -DHOWMANY=69632 -fPIE $(pkg-config libseccomp --cflags)" export CFLAGS="%{optflags} -DHOWMANY=69632 -fPIE $(pkg-config libseccomp --cflags)"
%configure --disable-silent-rules --datadir=%{_miscdir} \ %configure --disable-silent-rules --datadir=%{magicdir} \
--disable-static \ --disable-static \
--enable-fsect-man5 --enable-fsect-man5
make %{?_smp_mflags} pkgdatadir='$(datadir)' LDFLAGS="-pie" make %{?_smp_mflags} pkgdatadir='$(datadir)' LDFLAGS="-pie"
@ -150,8 +151,11 @@ mkdir %{buildroot}/etc
make DESTDIR=%{buildroot} install pkgdatadir='$(datadir)' make DESTDIR=%{buildroot} install pkgdatadir='$(datadir)'
rm -vf %{buildroot}%{_sysconfdir}/magic rm -vf %{buildroot}%{_sysconfdir}/magic
echo '# Localstuff: file(1) magic(5) for locally observed files' > %{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 # 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} %if %{with decore}
install -s dcore %{buildroot}%{_bindir} install -s dcore %{buildroot}%{_bindir}
%endif %endif
@ -182,6 +186,9 @@ unset LD_LIBRARY_PATH
%config(noreplace) %{_sysconfdir}/magic %config(noreplace) %{_sysconfdir}/magic
%{_miscdir}/magic %{_miscdir}/magic
%{_miscdir}/magic.mgc %{_miscdir}/magic.mgc
%dir %{magicdir}
%{magicdir}/magic
%{magicdir}/magic.mgc
%doc %{_mandir}/man5/magic.5.gz %doc %{_mandir}/man5/magic.5.gz
%files %files