rpms/netdisco/F-11 netdisco.spec,1.3,1.4

[gouldwp]

Author: gouldwp

Update of /cvs/pkgs/rpms/netdisco/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11171

Modified Files:
	netdisco.spec 
Log Message:



Index: netdisco.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netdisco/F-11/netdisco.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- netdisco.spec	17 Sep 2009 22:02:17 -0000	1.3
+++ netdisco.spec	6 Nov 2009 21:30:38 -0000	1.4
@@ -1,8 +1,8 @@
 %define mibs_version 0.7
 
 Name:           netdisco 
-Version:        0.95 
-Release:        4%{?dist}
+Version:        1.0 
+Release:        1%{?dist}
 Summary:        A web-based network management tool 
 License:        BSD
 Group:          Applications/Internet 
@@ -11,6 +11,8 @@ Source0:        http://downloads.sourcef
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       httpd
@@ -57,6 +59,11 @@ optionally provides automatic discovery 
 
 cp %{SOURCE2} netdisco.init
 cp %{SOURCE3} netdisco_config
+cp %{SOURCE4} INSTALL.fedora 
+cp %{SOURCE5} INSTALL.rhel 
+
+# remove malformed-line-in-lsb-comment-block in netdisco.init - from netdisco source
+perl -pi -e "s|# corporate and university networks.||g" netdisco.init
 
 # prefix fix
 find -type f | xargs perl -pi -e "s|/usr/local/netdisco|/usr/share/netdisco|g"
@@ -108,6 +115,12 @@ 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
+%__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/
 
 
 %pre
@@ -123,19 +136,25 @@ install -m0644 netdisco.pm %{buildroot}/
    /sbin/chkconfig --add %{name}
 
 
+
 %preun
 if [ "$1" = "0" ]; then
-   /sbin/service netdisco stop > /dev/null 2>&1
+   /sbin/service %{name} stop > /dev/null 2>&1
    /sbin/chkconfig --del %{name}
 fi
 
 
+%postun
+/usr/sbin/userdel %{name} 1>&2 > /dev/null 
+%__rm -rf %_datadir/%{name}
+
+
 %clean
 %__rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog INSTALL README* UPGRADE
+%doc ChangeLog INSTALL README* UPGRADE INSTALL.fedora INSTALL.rhel
 %{_initrddir}/netdisco
 %config(noreplace) %{_sysconfdir}/netdisco.conf
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/netdisco_apache.conf
@@ -147,11 +166,13 @@ fi
 %dir %_datadir/netdisco
 %_datadir/netdisco/*
 %{_mandir}/man1/*
+
  
 
 %changelog
-* Thu Sep 17 2009 <gouldwp at fedoraproject.org> 0.95-4
+* Tue Oct 27 2009 <gouldwp at fedoraproject.org> 1.0-1
 - Netdisco network management software.
+- Upstream 1.0 release
 - Added require graphviz-gd package for graphing to work 
 - Added chkconfig line in netdisco_config script
 - Changed chkconfig line in netdisco.init script to not start daemon by default