From abfc9931d6bcb0cfb3317414167d2c54e611b900 Mon Sep 17 00:00:00 2001 From: Ondrej Vasik Date: Wed, 23 Apr 2008 12:46:25 +0000 Subject: [PATCH] new upstream release+own directory of rpcsvc headers --- .cvsignore | 6 +--- quota-3.06-no-stripping.patch | 4 +-- quota-3.15-manpages.patch | 63 ----------------------------------- quota.spec | 12 ++++--- sources | 2 +- 5 files changed, 11 insertions(+), 76 deletions(-) delete mode 100644 quota-3.15-manpages.patch diff --git a/.cvsignore b/.cvsignore index b13530c..d7eb695 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,5 +1 @@ -quota-3.10.tar.gz -quota-3.12.tar.gz -quota-3.13.tar.gz -quota-3.14.tar.gz -quota-3.15.tar.gz +quota-3.16.tar.gz diff --git a/quota-3.06-no-stripping.patch b/quota-3.06-no-stripping.patch index d1c9588..1125f06 100644 --- a/quota-3.06-no-stripping.patch +++ b/quota-3.06-no-stripping.patch @@ -4,8 +4,8 @@ -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) $(STRIP) -m $(DEF_SBIN_MODE) quota $(ROOTDIR)$(bindir) +- -$(INSTALL) $(STRIP) -m $(DEF_SBIN_MODE) rpc.rquotad $(ROOTDIR)$(sbindir) + -$(INSTALL) -m $(DEF_SBIN_MODE) quota $(ROOTDIR)$(bindir) + -$(INSTALL) -m $(DEF_SBIN_MODE) rpc.rquotad $(ROOTDIR)$(sbindir) -$(INSTALL) -m $(DEF_MAN_MODE) *.1 $(ROOTDIR)$(mandir)/man1 diff --git a/quota-3.15-manpages.patch b/quota-3.15-manpages.patch deleted file mode 100644 index dc0c7d2..0000000 --- a/quota-3.15-manpages.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -urNp quota-tools-orig/quota_nld.8 quota-tools/quota_nld.8 ---- quota-tools-orig/quota_nld.8 2007-06-18 15:47:03.000000000 +0200 -+++ quota-tools/quota_nld.8 2008-02-21 15:42:36.000000000 +0100 -@@ -8,9 +8,11 @@ quota_nld \- quota netlink message daemo - ] - .SH DESCRIPTION - .BR quota_nld --is a daemon that listens on netlink socket and processes received quota --warnings. The daemon supports forwarding warning messages to the system's --DBUS and writing them to the terminal user has last accessed. -+is a daemon that listens on netlink socket and processes received quota -+warnings. Note, that you have to enable the kernel support for sending quota -+messages over netlink (in Filesystems->Quota menu). The daemon supports -+forwarding warning messages to the system's DBUS (so that desktop manager -+can display a dialog) and writing them to the terminal user has last accessed. - - .SH OPTIONS - .TP -diff -urNp quota-tools-orig/quotaon.8 quota-tools/quotaon.8 ---- quota-tools-orig/quotaon.8 2008-02-21 15:31:46.000000000 +0100 -+++ quota-tools/quotaon.8 2008-02-21 15:38:16.000000000 +0100 -@@ -200,4 +200,6 @@ default filesystems - .SH "SEE ALSO" - .BR quotactl (2), - .BR fstab (5), --.BR repquota (8). -+.BR quota_nld (8), -+.BR repquota (8), -+.BR warnquota (8) -diff -urNp quota-tools-orig/quota.1 quota-tools/quota.1 ---- quota-tools-orig/quota.1 2007-06-20 15:57:10.000000000 +0200 -+++ quota-tools/quota.1 2008-02-21 15:39:08.000000000 +0100 -@@ -170,4 +170,6 @@ default filesystems - .BR edquota (8), - .BR quotacheck (8), - .BR quotaon (8), --.BR repquota (8) -+.BR quota_nld (8), -+.BR repquota (8), -+.BR warnquota (8) -diff -urNp quota-tools-orig/repquota.8 quota-tools/repquota.8 ---- quota-tools-orig/repquota.8 2006-10-30 16:26:20.000000000 +0100 -+++ quota-tools/repquota.8 2008-02-21 15:36:14.000000000 +0100 -@@ -144,4 +144,6 @@ default set of groups - .BR edquota (8), - .BR quotacheck (8), - .BR quotaon (8), --.BR setquota (8) -+.BR quota_nld (8), -+.BR setquota (8), -+.BR warnquota (8) -diff -urNp quota-tools-orig/warnquota.8 quota-tools/warnquota.8 ---- quota-tools-orig/warnquota.8 2006-05-13 03:05:24.000000000 +0200 -+++ quota-tools/warnquota.8 2008-02-21 15:34:47.000000000 +0100 -@@ -20,7 +20,7 @@ warnquota \- send mail to users over quo - ] - .SH DESCRIPTION - .B warnquota --checks the disk quota for each filesystem and mails a warning -+checks the disk quota for each local filesystem and mails a warning - message to those users who have reached their softlimit. - It is typically run via - .BR cron (8). diff --git a/quota.spec b/quota.spec index 672c3e0..4c38322 100644 --- a/quota.spec +++ b/quota.spec @@ -4,8 +4,8 @@ Name: quota Summary: System administration tools for monitoring users' disk usage Epoch: 1 -Version: 3.15 -Release: 6%{?dist} +Version: 3.16 +Release: 1%{?dist} License: BSD and GPLv2+ URL: http://sourceforge.net/projects/linuxquota/ Group: System Environment/Base @@ -19,8 +19,6 @@ Patch1: quota-3.06-no-stripping.patch Patch2: quota-3.06-man-page.patch Patch3: quota-3.06-pie.patch Patch4: quota-3.13-wrong-ports.patch -Patch5: quota-3.15-manpages.patch - %description The quota package contains system administration tools for monitoring @@ -36,7 +34,6 @@ and limiting user and or group disk usage per filesystem. %patch3 -p1 %endif %patch4 -p1 -%patch5 -p1 %build @@ -81,6 +78,7 @@ rm -rf %{buildroot} %attr(0755,root,root) /sbin/* %attr(0755,root,root) %{_bindir}/* %attr(0755,root,root) %{_sbindir}/* +%dir %{_includedir}/rpcsvc %{_includedir}/rpcsvc/* %attr(0644,root,root) %{_mandir}/man1/* %attr(0644,root,root) %{_mandir}/man2/* @@ -89,6 +87,10 @@ rm -rf %{buildroot} %changelog +* Wed Apr 23 2008 Ondrej Vasik 3.16-1 +- own directory of rpcsvc headers(#442143) +- new upstream release + * Wed Mar 12 2008 Ondrej Vasik 3.15-6 - added enable-ldapmail=try option(wonder how #133207 got closed by FC-4 without it or warnquota.conf change) diff --git a/sources b/sources index 48107df..ff1a809 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5a1c2f5e669aba825e0126d2f30ee622 quota-3.15.tar.gz +6d1467458a092c4754abef92e7fa6ebe quota-3.16.tar.gz