From b91cfe883b5e676f9a14c312ade70decefa1918c Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@fedoraproject.org>
Date: Jan 24 2008 12:20:47 +0000
Subject: - Upgraded to version 3.15

- Updated spec file per Merge Review (bz 226353)

---

diff --git a/.cvsignore b/.cvsignore
index 801bada..b13530c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,3 +2,4 @@ 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
diff --git a/quota-3.06-pie.patch b/quota-3.06-pie.patch
index f3e9368..caf7653 100644
--- a/quota-3.06-pie.patch
+++ b/quota-3.06-pie.patch
@@ -1,6 +1,6 @@
---- quota-tools/Makefile.in.lr	2004-01-27 15:20:18.000000000 +0100
-+++ quota-tools/Makefile.in	2004-01-27 15:21:48.000000000 +0100
-@@ -49,6 +49,10 @@
+--- quota-tools/Makefile.in.orig	2008-01-24 06:52:54.658544000 -0500
++++ quota-tools/Makefile.in	2008-01-24 06:56:58.930806000 -0500
+@@ -52,6 +52,10 @@ LIBOBJS += @LIBMALLOC@
   
  all: $(PROGS)
  
@@ -11,7 +11,7 @@
  clean:
  	-rm -f core *.o .*.d
  
-@@ -125,10 +129,10 @@
+@@ -130,7 +134,8 @@ setquota: setquota.o quotaops.o $(LIBOBJ
  convertquota: convertquota.o $(LIBOBJS)
  
  rpc.rquotad: rquota_server.o rquota_svc.o svc_socket.o $(LIBOBJS)
@@ -19,12 +19,9 @@
 +	$(CC) $(LDFLAGS) -pie -o $@ $^ $(LIBS)
 +	@if readelf -d $@|fgrep -q TEXTREL; then echo "*** Text relocation"; false; else true; fi
  
- pot.o: pot.c pot.h
--	$(CC) $(CFLAGS) -c $<
- 
- rquota.h: rquota.x
- 	$(RPCGEN) -h -o $@ $<
-@@ -137,7 +141,7 @@
+ ifneq ($(NETLINKLIBS),)
+ quota_nld: quota_nld.o $(LIBOBJS)
+@@ -146,7 +151,7 @@ rquota_xdr.c: rquota.x
  	$(RPCGEN) -c -o $@ $<
  
  rquota_xdr.o: rquota_xdr.c rquota.h
diff --git a/quota.spec b/quota.spec
index df520ab..7df184d 100644
--- a/quota.spec
+++ b/quota.spec
@@ -1,7 +1,7 @@
 Name: quota
 Summary: System administration tools for monitoring users' disk usage.
 Epoch: 1
-Version: 3.14
+Version: 3.15
 Release: 1%{?dist}
 License: BSD
 URL: http://sourceforge.net/projects/linuxquota/
@@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-root
 Requires: initscripts >= 6.38
 Conflicts: kernel < 2.4
 BuildPreReq: e2fsprogs-devel gettext tcp_wrappers-devel
-Source0: http://unc.dl.sourceforge.net/sourceforge/linuxquota/quota-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/linuxquota/%{name}-%{version}.tar.gz
 Patch0:	quota-3.06-warnquota.patch
 Patch1: quota-3.06-no-stripping.patch
 Patch2: quota-3.06-man-page.patch
@@ -80,6 +80,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Jan 24 2008 Steve Dickson <SteveD@RedHat.com> 3.15-1
+- Upgraded to version 3.15 
+- Updated spec file per Merge Review (bz 226353)
+
 * Thu Feb 15 2007  Steve Dickson <SteveD@RedHat.com> 3.14-1
 - Upgraded to version 3.14 (bz# 213641)
 
diff --git a/sources b/sources
index 91d4620..48107df 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e6ae17d4bf26012e820c3582ec7af487  quota-3.14.tar.gz
+5a1c2f5e669aba825e0126d2f30ee622  quota-3.15.tar.gz