rpms/dcbd/devel dcbd-0.9.15-sysconfig.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 dcbd-0.9.7-init.patch, 1.1, 1.2 dcbd.spec, 1.2, 1.3 sources, 1.2, 1.3 dcbd-0.9.7-sysconfig.patch, 1.1, NONE

[Jan Zeleny]

Author: jzeleny

Update of /cvs/extras/rpms/dcbd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25911

Modified Files:
	.cvsignore dcbd-0.9.7-init.patch dcbd.spec sources 
Added Files:
	dcbd-0.9.15-sysconfig.patch 
Removed Files:
	dcbd-0.9.7-sysconfig.patch 
Log Message:
Rebase to 0.9.15


dcbd-0.9.15-sysconfig.patch:
 Makefile.am    |    2 +-
 Makefile.in    |    2 +-
 README         |    4 ++--
 dcbd.8         |    2 +-
 include/dcbd.h |    2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE dcbd-0.9.15-sysconfig.patch ---
diff -Nurp dcbd-0.9.15/dcbd.8 dcbd-0.9.15-corrected/dcbd.8
--- dcbd-0.9.15/dcbd.8	2009-07-09 01:17:03.000000000 +0200
+++ dcbd-0.9.15-corrected/dcbd.8	2009-08-17 13:07:08.693587866 +0200
@@ -61,7 +61,7 @@ show usage information
 .TP
 .BI "-f" " filename"
 use the specified file as the configuration file instead of the default file:
-/etc/sysconfig/dcbd/dcbd.conf
+/etc/dcbd/dcbd.conf
 .B dcbd
 expects the directory of the configuration file to exist, but if the
 configuration file does not exist, then a default configuration file will
diff -Nurp dcbd-0.9.15/include/dcbd.h dcbd-0.9.15-corrected/include/dcbd.h
--- dcbd-0.9.15/include/dcbd.h	2009-07-09 01:13:57.000000000 +0200
+++ dcbd-0.9.15-corrected/include/dcbd.h	2009-08-17 13:07:33.313595906 +0200
@@ -43,7 +43,7 @@
 #define CLIF_IFACE_DIR "/var/run/dcbd"
 #define CLIF_IFACE_IFNAME "clif"
 
-#define DEFAULT_CFG_FILE "/etc/sysconfig/dcbd/dcbd.conf"
+#define DEFAULT_CFG_FILE "/etc/dcbd/dcbd.conf"
 
 #define DEFAULT_DCBX_VERSION  2
 
diff -Nurp dcbd-0.9.15/Makefile.am dcbd-0.9.15-corrected/Makefile.am
--- dcbd-0.9.15/Makefile.am	2009-07-09 01:13:57.000000000 +0200
+++ dcbd-0.9.15-corrected/Makefile.am	2009-08-17 13:08:13.101591160 +0200
@@ -58,7 +58,7 @@ nltest_SOURCES = nltest.c nltest.h
 dist_man_MANS = dcbd.8 dcbtool.8
 
 ## force the creation of an empty configuration directory at install time
-dcbdconfigdir = /etc/sysconfig/dcbd
+dcbdconfigdir = /etc/dcbd
 dcbdconfig_DATA =
 
 ## pkg-config data file, for client interface software to find headers
