[netdisco/el6] Update for version 1.1

[gouldwp]

commit 7128c9d68221669ef4ab7b2d4507e9c079e3323f
Author: Walter Gould <gouldwp at fedoraproject.org>
Date:   Sun Oct 16 15:35:33 2011 -0500

    Update for version 1.1

 netdisco.spec |   40 ----------------------------------------
 1 files changed, 0 insertions(+), 40 deletions(-)
---
diff --git a/netdisco.spec b/netdisco.spec
index 9ec8207..1af70bf 100644
--- a/netdisco.spec
+++ b/netdisco.spec
@@ -1,29 +1,15 @@
 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
@@ -68,17 +54,10 @@ optionally provides automatic discovery of the network topology.
 /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
@@ -133,14 +112,6 @@ install -m0644 netdisco.pm %{buildroot}/%perl_vendorlib/
 %__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
@@ -150,7 +121,6 @@ install -m0644 netdisco.pm %{buildroot}/%perl_vendorlib/
 %__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
@@ -178,7 +148,6 @@ install -m0644 netdisco.pm %{buildroot}/%perl_vendorlib/
 
 
 
-
 %preun
 if [ "$1" = "0" ]; then
    /sbin/service %{name} stop > /dev/null 2>&1
@@ -187,10 +156,6 @@ fi
 
 
 %postun
-<<<<<<< HEAD
-/usr/sbin/userdel %{name} 1>&2 > /dev/null 
-=======
->>>>>>> master
 %__rm -rf %_datadir/%{name}
 
 
@@ -215,16 +180,11 @@ fi
  
 
 %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