Changes - j0ke.net Open Build Service

Changes of Revision 7

[-] [+]	Changed	lcr162.spec
@@ -6,24 +6,27 @@ # norootforbuild # usedforbuild aaa_base acl asterisk162 asterisk162-devel attr audit-libs autoconf automake bash bind-libs bind-utils binutils bison bzip2 capi4linux capisuite coreutils cpio cpp cpp41 cracklib cvs cyrus-sasl db diffutils e2fsprogs file filesystem fillup findutils flex gawk gcc gcc41 gcc-c++ gdbm gdbm-devel gettext gettext-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv kernel-source kernel-syms klogd less libacl libattr libcom_err libgcc41 libgsm1 libgsm-devel libltdl libmudflap41 libnscd libstdc++41 libtool libvolume_id libxcrypt libzio linux-kernel-headers m4 make man mktemp module-init-tools ncurses ncurses-devel net-tools netcfg openldap2-client openssl pam pam-modules patch perl permissions popt procinfo procps psmisc pwdutils rcs readline rpm sed strace sysvinit tar tcpd texinfo timezone udev unzip util-linux vim zlib zlib-devel -%define dver 20100601 +#%define dver 20110401 Name: lcr162 BuildRequires: kernel-source kernel-syms udev newt-devel wget flex ncurses-devel asterisk162-devel BuildRequires: mISDNuser mISDNuser-devel libgsm1 libgsm-devel gcc-c++ URL: http://www.misdn.org Summary: Modular ISDN driver architecture -Version: 1.7 -Release: 10 +Version: 1.6 +Release: 15 License: GNU General Public License (GPL) Group: Productivity/Telephony/Utilities PreReq: %insserv_prereq %fillup_prereq udev Requires: lcr162 Excludearch: s390 s390x BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: lcr-%{dver}.tar.bz2 +#Source0: lcr-%{dver}.tar.bz2 +Source0: lcr-%{version}.tar.bz2 Source1: lcr.init -Patch0: lcr.patch -Patch1: chan_lcr.patch +#Patch0: lcr-%{dver}.patch +Patch0: lcr.patch +#Patch1: chan_lcr.patch +#Patch1: lcr162-include.patch Requires: asterisk162 Requires: mISDNuser mISDNuser-devel @@ -40,7 +43,7 @@ %setup -n lcr %patch0 -p0 -%patch1 -p0 +#patch1 -p0 %build ./autogen.sh
[-] [+]	Added	lcr-20110401.patch ^
@@ -0,0 +1,59 @@ +--- Makefile.am.orig 2011-04-01 21:44:06.829888854 +0200 ++++ Makefile.am 2011-04-01 21:46:06.197402532 +0200 +@@ -20,7 +20,7 @@ + ## the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + ## Boston, MA 02110-1301, USA. + +-INSTALLdir = $(DESTDIR)/usr/local/lcr ++INSTALLdir = $(DESTDIR)/var/lib/lcr + + pkglogdir=$(localstatedir)/log/@PACKAGE@ + pkgsysconfdir=$(sysconfdir)/@PACKAGE@ +@@ -35,13 +35,13 @@ + LOGdir=$(INSTALLdir) + EXTENSIONdir=$(INSTALLdir)/extensions + +-astmoddir = $(DESTDIR)/usr/lib/asterisk/modules ++astmoddir = $(DESTDIR)/$(LIBDIR)/asterisk/modules + + INSTALLATION_DEFINES = \ +- -DCONFIG_DATA="\"$(CONFIGdir)\"" \ +- -DSHARE_DATA="\"$(SHAREdir)\"" \ +- -DLOG_DIR="\"$(LOGdir)\"" \ +- -DEXTENSION_DATA="\"$(EXTENSIONdir)\"" ++ -DCONFIG_DATA="\"/var/lib/lcr\"" \ ++ -DSHARE_DATA="\"/var/lib/lcr\"" \ ++ -DLOG_DIR="\"/var/lib/lcr\"" \ ++ -DEXTENSION_DATA="\"/var/lib/lcr/extensions\"" + + GSM_INCLUDE = + GSM_SOURCE = +--- Makefile.in.orig 2011-04-01 21:33:49.000000000 +0200 ++++ Makefile.in 2011-04-01 21:42:47.574139734 +0200 +@@ -257,7 +257,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-INSTALLdir = $(DESTDIR)/usr/local/lcr ++INSTALLdir = $(DESTDIR)/var/lib/lcr + pkglogdir = $(localstatedir)/log/@PACKAGE@ + pkgsysconfdir = $(sysconfdir)/@PACKAGE@ + +@@ -269,12 +269,12 @@ + SHAREdir = $(INSTALLdir) + LOGdir = $(INSTALLdir) + EXTENSIONdir = $(INSTALLdir)/extensions +-astmoddir = $(DESTDIR)/usr/lib/asterisk/modules ++astmoddir = $(DESTDIR)/$(LIBDIR)/asterisk/modules + INSTALLATION_DEFINES = \ +- -DCONFIG_DATA="\"$(CONFIGdir)\"" \ +- -DSHARE_DATA="\"$(SHAREdir)\"" \ +- -DLOG_DIR="\"$(LOGdir)\"" \ +- -DEXTENSION_DATA="\"$(EXTENSIONdir)\"" ++ -DCONFIG_DATA="\"/var/lib/lcr\"" \ ++ -DSHARE_DATA="\"/var/lib/lcr\"" \ ++ -DLOG_DIR="\"/var/lib/lcr\"" \ ++ -DEXTENSION_DATA="\"/var/lib/lcr/extensions\"" + + GSM_INCLUDE = $(am__append_1) $(am__append_4) $(am__append_7) + GSM_SOURCE = $(am__append_2) $(am__append_5) $(am__append_8)
[-] [+]	Added	lcr162-include.patch ^
@@ -0,0 +1,42 @@ +--- acinclude.m4.orig 2011-04-01 22:12:36.962529312 +0200 ++++ acinclude.m4 2011-04-01 22:13:08.146231401 +0200 +@@ -301,7 +301,7 @@ + for dir in $pbx_misdn_dirs; do + misdn_incdirs="$misdn_incdirs $dir/include $dir" + done +-misdn_incdirs="$MISDNINC $misdn_incdirs /usr/include/mISDNuser /usr/include/misdn /usr/include" ++misdn_incdirs="$MISDNINC $misdn_incdirs /usr/include/mISDN /usr/include/misdn /usr/include" + if test ! "$ac_misdnuser_includes" = "NO"; then + misdn_incdirs="$ac_misdnuser_includes $misdn_incdirs" + fi +@@ -515,7 +515,7 @@ + for dir in $misdn_kernelheader_dirs; do + misdnkernel_incdirs="$misdnkernel_incdirs $dir/include $dir" + done +-misdnkernel_incdirs="$MISDNKERNELINC $misdnkernel_incdirs /usr/include/mISDNuser /usr/include/misdn /usr/include" ++misdnkernel_incdirs="$MISDNKERNELINC $misdnkernel_incdirs /usr/include/mISDN /usr/include/misdn /usr/include" + if test ! "$ac_misdnkernel_includes" = "NO"; then + misdnkernel_incdirs="$ac_misdnkernel_includes $misdnkernel_incdirs" + fi +--- Makefile.in.orig 2011-04-01 22:12:09.402535060 +0200 ++++ Makefile.in 2011-04-01 22:13:16.202232295 +0200 +@@ -249,7 +249,7 @@ + @ENABLE_ASTERISK_CHANNEL_DRIVER_TRUE@chan_lcr_so_SOURCES = + @ENABLE_ASTERISK_CHANNEL_DRIVER_TRUE@chan_lcr_so_LDFLAGS = -shared + @ENABLE_ASTERISK_CHANNEL_DRIVER_TRUE@chan_lcr_so_LDADD = chan_lcr.po bchannel.po options.po callerid.po +-INCLUDES = $(all_includes) $(GSM_INCLUDE) -Wall -I/usr/include/mISDNuser $(INSTALLATION_DEFINES) ++INCLUDES = $(all_includes) $(GSM_INCLUDE) -Wall -I/usr/include/mISDN $(INSTALLATION_DEFINES) + lcr_SOURCES = $(GSM_SOURCE) action.cpp mISDN.cpp tones.c \ + action_efi.cpp crypt.cpp mail.c trace.c \ + action_vbox.cpp dss1.cpp main.c \ +--- Makefile.am.orig 2011-04-01 22:12:02.117188524 +0200 ++++ Makefile.am 2011-04-01 22:13:23.270232499 +0200 +@@ -84,7 +84,7 @@ + $(INSTALL) chan_lcr.so $(astmoddir) + endif + +-INCLUDES = $(all_includes) $(GSM_INCLUDE) -Wall -I/usr/include/mISDNuser $(INSTALLATION_DEFINES) ++INCLUDES = $(all_includes) $(GSM_INCLUDE) -Wall -I/usr/include/mISDN $(INSTALLATION_DEFINES) + + lcr_SOURCES = $(GSM_SOURCE) action.cpp mISDN.cpp tones.c \ + action_efi.cpp crypt.cpp mail.c trace.c \
	Added	lcr-20110401.tar.bz2 ^