rpms/isdn4k-utils/devel isdn4k-utils.spec,1.92,1.93

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/isdn4k-utils/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31375

Modified Files:
	isdn4k-utils.spec 
Log Message:
- fix multilib issue
- add subpackage doc




Index: isdn4k-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/isdn4k-utils/devel/isdn4k-utils.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- isdn4k-utils.spec	4 May 2010 12:41:44 -0000	1.92
+++ isdn4k-utils.spec	5 May 2010 17:04:44 -0000	1.93
@@ -47,7 +47,7 @@ Patch20: isdn4k-utils-CVS-2010-05-01-cap
 Requires: udev >= 039-10.14.EL4
 Requires: hwdata >= 0.146.18.EL-1
 Requires: initscripts >= 5.92
-Requires(pre): coreutils, chkconfig, /sbin/service
+Requires(pre): coreutils, chkconfig, /sbin/service, bzip2
 
 BuildRequires: openjade
 BuildRequires: linuxdoc-tools
@@ -74,7 +74,7 @@ The isdn4k-utils package contains a coll
 configuring an ISDN subsystem.
 
 %package devel
-Summary: header files for capi development
+Summary: Header files for capi development
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
@@ -110,6 +110,14 @@ Requires: %{name}
 The xisdnload utility displays a periodically updated histogram of the
 load average over your ISDN connection.
 
+%package doc
+Summary: Documentation for isdn4k-utils
+Group: Documentation
+Requires: %{name}
+
+%description doc
+The isdn4k-utils-doc package contains the documentation for isdn4k-utils.
+
 %prep
 %setup -q -n %{name}-%{interver}-patched
 %patch0 -p1 -b .redhat
@@ -135,6 +143,9 @@ popd
 %patch19 -p1 -b .quote
 %patch20 -p1 -b .capinew
 
+# remove useless files
+find -type d -name "CVS" | xargs rm -rf
+
 # enable capi20.new
 rm -rf capi20 && mv capi20.new capi20
 
@@ -146,8 +157,12 @@ for i in */configure; do
 done
 
 # fix utf8 issue
-iconv -f iso-8859-1 -t utf-8 < imontty/imontty.8.in > imontty/imontty.8.in_
-mv imontty/imontty.8.in_ imontty/imontty.8.in
+for f in vbox/doc/de/vbox.txt.in imontty/imontty.8.in FAQ/tutorial/EN-i4l.sgml \
+		isdnlog/README isdnlog/tools/rate-files.man \
+		Mini-FAQ/isdn-faq.txt vbox/doc/de/vbox.sgml.in ; do
+	iconv -f iso-8859-1 -t utf-8 < $f > ${f}_
+	mv ${f}_ $f
+done
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
@@ -166,11 +181,11 @@ make subconfig
 make
 
 # build ibod
-(cd ibod && gcc $RPM_OPT_FLAGS ibod.c -o ibod)
+gcc $RPM_OPT_FLAGS ibod/ibod.c -o ibod/ibod
 
 %if 0%{?fedora} < 14
-  # build userisdnctl
-  gcc %{PIE} -pie $RPM_OPT_FLAGS %{SOURCE3} -o isdnctrl/userisdnctl
+	# build userisdnctl
+	gcc %{PIE} -pie $RPM_OPT_FLAGS %{SOURCE3} -o isdnctrl/userisdnctl
 %endif
 
 %install
@@ -194,7 +209,7 @@ make install DESTDIR=%{buildroot} \
 install -m 644 ibod/ibod.1 %{buildroot}%{_mandir}/man1/
 install -m 644 ibod/ibod.cf.4 %{buildroot}%{_mandir}/man4/
 install -m 644 ibod/ibod.cf %{buildroot}/etc/isdn/
-install -m 755 ibod/ibod %{buildroot}/usr/sbin/
+install -m 755 ibod/ibod %{buildroot}%{_sbindir}
 
 touch %{buildroot}/etc/ppp/ioptions
 
@@ -204,10 +219,10 @@ fi
 
 # build some more documentation
 %ifnarch sparc
