[packages/usermode] - BR: pkgconfig, pass FDFORMAT path (different than configure default), explicit files in common dir
qboosh
qboosh at pld-linux.org
Thu Mar 19 20:17:14 CET 2026
commit a8bdbee0e7559e8d450c5e70c09c4d480a5125b5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Mar 19 20:16:11 2026 +0100
- BR: pkgconfig, pass FDFORMAT path (different than configure default), explicit files in common dirs
usermode.spec | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/usermode.spec b/usermode.spec
index bdb3eea..b21f67d 100644
--- a/usermode.spec
+++ b/usermode.spec
@@ -24,6 +24,7 @@ BuildRequires: libblkid-devel
%{?with_selinux:BuildRequires: libselinux-devel}
BuildRequires: libuser-devel
BuildRequires: pam-devel
+BuildRequires: pkgconfig
BuildRequires: startup-notification-devel
BuildRequires: tar >= 1:1.22
BuildRequires: xz
@@ -84,20 +85,20 @@ zmieniać hasło.
%build
%configure \
+ FDFORMAT=/usr/sbin/fdformat \
%{?with_selinux:--with-selinux} \
--without-fexecve
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
+
%{__make} install \
INSTALL='install -p' \
DESTDIR=$RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/etc/security/console.apps
-
-install -p %{SOURCE1} \
- $RPM_BUILD_ROOT/etc/security/console.apps/config-util
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/security/console.apps/config-util
%find_lang %{name}
@@ -120,12 +121,20 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/userinfo
%attr(755,root,root) %{_bindir}/usermount
%attr(755,root,root) %{_bindir}/userpasswd
+%{_datadir}/%{name}
%{_mandir}/man1/pam-panel-icon.1*
%{_mandir}/man1/userinfo.1*
%{_mandir}/man1/usermount.1*
%{_mandir}/man1/userpasswd.1*
%{_mandir}/man8/consolehelper-gtk.8*
-%{_datadir}/%{name}
-%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*.png
+%{_desktopdir}/redhat-userinfo.desktop
+%{_desktopdir}/redhat-usermount.desktop
+%{_desktopdir}/redhat-userpasswd.desktop
+%{_pixmapsdir}/badge-small.png
+%{_pixmapsdir}/disks.png
+%{_pixmapsdir}/keyring.png
%{_pixmapsdir}/keys.xpm
+%{_pixmapsdir}/password.png
+%{_pixmapsdir}/status_lock.png
+%{_pixmapsdir}/status_unlocked.png
+%{_pixmapsdir}/user_icon.png
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/usermode.git/commitdiff/a8bdbee0e7559e8d450c5e70c09c4d480a5125b5
More information about the pld-cvs-commit
mailing list