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

[Jan Zeleny]

Author: jzeleny

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

Modified Files:
	.cvsignore sources 
Added Files:
	dcbd-0.9.7-init.patch dcbd-0.9.7-make.patch 
	dcbd-0.9.7-sysconfig.patch dcbd.spec 
Log Message:
Initial upload of sources, patches and spec file.



dcbd-0.9.7-init.patch:

--- NEW FILE dcbd-0.9.7-init.patch ---
diff -Nurp dcbd-0.9.7-current/dcbd.init dcbd-0.9.7-corrected/dcbd.init
--- dcbd-0.9.7-current/dcbd.init	2009-03-11 17:51:59.000000000 +0100
+++ dcbd-0.9.7-corrected/dcbd.init	2009-03-11 18:19:10.000000000 +0100
@@ -33,15 +33,16 @@
 # dcbd		This shell script takes care of starting and stopping
 #		dcbd (DCB capabilities exchange protocol)
 #
-# chkconfig: 345 20 80
+# chkconfig: - 20 80
 # description: Data Center Bridging Exchange protocol daemon
 #
 ### BEGIN INIT INFO
 # Provides: dcbd
 # Required-Start: network
 # Required-Stop:
-# Default-Start: 3 4 5
+# Default-Start:
 # Default-Stop:
+# Short-Description: Data Center Bridging Exchange protocol daemon
 # Description: Data Center Bridging Exchange protocol daemon
 ### END INIT INFO
 

dcbd-0.9.7-make.patch:

--- NEW FILE dcbd-0.9.7-make.patch ---
diff -Nurp dcbd-0.9.7/Makefile.am dcbd-0.9.7-corrected/Makefile.am
--- dcbd-0.9.7/Makefile.am	2009-03-10 11:26:53.000000000 +0100
+++ dcbd-0.9.7-corrected/Makefile.am	2009-03-10 11:27:35.000000000 +0100
@@ -26,6 +26,7 @@ else
 ## system has a shared libconfig, use it
 AM_CFLAGS = $(LIBCONFIG_CFLAGS)
 AM_LDFLAGS = $(LIBCONFIG_LIBS)
+dcbd_LDFLAGS = $(LIBCONFIG_LIBS)
 endif
 
 ## header files to be installed, for programs using the client interface to dcbd
diff -Nurp dcbd-0.9.7/Makefile.in dcbd-0.9.7-corrected/Makefile.in
--- dcbd-0.9.7/Makefile.in	2009-03-10 11:30:20.000000000 +0100
+++ dcbd-0.9.7-corrected/Makefile.in	2009-03-10 11:28:26.000000000 +0100
@@ -272,6 +272,7 @@ AM_CPPFLAGS = -I${srcdir}/include -DSYSC
 	$(am__append_1)
 @BUILTIN_LIBCONFIG_TRUE at SUBDIRS = .
 @BUILTIN_LIBCONFIG_TRUE at DIST_SUBDIRS = . ${subdirs}
+ at BUILTIN_LIBCONFIG_FALSE@dcbd_LDFLAGS = $(LIBCONFIG_LIBS)
 @BUILTIN_LIBCONFIG_TRUE at dcbd_LDFLAGS = -static
 @BUILTIN_LIBCONFIG_TRUE at dcbd_LDADD = libconfig-1.3.1/libconfig.la
 @BUILTIN_LIBCONFIG_TRUE at dcbtool_LDFLAGS = -static

dcbd-0.9.7-sysconfig.patch:

--- NEW FILE dcbd-0.9.7-sysconfig.patch ---
diff -Nurp dcbd-0.9.7/dcbd.8 dcbd-0.9.7-corrected/dcbd.8
--- dcbd-0.9.7/dcbd.8	2009-03-01 23:10:04.000000000 +0100
+++ dcbd-0.9.7-corrected/dcbd.8	2009-03-11 16:25:34.000000000 +0100
@@ -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.7/include/dcbd.h dcbd-0.9.7-corrected/include/dcbd.h
--- dcbd-0.9.7/include/dcbd.h	2009-03-01 23:10:04.000000000 +0100
+++ dcbd-0.9.7-corrected/include/dcbd.h	2009-03-11 16:23:56.000000000 +0100
@@ -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  1
 
