OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/quota?expand=0&rev=13

quota-3.16-dbus_header_check.patch

@@ -0,0 +1,48 @@
+--- configure.in
++++ configure.in
+@@ -96,23 +96,15 @@
+ fi
+ AC_SUBST(EXT2LIBS)
+ 
+-AC_ARG_WITH(dbus_include,
+-	[  --with-dbus_include=path        Path to directory with dbus include directory [default=/usr/include/dbus-1.0/]],
+-	DBUS_INCLUDE="$with_dbus_include",
+-	DBUS_INCLUDE="/usr/include/dbus-1.0/")
+-AC_ARG_WITH(dbus_arch_include,
+-	[  --with-dbus_arch_include=path   Path to directory with dbus arch-dependent include directory [default=/usr/lib/dbus-1.0/include/]],
+-	DBUS_ARCH_INCLUDE="$with_dbus_arch_include",
+-	DBUS_ARCH_INCLUDE="/usr/lib/dbus-1.0/include/")
++PKG_CHECK_MODULES(DBUS, dbus-1)
+ 
+ AC_ARG_ENABLE(netlink,
+ 	[  --enable-netlink=[yes/no/try]   Compile daemon receiving quota messages via netlink [default=no].],
+ 	,
+ 	enable_netlink="no")
+ if test "x$enable_netlink" != "xno"; then
+-	AC_CHECK_LIB(nl, genl_register, NETLINKLIBS="-lnl $NETLINKLIBS")
+-	AC_CHECK_LIB(dbus-1, dbus_bus_get, NETLINKLIBS="-ldbus-1 $NETLINKLIBS")
+-	if test "${ac_cv_lib_nl_genl_register}" != "yes" -o "${ac_cv_lib_dbus_1_dbus_bus_get}" != "yes"; then
++	AC_CHECK_LIB(nl, genl_register, NETLINKLIBS="-lnl $DBUS_LIBS $NETLINKLIBS")
++	if test -z "$NETLINKLIBS" -o -z "$DBUS_LIBS" ; then
+ 		if test "x$enable_netlink" = "xyes"; then
+ 			AC_MSG_ERROR([Required libraries for quota netlink daemon not found.])
+ 		else
+@@ -121,16 +113,13 @@
+ 		enable_netlink="no"
+ 		NETLINKLIBS=""
+ 	else
+-		oldCPPFLAGS="$CPPFLAGS"
+-		CPPFLAGS="-I $DBUS_INCLUDE -I $DBUS_ARCH_INCLUDE $CPPFLAGS"
+-		AC_CHECK_HEADERS(dbus/dbus.h, have_dbus="yes")
+-		if test "x$have_dbus" != "xyes"; then
++		CPPFLAGS="$DBUS_CFLAGS $CPPFLAGS"
++		if test -z "$DBUS_LIBS" ; then
+ 			if test "x$enable_netlink" = "xyes"; then
+ 				AC_MSG_ERROR([Required headers for quota netlink daemon not found.])
+ 			else
+ 				AC_MSG_WARN([Quota netlink daemon won't be compiled. Required headers not found.])
+ 			fi
+-			CPPFLAGS="$oldCPPFLAGS"
+ 			NETLINKLIBS=""
+ 			enable_netlink="no"
+ 		else

quota.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Apr 14 17:50:39 CEST 2008 - lmichnovic@suse.cz
+
+- enabled compilation with netlink 
+- needed rewrite of configure check (*dbus_header_check.patch)
+- added pkg-config into BuildReq
+
 -------------------------------------------------------------------
 Fri Mar 14 10:26:23 CET 2008 - lmichnovic@suse.cz
 

quota.spec

@@ -12,9 +12,9 @@
 
 
 Name:           quota
-BuildRequires:  e2fsprogs-devel tcpd-devel
+BuildRequires:  dbus-1-devel e2fsprogs-devel libnl-devel pkg-config tcpd-devel
 Version:        3.16
-Release:        3
+Release:        11
 PreReq:         %insserv_prereq %fillup_prereq
 AutoReqProv:    on
 Group:          System/Filesystems
@@ -27,6 +27,7 @@ Patch1:         %{name}-%{version}-makefile.patch
 Patch2:         %{name}-%{version}-man.patch
 Patch3:         %{name}-%{version}-warnquota.patch
 Patch4:         %{name}-%{version}-type.patch
+Patch5:         %{name}-%{version}-dbus_header_check.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -44,6 +45,7 @@ Authors:
     Jan Kara <jack@suse.cz>
 
 %package nfs
+License:        GPL v2 only
 Summary:        Disk Quota System on NFS
 Group:          System/Filesystems
 Requires:       quota = %version
@@ -72,6 +74,7 @@ Authors:
 %patch2
 %patch3
 %patch4
+%patch5
 find -type d -name CVS -exec rm -rf {} \; -prune
 find -type d | xargs chmod 755
 
@@ -81,7 +84,7 @@ aclocal --force
 autoconf --force
 %configure \
 	--sysconfdir=%{_sysconfdir} \
-	--disable-netlink
+	--enable-netlink
 make CC="gcc" 
 
 %install
@@ -143,6 +146,10 @@ rm -rf $RPM_BUILD_ROOT
 %exclude /usr/include/rpcsvc/*
 
 %changelog
+* Mon Apr 14 2008 lmichnovic@suse.cz
+- enabled compilation with netlink
+- needed rewrite of configure check (*dbus_header_check.patch)
+- added pkg-config into BuildReq
 * Fri Mar 14 2008 lmichnovic@suse.cz
 - excluding files /usr/include/rpcsvc/rquota.*
 * Thu Mar 13 2008 lmichnovic@suse.cz