-pushd FAQ/tutorial ; {
-    sgml2txt EN-i4l.sgml
-    sgml2html EN-i4l.sgml
-} ; popd
+	pushd FAQ/tutorial
+	sgml2txt EN-i4l.sgml
+	sgml2html EN-i4l.sgml
+	popd
 %endif
 
 # copy config files for isdnlog
@@ -218,21 +233,19 @@ chmod 644 %{buildroot}%{_datadir}/isdn/*
 # delete files to avoid conflicts and don't package *.la files
 rm -rf %{buildroot}/etc/isdn/stop \
        %{buildroot}/etc/drdsl/adsl.conf \
-       %{buildroot}/usr/bin/cdb* \
-       %{buildroot}/usr/include/freecdb.h \
-       %{buildroot}/usr/include/freecdbmake.h \
+       %{buildroot}%{_bindir}/cdb* \
+       %{buildroot}%{_includedir}/freecdb.h \
+       %{buildroot}%{_includedir}/freecdbmake.h \
        %{buildroot}%{_libdir}/*.la \
-       %{buildroot}/usr/lib/libfreecdb.a \
-       %{buildroot}/usr/lib/libfreecdbmake.a \
        %{buildroot}%{_libdir}/capi/*.la \
        %{buildroot}%{_libdir}/capi/*.so \
-       %{buildroot}/usr/share/man/man1/cdb* \
-       %{buildroot}/usr/share/man/man3 \
+       %{buildroot}%{_mandir}/man1/cdb* \
+       %{buildroot}%{_mandir}/man3 \
        %{buildroot}%{_mandir}/man5/vboxtcl.5* \
-       %{buildroot}%{_docdir}/isdn4k-utils  \
+       %{buildroot}%{_docdir}/isdn4k-utils \
        %{buildroot}%{_docdir}/vbox \
        %{buildroot}/usr/X11R6 \
-       %{buildroot}%{_prefix}/lib/X11
+       %{buildroot}/usr/lib*/X11
 
 # install isdn startup script
 mkdir -p %{buildroot}%{_initddir}
@@ -243,26 +256,26 @@ install -m755 %{SOURCE8} %{buildroot}%{_
 mkdir -p %{buildroot}/sbin
 pushd %{buildroot}%{_sbindir}/
 for i in * ; do
-  case $i in
-    imon|rcapid|vboxgetty|vboxputty|imontty) continue ;;
-    *) mv $i %{buildroot}/sbin && ln -fs ../../sbin/$i .
-  esac
+	case $i in
+		imon|rcapid|vboxgetty|vboxputty|imontty) continue ;;
+		*) mv $i %{buildroot}/sbin && ln -fs ../../sbin/$i .
+	esac
 done
 popd
 
 %if 0%{?fedora} < 14
-  # install userisdnctl,isdnup
-  install -m 755 isdnctrl/userisdnctl %{buildroot}%{_sbindir}/
-  install -m 755 %{SOURCE4} %{buildroot}%{_sbindir}/
-  install -m 755 %{SOURCE5} %{buildroot}%{_sbindir}/
-  install -m 755 %{SOURCE6} %{buildroot}%{_sbindir}/
+	# install userisdnctl,isdnup
+	install -m 755 isdnctrl/userisdnctl %{buildroot}%{_sbindir}/
+	install -m 755 %{SOURCE4} %{buildroot}%{_sbindir}/
+	install -m 755 %{SOURCE5} %{buildroot}%{_sbindir}/
+	install -m 755 %{SOURCE6} %{buildroot}%{_sbindir}/
 %endif
 
 mv %{buildroot}%{_mandir}/man8/.isdnctrl_conf.8 \
    %{buildroot}%{_mandir}/man8/isdnctrl_conf.8
 
 # move doc file to avoid conflict
-cp isdnlog/README isdnlog/README.isdnlog
+mv isdnlog/README isdnlog/README.isdnlog
 
 # install man page for capiinit
 install -m644 %{SOURCE9} %{buildroot}%{_mandir}/man8/
