rpms/ncid/EL-6 ncid.spec,1.1,1.2 sources,1.2,1.3

[Eric Sandeen]

Author: sandeen

Update of /cvs/pkgs/rpms/ncid/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2088

Modified Files:
	ncid.spec sources 
Log Message:
* Mon May 17 2010 Eric Sandeen <sandeen at redhat.com> 0.78-1
- New upstream version



Index: ncid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncid/EL-6/ncid.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ncid.spec	18 Oct 2009 16:31:11 -0000	1.1
+++ ncid.spec	5 Jul 2010 15:48:11 -0000	1.2
@@ -1,6 +1,6 @@
 Name:       ncid
-Version:    0.74
-Release:    3%{?dist}
+Version:    0.78
+Release:    1%{?dist}
 Summary:    Network Caller ID server, client, and gateways
 
 Group:      Applications/Communications
@@ -26,6 +26,7 @@ ncid-client package.
 Summary:    NCID (Network Caller ID) client
 Group:      Applications/Communications
 Requires:   tcl, tk, /bin/mail
+BuildArch:  noarch
 
 %description client
 The ncid-client obtains the Caller ID from the ncid-server and normally
@@ -92,14 +93,11 @@ done
 
 %post client
 # make services known
-for SCRIPT in ncid-page ncid-yac ncid-mythtv
+for SCRIPT in ncid-page ncid-yac ncid-mythtv ncid-initmodem ncid-hangup
 do
     /sbin/chkconfig --add $SCRIPT
 done
 
-%post kpopup
-/sbin/chkconfig --add ncid-kpopup
-
 %post samba
 /sbin/chkconfig --add ncid-samba
 
@@ -119,7 +117,7 @@ fi
 %preun client
 if [ $1 = 0 ] ; then ### Uninstall package ###
     # stop services and remove autostart
-    for SCRIPT in ncid-page ncid-yac ncid-mythtv
+    for SCRIPT in ncid-page ncid-yac ncid-mythtv ncid-initmodem ncid-hangup
     do
         /sbin/service $SCRIPT stop > /dev/null 2>&1 || :
         /sbin/chkconfig --del $SCRIPT
@@ -132,13 +130,6 @@ if [ "$1" -ge "1" ]; then ### upgrade pa
     /sbin/chkconfig ncid && /sbin/chkconfig --del ncid || true
 fi
 
-%preun kpopup
-if [ $1 = 0 ] ; then ### Uninstall package ###
-    # stop services and remove autostart
-    /sbin/service ncid-kpopup stop > /dev/null 2>&1 || :
-    /sbin/chkconfig --del ncid-kpopup
-fi
-
 %preun samba
 if [ $1 = 0 ] ; then ### Uninstall package ###
     # stop services and remove autostart
@@ -156,7 +147,7 @@ fi
 %postun
 if [ "$1" -ge "1" ]; then ### upgrade package ###
     # restart services that are running
-    for SCRIPT in ncidd ncidsip ncidsip
+    for SCRIPT in ncidd ncidsip
     do
         /sbin/service $SCRIPT condrestart >/dev/null 2>&1 || :
     done
@@ -171,12 +162,6 @@ if [ "$1" -ge "1" ]; then ### upgrade pa
     done
 fi
 
-%postun kpopup
-if [ "$1" -ge "1" ]; then ### upgrade package ###
-    # restart services if running
-    /sbin/service ncid-kpopup condrestart >/dev/null 2>&1 || :
-fi
-
 %postun samba
 if [ "$1" -ge "1" ]; then ### upgrade package ###
     # restart services if running
@@ -238,13 +223,19 @@ fi
 %{_datadir}/ncid/ncid-tivo
 %{_datadir}/ncid/ncid-yac
 %{_datadir}/ncid/ncid-mythtv
-%{_datadir}/pixmaps/ncid.gif
+%{_datadir}/pixmaps/ncid/ncid.gif
+%{_datadir}/ncid/ncid-initmodem
+%{_datadir}/ncid/ncid-hangup
 %dir %{_sysconfdir}/ncid
+%{_sysconfdir}/ncid/ncid.minicom
+%config(noreplace) %{_sysconfdir}/ncid/ncid.blacklist
 %config(noreplace) %{_sysconfdir}/ncid/ncid.conf
 %config(noreplace) %{_sysconfdir}/ncid/ncidmodules.conf
 %{_initrddir}/ncid-page
 %{_initrddir}/ncid-yac
 %{_initrddir}/ncid-mythtv
+%{_initrddir}/ncid-initmodem
+%{_initrddir}/ncid-hangup
 %{_mandir}/man1/ncid.1*
 %{_mandir}/man1/ncidmodules.1*
 %{_mandir}/man5/ncid.conf.5*
@@ -254,7 +245,6 @@ fi
 %defattr(-,root,root)
 %doc modules/README.modules
 %{_datadir}/ncid/ncid-kpopup
-%{_initrddir}/ncid-kpopup
 
 %files samba
 %defattr(-,root,root)
@@ -269,6 +259,19 @@ fi
 %{_initrddir}/ncid-speak
 
 %changelog
+* Mon May 17 2010 Eric Sandeen <sandeen at redhat.com> 0.78-1
+- New upstream version
+
+* Sat Apr 17 2010 Eric Sandeen <sandeen at redhat.com> 0.77-1
+- New upstream version
+
+* Tue Feb 16 2010 Eric Sandeen <sandeen at redhat.com> 0.76-1
+- New upstream version
+
+* Sat Nov 07 2009 Eric Sandeen <sandeen at redhat.com> 0.75-1
+- New upstream version
+- Make client subpackage noarch
+
 * Fri Oct 09 2009 Eric Sandeen <sandeen at redhat.com> 0.74-3
 - Address new review items
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncid/EL-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Oct 2009 16:31:11 -0000	1.2
+++ sources	5 Jul 2010 15:48:11 -0000	1.3
@@ -1 +1 @@
-18885a48bc8be40fa2423a266c6c9e40  ncid-0.74-src.tar.gz
+c64e6a1adb958debd1eb424ceb7012ca  ncid-0.78-src.tar.gz