Accepting request 61597 from home:vitezslav_cizek:branches:Base:System

self accept

OBS-URL: https://build.opensuse.org/request/show/61597
OBS-URL: https://build.opensuse.org/package/show/Base:System/quota?expand=0&rev=9

quota-SUSE.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0a667d05b602e2f31c915dae90c2b3194c3ebee76092629bacda83a1c9db640a
-size 4029
+oid sha256:546c9b9d1c51c5b3780f62a3a6ab723efbe1d858e08ff504ab5bd51be777a22c
+size 4290

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
 

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,17 @@ 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/sysconfig.nfs-quota $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.nfs-quota
 
 %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 -an nfs quotad}
+#%{fillup_only -an nfs}
 
 %preun
 %stop_on_removal boot.quota
@@ -152,6 +155,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc SUSE/README.quotad.SUSE
 %{_sbindir}/rpc.rquotad
 %{_sbindir}/rcquotad
+%{_localstatedir}/adm/fillup-templates/sysconfig.nfs-quota
 # these files conflicts with glibc rpm
 %exclude /usr/include/rpcsvc/*