@@ -272,33 +285,44 @@ mkdir -p $RPM_BUILD_ROOT/etc
 install -m 644 capiinit/capi.conf $RPM_BUILD_ROOT/etc
 install -m 644 %{SOURCE7} $RPM_BUILD_ROOT/etc
 
+# add comment
+echo "# config files" >> %{buildroot}/etc/ppp/ioptions
+
 # install 40-isdn.rules, it's dropped from udev in F14 and later
 %if 0%{?fedora} > 13 || 0%{?rhel} > 6
-  mkdir -p %{buildroot}/lib/udev/rules.d/
-  install -m 644 %{SOURCE10} %{buildroot}/lib/udev/rules.d/
+	mkdir -p %{buildroot}/lib/udev/rules.d/
+	install -m 644 %{SOURCE10} %{buildroot}/lib/udev/rules.d/
 %endif
 
+# touch zone-de-dtag.cdb, create it later in %post to avoid multilib issue
+# on machine with BIGENDIAN
+> %{buildroot}/%{_datadir}/isdn/zone-de-dtag.cdb
+
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add isdn
 /sbin/chkconfig --add capi
 /sbin/chkconfig capi off
+if [ ! -e %{_datadir}/isdn/zone-de-dtag.cdb ] ; then
+	bzip2 -dc %{_docdir}/isdn4k-utils-3.2/zred.dtag.bz2 | \
+	/sbin/mkzonedb -d %{_datadir}/isdn/zone-de-dtag.cdb -r -
+fi
 exit 0
 
 %preun
 if [ "$1" = "0" ]; then
-   /sbin/service isdn stop > /dev/null 2>&1
-   /sbin/service capi stop > /dev/null 2>&1
-   /sbin/chkconfig --del isdn
-   /sbin/chkconfig --del capi
+	/sbin/service isdn stop > /dev/null 2>&1
+	/sbin/service capi stop > /dev/null 2>&1
+	/sbin/chkconfig --del isdn
+	/sbin/chkconfig --del capi
 fi
 exit 0
 
 %postun
 /sbin/ldconfig
 if [ "$1" -ge "1" ]; then
-   /sbin/service isdn condrestart > /dev/null 2>&1
-   /sbin/service capi condrestart > /dev/null 2>&1
+	/sbin/service isdn condrestart > /dev/null 2>&1
+	/sbin/service capi condrestart > /dev/null 2>&1
 fi
 exit 0
 
