From 9ce71987fc25a1996000427df34995512375eafa Mon Sep 17 00:00:00 2001 From: fake Date: Tue, 4 Apr 2006 14:12:59 +0000 Subject: [PATCH] fake: quota: add a patch only applied if glibc24 is in use - don't install rquota.{h,x}, they are supplied by glibc24. [2006032623201522607] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7426 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/quota/quota.conf | 3 +++ package/base/quota/use-glibc24-header.diff | 10 ++++++++++ 2 files changed, 13 insertions(+) create mode 100644 package/base/quota/use-glibc24-header.diff diff --git a/package/base/quota/quota.conf b/package/base/quota/quota.conf index 5cb51a8d6..446165e16 100644 --- a/package/base/quota/quota.conf +++ b/package/base/quota/quota.conf @@ -22,3 +22,6 @@ postmake="rm -rf /usr/share/doc/packages/quota && cp -r doc /usr/share/doc/packages/quota" + +[ "$ROCKCFG_PKG_GLIBC_BRANCH" = "glibc24" ] && \ + var_append patchfiles " " "${confdir}/use-glibc24-header.diff" diff --git a/package/base/quota/use-glibc24-header.diff b/package/base/quota/use-glibc24-header.diff new file mode 100644 index 000000000..0cc8d620d --- /dev/null +++ b/package/base/quota/use-glibc24-header.diff @@ -0,0 +1,10 @@ +--- ./Makefile.in.orig 2006-03-26 22:11:58.000000000 +0200 ++++ ./Makefile.in 2006-03-26 22:13:42.000000000 +0200 +@@ -95,7 +95,6 @@ + -mkdir -p $(ROOTDIR)$(mandir)/man3 + -mkdir -p $(ROOTDIR)$(mandir)/man8 + -$(INSTALL) -m 755 -d $(ROOTDIR)$(includedir)/rpcsvc +- -$(INSTALL) -m 644 rquota.h rquota.x $(ROOTDIR)$(includedir)/rpcsvc + -$(INSTALL) -s -m $(DEF_SBIN_MODE) quota $(ROOTDIR)$(bindir) + -$(INSTALL) -s -m $(DEF_SBIN_MODE) rpc.rquotad $(ROOTDIR)$(sbindir) + -$(INSTALL) -m $(DEF_MAN_MODE) *.1 $(ROOTDIR)$(mandir)/man1