packages: netcf/netcf-pld_interfaces.patch, netcf/netcf.spec - updated to 0...

[qboosh]

Author: qboosh                       Date: Sat Aug 13 07:34:35 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 0.1.9
- enhanced pld_interfaces patch to adjust netcf-transaction script (needs more polishing)

---- Files affected:
packages/netcf:
   netcf-pld_interfaces.patch (1.2 -> 1.3) , netcf.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/netcf/netcf-pld_interfaces.patch
diff -u packages/netcf/netcf-pld_interfaces.patch:1.2 packages/netcf/netcf-pld_interfaces.patch:1.3
--- packages/netcf/netcf-pld_interfaces.patch:1.2	Mon Mar 28 20:21:13 2011
+++ packages/netcf/netcf-pld_interfaces.patch	Sat Aug 13 09:34:29 2011
@@ -17,3 +17,53 @@
      { "/augeas/load/Ifcfg/excl[1]", "*~" },
      { "/augeas/load/Ifcfg/excl[2]", "*.bak" },
      { "/augeas/load/Ifcfg/excl[3]", "*.orig" },
+--- netcf-0.1.9/src/netcf-transaction.init.sh.orig	2011-05-20 20:40:22.000000000 +0200
++++ netcf-0.1.9/src/netcf-transaction.init.sh	2011-08-13 09:14:09.519761783 +0200
+@@ -30,13 +30,12 @@
+ sysconfdir="@sysconfdir@"
+ localstatedir="@localstatedir@"
+ 
+-netconfdir="$sysconfdir"/sysconfig/network-scripts
++netconfdir="$sysconfdir"/sysconfig/interfaces
+ snapshotdir="$localstatedir"/lib/netcf/network-snapshot
+ rollbackdirbase="$localstatedir"/lib/netcf/network-rollback
+ 
+ # Source function library.
+-test ! -r "$sysconfdir"/rc.d/init.d/functions ||
+-    . "$sysconfdir"/rc.d/init.d/functions
++. "$sysconfdir"/rc.d/init.d/functions
+ 
+ # take a snapshot of current network configuration scripts
+ change_begin ()
+@@ -195,8 +194,8 @@
+ # usage [val]
+ # Display usage string, then exit with VAL (defaults to 2).
+ usage() {
+-    echo $"Usage: $0 {change-begin|change-commit|change-rollback|snapshot-dir|start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+-    exit ${1-2}
++    msg_usage "$0 {change-begin|change-commit|change-rollback|snapshot-dir|start|stop|status|restart|condrestart|try-restart|reload|force-reload}")
++    exit ${1:-2}
+ }
+ 
+ # See how we were called.
+@@ -208,7 +207,7 @@
+ case "$1" in
+     # commands required in all Fedora initscripts
+     start|restart|reload|force-reload|condrestart|try-restart)
+-        echo -n $"Running $prog $1: "
++        nls "Forcing network configuration rollback"
+         change_rollback
+         # ignore the "no pending transaction" error
+         test "$retval" != "$EINVALID_IN_THIS_STATE" && retval=$?
+@@ -217,9 +216,9 @@
+     stop|status)
+         if test -d "$snapshotdir"
+         then
+-            echo $"There is an open transaction"
++            nls "There is an open transaction"
+         else
+-            echo $"No open transaction"
++            nls "No open transaction"
+         fi
+         ;;
+ 

================================================================
Index: packages/netcf/netcf.spec
diff -u packages/netcf/netcf.spec:1.4 packages/netcf/netcf.spec:1.5
--- packages/netcf/netcf.spec:1.4	Mon May 30 22:03:26 2011
+++ packages/netcf/netcf.spec	Sat Aug 13 09:34:29 2011
@@ -1,19 +1,24 @@
 # $Revision$, $Date$
+# PLDify netcf-transaction more
 Summary:	netcf - a cross-platform network configuration library
 Summary(pl.UTF-8):	netcf - wieloplatformowa biblioteka do konfiguracji sieci
 Name:		netcf
-Version:	0.1.7
+Version:	0.1.9
 Release:	1
 License:	GPL v2
 Group:		Administration/System
 Source0:	https://fedorahosted.org/released/netcf/%{name}-%{version}.tar.gz
-# Source0-md5:	8e313b623c907eb035cf3948b71fecc2
+# Source0-md5:	4d62010a79d56c12438969da9035b63c
 Patch0:		%{name}-pld_interfaces.patch
 URL:		https://fedorahosted.org/netcf/
-BuildRequires:	augeas-devel
+BuildRequires:	autoconf >= 2.50
+BuildRequires:	automake >= 1:1.11
+BuildRequires:	augeas-devel >= 0.5.0
+BuildRequires:	libnl1-devel >= 1.1
+BuildRequires:	libtool
+BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	libxslt-devel
-BuildRequires:	libnl1-devel
-Requires:	augeas
+Requires:	augeas >= 0.5.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -26,6 +31,7 @@
 Summary:	Netcf library
 Summary(pl.UTF-8):	Biblioteka netcf
 Group:		Libraries
+Requires:	augeas-libs >= 0.5.0
 
 %description libs
 This package contains the netcf shared library.
@@ -38,6 +44,9 @@
 Summary(pl.UTF-8):	Pliki programistyczne netcf
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
+Requires:	augeas-devel >= 0.5.0
+Requires:	libxml2-devel >= 2.0
+Requires:	libxslt-devel
 
 %description devel
 This package contains the include files used to develop using netcf
@@ -64,7 +73,14 @@
 %patch0 -p1
 
 %build
-%configure 
+%{__libtoolize}
+%{__aclocal} -I gnulib/m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+	--disable-silent-rules \
+	--with-init-script=redhat
 
 %{__make}
 
@@ -83,6 +99,7 @@
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/ncftool
+%attr(754,root,root) /etc/rc.d/init.d/netcf-transaction
 %{_datadir}/netcf   
 
 %files libs
@@ -107,6 +124,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2011/08/13 07:34:29  qboosh
+- updated to 0.1.9
+- enhanced pld_interfaces patch to adjust netcf-transaction script (needs more polishing)
+
 Revision 1.4  2011/05/30 20:03:26  qboosh
 - cleaned up and unified
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/netcf/netcf-pld_interfaces.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/netcf/netcf.spec?r1=1.4&r2=1.5&f=u