rpms/isdn4k-utils/F-13 40-isdn.rules, NONE, 1.1 capi20.conf, NONE, 1.1 ibod-1.4-license.patch, NONE, 1.1 isdn4k-utils-CVS-2010-05-01-capi-soname.patch, NONE, 1.1 isdn4k-utils-CVS-2010-05-01-capi.patch, NONE, 1.1 isdn4k-utils.spec, 1.88, 1.89 sources, 1.17, 1.18
Than Ngo
than at fedoraproject.org
Mon May 17 11:51:06 UTC 2010
- Previous message: rpms/kde-plasma-smooth-tasks/devel kde-plasma-smooth-tasks.spec, 1.7, 1.8
- Next message: rpms/isdn4k-utils/F-12 40-isdn.rules, NONE, 1.1 capi20.conf, NONE, 1.1 ibod-1.4-license.patch, NONE, 1.1 isdn4k-utils-CVS-2010-05-01-capi-soname.patch, NONE, 1.1 isdn4k-utils-CVS-2010-05-01-capi.patch, NONE, 1.1 isdn4k-utils-autoconf-2.6.4-quoting.patch, NONE, 1.1 isdn4k-utils.spec, 1.83, 1.84 sources, 1.16, 1.17 capi20_be.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: than
Update of /cvs/extras/rpms/isdn4k-utils/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24759
Modified Files:
isdn4k-utils.spec sources
Added Files:
40-isdn.rules capi20.conf ibod-1.4-license.patch
isdn4k-utils-CVS-2010-05-01-capi-soname.patch
isdn4k-utils-CVS-2010-05-01-capi.patch
Log Message:
- fix bz#566909, thanks to Louis Lagendijk
- own LIBDIR/capi
- fix loading of plugins
- remove chkconfig capi off
--- NEW FILE 40-isdn.rules ---
# do not edit this file, it will be overwritten on update
SUBSYSTEM=="capi", KERNEL=="capi", NAME="capi20", GROUP="dialout"
SUBSYSTEM=="tty", KERNEL=="capi[0-9]*", NAME="capi/%n"
--- NEW FILE capi20.conf ---
# libcapi20 features autodetection of connected CAPI
# devices. In case you need to select a special device
# use the remote configuration file:
# ~/.capi20rc
# if it doesn't exist look for
# /etc/capi20.conf
#
# To set the remote machine, the above file need to have
# the following line
# REMOTE <driver> <remote hostname|ip-address> <remote port>
#
# Drivers:
# * fritzbox - Remote CAPI via FRITZ!Box
# * rcapi - Melware Remote CAPI
#
# If this doesn't exist, the library tries the old, normal way
# of using the local /dev/isdn/capi20.
# REMOTE fritzbox 192.168.178.1 5031
ibod-1.4-license.patch:
LICENSE | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 342 insertions(+)
--- NEW FILE ibod-1.4-license.patch ---
diff -Nur ibod/LICENSE ibod-1.5.0/LICENSE
--- ibod/LICENSE 1970-01-01 01:00:00.000000000 +0100
+++ ibod-1.5.0/LICENSE 2001-01-10 11:16:33.000000000 +0100
@@ -0,0 +1,342 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+
+
isdn4k-utils-CVS-2010-05-01-capi-soname.patch:
capi20.c | 4 !!!!
1 file changed, 4 modifications(!)
--- NEW FILE isdn4k-utils-CVS-2010-05-01-capi-soname.patch ---
*** isdn4k-utils/capi20.new/capi20.c.org 2010-05-07 20:56:21.000000000 +0200
--- isdn4k-utils/capi20.new/capi20.c 2010-05-07 22:01:45.000000000 +0200
***************
*** 590,598 ****
psDir = opendir( pnModuleDir );
if ( psDir != NULL ) {
/* read entry by entry */
while ( ( psEntry = readdir( psDir ) ) != NULL ) {
! /* skip ".", ".." and files which do not end with "so" */
nLen = strlen( psEntry -> d_name );
switch ( nLen ) {
case 1:
--- 590,598 ----
psDir = opendir( pnModuleDir );
if ( psDir != NULL ) {
/* read entry by entry */
while ( ( psEntry = readdir( psDir ) ) != NULL ) {
! /* skip ".", ".." and files which do not end with "so.?" */
nLen = strlen( psEntry -> d_name );
switch ( nLen ) {
case 1:
***************
*** 605,613 ****
continue;
}
break;
default:
! if ( strncmp( psEntry -> d_name + nLen - 3, ".so", nLen ) ) {
continue;
}
break;
}
--- 605,613 ----
continue;
}
break;
default:
! if ( strncmp( psEntry -> d_name + nLen - 5, ".so.0", 4 ) ) {
continue;
}
break;
}
isdn4k-utils-CVS-2010-05-01-capi.patch:
capidyn.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE isdn4k-utils-CVS-2010-05-01-capi.patch ---
diff -up isdn4k-utils-CVS-2006-07-20/capi20.new/capidyn.c.orig isdn4k-utils-CVS-2006-07-20/capi20.new/capidyn.c
--- isdn4k-utils-CVS-2006-07-20/capi20.new/capidyn.c.orig 2009-01-19 15:18:10.000000000 +0100
+++ isdn4k-utils-CVS-2006-07-20/capi20.new/capidyn.c 2009-01-19 15:19:30.000000000 +0100
@@ -26,7 +26,7 @@
#include <dlfcn.h>
-#define LIBCAPI "libcapi20.so"
+#define LIBCAPI "libcapi20.so.3"
static int loadlib(void);
/* ---------------------------------------------------------------------- */
Index: isdn4k-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/isdn4k-utils/F-13/isdn4k-utils.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- isdn4k-utils.spec 3 May 2010 13:55:51 -0000 1.88
+++ isdn4k-utils.spec 17 May 2010 11:51:06 -0000 1.89
@@ -1,40 +1,40 @@
-%define _default_patch_fuzz 2
-
-%define app_defaults_dir %{_datadir}/X11/app-defaults
-
-%define interver CVS-2009-10-20
-%ifarch s390 s390x
-%define PIE -fPIE
-%else
-%define PIE -fpie
-%endif
-
-%define initdir /etc/rc.d/init.d
+%global _default_patch_fuzz 2
+%global app_defaults_dir %{_datadir}/X11/app-defaults
+%global interver CVS-2010-05-01
+%global PIE -fpie
Summary: Utilities for configuring an ISDN subsystem
Name: isdn4k-utils
Version: 3.2
-Release: 69%{?dist}
+Release: 71%{?dist}
License: GPLv2+ and GPL+ and MIT and BSD and zlib
Group: Applications/System
-
Url: http://www.isdn4linux.de/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# license issue, remove the isdn_lzscomp.c and firmwares
Source0: ftp://ftp.isdn4linux.de/pub/isdn4linux/utils/isdn4k-utils-%{interver}-patched.tar.bz2
+# license GPL, http://www.datenwelt.net/oss/ibod
Source1: http://www.datenwelt.net/oss/ibod/ibod-1.4-src.tar.gz
Source2: isdn.init
Source3: userisdnctl.c
Source4: isdndial
Source5: isdnstatus
Source6: isdnhangup
+Source7: capi20.conf
Source8: capi.init
Source9: capiinit.8
+Source10: 40-isdn.rules
+
Patch0: isdn4k-utils-CVS-2009-10-20-redhat.patch
Patch1: isdn4k-utils-CVS-2009-10-20-lib64.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
+Patch6: ibod-1.4-license.patch
+
Patch11: isdn4k-utils-statfs.patch
Patch12: isdn4k-utils-CVS-2005-03-09-xmon.patch
Patch13: isdn4k-utils-capiinit.patch
@@ -42,18 +42,16 @@ Patch16: isdn4k-utils-CVS-2006-07-20-cap
Patch17: isdn4k-utils-misc-overflow-in-capi-subsystem.patch
Patch18: isdn4k-utils-sh-linux.patch
Patch19: isdn4k-utils-autoconf-2.6.4-quoting.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch20: isdn4k-utils-CVS-2010-05-01-capi.patch
+Patch21: isdn4k-utils-CVS-2010-05-01-capi-soname.patch
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
-BuildRequires: /usr/bin/sgml2txt
-BuildRequires: /usr/bin/sgml2html
BuildRequires: ncurses-devel
BuildRequires: tcl-devel
BuildRequires: libpcap-devel
@@ -77,7 +75,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}
@@ -113,6 +111,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
@@ -127,6 +133,8 @@ popd
%patch3 -p1 -b .man
%patch4 -p1 -b .ac25x
%patch5 -p1 -b .true
+%patch6 -p0
+
%patch11 -p1 -b .statfs
%patch12 -p1 -b .xmon
%patch13 -p1 -b .capi
@@ -134,15 +142,29 @@ popd
%patch17 -p1 -b .misc-overflow
%patch18 -p1 -b .sh-support
%patch19 -p1 -b .quote
+%patch20 -p1 -b .capinew
+%patch21 -p1 -b .capi-soname
+
+# remove useless files
+find -type d -name "CVS" | xargs rm -rf
+
+# enable capi20.new
+rm -rf capi20 && mv capi20.new capi20
+# autoreconf for new autofoo
for i in */configure; do
cd `dirname $i`
autoreconf --force --install
cd ..
done
-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
+# fix utf8 issue
+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"
@@ -157,27 +179,16 @@ echo "CONFIG_FIRMWAREDIR='%{_datadir}/is
echo "CONFIG_CARD_SBINDIR='/sbin'" >>.config
sed -e "s,',,g" .config > .config.h
-# workaround for automake/autoconf
-if [ -x /usr/share/automake/depcomp ] ; then
- for i in capiinfo capiinit rcapid capifax; do
- cp -f /usr/share/automake/depcomp $i
- ( cd $i ; aclocal && autoconf )
- done
-fi
-
-# we need it on ia64 machine
-( cd capi20; [ -f configure.in ] && libtoolize --copy --force )
-( cd vbox; [ -f configure.in ] && libtoolize --copy --force )
-
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
-# build userisdnctl
-cp %{SOURCE3} isdnctrl
-(cd isdnctrl ; gcc %{PIE} -pie $RPM_OPT_FLAGS userisdnctl.c -o userisdnctl)
+%if 0%{?fedora} < 14
+ # build userisdnctl
+ gcc %{PIE} -pie $RPM_OPT_FLAGS %{SOURCE3} -o isdnctrl/userisdnctl
+%endif
%install
rm -rf %{buildroot}
@@ -200,7 +211,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
@@ -210,10 +221,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
@@ -221,82 +232,98 @@ mkdir -p %{buildroot}%{_datadir}/isdn
cp -f isdnlog/*.dat %{buildroot}%{_datadir}/isdn/
chmod 644 %{buildroot}%{_datadir}/isdn/*.dat
-# delete files to avoid conflicts
+# delete files to avoid conflicts and don't package *.la files
rm -rf %{buildroot}/etc/isdn/stop \
- %{buildroot}/usr/bin/cdb* \
- %{buildroot}/usr/include/freecdb.h \
- %{buildroot}/usr/include/freecdbmake.h \
- %{buildroot}/usr/lib/libfreecdb.a \
- %{buildroot}/usr/lib/libfreecdbmake.a \
- %{buildroot}/usr/share/man/man1/cdb* \
- %{buildroot}/usr/share/man/man3
+ %{buildroot}/etc/drdsl/adsl.conf \
+ %{buildroot}%{_bindir}/cdb* \
+ %{buildroot}%{_includedir}/freecdb.h \
+ %{buildroot}%{_includedir}/freecdbmake.h \
+ %{buildroot}%{_libdir}/*.la \
+ %{buildroot}%{_libdir}/capi/*.la \
+ %{buildroot}%{_libdir}/capi/*.so \
+ %{buildroot}%{_mandir}/man1/cdb* \
+ %{buildroot}%{_mandir}/man3 \
+ %{buildroot}%{_mandir}/man5/vboxtcl.5* \
+ %{buildroot}%{_docdir}/isdn4k-utils \
+ %{buildroot}%{_docdir}/vbox \
+ %{buildroot}/usr/X11R6 \
+ %{buildroot}/usr/lib*/X11
# install isdn startup script
-mkdir -p %{buildroot}%{initdir}
-install -m755 %{SOURCE2} %{buildroot}%{initdir}/isdn
-install -m755 %{SOURCE8} %{buildroot}%{initdir}/capi
+mkdir -p %{buildroot}%{_initddir}
+install -m755 %{SOURCE2} %{buildroot}%{_initddir}/isdn
+install -m755 %{SOURCE8} %{buildroot}%{_initddir}/capi
# move some binaries into /sbin
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
-# 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}/
+%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}/
+%endif
mv %{buildroot}%{_mandir}/man8/.isdnctrl_conf.8 \
%{buildroot}%{_mandir}/man8/isdnctrl_conf.8
-rm -rf %{buildroot}%{_docdir}/isdn4k-utils \
- %{buildroot}%{_docdir}/vbox \
- %{buildroot}/etc/drdsl/adsl.conf \
- %{buildroot}%{_mandir}/man5/vboxtcl.5* \
- %{buildroot}/usr/X11R6 \
- %{buildroot}%{_prefix}/lib/X11 \
- %{buildroot}%{_libdir}/*.la
-
# 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/
-chmod 644 %{buildroot}%{_mandir}/man?/*
-
-chmod 755 %{buildroot}%{_bindir}/vboxbeep
-
+# install config file for capi
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/
+%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 ! test -s %{_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
@@ -310,16 +337,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
@@ -408,35 +435,32 @@ exit 0
rm -rf %{buildroot}
%files
-%defattr(-,root,root)
+%defattr(-,root,root,755)
%dir /etc/isdn
%dir /etc/vbox
%dir /var/spool/vbox
%dir /var/log/vbox
+%dir %{_datadir}/isdn
+%dir %{_libdir}/capi
%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/capi20.conf
%config(noreplace) /etc/vbox/*.conf
-%config %{initdir}/isdn
-%config %{initdir}/capi
+%if 0%{?fedora} > 13 || 0%{?rhel} > 6
+/lib/udev/rules.d/40-isdn.rules
+%endif
%{_libdir}/pppd
-%{_bindir}/*
-%{_datadir}/isdn
+%{_datadir}/isdn/*.dat
+%{_datadir}/isdn/dest.cdb
%{_libdir}/*.so.*
-%{_mandir}/man1/*
-%{_mandir}/man4/*
-%{_mandir}/man5/*
-%{_mandir}/man7/*
-%{_mandir}/man8/*
-%exclude %{_mandir}/man1/xmonisdn.1*
-%exclude %{_mandir}/man1/xisdnload.1*
-%exclude %{_mandir}/man5/vboxgetty.conf.5*
-%exclude %{_mandir}/man8/vboxgetty.8*
-%exclude %{_mandir}/man8/vboxputty.8*
-%exclude %{_bindir}/xisdnload
-%exclude %{_bindir}/xmonisdn
+%{_libdir}/capi/*.so.*
+%defattr(755,root,root,755)
/sbin/*
+%{_initddir}/isdn
+%{_initddir}/capi
+%{_bindir}/*
%{_sbindir}/capiinit
%{_sbindir}/ibod
%{_sbindir}/imon
@@ -449,49 +473,85 @@ rm -rf %{buildroot}
%{_sbindir}/mkzonedb
%{_sbindir}/rcapid
%{_sbindir}/vboxd
+%if 0%{?fedora} < 14
%attr(4755,root,root) %{_sbindir}/userisdnctl
%{_sbindir}/isdnhangup
%{_sbindir}/isdnstatus
%{_sbindir}/isdndial
-
+%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*
-%doc vbox/examples/beep.msg*
-%doc vbox/examples/timeout*
-%lang(de) %doc vbox/doc/de/vbox.sgml vbox/doc/de/vbox.txt
-%doc FAQ/tutorial/* FAQ/i4lfaq* Mini-FAQ/ FAQ/_howto/ FAQ/_example/
+%doc isdnlog/tools/zone/de/01033/zred.dtag.bz2
+%ghost %{_datadir}/isdn/zone-de-dtag.cdb
+%{_mandir}/man1/*
+%{_mandir}/man4/*
+%{_mandir}/man5/*
+%{_mandir}/man7/*
+%{_mandir}/man8/*
+%exclude %{_mandir}/man1/xmonisdn.1*
+%exclude %{_mandir}/man1/xisdnload.1*
+%exclude %{_mandir}/man5/vboxgetty.conf.5*
+%exclude %{_mandir}/man8/vboxgetty.8*
+%exclude %{_mandir}/man8/vboxputty.8*
+%exclude %{_bindir}/xisdnload
+%exclude %{_bindir}/xmonisdn
%files vboxgetty
-%defattr(-,root,root)
-%{_sbindir}/vboxgetty
-%{_sbindir}/vboxputty
+%defattr(644,root,root,755)
+%doc vbox/examples/vboxgetty*.example
%{_mandir}/man5/vboxgetty.conf.5*
%{_mandir}/man8/vboxgetty.8*
%{_mandir}/man8/vboxputty.8*
-%doc vbox/examples/vboxgetty*.example
+%defattr(755,root,root,755)
+%{_sbindir}/vboxgetty
+%{_sbindir}/vboxputty
%files devel
%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
%files static
%{_libdir}/*.a
%files -n xisdnload
-%defattr(-,root,root)
-%{_bindir}/xisdnload
-%{_bindir}/xmonisdn
+%defattr(644,root,root,755)
+%doc xmonisdn/README
%{app_defaults_dir}/*
%{_mandir}/man1/xisdnload.1*
%{_mandir}/man1/xmonisdn.1*
-%doc xmonisdn/README
+%defattr(755,root,root,755)
+%{_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
+* Fri May 14 2010 Than Ngo <than at redhat.com> - 3.2-71
+- fix bz#566909, thanks to Louis Lagendijk
+ - own LIBDIR/capi
+ - fix loading of plugins
+ - remove chkconfig capi off
+
+* 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
- fix bz#556056, split off -static subpackage
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/isdn4k-utils/F-13/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources 29 Jan 2010 17:32:24 -0000 1.17
+++ sources 17 May 2010 11:51:06 -0000 1.18
@@ -1,3 +1,3 @@
38b45be27c0a82b38380f680fdee0aff ibod-1.4-src.tar.gz
45e047c31ebbdfd2865532a80393223b capiinit.8
-b15f7bfa9c19047186f9eb10f8d44f9d isdn4k-utils-CVS-2009-10-20-patched.tar.bz2
+8c4184ad6c614f9a3ee8fdd291372507 isdn4k-utils-CVS-2010-05-01-patched.tar.bz2
- Previous message: rpms/kde-plasma-smooth-tasks/devel kde-plasma-smooth-tasks.spec, 1.7, 1.8
- Next message: rpms/isdn4k-utils/F-12 40-isdn.rules, NONE, 1.1 capi20.conf, NONE, 1.1 ibod-1.4-license.patch, NONE, 1.1 isdn4k-utils-CVS-2010-05-01-capi-soname.patch, NONE, 1.1 isdn4k-utils-CVS-2010-05-01-capi.patch, NONE, 1.1 isdn4k-utils-autoconf-2.6.4-quoting.patch, NONE, 1.1 isdn4k-utils.spec, 1.83, 1.84 sources, 1.16, 1.17 capi20_be.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list