packages: openh323/openh323-system-libs.patch, openh323/openh323.spec - up ...

glen glen at pld-linux.org
Wed Dec 30 18:16:05 CET 2009 

Author: glen                         Date: Wed Dec 30 17:16:05 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.19.0.1

---- Files affected:
packages/openh323:
   openh323-system-libs.patch (1.6 -> 1.7) , openh323.spec (1.111 -> 1.112) 

---- Diffs:

================================================================
Index: packages/openh323/openh323-system-libs.patch
diff -u packages/openh323/openh323-system-libs.patch:1.6 packages/openh323/openh323-system-libs.patch:1.7
--- packages/openh323/openh323-system-libs.patch:1.6	Thu Apr 13 00:36:30 2006
+++ packages/openh323/openh323-system-libs.patch	Wed Dec 30 18:16:00 2009
@@ -1,4 +1,3 @@
-diff -urN openh323_v1_18_0.org/plugins/audio/GSM0610/gsm06_10_codec.c openh323_v1_18_0/plugins/audio/GSM0610/gsm06_10_codec.c
 --- openh323_v1_18_0.org/plugins/audio/GSM0610/gsm06_10_codec.c	2005-07-15 12:08:59.000000000 +0200
 +++ openh323_v1_18_0/plugins/audio/GSM0610/gsm06_10_codec.c	2006-04-13 00:33:28.879793500 +0200
 @@ -79,7 +79,7 @@
@@ -10,7 +9,6 @@
  
  #define	BITS_PER_SECOND         13200
  
-diff -urN openh323_v1_18_0.org/plugins/audio/GSM0610/Makefile.in openh323_v1_18_0/plugins/audio/GSM0610/Makefile.in
 --- openh323_v1_18_0.org/plugins/audio/GSM0610/Makefile.in	2006-02-20 09:55:03.000000000 +0100
 +++ openh323_v1_18_0/plugins/audio/GSM0610/Makefile.in	2006-04-13 00:33:57.113558000 +0200
 @@ -63,7 +63,7 @@
@@ -22,33 +20,6 @@
  H323_EMBEDDED_GSM=@H323_EMBEDDED_GSM@
  
  CC=@CC@
-@@ -82,7 +82,7 @@
- 
- SRCS	+= gsm06_10_codec.c
- 
--#ifeq ($(H323_SYSTEM_GSM),0)
-+ifeq ($(H323_SYSTEM_GSM),0)
- 
- SRCS	+= $(SRCDIR)/gsm_create.c \
-            $(SRCDIR)/gsm_destroy.c \
-@@ -101,11 +101,11 @@
- 
- EXTRALIBS = 
- 
--#else
--#
--#EXTRALIBS = -lgsm
--#
--#endif
-+else
-+
-+EXTRALIBS = -lgsm
-+
-+endif
- 
- vpath	%.o $(OBJDIR)
- vpath	%.c $(SRCDIR)
-diff -urN openh323_v1_18_0.org/plugins/audio/LPC_10/lpc_10_codec.c openh323_v1_18_0/plugins/audio/LPC_10/lpc_10_codec.c
 --- openh323_v1_18_0.org/plugins/audio/LPC_10/lpc_10_codec.c	2005-07-15 12:09:00.000000000 +0200
 +++ openh323_v1_18_0/plugins/audio/LPC_10/lpc_10_codec.c	2006-04-13 00:33:28.883793750 +0200
 @@ -44,7 +44,7 @@
@@ -60,7 +31,6 @@
  
  PLUGIN_CODEC_IMPLEMENT("LPC 10")
  
-diff -urN openh323_v1_18_0.org/plugins/audio/LPC_10/Makefile.in openh323_v1_18_0/plugins/audio/LPC_10/Makefile.in
 --- openh323_v1_18_0.org/plugins/audio/LPC_10/Makefile.in	2004-08-22 06:20:19.000000000 +0200
 +++ openh323_v1_18_0/plugins/audio/LPC_10/Makefile.in	2006-04-13 00:33:28.883793750 +0200
 @@ -52,41 +52,8 @@
@@ -107,7 +77,6 @@
  
  vpath	%.o $(OBJDIR)
  vpath	%.c $(SRCDIR)
-diff -urN openh323_v1_18_0.org/plugins/audio/Speex/speexcodec.cxx openh323_v1_18_0/plugins/audio/Speex/speexcodec.cxx
 --- openh323_v1_18_0.org/plugins/audio/Speex/speexcodec.cxx	2005-08-15 03:57:13.000000000 +0200
 +++ openh323_v1_18_0/plugins/audio/Speex/speexcodec.cxx	2006-04-13 00:33:28.883793750 +0200
 @@ -88,7 +88,7 @@

