!3 Be consistent with the native community

Merge pull request !3 from hy/local
This commit is contained in:
openeuler-ci-bot 2020-01-11 16:48:26 +08:00 committed by Gitee
commit 8dcd0ab196
2 changed files with 7 additions and 39 deletions

View File

@ -1,35 +0,0 @@
diff -up nfs4-acl-tools-0.3.2/configure.ac.orig nfs4-acl-tools-0.3.2/configure.ac
--- nfs4-acl-tools-0.3.2/configure.ac.orig 2007-10-22 15:46:09.000000000 -0400
+++ nfs4-acl-tools-0.3.2/configure.ac 2008-10-29 14:42:02.427246000 -0400
@@ -32,5 +32,6 @@ AC_PACKAGE_NEED_GETXATTR_LIBATTR
AC_MANUAL_FORMAT
AC_FUNC_GCC_VISIBILITY
+AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE, [], [GCC supports visibility attributes])
AC_OUTPUT(include/builddefs)
diff -up nfs4-acl-tools-0.3.2/include/buildmacros.orig nfs4-acl-tools-0.3.2/include/buildmacros
--- nfs4-acl-tools-0.3.2/include/buildmacros.orig 2007-03-08 13:32:15.000000000 -0500
+++ nfs4-acl-tools-0.3.2/include/buildmacros 2008-10-29 14:42:02.431244000 -0400
@@ -54,7 +54,8 @@ OBJECTS = $(ASFILES:.s=.o) \
$(LFILES:.l=.o) \
$(YFILES:%.y=%.tab.o)
-INSTALL = $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
+#INSTALL = $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
+INSTALL = $(TOPDIR)/install-sh
SHELL = /bin/sh
IMAGES_DIR = $(TOPDIR)/all-images
diff -up nfs4-acl-tools-0.3.2/Makefile.orig nfs4-acl-tools-0.3.2/Makefile
--- nfs4-acl-tools-0.3.2/Makefile.orig 2007-02-27 18:58:58.000000000 -0500
+++ nfs4-acl-tools-0.3.2/Makefile 2008-10-29 14:42:02.413258000 -0400
@@ -46,7 +46,7 @@ LDIRT = config.log .dep config.status co
SUBDIRS = include libnfs4acl nfs4_getfacl nfs4_setfacl man
-default: $(CONFIGURE)
+default:
ifeq ($(HAVE_BUILDDEFS), no)
$(MAKE) -C . $@
else

View File

@ -1,6 +1,6 @@
Name: nfs4-acl-tools Name: nfs4-acl-tools
Version: 0.3.4 Version: 0.3.4
Release: 4 Release: 5
Summary: The nfs4 ACL tools Summary: The nfs4 ACL tools
License: BSD License: BSD
URL: http://www.citi.umich.edu/projects/nfsv4/linux/ URL: http://www.citi.umich.edu/projects/nfsv4/linux/
@ -8,9 +8,6 @@ Source0: http://linux-nfs.org/~bfields/nfs4-acl-tools/%{name}-%{version}.
BuildRequires: libtool libattr-devel qt-devel git BuildRequires: libtool libattr-devel qt-devel git
Patch0000: 0000-nfs4acl-0.2.0-compile.patch
%description %description
It contains commandline and GUI NFSv4 ACL tools, which deal directly with NFSv4 ACLs. It contains commandline and GUI NFSv4 ACL tools, which deal directly with NFSv4 ACLs.
It also contains GUI ACL utilities for the Linux NFSv4 client. It also contains GUI ACL utilities for the Linux NFSv4 client.
@ -63,6 +60,12 @@ install -m 0755 GUI/nfs4-acl-editor/nfs4-acl-editor %{buildroot}/usr/bin/nfs4-ac
%changelog %changelog
* Sat Jan 11 2020 renxudong <renxudong1@huawei.com> - 0.3.4-5
- Type:enhancemnet
- ID:NA
- SUG:NA
- DESC:Be consistent with the native community
* Wed Sep 11 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.3.4-4 * Wed Sep 11 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.3.4-4
- Type:enhancemnet - Type:enhancemnet
- ID:NA - ID:NA