rpms/isdn4k-utils/devel isdn4k-utils-CVS-2006-07-20-redhat.patch, 1.1, 1.2 isdn4k-utils.spec, 1.75, 1.76

[Than Ngo]

Author: than

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

Modified Files:
	isdn4k-utils-CVS-2006-07-20-redhat.patch isdn4k-utils.spec 
Log Message:
bz450370, fix multilib issue


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

Index: isdn4k-utils-CVS-2006-07-20-redhat.patch
===================================================================
RCS file: /cvs/extras/rpms/isdn4k-utils/devel/isdn4k-utils-CVS-2006-07-20-redhat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- isdn4k-utils-CVS-2006-07-20-redhat.patch	19 Jul 2006 15:02:56 -0000	1.1
+++ isdn4k-utils-CVS-2006-07-20-redhat.patch	28 Oct 2008 12:48:16 -0000	1.2
@@ -744,7 +744,7 @@
  CONFIG_USERCONFFILE='~/.isdn'
  CONFIG_COUNTRYCODE='49'
 -CONFIG_AREACODE=''
-+CONFIG_AREACODE='9999'
++CONFIG_AREACODE=''
  CONFIG_COUNTRY_PREFIX='+'
  CONFIG_AREA_PREFIX='0'
 -CONFIG_DATADIR='/usr/lib/isdn'


Index: isdn4k-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/isdn4k-utils/devel/isdn4k-utils.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- isdn4k-utils.spec	2 Oct 2008 14:22:26 -0000	1.75
+++ isdn4k-utils.spec	28 Oct 2008 12:48:16 -0000	1.76
@@ -17,7 +17,7 @@
 Summary: Utilities for configuring an ISDN subsystem.
 Name: isdn4k-utils
 Version: 3.2
-Release: 60%{?dist}
+Release: 61%{?dist}
 License: GPLv2+
 Group: Applications/System
 
@@ -145,9 +145,9 @@
 echo CONFIG_GENMAN=y >>.config
 echo CONFIG_FAQ=y >>.config
 echo "CONFIG_FAQDIR='/usr/share/doc/isdn4k-utils'" >>.config
-echo "CONFIG_DATADIR='%{_libdir}/isdn'" >>.config
+echo "CONFIG_DATADIR='%{_datadir}/isdn'" >>.config
 echo "LIBDIR='%{_libdir}'" >>.config
-echo "CONFIG_FIRMWAREDIR='%{_libdir}/isdn'" >>.config
+echo "CONFIG_FIRMWAREDIR='%{_datadir}/isdn'" >>.config
 echo "CONFIG_CARD_SBINDIR='/sbin'" >>.config
 sed -e "s,',,g" .config > .config.h
 
@@ -186,7 +186,7 @@
 
 chmod 1777 %{buildroot}/var/spool/vbox
 make install DESTDIR=%{buildroot} \
-             DATADIR=%{_libdir}/isdn \
+             DATADIR=%{_datadir}/isdn \
              XAPPLOADDIR=%{app_defaults_dir} \
              MANPATH=%{_mandir} \
              MANSUFFIX=1
@@ -211,9 +211,9 @@
 %endif
 
 # copy config files for isdnlog
-mkdir -p %{buildroot}%{_libdir}/isdn
-cp -f isdnlog/*.dat %{buildroot}%{_libdir}/isdn/
-chmod 644 %{buildroot}%{_libdir}/isdn/*.dat
+mkdir -p %{buildroot}%{_datadir}/isdn
+cp -f isdnlog/*.dat %{buildroot}%{_datadir}/isdn/
+chmod 644 %{buildroot}%{_datadir}/isdn/*.dat
 
 # delete files to avoid conflicts
 rm -rf %{buildroot}/etc/isdn/stop \
@@ -425,7 +425,7 @@
 %config %{initdir}/capi
 %{_libdir}/pppd
 %{_bindir}/*
-%{_libdir}/isdn
+%{_datadir}/isdn
 %{_libdir}/*.so.*
 %{_mandir}/man1/*
 %{_mandir}/man4/*
@@ -502,6 +502,9 @@
 %doc xmonisdn/README
 
 %changelog
+* Mon Oct 27 2008 Than Ngo <than at redhat.com> 3.2-61
+- bz450370, fix multilib issue
+
 * Thu Oct 02 2008 Than Ngo <than at redhat.com> 3.2-60
 - rebuild