rpms/isdn4k-utils/devel .cvsignore, 1.14, 1.15 isdn4k-utils.spec, 1.81, 1.82 sources, 1.15, 1.16 isdn4k-utils-CVS-2004-11-18-lib64.patch, 1.2, NONE isdn4k-utils-CVS-2006-02-13-cleanup.patch, 1.1, NONE isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch, 1.1, NONE isdn4k-utils-CVS-2006-07-20-redhat.patch, 1.2, NONE isdn4k-utils-CVS-2008-01-07-redhat.patch, 1.1, NONE isdn4k-utils-gcc3x.patch, 1.1, NONE

Than Ngo than at fedoraproject.org
Tue Oct 20 11:35:22 UTC 2009 

Author: than

Update of /cvs/extras/rpms/isdn4k-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15545

Modified Files:
	.cvsignore isdn4k-utils.spec sources 
Removed Files:
	isdn4k-utils-CVS-2004-11-18-lib64.patch 
	isdn4k-utils-CVS-2006-02-13-cleanup.patch 
	isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch 
	isdn4k-utils-CVS-2006-07-20-redhat.patch 
	isdn4k-utils-CVS-2008-01-07-redhat.patch 
	isdn4k-utils-gcc3x.patch 
Log Message:
- add missing man pages
- add upstream fixes




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/isdn4k-utils/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	19 Jul 2006 14:54:56 -0000	1.14
+++ .cvsignore	20 Oct 2009 11:35:22 -0000	1.15
@@ -9,3 +9,5 @@ isdn4k-utils-CVS-2005-03-09.tar.bz2
 isdn4k-utils-CVS-2006-02-13.tar.bz2
 isdn4k-utils-ppp-2.4.4.tar.bz2
 isdn4k-utils-CVS-2006-07-20.tar.bz2
+isdn4k-utils-CVS-2009-10-20.tar.bz2
+capiinit.8


Index: isdn4k-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/isdn4k-utils/devel/isdn4k-utils.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- isdn4k-utils.spec	25 Jul 2009 03:38:33 -0000	1.81
+++ isdn4k-utils.spec	20 Oct 2009 11:35:22 -0000	1.82
@@ -2,7 +2,7 @@
 
 %define app_defaults_dir %{_datadir}/X11/app-defaults
 
-%define interver CVS-2006-07-20
+%define interver CVS-2009-10-20
 %ifarch s390 s390x
 %define PIE -fPIE
 %else
@@ -10,14 +10,11 @@
 %endif
 
 %define initdir /etc/rc.d/init.d
-%define divert 0
-%define eicon 0
-%define act 0
 
 Summary: Utilities for configuring an ISDN subsystem.
 Name: isdn4k-utils
 Version: 3.2
-Release: 65%{?dist}
+Release: 66%{?dist}
 License: GPLv2+
 Group: Applications/System
 
@@ -28,21 +25,17 @@ Source3: userisdnctl.c
 Source4: isdndial
 Source5: isdnstatus
 Source6: isdnhangup
-Source7: isdn4k-utils-ppp-2.4.4.tar.bz2
 Source8: capi.init
+Source9: capiinit.8
 
-Patch0: isdn4k-utils-CVS-2008-01-07-redhat.patch
+Patch0: isdn4k-utils-CVS-2009-10-20-redhat.patch
 Patch2: ibod-config.patch
 Patch3: isdn4k-utils-man.patch
 Patch4: isdn4k-utils-CVS-2004-11-18-autoconf25x.patch
 Patch5: isdn4k-utils-0202131200-true.patch
-Patch7: isdn4k-utils-CVS-2006-02-13-cleanup.patch
-Patch10: isdn4k-utils-CVS-2004-11-18-lib64.patch
 Patch11: isdn4k-utils-statfs.patch
 Patch12: isdn4k-utils-CVS-2005-03-09-xmon.patch
 Patch13: isdn4k-utils-capiinit.patch
-Patch14: isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch
-Patch15: isdn4k-utils-gcc3x.patch
 Patch16: isdn4k-utils-CVS-2006-07-20-capi.patch
 Patch17: isdn4k-utils-misc-overflow-in-capi-subsystem.patch
 Patch18: isdn4k-utils-sh-linux.patch
@@ -112,7 +105,7 @@ The xisdnload utility displays a periodi
 load average over your ISDN connection.
 
 %prep
-%setup -q -n %{name}-%{interver} -a 7
+%setup -q -n %{name}-%{interver}
 %patch0 -p1 -b .redhat
 
 mkdir -p ibod
@@ -124,13 +117,9 @@ popd
 %patch3 -p1 -b .man
 %patch4 -p1 -b .ac25x
 %patch5 -p1 -b .true
