From c2ec8ddd3f949542e76a116c962a12dbeaaa06d42dc79f95133bb210c5578c82 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 21 Sep 2010 10:34:48 +0000 Subject: [PATCH] Accepting request 47612 from Base:System Copy from Base:System/quota based on submit request 47612 from user anicka OBS-URL: https://build.opensuse.org/request/show/47612 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/quota?expand=0&rev=26 --- quota-SUSE.tar.bz2 | 4 ++-- quota.changes | 5 +++++ quota.spec | 9 ++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/quota-SUSE.tar.bz2 b/quota-SUSE.tar.bz2 index a5d2a35..feddf13 100644 --- a/quota-SUSE.tar.bz2 +++ b/quota-SUSE.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a667d05b602e2f31c915dae90c2b3194c3ebee76092629bacda83a1c9db640a -size 4029 +oid sha256:60c09f9ff1d62cc00a5dc3a75f189bb6e5063d04dd0e4926eadbc2795835b66c +size 4259 diff --git a/quota.changes b/quota.changes index 01ebcb9..1202ee7 100644 --- a/quota.changes +++ b/quota.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 9 16:59:51 CEST 2010 - anicka@suse.cz + +- add port settings to sysconfig (bnc#637382) + ------------------------------------------------------------------- Wed Jun 23 08:15:39 UTC 2010 - mseben@novell.com diff --git a/quota.spec b/quota.spec index b662eef..d8ea86b 100644 --- a/quota.spec +++ b/quota.spec @@ -21,7 +21,7 @@ Name: quota BuildRequires: dbus-1-devel e2fsprogs-devel libnl-devel pkg-config tcpd-devel Version: 3.17 -Release: 3 +Release: 10 PreReq: %insserv_prereq %fillup_prereq AutoReqProv: on Group: System/Filesystems @@ -98,6 +98,7 @@ make CC="gcc" %install install -d -m 755 ${RPM_BUILD_ROOT}/etc/init.d install -d -m 755 ${RPM_BUILD_ROOT}/sbin +install -d -m 755 ${RPM_BUILD_ROOT}/var/adm/fillup-templates make install ROOTDIR=${RPM_BUILD_ROOT} #quotactl.2 manual page was moved from quota to man-pages[bnc#587393] rm ${RPM_BUILD_ROOT}/%{_mandir}/man?/quotactl.* @@ -110,15 +111,16 @@ cp SUSE/{quotad,boot.quota} ${RPM_BUILD_ROOT}/etc/init.d #ln -s ../../etc/init.d/quota ${RPM_BUILD_ROOT}/usr/sbin/rcquota ln -s ../../etc/init.d/quotad ${RPM_BUILD_ROOT}/usr/sbin/rcquotad %find_lang %{name} +cp SUSE/rquotad.sysconfig $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.rquotad %clean rm -rf $RPM_BUILD_ROOT %post -%{fillup_and_insserv -y boot.quota} +%{fillup_and_insserv -f -y boot.quota} %post nfs -%{fillup_and_insserv quotad} +%{fillup_and_insserv -n rquotad quotad} %preun %stop_on_removal boot.quota @@ -152,6 +154,7 @@ rm -rf $RPM_BUILD_ROOT %doc SUSE/README.quotad.SUSE %{_sbindir}/rpc.rquotad %{_sbindir}/rcquotad +/var/adm/fillup-templates/sysconfig.rquotad # these files conflicts with glibc rpm %exclude /usr/include/rpcsvc/*