[netdisco/el5] Update to verison 1.1

Wed Oct 19 19:29:15 UTC 2011

commit ac4092491a7cd64abd9ba26f28cee74b64302167
Author: Walter Gould <gouldwp at fedoraproject.org>
Date:   Sun Oct 16 16:37:06 2011 -0500

    Update to verison 1.1

 netdisco.spec   |   61 -------------------------------------------------------
 netdisco_config |   11 +++------
 sources         |    5 ----
 3 files changed, 4 insertions(+), 73 deletions(-)
---

diff --git a/netdisco.spec b/netdisco.spec
index ce4e87f..1af70bf 100644
--- a/netdisco.spec
+++ b/netdisco.spec
@@ -1,43 +1,22 @@
-<<<<<<< HEAD
-%define mibs_version 0.7
-
-Name:           netdisco 
-Version:        1.0 
-Release:        2%{?dist}
-=======
 Name:           netdisco 
 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
 Requires:       postgresql postgresql-server
 Requires:       net-snmp net-snmp-perl
 Requires:       mod_perl mod_ssl
-<<<<<<< HEAD
-Requires:       graphviz graphviz-gd 
-=======
 Requires:       graphviz graphviz-gd wget 
->>>>>>> master
 Requires:       perl(DBI) 
 Requires:       perl(Apache::DBI)
 Requires:       perl(DBD::Pg)
@@ -71,16 +50,6 @@ optionally provides automatic discovery of the network topology.
 
 
 %prep
-<<<<<<< HEAD
-%setup -q -n %{name}-%{version} -a1
-/usr/bin/iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && /bin/mv -f ChangeLog.conv ChangeLog
-%define debug_package %{nil}
-
-cp %{SOURCE2} netdisco.init
-cp %{SOURCE3} netdisco_config
-cp %{SOURCE4} INSTALL.fedora 
-cp %{SOURCE5} INSTALL.rhel 
-=======
 %setup -q -n %{name}-%{version} 
 /usr/bin/iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && /bin/mv -f ChangeLog.conv ChangeLog
 %define debug_package %{nil}
@@ -89,7 +58,6 @@ 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
@@ -139,23 +107,11 @@ install -m0755 netdisco_config %{buildroot}%{_sbindir}/netdisco_config
 install -m0644 netdisco.pm %{buildroot}/%perl_vendorlib/ 
 
 %__cp -aRf * %{buildroot}%_datadir/%{name}/
-<<<<<<< HEAD
-%__mv %{buildroot}%_datadir/%{name}/%{name}-mibs-%{mibs_version} %{buildroot}%_datadir/%{name}/mibs/
-=======
 #%__mv %{buildroot}%_datadir/%{name}/%{name}-mibs-%{mibs_version} %{buildroot}%_datadir/%{name}/mibs/
->>>>>>> master
 %__rm -rf %{buildroot}%_datadir/%{name}/netdisco.conf
 %__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
@@ -165,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
@@ -179,8 +134,6 @@ install -m0644 netdisco.pm %{buildroot}/%perl_vendorlib/
 
 %post
    /sbin/chkconfig --add %{name}
-<<<<<<< HEAD
-=======
    echo ''
    echo ''
    echo '**************************************************************************************************'
@@ -192,7 +145,6 @@ install -m0644 netdisco.pm %{buildroot}/%perl_vendorlib/
    echo '**************************************************************************************************'
    echo ''
    echo ''
->>>>>>> master
 
 
 
@@ -204,10 +156,6 @@ fi
 
 
 %postun
-<<<<<<< HEAD
-/usr/sbin/userdel %{name} 1>&2 > /dev/null 
-=======
->>>>>>> master
 %__rm -rf %_datadir/%{name}
 
 
@@ -223,11 +171,7 @@ fi
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/netdisco_apache_dir.conf
 %{_sbindir}/netdisco
 %{_sbindir}/netdisco_config
-<<<<<<< HEAD
-%dir /var/run/netdisco
-=======
 %ghost /var/run/netdisco
->>>>>>> master
 %perl_vendorlib/netdisco.pm
 %dir %_datadir/netdisco
 %_datadir/netdisco/*
@@ -236,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
diff --git a/netdisco_config b/netdisco_config
index 1d6964a..4931a0c 100755
--- a/netdisco_config
+++ b/netdisco_config
@@ -186,16 +186,13 @@ chcon system_u:object_r:usr_t:s0 /usr/share/netdisco/html/netmap.map /usr/share/
 chmod 644 /usr/share/netdisco/html/netmap.map /usr/share/netdisco/html/netmap.gif
 chown netdisco:netdisco /usr/share/netdisco/html/netmap.map /usr/share/netdisco/html/netmap.gif
 
-<<<<<<< HEAD
+# EPEL
 /etc/init.d/postgresql start
 /etc/init.d/httpd start
-=======
-#/etc/init.d/postgresql start
-#/etc/init.d/httpd start
 
-/bin/systemctl start postgresql.service
-/usr/sbin/httpd > /dev/null 2>&1
->>>>>>> master
+# Fedora
+#/bin/systemctl start postgresql.service
+#/usr/sbin/httpd > /dev/null 2>&1
 
 # Start postgres and httpd at system startup
 /sbin/chkconfig postgresql on
diff --git a/sources b/sources
index 6dd3d68..0593fc7 100644
--- a/sources
+++ b/sources
@@ -1,6 +1 @@
-<<<<<<< HEAD
-35b656bdb8506f0b413c4abab44523e6  netdisco-mibs-0.7.tar.gz
-bbb9cd2dbf487a3c106456eb67a10b6a  netdisco-1.0.tar.gz
-=======
 4f2d655d5520a2006b8b20a2837d66c9  netdisco-1.1_with_mibs.tar.gz
->>>>>>> master