diff -Nurp dcbd-0.9.7/Makefile.am dcbd-0.9.7-corrected/Makefile.am
--- dcbd-0.9.7/Makefile.am	2009-03-10 11:26:53.000000000 +0100
+++ dcbd-0.9.7-corrected/Makefile.am	2009-03-11 16:27:36.000000000 +0100
@@ -58,7 +59,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.7/Makefile.in dcbd-0.9.7-corrected/Makefile.in
--- dcbd-0.9.7/Makefile.in	2009-03-10 11:30:20.000000000 +0100
+++ dcbd-0.9.7-corrected/Makefile.in	2009-03-11 16:29:52.000000000 +0100
@@ -302,7 +303,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.7/README dcbd-0.9.7-corrected/README
--- dcbd-0.9.7/README	2009-03-01 23:10:04.000000000 +0100
+++ dcbd-0.9.7-corrected/README	2009-03-11 16:27:59.000000000 +0100
@@ -158,7 +158,7 @@ dcbd Application Install
      ./configure; make; make install
 
    This will build and install 'dcbd' and 'dcbtool' to /usr/local/sbin (by
-   default), make the '/etc/sysconfig/dcbd' directory (default location of
+   default), make 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
@@ -175,7 +175,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
 


--- NEW FILE dcbd.spec ---
Name:           dcbd
Version:        0.9.7
Release:        4%{?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
Patch0:         dcbd-0.9.7-make.patch
Patch1:         dcbd-0.9.7-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(post):   chkconfig
Requires(preun):  chkconfig initscripts
Requires(postun): initscripts

%description
This package contains the Linux user space daemon and configuration tool for
Intel Enhanced Ethernet for the Data Center software.

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains header files for developing applications
that use %{name}.

%prep
%setup -q
%patch0 -p1 -b .make
%patch1 -p1 -b .sysconfig
%patch2 -p1 -b .init


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unneeded development files
# rm -rf $RPM_BUILD_ROOT%{_includedir}
# rm -rf $RPM_BUILD_ROOT%{_libdir}
mkdir -p $RPM_BUILD_ROOT%{_initddir}
mv $RPM_BUILD_ROOT/etc/init.d/dcbd $RPM_BUILD_ROOT%{_initddir}
rm -rf $RPM_BUILD_ROOT/etc/init.d


%clean
rm -rf $RPM_BUILD_ROOT


%post
/sbin/chkconfig --add dcbd

%preun
if [ $1 = 0 ]; then
        /sbin/service dcbd stop > /dev/null 2>&1
        /sbin/chkconfig --del dcbd
fi

%postun
if [ "$1" -ge "1" ]; then
        /sbin/service dcbd condrestart > /dev/null  2>&1 || :
fi


%files
%defattr(-,root,root,-)
%doc COPYING README
%{_sbindir}/*
%dir %{_sysconfdir}/dcbd
%{_initddir}/dcbd
%{_mandir}/man8/*

%files devel
%defattr(-,root,root,-)
%doc COPYING
%doc README
%{_includedir}/*
%{_libdir}/pkgconfig/*.pc


%changelog
* Fri Mar 20 2009 Jan Zeleny <jzeleny at redhat.com> - 0.9.7-4
- updated scriptlets in spec file to follow the rules

* Wed Mar 11 2009 Jan Zeleny <jzeleny at redhat.com> - 0.9.7-3
- added devel files again to support fcoe-utils package
- added kernel >= 2.6.29 to Requires, deleted dcbnl.h, since it is
  aviable in kernel 2.6.29-rc7
- changed config dir from /etc/sysconfig/dcbd to /etc/dcbd
- updated init script: added mandatory Short description tag,
  deleted default runlevels, which should start the script

* Tue Mar 10 2009 Jan Zeleny <jzeleny at redhat.com> - 0.9.7-2
- added patch to enable usage of libconfig shared in system
- removed devel part of package

* Mon Mar 2 2009 Chris Leech <christopher.leech at intel.com> - 0.9.7-1
- Updated to 0.9.7
- Added a private copy of dcbnl.h until kernel-headers includes it.
  Export patch is making it's way to the upstream kernel via net-2.6,
  expected in 2.6.29-rc7

* Thu Feb 26 2009 Chris Leech <christopher.leech at intel.com> - 0.9.5-1
- initial RPM packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dcbd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Mar 2009 05:30:19 -0000	1.1
+++ .cvsignore	23 Mar 2009 13:25:25 -0000	1.2
@@ -0,0 +1 @@
+dcbd-0.9.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dcbd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Mar 2009 05:30:19 -0000	1.1
+++ sources	23 Mar 2009 13:25:25 -0000	1.2
@@ -0,0 +1 @@
+8a7ad4e410abc1e5c3497aae0db5aa1e  dcbd-0.9.7.tar.gz