================================================================
Index: packages/openh323/openh323.spec
diff -u packages/openh323/openh323.spec:1.111 packages/openh323/openh323.spec:1.112
--- packages/openh323/openh323.spec:1.111	Thu Feb  7 14:34:31 2008
+++ packages/openh323/openh323.spec	Wed Dec 30 18:16:00 2009
@@ -3,18 +3,18 @@
 # - separate plugins to subpackages
 # - gsm-amr plugin (using system amrnb if possible)
 # - use system libilbc or at least use optflags for plugins/audio/iLBC
-#
-%define	fver	%(echo %{version} | tr . _)
+# - links with -losptk but no BR
+
+%define		fver	%(echo %{version} | tr . _)
 Summary:	OpenH323 Library
 Summary(pl.UTF-8):	Biblioteka OpenH323
 Name:		openh323
-Version:	1.18.0
-Release:	10
+Version:	1.19.0.1
+Release:	0.1
 License:	MPL 1.0
 Group:		Libraries
 Source0:	http://www.voxgratia.org/releases/%{name}-v%{fver}-src-tar.gz
-# Source0-md5:	d7043ba34b5038f0113b099ede0884fb
-#Source0:	http://www.seconix.com/%{name}-%{version}.tar.gz
+# Source0-md5:	e7ba3ae6b50d0d02c5cbe9ed3a3152c4
 Patch0:		%{name}-mak_files.patch
 Patch1:		%{name}-asnparser.patch
 Patch2:		%{name}-lib.patch
@@ -23,6 +23,8 @@
 Patch5:		%{name}-configure_fix.patch
 Patch6:		%{name}-install64.patch
 Patch7:		%{name}-inc.patch
+Patch8:		ptlib-check.patch
+Patch9:		ptlib-headers.patch
 URL:		http://www.voxgratia.org/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -33,8 +35,6 @@
 BuildRequires:	pwlib-devel >= 1.10.0
 BuildRequires:	sed >= 4.0
 BuildRequires:	speex-devel >= 1:1.1.5
-%requires_eq	pwlib
-Requires:	pwlib >= 1.10.0
 Requires:	speex >= 1:1.1.5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -91,27 +91,23 @@
 sed -i -e 's#/lib#/lib64#g' openh323u.mak.in
 %endif
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
-PWLIBDIR=%{_prefix}; export PWLIBDIR
-OPENH323DIR=`pwd`; export OPENH323DIR
-OPENH323_BUILD="yes"; export OPENH323_BUILD
+export OPENH323DIR=${PWD:-$(pwd)}
+export OPENH323_BUILD="yes"
 cp -f /usr/share/automake/config.sub .
 %{__autoconf}
 %configure \
 	--enable-localspeex=no \
 	--enable-plugins
 
-%{__make} %{?debug:debugshared}%{!?debug:optshared} \
+%{__make} %{?debug:debug}%{!?debug:opt}shared apps \
 	CC="%{__cc}" \
 	CPLUS="%{__cxx}" \
 	OPTCCFLAGS="%{rpmcflags} %{!?debug:-DNDEBUG}"
 
-%{__make} -C samples/simple %{?debug:debugshared}%{!?debug:optshared} \
-	CC="%{__cc}" \
-	CPLUS=%{__cxx} \
-	OPTCCFLAGS="%{rpmcflags} %{!?debug:-DNDEBUG}"
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_libdir},%{_bindir}}
@@ -121,9 +117,9 @@
 	LIBDIR=$RPM_BUILD_ROOT%{_libdir}
 
 # using cp as install won't preserve links
