delete redundant files

This commit is contained in:
openeuler-basic 2020-01-08 14:31:11 +08:00
parent 1f2e437612
commit 79daaeb654
3 changed files with 17 additions and 8 deletions

View File

@ -1,3 +1,14 @@
From c5a0bfd174e4a88fcd49fe7a130b37b6779c1a18 Mon Sep 17 00:00:00 2001
From: Jiri Kucera <jkucera@redhat.com>
Date: Aug 07 2018 14:10:07 +0000
Subject: Include <sys/sysmacros.h> manually
Inclusion of <sys/sysmacros.h> from <sys/types.h>
is now deprecated
---
diff --git a/usermount.c b/usermount.c diff --git a/usermount.c b/usermount.c
index 3aafadd..5875c09 100644 index 3aafadd..5875c09 100644
--- a/usermount.c --- a/usermount.c
@ -10,3 +21,4 @@ index 3aafadd..5875c09 100644
#include <errno.h> #include <errno.h>
#include <glob.h> #include <glob.h>
#include <libintl.h> #include <libintl.h>

View File

@ -1,2 +0,0 @@
USER=root
UGROUPS=wheel

View File

@ -1,13 +1,12 @@
Name: usermode Name: usermode
Version: 1.112 Version: 1.112
Release: 6 Release: 7
Summary: Tools for certain user account management tasks Summary: Tools for certain user account management tasks
License: GPLv2+ License: GPLv2+
URL: https://pagure.io/usermode/ URL: https://pagure.io/usermode/
Source: https://releases.pagure.org/usermode/usermode-%{version}.autotoolized.tar.xz Source: https://releases.pagure.org/usermode/usermode-%{version}.autotoolized.tar.xz
Source1: config-util
Patch0000: sysmacros.patch Patch0000: Include-sys-sysmacros.h-manually.patch
Requires: pam passwd util-linux Requires: pam passwd util-linux
BuildRequires: desktop-file-utils gettext intltool perl-XML-Parser util-linux BuildRequires: desktop-file-utils gettext intltool perl-XML-Parser util-linux
BuildRequires: glib2-devel gtk2-devel libblkid-devel libSM-devel libselinux-devel libuser-devel BuildRequires: glib2-devel gtk2-devel libblkid-devel libSM-devel libselinux-devel libuser-devel
@ -46,8 +45,6 @@ Package help includes man pages for usermode.
%{__ln_s} usermount %{buildroot}%{_bindir}/userformat %{__ln_s} usermount %{buildroot}%{_bindir}/userformat
%{__ln_s} usermount.1 %{buildroot}%{_mandir}/man1/userformat.1 %{__ln_s} usermount.1 %{buildroot}%{_mandir}/man1/userformat.1
install -D -p -m 644 %{SOURCE1} %{buildroot}/etc/security/console.apps/config-util
for i in openeuler-userinfo.desktop openeuler-userpasswd.desktop openeuler-usermount.desktop; do for i in openeuler-userinfo.desktop openeuler-userpasswd.desktop openeuler-usermount.desktop; do
echo 'NotShowIn=GNOME;KDE;' >>%{buildroot}%{_datadir}/applications/$i echo 'NotShowIn=GNOME;KDE;' >>%{buildroot}%{_datadir}/applications/$i
desktop-file-install --vendor openeuler --delete-original \ desktop-file-install --vendor openeuler --delete-original \
@ -59,7 +56,6 @@ done
%files -f %{name}.lang %files -f %{name}.lang
%doc COPYING ChangeLog NEWS README %doc COPYING ChangeLog NEWS README
%config(noreplace) /etc/security/console.apps/config-util
%attr(4711,root,root) /usr/sbin/userhelper %attr(4711,root,root) /usr/sbin/userhelper
%{_bindir}/* %{_bindir}/*
%{_datadir}/usermode %{_datadir}/usermode
@ -71,6 +67,9 @@ done
%{_mandir}/man8/* %{_mandir}/man8/*
%changelog %changelog
* Sat Jan 4 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.112-7
- Delete redundant file
* Tue Dec 31 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.112-6 * Tue Dec 31 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.112-6
- Delete unneeded patch - Delete unneeded patch