rpms/pwlib/devel pwlib-1.9.2.ldap.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 pwlib.spec, 1.26, 1.27 sources, 1.10, 1.11

[fedora-cvs-commits at redhat.com]

Author: veillard

Update of /cvs/dist/rpms/pwlib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13977

Modified Files:
	.cvsignore pwlib.spec sources 
Added Files:
	pwlib-1.9.2.ldap.patch 
Log Message:
Update for ekiga beta release, Daniel


pwlib-1.9.2.ldap.patch:
 configure    |    2 !!
 configure.ac |    2 !!
 2 files changed, 4 modifications(!)

--- NEW FILE pwlib-1.9.2.ldap.patch ---
*** configure.orig	2006-01-18 21:51:56.000000000 +0100
--- configure	2006-01-18 21:53:14.000000000 +0100
*************** _ACEOF
*** 2240,2246 ****
  fi
  
  if test ${OSTYPE} != solaris ; then
!    LDAP_LIBRARIES = "-llber -lldap_r"
  fi
  
  
--- 2240,2246 ----
  fi
  
  if test ${OSTYPE} != solaris ; then
!    LDAP_LIBRARIES="-llber -lldap_r"
  fi
  
  
*** configure.ac.orig	2006-01-18 21:52:19.000000000 +0100
--- configure.ac	2006-01-18 21:52:40.000000000 +0100
*************** fi
*** 204,210 ****
  
  dnl solaris has it's own ldap library
  if test ${OSTYPE} != solaris ; then
!    LDAP_LIBRARIES = "-llber -lldap_r"
  fi
  
  dnl ########################################################################
--- 204,210 ----
  
  dnl solaris has it's own ldap library
  if test ${OSTYPE} != solaris ; then
!    LDAP_LIBRARIES="-llber -lldap_r"
  fi
  
  dnl ########################################################################


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pwlib/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	6 Sep 2005 09:25:30 -0000	1.10
+++ .cvsignore	24 Jan 2006 14:13:02 -0000	1.11
@@ -1,3 +1,4 @@
 pwlib-v1_8_3-src-tar.gz
 pwlib-1.8.4.tar.gz
 pwlib-1.8.7.tar.gz
+pwlib-1.9.2.tar.gz


Index: pwlib.spec
===================================================================
RCS file: /cvs/dist/rpms/pwlib/devel/pwlib.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- pwlib.spec	14 Dec 2005 15:06:20 -0000	1.26
+++ pwlib.spec	24 Jan 2006 14:13:02 -0000	1.27
@@ -1,17 +1,15 @@
 Summary:	Portable Windows Libary
 Name:		pwlib
-Version:	1.8.7
-Release: 3
+Version:	1.9.2
+Release:        1
 URL:		http://www.openh323.org/
-Source0:	http://www.seconix.com/pwlib-%{version}.tar.gz
+Source0:	http://www.ekiga.org/pwlib-%{version}.tar.gz
 #We still need this for ppc64 it was not updated in 1.8.4
 Source1: config.guess 
 License: MPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
-Patch0:		pwlib-1.6.5-debuginfo.patch
-Patch1: 	pwlib-1.8.7-gcc4.patch
-Patch2: 	pwlib-1.8.7-gcc41.patch
+#Patch0:		pwlib-1.6.5-debuginfo.patch
 BuildPrereq:	expat  openssl-devel pkgconfig
 
 %ifnarch  s390 s390x
@@ -21,6 +19,7 @@
 BuildRequires: alsa-lib-devel libstdc++-devel
 Requires: alsa-lib libstdc++
 BuildRequires: openldap-devel expat-devel SDL-devel
+Patch0: pwlib-1.9.2.ldap.patch
 
 %description
 PWLib is a moderately large class library that has its genesis many
@@ -42,14 +41,12 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .debuginfo
-%patch1 -p1 -b .gcc4
-%patch2 -p1 -b .gcc41
+%patch0 -p0
 cp -f %{SOURCE1} .
 
 %build
 export CFLAGS="$CFLAGS -DLDAP_DEPRECATED"
-%configure --enable-plugins 
+%configure --prefix=/usr --enable-opal --enable-plugins --disable-oss --enable-v4l2
 make
 
 %install
@@ -81,9 +78,9 @@
 %defattr(-,root,root)
 %{_libdir}/libpt*.so.*
 # List these explicitly so we don't get any surprises
-%{_libdir}/pwlib/devices/sound/oss_pwplugin.so
 %{_libdir}/pwlib/devices/sound/alsa_pwplugin.so
 %{_libdir}/pwlib/devices/videoinput/v4l_pwplugin.so
+%{_libdir}/pwlib/devices/videoinput/v4l2_pwplugin.so
 %ifnarch  s390 s390x
 %{_libdir}/pwlib/devices/videoinput/avc_pwplugin.so
 %endif
@@ -96,6 +93,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Tue Jan 24 2006 Daniel Veillard <veillard at redhat.com> - 1.9.2-1
+- beta version of next release for ekiga
+
 * Wed Dec 14 2005 Alexander Larsson <alexl at redhat.com> - 1.8.7-3
 - Fixes for gcc 4.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pwlib/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	6 Sep 2005 09:25:30 -0000	1.10
+++ sources	24 Jan 2006 14:13:02 -0000	1.11
@@ -1 +1,2 @@
 ba4fddd6cb8d4420cc18f308ccf48e00  pwlib-1.8.7.tar.gz
+64f7ee4062f507e871863680df5278b9  pwlib-1.9.2.tar.gz