-cp -d %{_lib}/lib*.a $RPM_BUILD_ROOT%{_libdir}
-install samples/simple/obj_*/simph323 $RPM_BUILD_ROOT%{_bindir}
-install version.h $RPM_BUILD_ROOT%{_includedir}/%{name}
+cp -pd %{_lib}/lib*.a $RPM_BUILD_ROOT%{_libdir}
+cp -a samples/simple/obj_*/simph323 $RPM_BUILD_ROOT%{_bindir}
+cp -a version.h $RPM_BUILD_ROOT%{_includedir}/%{name}
 
 sed -i -e 's#OH323_INCDIR = .*#OH323_INCDIR = %{_includedir}/%{name}#g' $RPM_BUILD_ROOT%{_datadir}/%{name}/*.mak
 sed -i -e 's#OH323_LIBDIR = .*#OH323_LIBDIR = %{_libdir}#g' $RPM_BUILD_ROOT%{_datadir}/%{name}/*.mak
@@ -159,6 +155,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.112  2009/12/30 17:16:00  glen
+- up to 1.19.0.1
+
 Revision 1.111  2008/02/07 13:34:31  glen
 - rel 10 (ffmpeg)
 
@@ -212,13 +211,13 @@
 - rebuild with openldap 2.3
 
 Revision 1.94  2005/06/06 07:55:59  speedy
-- simplify %%install
+- simplify %install
 
 Revision 1.93  2005/06/04 23:26:19  qboosh
 - more general lib64 if
 
 Revision 1.92  2005/06/04 21:18:28  speedy
-- fix %%install (64bit)
+- fix %install (64bit)
 - release 2
 
 Revision 1.91  2005/05/18 18:06:44  radzio
@@ -315,7 +314,7 @@
 Revision 1.63  2003/07/13 00:42:04  qboosh
 - up to 1.12.0
 - updated lib,mak_files,system_libs patches, added ffmpeg patch
-- openh323u.mak moved to standard %%{_datadir}/openh323 dir
+- openh323u.mak moved to standard %{_datadir}/openh323 dir
 
 Revision 1.62  2003/05/28 13:00:05  malekith
 - massive attack: source-md5
@@ -346,13 +345,13 @@
 - updated to 1.10.4
 
 Revision 1.53  2002/11/17 16:17:01  agaran
-BR: openldap-devel its used
+- BR: openldap-devel its used
 
 Revision 1.52  2002/11/17 16:04:40  kloczek
 - removed openldap-devel from BuildRequires (isn't used).
 
 Revision 1.51  2002/11/17 14:24:26  agaran
-added br openldap-devel
+- added br openldap-devel
 
 Revision 1.50  2002/11/13 20:29:37  aflinta
 - updated to version 1.10.3
@@ -447,7 +446,7 @@
   Group field using gettext).
 
 Revision 1.24  2002/01/18 02:14:07  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.23  2002/01/17 03:06:26  kloczek
 - updated to 1.7.10 (bugfix release).
@@ -462,14 +461,14 @@
 - release 2
 
 Revision 1.19  2002/01/08 13:29:24  misiek
-BuildRequires:  pwlib-devel >= 1.2.9
+- BuildRequires:  pwlib-devel >= 1.2.9
 
 Revision 1.18  2002/01/08 13:00:47  misiek
 - updated to 1.7.8
 
 Revision 1.17  2001/11/04 02:57:59  blues
 - pl translation added
-NOTE: there is new version avaible
+  NOTE: there is new version avaible
 
 Revision 1.16  2001/09/01 07:27:11  kloczek
 - updated to 1.6.1.
@@ -479,7 +478,7 @@
 - compile C++ code with -fno-exceptions -fno-rtti (much more smaller binaries),
 - small fix in %files in main package (donot include SONAME symlink),
 - spec adapterized,
-- added using %%{rpmcflags} macros.
+- added using %{rpmcflags} macros.
 
 Revision 1.14  2001/08/21 12:23:18  waszi
 - version 1.6.0
@@ -504,13 +503,13 @@
 
 Revision 1.8  2001/01/11 14:37:50  jajcus
 - make it build wit latest pwlib packages
-- %%{debug} handling based on pwlib build system
+- %{debug} handling based on pwlib build system
 
 Revision 1.7  2001/01/08 13:13:28  kloczek
 - added gzipping %doc and %doc moved to devel,
 - added no_samples patch because makefiles for building samples are brouke
   (probably this can/must be fixed),
-- make spec %%{debug} ready,
+- make spec %{debug} ready,
 - BuildRequires pwlib-devel only,
 - fix permission on shared libraries.
 
@@ -522,7 +521,7 @@
 - fix openh323u.mak while installing it
 
 Revision 1.4  2001/01/06 11:30:33  jajcus
-- %%{_datadir}/misc/* added to %%files
+- %{_datadir}/misc/* added to %files
 
 Revision 1.3  2001/01/06 11:08:13  jajcus
 - these are not X11 libraries
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openh323/openh323-system-libs.patch?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openh323/openh323.spec?r1=1.111&r2=1.112&f=u

More information about the pld-cvs-commit mailing list