@@ -312,16 +336,16 @@ provider=`ls $PDIR/conf-* 2>/dev/null | 
 
 function clear_env()
 {
-    PROVIDER=; USER=; PASSWORD=; ENCAP=; DIALMODE=; SECURE=; MSN=; PHONE_IN=
-    PREFIX=; AREACODE=; PHONE_OUT=; CITY=; BUNDLING=; LOCAL_IP=; REMOTE_IP=
-    NETWORK=; BROADCAST=; HUPTIMEOUT=; DNS=; ISDN_HOSTNAME=; ISDN_DOMAIN=; L2_PROT=
-    L3_PROT=; CALLBACK=; CHARGEHUP=; CHARGEINT=; CBHUP=; CBDELAY=; DIALMAX=
-    AUTH=; IHUP=; IP_FORWARD=; SLAVE_DELAY=; SLAVE_TRIGGER=; FIRMWARE=
-    VJ=; VJCCOMP=; AC=; PC=; BSDCOMP=; MTU=; MRU=; DRIVERTYPE=
-    SLAVE_DIALMODE=; SLAVE_MSN=; SLAVE_PHONE_IN=; SLAVE_PHONE_OUT=
-    SLAVE_HUPTIMEOUT=; SLAVE_CALLBACK=; SLAVE_CHARGEHUP=; SLAVE_CHARGEINT=
-    SLAVE_CBHUP=; SLAVE_CBDELAY=; SLAVE_DIALMAX=; SLAVE_IHUP=; DELDEFAULTROUTE=
-    CBCP=; DIALIN=; SLAVE_DEVICE=; PEERDNS=
+	PROVIDER=; USER=; PASSWORD=; ENCAP=; DIALMODE=; SECURE=; MSN=; PHONE_IN=
+	PREFIX=; AREACODE=; PHONE_OUT=; CITY=; BUNDLING=; LOCAL_IP=; REMOTE_IP=
+	NETWORK=; BROADCAST=; HUPTIMEOUT=; DNS=; ISDN_HOSTNAME=; ISDN_DOMAIN=; L2_PROT=
+	L3_PROT=; CALLBACK=; CHARGEHUP=; CHARGEINT=; CBHUP=; CBDELAY=; DIALMAX=
+	AUTH=; IHUP=; IP_FORWARD=; SLAVE_DELAY=; SLAVE_TRIGGER=; FIRMWARE=
+	VJ=; VJCCOMP=; AC=; PC=; BSDCOMP=; MTU=; MRU=; DRIVERTYPE=
+	SLAVE_DIALMODE=; SLAVE_MSN=; SLAVE_PHONE_IN=; SLAVE_PHONE_OUT=
+	SLAVE_HUPTIMEOUT=; SLAVE_CALLBACK=; SLAVE_CHARGEHUP=; SLAVE_CHARGEINT=
+	SLAVE_CBHUP=; SLAVE_CBDELAY=; SLAVE_DIALMAX=; SLAVE_IHUP=; DELDEFAULTROUTE=
+	CBCP=; DIALIN=; SLAVE_DEVICE=; PEERDNS=
 }
 
 n=0
@@ -429,7 +453,7 @@ rm -rf %{buildroot}
 /sbin/*
 %{_initddir}/isdn
 %{_initddir}/capi
-%{_bindir}/
+%{_bindir}/*
 %{_sbindir}/capiinit
 %{_sbindir}/ibod
 %{_sbindir}/imon
@@ -450,16 +474,8 @@ rm -rf %{buildroot}
 %endif
 %defattr(644,root,root,755)
 %doc COPYING README isdnlog/README.*
-%doc isdnlog/FAQ
-%doc vbox/examples/vbox.conf.example
-%doc vbox/examples/vboxd.conf.example
-%doc vbox/examples/vboxrc.example
-%doc vbox/examples/standard.tcl.example
-%doc vbox/examples/timeout.msg.example
-%doc vbox/examples/beep.msg*
-%doc vbox/examples/timeout*
-%doc FAQ/tutorial/* FAQ/i4lfaq* Mini-FAQ/isdn-faq.txt
-%lang(de) %doc vbox/doc/de/vbox.sgml vbox/doc/de/vbox.txt
+%doc isdnlog/tools/zone/de/01033/zred.dtag.bz2
+%ghost %{_datadir}/isdn/zone-de-dtag.cdb
 %{_mandir}/man1/*
 %{_mandir}/man4/*
 %{_mandir}/man5/*
@@ -502,10 +518,26 @@ rm -rf %{buildroot}
 %{_bindir}/xisdnload
 %{_bindir}/xmonisdn
 
+%files doc
+%defattr(-,root,root)
+%doc isdnlog/FAQ
+%doc vbox/examples/vbox.conf.example
+%doc vbox/examples/vboxd.conf.example
+%doc vbox/examples/vboxrc.example
+%doc vbox/examples/standard.tcl.example
+%doc vbox/examples/timeout.msg.example
+%doc vbox/examples/beep.msg*
+%doc vbox/examples/timeout*
+%doc FAQ/tutorial/* FAQ/i4lfaq* Mini-FAQ/isdn-faq.txt
+%lang(de) %doc vbox/doc/de/vbox.sgml vbox/doc/de/vbox.txt
+
+
 %changelog
 * Tue May 04 2010 Than Ngo <than at redhat.com> - 3.2-70
 - enable capi.new
 - add 40-isdn.rules, it's dropped from udev in F14 and later
+- fix multilib issue
+- add subpackage doc
 
 * Mon May 03 2010 Than Ngo <than at redhat.com> - 3.2-69
 - fix quotation issue with autoconf-2.64