Removed fuzzness from the compile.patch (bz 321745)

This commit is contained in:
Steve Dickson 2008-10-29 19:12:56 +00:00
parent 7442f29ae2
commit 722e0206bf
2 changed files with 22 additions and 16 deletions

View File

@ -1,6 +1,6 @@
Name: nfs4-acl-tools
Version: 0.3.2
Release: 2%{?dist}
Release: 3%{?dist}
Summary: The nfs4 ACL tools
Group: System Environment/Tools
License: BSD
@ -52,6 +52,9 @@ rm -rf %{buildroot}
%{_mandir}/man5/*
%changelog
* Wed Oct 29 2008 Steve Dickson <steved@redhat.com> - 0.3.2-3
- Removed fuzzness from the compile.patch (bz 321745)
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.3.2-2
- Autorebuild for GCC 4.3

View File

@ -1,16 +1,6 @@
--- nfs4-acl-tools/Makefile.orig 2006-10-24 17:52:48.000000000 -0400
+++ nfs4-acl-tools/Makefile 2007-02-16 14:33:09.000000000 -0500
@@ -46,7 +46,7 @@ LDIRT = config.log .dep config.status co
SUBDIRS = include libnfs4acl nfs4_getfacl nfs4_setfacl
-default: $(CONFIGURE)
+default:
ifeq ($(HAVE_BUILDDEFS), no)
$(MAKE) -C . $@
else
--- nfs4-acl-tools/configure.ac.orig 2006-10-25 13:34:00.000000000 -0400
+++ nfs4-acl-tools/configure.ac 2007-02-16 14:33:09.000000000 -0500
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
@ -18,8 +8,9 @@
+AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE, [], [GCC supports visibility attributes])
AC_OUTPUT(include/builddefs)
--- nfs4-acl-tools/include/buildmacros.orig 2006-08-21 13:05:23.000000000 -0400
+++ nfs4-acl-tools/include/buildmacros 2007-02-16 14:35:40.000000000 -0500
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)
@ -30,3 +21,15 @@
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