[netdisco/el6: 8/8] Merge branch 'master' into el6

[gouldwp]

commit 554c25a48b7501fbb60c2b82d9d313e3e4cd9360
Merge: e421498 a28ab46
Author: Walter Gould <gouldwp at fedoraproject.org>
Date:   Sat Oct 15 16:01:19 2011 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	netdisco.spec
    	sources

 .gitignore      |    8 ++++++
 netdisco.spec   |   65 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 netdisco_config |    7 ++++-
 sources         |    4 +++
 4 files changed, 76 insertions(+), 8 deletions(-)
---
diff --cc .gitignore
index 89b5e37,fa37ab7..d253874
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,5 +1,12 @@@
++<<<<<<< HEAD
 +netdisco-1.0.tar.gz
 +INSTALL.fedora
 +INSTALL.rhel
 +netdisco-mibs-0.7.tar.gz
++=======
+ INSTALL.fedora
+ INSTALL.rhel
+ netdisco-1.0.tar.gz
+ netdisco-mibs-0.7.tar.gz
+ /netdisco-1.1_with_mibs.tar.gz
++>>>>>>> master
diff --cc netdisco.spec
index 4dad144,1af70bf..9ec8207
--- a/netdisco.spec
+++ b/netdisco.spec
@@@ -1,18 -1,15 +1,29 @@@
- %define mibs_version 0.7
- 
  Name:           netdisco 
++<<<<<<< HEAD
 +Version:        1.0 
 +Release:        2%{?dist}
++=======
+ Version:        1.1 
+ Release:        1%{?dist}
++>>>>>>> master
  Summary:        A web-based network management tool 
  License:        BSD
  Group:          Applications/Internet 
  URL:            http://netdisco.org/ 
++<<<<<<< HEAD
 +Source0:        http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz
 +Source1:        http://downloads.sourceforge.net/project/%{name}/%{name}-mibs/%{mibs_version}/%{name}-mibs-%{mibs_version}.tar.gz
 +Source2:        netdisco.init
 +Source3:        netdisco_config
 +Source4:        INSTALL.fedora
 +Source5:        INSTALL.rhel
++=======
+ Source0:        http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}_with_mibs.tar.gz
+ Source1:        netdisco.init
+ Source2:        netdisco_config
+ Source3:        INSTALL.fedora
+ Source4:        INSTALL.rhel
++>>>>>>> master
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  BuildArch:      noarch
  Requires:       httpd
@@@ -57,10 -54,10 +68,17 @@@ optionally provides automatic discover
  /usr/bin/iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && /bin/mv -f ChangeLog.conv ChangeLog
  %define debug_package %{nil}
  
++<<<<<<< HEAD
 +cp %{SOURCE2} netdisco.init
 +cp %{SOURCE3} netdisco_config
 +cp %{SOURCE4} INSTALL.fedora 
 +cp %{SOURCE5} INSTALL.rhel 
++=======
+ cp %{SOURCE1} netdisco.init
+ cp %{SOURCE2} netdisco_config
+ cp %{SOURCE3} INSTALL.fedora 
+ cp %{SOURCE4} INSTALL.rhel 
++>>>>>>> master
  
  # remove malformed-line-in-lsb-comment-block in netdisco.init - from netdisco source
  perl -pi -e "s|# corporate and university networks.||g" netdisco.init
@@@ -115,12 -112,15 +133,24 @@@ install -m0644 netdisco.pm %{buildroot}
  %__ln_s %{_sysconfdir}/netdisco.conf %{buildroot}%_datadir/%{name}/netdisco.conf
  
  %__chmod 0644 %{buildroot}%_datadir/%{name}/mibs/cisco/CISCO-VSAN-MIB.my