-%patch7 -p0 -b .cleanup
-%patch10 -p1 -b .lib64
 %patch11 -p1 -b .statfs
 %patch12 -p1 -b .xmon
 %patch13 -p1 -b .capi
-%patch14 -p1 -b .pppd-2.4.4
-%patch15 -p1 -b .glibc
 %patch16 -p1 -b .capi
 %patch17 -p1 -b .misc-overflow
 %patch18 -p1 -b .sh-support
@@ -186,7 +175,9 @@ mkdir -p %{buildroot}/dev \
          %{buildroot}/etc/{rc.d/init.d,ppp,isdn} \
          %{buildroot}/var/{log/vbox,spool/vbox,lock/isdn} \
          %{buildroot}%{_prefix}/{sbin,bin} \
-         %{buildroot}%{_mandir}/man4
+         %{buildroot}%{_mandir}/man1 \
+         %{buildroot}%{_mandir}/man4 \
+         %{buildroot}%{_mandir}/man8
 
 chmod 1777 %{buildroot}/var/spool/vbox
 make install DESTDIR=%{buildroot} \
@@ -265,23 +256,12 @@ rm -rf %{buildroot}%{_docdir}/isdn4k-uti
 # move doc file to avoid conflict
 cp isdnlog/README isdnlog/README.isdnlog
 
-%if !%{divert}
-  rm -rf %{buildroot}%{_mandir}/man8/divertctrl.8*
-  rm -f %{buildroot}/sbin/divertctrl
-%endif
-
-%if !%{eicon}
-  rm -rf %{buildroot}%{_mandir}/man8/eiconctrl.8*
-  rm -rf %{buildroot}%{_libdir}/eicon
-  rm -f %{buildroot}/sbin/eiconctrl
-%endif
+install -m644 %{SOURCE9} %{buildroot}%{_mandir}/man8/
 
 chmod 644 %{buildroot}%{_mandir}/man?/*
 
 chmod 755 %{buildroot}%{_bindir}/vboxbeep
 
-rm -f %{buildroot}%{_sbindir}/{divalog,divalogd,divertctrl}
-
 mkdir -p $RPM_BUILD_ROOT/etc
 install -m 644 capiinit/capi.conf $RPM_BUILD_ROOT/etc
 
@@ -419,12 +399,14 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %dir /etc/isdn
+%dir /etc/vbox
 %dir /var/spool/vbox
 %dir /var/log/vbox
 %verify(not md5 size mtime) %config(noreplace) /etc/isdn/*
 %verify(not md5 size mtime) %config(noreplace) /etc/ppp/ioptions
 %config(noreplace) /etc/ppp/peers/*
 %config(noreplace) /etc/capi.conf
+%config(noreplace) /etc/vbox/*.conf
 %config %{initdir}/isdn
 %config %{initdir}/capi
 %{_libdir}/pppd
@@ -444,16 +426,7 @@ rm -rf %{buildroot}
 %exclude %{_bindir}/xisdnload
 %exclude %{_bindir}/xmonisdn
 /sbin/*
-%if %{act}
-%{_sbindir}/actctrl
-%endif
-%if %{eicon}
-%{_sbindir}/eiconctrl
-%endif
 %{_sbindir}/capiinit
-%if %{divert}
-%{_sbindir}/divertctrl
-%endif
 %{_sbindir}/ibod
 %{_sbindir}/imon
 %{_sbindir}/imontty
@@ -506,6 +479,10 @@ rm -rf %{buildroot}
 %doc xmonisdn/README
 
 %changelog
+* Mon Oct 19 2009 Than Ngo <than at redhat.com> - 3.2-66
+- add missing man pages
+- add upstream fixes
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-65
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/isdn4k-utils/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	19 Jul 2006 14:54:56 -0000	1.15
+++ sources	20 Oct 2009 11:35:22 -0000	1.16
@@ -1,3 +1,3 @@
 38b45be27c0a82b38380f680fdee0aff  ibod-1.4-src.tar.gz
-92c52638be0abee7bd8195878f4df335  isdn4k-utils-ppp-2.4.4.tar.bz2
-7cde4a61e870bb7e53cd912a3fc30207  isdn4k-utils-CVS-2006-07-20.tar.bz2
+0f85c8843d99230945a23fee3cb7983d  isdn4k-utils-CVS-2009-10-20.tar.bz2
+45e047c31ebbdfd2865532a80393223b  capiinit.8


--- isdn4k-utils-CVS-2004-11-18-lib64.patch DELETED ---


--- isdn4k-utils-CVS-2006-02-13-cleanup.patch DELETED ---


--- isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch DELETED ---


--- isdn4k-utils-CVS-2006-07-20-redhat.patch DELETED ---


--- isdn4k-utils-CVS-2008-01-07-redhat.patch DELETED ---


--- isdn4k-utils-gcc3x.patch DELETED ---

More information about the fedora-extras-commits mailing list