Hello community,

here is the log from the commit of package quota for openSUSE:Factory checked 
in at 2012-06-05 15:35:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/quota (Old)
 and      /work/SRC/openSUSE:Factory/.quota.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "quota", Maintainer is "[email protected]"

Changes:
--------
--- /work/SRC/openSUSE:Factory/quota/quota.changes      2012-01-04 
07:31:08.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.quota.new/quota.changes 2012-06-05 
15:35:04.000000000 +0200
@@ -1,0 +2,8 @@
+Thu May 31 19:36:13 UTC 2012 - [email protected]
+
+- unroll binary file list
+- remove install_nld.patch, not needed since 4.00-pre1
+- remove automake dependency
+- prepare UsrMerge (UsrMerge project), this obsoletes man.patch
+
+-------------------------------------------------------------------

Old:
----
  quota-3.17-install_nld.patch
  quota-3.17-man.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ quota.spec ++++++
--- /var/tmp/diff_new_pack.aLjU0j/_old  2012-06-05 15:35:05.000000000 +0200
+++ /var/tmp/diff_new_pack.aLjU0j/_new  2012-06-05 15:35:05.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package quota
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,6 @@
 
 
 Name:           quota
-BuildRequires:  automake
 BuildRequires:  dbus-1-devel
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  libnl-1_1-devel
@@ -33,9 +32,7 @@
 Source:         %{name}-%{version}-pre1.tar.gz
 Source1:        %{name}-SUSE.tar.bz2
 Patch1:         %{name}-3.17-makefile.patch
-Patch2:         %{name}-3.17-man.patch
 Patch3:         %{name}-3.17-warnquota.patch
-Patch7:         %{name}-3.17-install_nld.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -54,11 +51,12 @@
 
 %package nfs
 Summary:        Disk Quota System on NFS
+Group:          System/Filesystems
 Requires:       quota = %version
 PreReq:         %insserv_prereq %fillup_prereq
 # Require the services needed to be present for quotad service: portmap, 
nfsserver, network
-Requires:       portmap
 Requires:       nfs-kernel-server
+Requires:       portmap
 Requires:       sysconfig
 # Split provides
 Provides:       quota:/etc/init.d/quotad
@@ -77,15 +75,11 @@
 %prep
 %setup -q -n quota-tools -a 1
 %patch1
-%patch2
 %patch3
-%patch7
 find -type d -name CVS -exec rm -rf {} \; -prune
 find -type d | xargs chmod 755
 
 %build
-aclocal --force
-autoconf --force
 %configure \
        --sysconfdir=%{_sysconfdir} \
        --enable-netlink
@@ -98,13 +92,13 @@
 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.*
-mv ${RPM_BUILD_ROOT}%{_sbindir}/{quotacheck,quotaon,quotaoff} 
${RPM_BUILD_ROOT}/sbin/
+#UsrMerge
+ln -s %{_sbindir}/{quotacheck,quotaon,quotaoff} ${RPM_BUILD_ROOT}/sbin/
+#EndUsrMerge
 #installing ldap-scripts
 install -m 755 ldap-scripts/*pl ${RPM_BUILD_ROOT}/usr/sbin/
 install -m 755 ldap-scripts/edquota_editor ${RPM_BUILD_ROOT}/usr/sbin/
-#ln -sf ../../sbin/quotacheck ${RPM_BUILD_ROOT}/usr/sbin/quotacheck
 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
@@ -138,11 +132,28 @@
 %config /etc/warnquota.conf
 %doc SUSE/README.SUSE README.* doc
 %doc %{_mandir}/man?/*
-/sbin/*
-%{_bindir}/*
-%{_sbindir}/*
-%exclude %{_sbindir}/rpc.rquotad
-%exclude %{_sbindir}/rcquotad
+#UsrMerge
+/sbin/quotacheck
+/sbin/quotaoff
+/sbin/quotaon
+#EndUsrMerge
+%{_bindir}/quota
+%{_sbindir}/applySystemQuotas.pl
+%{_sbindir}/convertquota
+%{_sbindir}/edquota
+%{_sbindir}/edquota_editor
+%{_sbindir}/quot
+%{_sbindir}/quota_nld
+%{_sbindir}/quotacheck
+%{_sbindir}/quotaoff
+%{_sbindir}/quotaon
+%{_sbindir}/quotastats
+%{_sbindir}/repquota
+%{_sbindir}/setSystemQuotas.pl
+%{_sbindir}/setquota
+%{_sbindir}/setquota-ldap.pl
+%{_sbindir}/warnquota
+%{_sbindir}/xqmstats
 
 %files nfs
 %defattr(-,root,root)

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to