diff -Nurp dcbd-0.9.15/Makefile.in dcbd-0.9.15-corrected/Makefile.in
--- dcbd-0.9.15/Makefile.in	2009-07-09 01:14:09.000000000 +0200
+++ dcbd-0.9.15-corrected/Makefile.in	2009-08-17 13:08:21.275576489 +0200
@@ -299,7 +299,7 @@ $(dcbd_include_HEADERS) $(noinst_HEADERS
 
 nltest_SOURCES = nltest.c nltest.h
 dist_man_MANS = dcbd.8 dcbtool.8
-dcbdconfigdir = /etc/sysconfig/dcbd
+dcbdconfigdir = /etc/dcbd
 dcbdconfig_DATA = 
 pkgconfigdir = ${libdir}/pkgconfig
 pkgconfig_DATA = dcbd.pc
diff -Nurp dcbd-0.9.15/README dcbd-0.9.15-corrected/README
--- dcbd-0.9.15/README	2009-07-09 01:13:57.000000000 +0200
+++ dcbd-0.9.15-corrected/README	2009-08-17 13:08:37.654597087 +0200
@@ -159,7 +159,7 @@ dcbd Application Install
      ./configure --prefix=/usr; make; make install
 
    This will build and install 'dcbd' and 'dcbtool' to /usr/sbin, make
-   the '/etc/sysconfig/dcbd' directory (default location of
+   the '/etc/dcbd' directory (default location of
    the dcbd.conf file) and setup dcbd to run as a system service using the
    chkconfig program.  Verify that the dcbd service is working as expected
    with the 'service dcbd status' command. If the service is not on, issue
@@ -181,7 +181,7 @@ Options
 dcbd has the following command line options:
     -h show usage information
     -f configfile    use the specified file as the config file instead of
-                     the default file - /etc/sysconfig/dcbd/dcbd.conf
+                     the default file - /etc/dcbd/dcbd.conf
     -d run dcbd as a daemon
     -v show dcbd version
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dcbd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Mar 2009 13:25:25 -0000	1.2
+++ .cvsignore	17 Aug 2009 11:48:11 -0000	1.3
@@ -1 +1 @@
-dcbd-0.9.7.tar.gz
+dcbd-0.9.15.tar.gz

dcbd-0.9.7-init.patch:
 dcbd.init |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Index: dcbd-0.9.7-init.patch
===================================================================
RCS file: /cvs/extras/rpms/dcbd/devel/dcbd-0.9.7-init.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dcbd-0.9.7-init.patch	23 Mar 2009 13:25:25 -0000	1.1
+++ dcbd-0.9.7-init.patch	17 Aug 2009 11:48:11 -0000	1.2
@@ -13,7 +13,7 @@ diff -Nurp dcbd-0.9.7-current/dcbd.init 
  # Provides: dcbd
  # Required-Start: network
  # Required-Stop:
--# Default-Start: 3 4 5
+-# Default-Start: 3 5
 +# Default-Start:
  # Default-Stop:
 +# Short-Description: Data Center Bridging Exchange protocol daemon


Index: dcbd.spec
===================================================================
RCS file: /cvs/extras/rpms/dcbd/devel/dcbd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dcbd.spec	24 Jul 2009 20:04:39 -0000	1.2
+++ dcbd.spec	17 Aug 2009 11:48:11 -0000	1.3
@@ -1,19 +1,19 @@
 Name:           dcbd
-Version:        0.9.7
-Release:        5%{?dist}
+Version:        0.9.15
+Release:        1%{?dist}
 Summary:        Intel EEDC Connection
 
 Group:          System Environment/Daemons
 License:        GPLv2
 URL:            http://e1000.sourceforge.net
-Source0:        http://downloads.sourceforge.net/e1000/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/project/e1000/DCB%20Tools/%{version}/%{name}-%{version}.tar.gz
 Patch0:         dcbd-0.9.7-make.patch
-Patch1:         dcbd-0.9.7-sysconfig.patch
+Patch1:         dcbd-0.9.15-sysconfig.patch
 Patch2:         dcbd-0.9.7-init.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires: kernel >= 2.6.29
-BuildRequires:  libconfig-devel kernel-headers >= 2.6.29
+Requires: kernel >= 2.6.31
+BuildRequires:  libconfig-devel kernel-headers >= 2.6.31
 Requires(post):   chkconfig
 Requires(preun):  chkconfig initscripts
 Requires(postun): initscripts
@@ -90,6 +90,9 @@ fi
 
 
 %changelog
+* Mon Aug 17 2009 Jan Zeleny <jzeleny at redhat.com> - 0.9.15-1
+- rebase to 0.9.15
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dcbd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Mar 2009 13:25:25 -0000	1.2
+++ sources	17 Aug 2009 11:48:11 -0000	1.3
@@ -1 +1 @@
-8a7ad4e410abc1e5c3497aae0db5aa1e  dcbd-0.9.7.tar.gz
+8e4c745ae1b34c7663bce5cb5f5d7059  dcbd-0.9.15.tar.gz


--- dcbd-0.9.7-sysconfig.patch DELETED ---