OBS User unknown 2007-03-20 23:43:09 +00:00 committed by Git OBS Bridge
parent d4e7995c94
commit 1583bd1612
4 changed files with 46 additions and 16 deletions

20
quota-3.14-cflags.diff Normal file
View File

@ -0,0 +1,20 @@
--- Makefile.in
+++ Makefile.in
@@ -1,7 +1,7 @@
PROGS = quotacheck quotaon quota quot repquota warnquota quotastats xqmstats edquota setquota convertquota rpc.rquotad
SOURCES = bylabel.c common.c convertquota.c edquota.c pot.c quot.c quota.c quotacheck.c quotacheck_v1.c quotacheck_v2.c quotaio.c quotaio_rpc.c quotaio_v1.c quotaio_v2.c quotaio_xfs.c quotaio_generic.c quotaon.c quotaon_xfs.c quotaops.c quotastats.c quotasys.c repquota.c rquota_client.c rquota_server.c rquota_svc.c setquota.c warnquota.c xqmstats.c svc_socket.c
VERSIONDEF = -DQUOTA_VERSION=\"3.14\"
-CFLAGS = @CFLAGS@ @EXT2_DIRECT@ -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 $(VERSIONDEF)
+CFLAGS = @CFLAGS@ @EXT2_DIRECT@ -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 $(VERSIONDEF) -fPIE
EXT2LIBS = @EXT2LIBS@
RPCSRC = rquota.h rquota_xdr.c rquota_clnt.c
LIBS = @LIBS@
@@ -44,7 +44,7 @@
.PHONY: all clean clobber realclean pot mo inst_mo
.%.d: %.c
- set -e; $(CC) -MM -MG $(CPPFLAGS) $< | \
+ set -e; $(CC) -MM -MG $(CPPFLAGS) $(CFLAGS) $< | \
sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' > $@; \
[ -s $@ ] || rm -f $@

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Mar 19 17:32:32 CET 2007 - lmichnovic@suse.cz
- fixed compiling some files without RPM_OPT_FLAGS and -fPIE
(cflags.diff)
- patch quota-%{version}.diff renamed to quota-%{version}-mode.diff
-------------------------------------------------------------------
Thu Oct 5 18:38:28 CEST 2006 - mjancar@suse.cz

View File

@ -1,7 +1,7 @@
#
# spec file for package quota (Version 3.14)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@ -13,20 +13,21 @@
Name: quota
BuildRequires: e2fsprogs-devel tcpd-devel
Version: 3.14
Release: 1
Release: 23
PreReq: %insserv_prereq %fillup_prereq
Autoreqprov: on
Group: System/Filesystems
License: GPL
License: GNU General Public License (GPL)
URL: http://sourceforge.net/projects/linuxquota/
Summary: Disk Quota System
Source: %{name}-%{version}.tar.bz2
Source1: %{name}-%{version}-SUSE.tar.gz
Patch0: %{name}-%{version}.diff
Patch0: %{name}-%{version}-mode.diff
Patch1: %{name}-%{version}-man.diff
Patch2: %{name}-%{version}-warnquota.diff
Patch3: %{name}-%{version}-type.diff
Patch4: %{name}-%{version}-pie.diff
Patch5: %{name}-%{version}-cflags.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -50,6 +51,7 @@ Authors:
%patch2
%patch3
%patch4
%patch5
find -type d -name CVS -exec rm -rf {} \; -prune
find -type d | xargs chmod 755
@ -57,12 +59,9 @@ find -type d | xargs chmod 755
%{suse_update_config -f}
aclocal --force
autoconf --force
CFLAGS="$RPM_OPT_FLAGS -Wall -fPIE" \
./configure \
--prefix=%{_prefix} \
--mandir=%{_mandir} \
%configure \
--sysconfdir=%{_sysconfdir}
make CC="gcc"
make CC="gcc"
%install
install -d -m 755 ${RPM_BUILD_ROOT}/etc/init.d
@ -97,7 +96,11 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/*
%{_sbindir}/*
%changelog -n quota
%changelog
* Mon Mar 19 2007 - lmichnovic@suse.cz
- fixed compiling some files without RPM_OPT_FLAGS and -fPIE
(cflags.diff)
- patch quota-%%{version}.diff renamed to quota-%%{version}-mode.diff
* Thu Oct 05 2006 - mjancar@suse.cz
- update to 3.14
* updated Polish translations (Jakub Bogusz)
@ -171,9 +174,9 @@ rm -rf $RPM_BUILD_ROOT
- update to version 3.08
* Wed Oct 02 2002 - tcrhak@suse.cz
- fixed bugs #20275 and #20278:
- added warnquota configuration files
- added /etc/quotatab to warnquota manual page
- fixed README.SuSE
- added warnquota configuration files
- added /etc/quotatab to warnquota manual page
- fixed README.SuSE
- removed quotad and colon patches and applied
them to the SuSE tarball
* Tue Sep 17 2002 - ro@suse.de
@ -183,10 +186,10 @@ rm -rf $RPM_BUILD_ROOT
quotad unless all the services are running
* Thu Sep 05 2002 - tcrhak@suse.cz
- fixed rcquotad script (bug #17319)
- use rc... status to test whether required services
- use rc... status to test whether required services
are running
- go through these tests only for `start'
- exit with 1 rather then 0 when some service is
- go through these tests only for `start'
- exit with 1 rather then 0 when some service is
not running
* Tue Aug 20 2002 - mmj@suse.de
- Correct PreReq