| |
@@ -1,6 +1,3 @@
|
| |
- %global _root_libdir /%{_lib}
|
| |
- %global _root_sbindir /sbin
|
| |
-
|
| |
Name: nilfs-utils
|
| |
Version: 2.2.11
|
| |
Release: 1%{?dist}
|
| |
@@ -35,30 +32,31 @@
|
| |
|
| |
%build
|
| |
# geez, make install is trying to run ldconfig on the system
|
| |
- %configure LDCONFIG=/bin/true --disable-static --libdir %{_root_libdir}
|
| |
+ %configure LDCONFIG=/bin/true --disable-static
|
| |
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
| |
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
| |
make %{?_smp_mflags}
|
| |
|
| |
%install
|
| |
rm -rf $RPM_BUILD_ROOT
|
| |
- make install DESTDIR=$RPM_BUILD_ROOT
|
| |
- rm -f $RPM_BUILD_ROOT/%{_root_libdir}/libnilfs*.la
|
| |
+ make install DESTDIR=$RPM_BUILD_ROOT sbindir=%_sbindir root_sbindir=%_sbindir
|
| |
+ rm -f $RPM_BUILD_ROOT/%{_libdir}/libnilfs*.la
|
| |
|
| |
%ldconfig_scriptlets
|
| |
|
| |
%files
|
| |
%doc COPYING ChangeLog
|
| |
%config(noreplace) /etc/nilfs_cleanerd.conf
|
| |
- %{_root_sbindir}/mkfs.nilfs2
|
| |
- %{_root_sbindir}/mount.nilfs2
|
| |
- %{_root_sbindir}/nilfs_cleanerd
|
| |
- %{_root_sbindir}/umount.nilfs2
|
| |
+ %{_sbindir}/mkfs.nilfs2
|
| |
+ %{_sbindir}/mount.nilfs2
|
| |
+ %{_sbindir}/nilfs_cleanerd
|
| |
+ %{_sbindir}/umount.nilfs2
|
| |
%{_sbindir}/nilfs-tune
|
| |
%{_sbindir}/nilfs-clean
|
| |
%{_sbindir}/nilfs-resize
|
| |
- %{_root_libdir}/libnilfscleaner.so.*
|
| |
- %{_root_libdir}/libnilfsgc.so.*
|
| |
+ %{_libdir}/libnilfscleaner.so.*
|
| |
+ %{_libdir}/libnilfsgc.so.*
|
| |
+ %{_libdir}/libnilfs.so.*
|
| |
%{_bindir}/chcp
|
| |
%{_bindir}/dumpseg
|
| |
%{_bindir}/lscp
|
| |
@@ -80,12 +78,11 @@
|
| |
%{_mandir}/man8/nilfs-tune.8.gz
|
| |
%{_mandir}/man8/nilfs-clean.8.gz
|
| |
%{_mandir}/man8/nilfs-resize.8.gz
|
| |
- %{_root_libdir}/libnilfs.so.*
|
| |
|
| |
%files devel
|
| |
- %{_root_libdir}/libnilfs.so
|
| |
- %{_root_libdir}/libnilfscleaner.so
|
| |
- %{_root_libdir}/libnilfsgc.so
|
| |
+ %{_libdir}/libnilfs.so
|
| |
+ %{_libdir}/libnilfscleaner.so
|
| |
+ %{_libdir}/libnilfsgc.so
|
| |
%{_includedir}/nilfs.h
|
| |
%{_includedir}/nilfs_cleaner.h
|
| |
|
| |
zbyszek
commented 2 months ago
This is in preparation for
https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin and
implements https://pagure.io/packaging-committee/pull-request/1355.
The files were physically located under /usr anyway, since /sbin and
/lib are symlinks, but rpm would report their location in the
"traditonal locations". The linked guidelines change drop this
historical rule and instead the real location is used.
When building with %_sbindir==%_bindir, the build would fail because
some files were installed into /usr/sbin. Override sbindir in the make
invocation to fix that.
This can be merged immediately after
https://pagure.io/packaging-committee/pull-request/1355 is approved.
This should all be invisible to users, so I didn't add a changelog entry.