++<<<<<<< HEAD
 +%__chmod 0755 %{buildroot}%_datadir/%{name}/bin/install/0.94/FC4_install.sh
 +%__chmod 0755 %{buildroot}%_datadir/%{name}/bin/install/0.94/FC5_install.sh
 +%__chmod 0755 %{buildroot}%_datadir/%{name}/bin/install/0.94/CentOs_install.sh
 +%__chmod 0755 %{buildroot}%_datadir/%{name}/bin/install/0.94/Debian_3.1_install.sh
 +%__chmod -R 0755 %{buildroot}%_datadir/%{name}/bin/install/0.95/
 +%__chmod -R 0755 %{buildroot}%_datadir/%{name}/bin/install/1.0/
++=======
+ %__chmod 0644 %{buildroot}%_datadir/%{name}/mibs/cisco/CISCO-LWAPP-DOT11-CCX-CLIENT-DIAG-MIB.my
+ %__chmod 0644 %{buildroot}%_datadir/%{name}/mibs/hp/hpicfvrrp.mib
+ %__chmod 0644 %{buildroot}%_datadir/%{name}/mibs/hp/hpicfratelimit.mib
+ %__chmod 0644 %{buildroot}%_datadir/%{name}/mibs/hp/hpicfipaddress.mib
+ %__chmod 0644 %{buildroot}%_datadir/%{name}/mibs/hp/hpicfpim.mib
+ %__chmod -R 0755 %{buildroot}%_datadir/%{name}/bin/install/0.94/
+ %__chmod -R 0755 %{buildroot}%_datadir/%{name}/bin/install/0.95/
+ %__chmod -R 0755 %{buildroot}%_datadir/%{name}/bin/install/1.0/
+ %__chmod -R 0644 %{buildroot}%_datadir/%{name}/bin/install/0.94/readme*
++>>>>>>> master
  
  
  %pre
@@@ -134,9 -134,20 +164,21 @@@
  
  %post
     /sbin/chkconfig --add %{name}
+    echo ''
+    echo ''
+    echo '**************************************************************************************************'
+    echo '**************************************************************************************************'
+    echo ''
+    echo 'To configure netdisco for your environment, you need to run the /usr/sbin/netdisco_config script.'
+    echo ''
+    echo '**************************************************************************************************'
+    echo '**************************************************************************************************'
+    echo ''
+    echo ''
+ 
  
  
 +
  %preun
  if [ "$1" = "0" ]; then
     /sbin/service %{name} stop > /dev/null 2>&1
@@@ -145,7 -156,6 +187,10 @@@ f
  
  
  %postun
++<<<<<<< HEAD
 +/usr/sbin/userdel %{name} 1>&2 > /dev/null 
++=======
++>>>>>>> master
  %__rm -rf %_datadir/%{name}
  
  
@@@ -170,8 -180,11 +215,16 @@@
   
  
  %changelog
++<<<<<<< HEAD
 +* Tue Nov 9 2009 <gouldwp at fedoraproject.org> 1.0-2
 +- Netdisco network management software.
++=======
+ * Thu Oct 13 2011 <gouldwp at fedoraproject.org> 1.1-1
+ - Netdisco network management software.
+ - Changed %dir/var/run/netdisco to %ghost /var/run/netdisco - bug 656636 
+ - Upstream 1.1 release
+ * Tue Nov 9 2009 <gouldwp at fedoraproject.org> 1.0-2
++>>>>>>> master
  - Upstream 1.0 release
  - Added require graphviz-gd package for graphing to work 
  - Added chkconfig line in netdisco_config script
diff --cc sources
index 86ea0ef,0593fc7..ab3acbc
--- a/sources
+++ b/sources
@@@ -1,4 -1,1 +1,8 @@@
++<<<<<<< HEAD
 +bbb9cd2dbf487a3c106456eb67a10b6a  netdisco-1.0.tar.gz
 +8b90b508efd76f206739dc82c3c4601e  INSTALL.fedora
 +8b90b508efd76f206739dc82c3c4601e  INSTALL.rhel
 +35b656bdb8506f0b413c4abab44523e6  netdisco-mibs-0.7.tar.gz
++=======
+ 4f2d655d5520a2006b8b20a2837d66c9  netdisco-1.1_with_mibs.tar.gz
++>>>>>>> master