Hello community,
here is the log from the commit of package pwlib for openSUSE:Factory
checked in at Mon Mar 8 18:21:23 CET 2010.
--------
--- pwlib/pwlib.changes 2008-09-01 12:31:43.000000000 +0200
+++ /mounts/work_src_done/STABLE/pwlib/pwlib.changes 2010-01-14 23:26:25.000000000 +0100
@@ -1,0 +2,26 @@
+Thu Jan 14 22:28:10 UTC 2010 - chris@computersalat.de
+
+- update to v1_11_0
+ the version needed by openh323_v1_19_0_1
+- reworked patches
+ o replaced
+ pwlib-1.10.10.diff
+ pwlib-1.10.10-make.diff
+ pwlib-1.10.10-pstring-fix.diff
+ pwlib-1.10.10-ldap.patch
+ o with
+ pwlib-v1_11_0-PVXMLSession.patch
+ pwlib-v1_11_0-make.patch
+ pwlib-v1_11_0-pstring-fix.patch
+ pwlib-v1_11_0-ldap.patch
+- add baselibs.conf as a source
+- shared lib to subpkg libpt1_11
+- added debug_package_requires libpt1_11
+- cleanup spec
+ o sort TAGS, BuildReq
+ o macros
+ rm > {__rm}
+ name > {name}, version > {version}, ...
+ o removed changelog from spec, we have a changes file
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
pwlib-1.10.10-ldap.patch
pwlib-1.10.10-make.diff
pwlib-1.10.10-pstring-fix.diff
pwlib-1.10.10.diff
pwlib-1.10.10.tar.bz2
New:
----
baselibs.conf
pwlib-v1_11_0-PVXMLSession.patch
pwlib-v1_11_0-ldap.patch
pwlib-v1_11_0-make.patch
pwlib-v1_11_0-pstring-fix.patch
pwlib-v1_11_0-src-tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pwlib.spec ++++++
--- /var/tmp/diff_new_pack.oT8W2J/_old 2010-03-08 18:21:12.000000000 +0100
+++ /var/tmp/diff_new_pack.oT8W2J/_new 2010-03-08 18:21:12.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package pwlib (Version 1.10.10)
+# spec file for package pwlib (Version 1.11.0)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,27 +19,35 @@
Name: pwlib
-Version: 1.10.10
-Release: 120
-BuildRequires: SDL-devel bison esound-devel flex gcc-c++ libavc1394-devel libdc1394_control12-devel libdv-devel libexpat-devel libstdc++-devel openldap2-devel
-Url: http://www.openh323.org/
-License: MOZILLA PUBLIC LICENSE (MPL/NPL)
+Summary: Portable Windows Library from Equivalence Pty. Ltd
+Version: 1.11.0
+Release: 1
+%define package_version v1_11_0
+License: MPL ..
Group: System/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
AutoReqProv: on
-Provides: pwlib-plugins-alsa pwlib-plugins-oss pwlib-plugins-v4l
-Obsoletes: pwlib-plugins-alsa pwlib-plugins-oss pwlib-plugins-v4l
-Summary: Portable Windows Library from Equivalence Pty. Ltd.
+Url: http://openh323.sourceforge.net
# https://sourceforge.net/projects/openh323
-Source: %{name}-%{version}.tar.bz2
-# http://sourceforge.net/tracker/index.php?func=detail&aid=1532388&group_id=80674&atid=560614
-Patch: %{name}-%{version}.diff
-#Patch1: %{name}-%{version}-aliasing.diff
-#Patch2: %{name}-%{version}-gcc42-atomic.diff
-Patch3: %{name}-%{version}-make.diff
-#Patch4: pwlib.linux-time.patch
-Patch4: %{name}-%{version}-pstring-fix.diff
-Patch5: %{name}-%{version}-ldap.patch
+Source: %{name}-%{package_version}-src-tar.bz2
+Source2: baselibs.conf
+Patch0: %{name}-v1_11_0-PVXMLSession.patch
+Patch1: %{name}-v1_11_0-make.patch
+Patch2: %{name}-v1_11_0-pstring-fix.patch
+Patch3: %{name}-v1_11_0-ldap.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: bison flex gcc-c++
+BuildRequires: SDL-devel
+BuildRequires: esound-devel
+BuildRequires: libavc1394-devel
+BuildRequires: libdc1394_control12-devel
+BuildRequires: libdv-devel
+BuildRequires: libexpat-devel
+BuildRequires: libstdc++-devel
+BuildRequires: openldap2-devel
+Provides: %{name}-plugins-alsa %{name}-plugins-oss %{name}-plugins-v4l
+Obsoletes: %{name}-plugins-alsa %{name}-plugins-oss %{name}-plugins-v4l
+
+%define debug_package_requires libpt1_11 = %{version}-%{release}
%description
PWLib is a moderately large class library that was created many years
@@ -55,11 +63,27 @@
--------
Equivalence Pty. Ltd.
+%package -n libpt1_11
+License: MPL ..
+Summary: The pwlib shared libs
+Group: System/Libraries
+Requires: %{name} = %{version}
+
+%description -n libpt1_11
+This package includes the PWLIB library.
+
+
+
+Authors:
+--------
+ Equivalence Pty. Ltd.
+
%package devel
-License: MOZILLA PUBLIC LICENSE (MPL/NPL)
-Requires: %{name} = %{version} SDL-devel libexpat-devel openldap2-devel openssl-devel
-Summary: pwlib package for developers (includes headers and scripts)
+License: MPL ..
+Summary: The pwlib package for developers (includes headers and scripts)
Group: Development/Libraries/C and C++
+Requires: libpt1_11 = %{version}
+Requires: SDL-devel libexpat-devel openldap2-devel openssl-devel
%description devel
This package includes header files and scripts needed for developers
@@ -72,10 +96,10 @@
Equivalence Pty. Ltd.
%package plugins-avc
-License: MOZILLA PUBLIC LICENSE (MPL/NPL)
-Provides: pwlib-video-plugin
+License: MPL ..
Summary: AVC plugin for pwlib
Group: System/Libraries
+Provides: pwlib-video-plugin
%description plugins-avc
This plugin enables AVC (firewire control for digital video cameras)
@@ -88,10 +112,10 @@
Equivalence Pty. Ltd.
%package plugins-dc
-License: MOZILLA PUBLIC LICENSE (MPL/NPL)
-Provides: pwlib-video-plugin
+License: MPL ..
Summary: DC plugin for pwlib
Group: System/Libraries
+Provides: pwlib-video-plugin
%description plugins-dc
This plugin enables DC control (via firewire for digital video cameras)
@@ -104,10 +128,10 @@
Equivalence Pty. Ltd.
%package plugins-v4l2
-License: MOZILLA PUBLIC LICENSE (MPL/NPL)
-Provides: pwlib-video-plugin
+License: MPL ..
Summary: V4L2 support for pwlib
Group: System/Libraries
+Provides: pwlib-video-plugin
%description plugins-v4l2
This plugin enables 'video for linux' (version 2) support (e.g. for USB
@@ -120,13 +144,11 @@
Equivalence Pty. Ltd.
%prep
-%setup -q
-%patch
-#%patch1 -p1
-#%patch2 -p1
+%setup -n %{name}_%{package_version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
%build
#autoreconf --force --install
@@ -138,7 +160,7 @@
cd ..
#automake --force-missing
%{?suse_update_config:%{suse_update_config -f}}
-PWINSTDIR=/usr/share/pwlib X11LIBDIR=/usr/X11R6/%_lib ./configure \
+PWINSTDIR=%{_datadir}/%{name} X11LIBDIR=/usr/X11R6/%_lib ./configure \
--prefix=/usr \
--libdir=%{_libdir} \
--mandir=%{_mandir} \
@@ -150,62 +172,65 @@
--enable-alsa
# --enable-sockagg\
# --enable-exceptions
-#make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fstack-protector" %{?jobs:-j %jobs}
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fstack-protector" %{?jobs:-j %jobs}
+
+make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fstack-protector" %{?jobs:-j %jobs}
%install
make install DESTDIR=$RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
+%post -n libpt1_11 -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%postun -n libpt1_11 -p /sbin/ldconfig
%clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc mpl-1.0.htm History.txt
-%dir %{_libdir}/pwlib
-%dir %{_libdir}/pwlib/devices
-%dir %{_libdir}/pwlib/devices/sound
-%dir %{_libdir}/pwlib/devices/videoinput
-%{_libdir}/libpt*.1*
-%{_libdir}/pwlib/devices/sound/alsa_pwplugin.so
-%{_libdir}/pwlib/devices/sound/oss_pwplugin.so
-%{_libdir}/pwlib/devices/videoinput/v4l_pwplugin.so
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/devices
+%dir %{_libdir}/%{name}/devices/sound
+%dir %{_libdir}/%{name}/devices/videoinput
+%{_libdir}/%{name}/devices/sound/alsa_pwplugin.so
+%{_libdir}/%{name}/devices/sound/oss_pwplugin.so
+%{_libdir}/%{name}/devices/videoinput/v4l_pwplugin.so
+
+%files -n libpt1_11
+%defattr(-,root,root)
+%{_libdir}/libpt.so.*
%files devel
%defattr(-,root,root)
%doc ReadMe.txt ReadMe_QOS.txt
-%dir /usr/share/pwlib
-/usr/share/pwlib/*
-%attr (0644, root, root) /usr/include/ptbuildopts.h
-%attr (0644, root, root) /usr/include/ptlib.h
-%dir /usr/include/ptlib
-%dir /usr/include/ptlib/unix
-%dir /usr/include/ptlib/unix/ptlib
-%attr (0644, root, root) /usr/include/ptlib/*.h
-%attr (0644, root, root) /usr/include/ptlib/*.inl
-%attr (0644, root, root) /usr/include/ptlib/unix/ptlib/*.h
-%attr (0644, root, root) /usr/include/ptlib/unix/ptlib/*.inl
-%dir /usr/include/ptclib
-%attr (0644, root, root) /usr/include/ptclib/*.h
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/*
+%attr (0644, root, root) %{_includedir}/ptbuildopts.h
+%attr (0644, root, root) %{_includedir}/ptlib.h
+%dir %{_includedir}/ptlib
+%dir %{_includedir}/ptlib/unix
+%dir %{_includedir}/ptlib/unix/ptlib
+%attr (0644, root, root) %{_includedir}/ptlib/*.h
+%attr (0644, root, root) %{_includedir}/ptlib/*.inl
+%attr (0644, root, root) %{_includedir}/ptlib/unix/ptlib/*.h
+%attr (0644, root, root) %{_includedir}/ptlib/unix/ptlib/*.inl
+%dir %{_includedir}/ptclib
+%attr (0644, root, root) %{_includedir}/ptclib/*.h
#%{_bindir}/asnparser
%{_bindir}/ptlib-config
%{_libdir}/libpt.so
%files plugins-avc
%defattr(-,root,root)
-%{_libdir}/pwlib/devices/videoinput/avc_pwplugin.so
+%{_libdir}/%{name}/devices/videoinput/avc_pwplugin.so
%files plugins-dc
%defattr(-,root,root)
-%{_libdir}/pwlib/devices/videoinput/dc_pwplugin.so
+%{_libdir}/%{name}/devices/videoinput/dc_pwplugin.so
%files plugins-v4l2
%defattr(-,root,root)
-%dir %{_libdir}/pwlib/devices/videoinput
-%{_libdir}/pwlib/devices/videoinput/v4l2_pwplugin.so
+%dir %{_libdir}/%{name}/devices/videoinput
+%{_libdir}/%{name}/devices/videoinput/v4l2_pwplugin.so
%changelog
++++++ baselibs.conf ++++++
libpt1_11
++++++ pwlib-v1_11_0-PVXMLSession.patch ++++++
diff -ruN pwlib_v1_11_0-orig/src/ptclib/vxml.cxx pwlib_v1_11_0/src/ptclib/vxml.cxx
--- pwlib_v1_11_0-orig/src/ptclib/vxml.cxx 2005-12-01 01:05:59.000000000 +0000
+++ pwlib_v1_11_0/src/ptclib/vxml.cxx 2010-01-14 21:36:56.257419204 +0000
@@ -1078,9 +1078,9 @@
return;
ch = userInputQueue.front();
userInputQueue.pop();
- }
PTRACE(3, "VXML\tHandling user input " << ch);
+ }
// recording
if (recording) {
++++++ pwlib-v1_11_0-ldap.patch ++++++
diff -ruN pwlib_v1_11_0-orig/configure.ac pwlib_v1_11_0/configure.ac
--- pwlib_v1_11_0-orig/configure.ac 2006-05-15 23:11:26.000000000 +0000
+++ pwlib_v1_11_0/configure.ac 2010-01-14 21:39:04.826841497 +0000
@@ -204,7 +204,7 @@
dnl solaris has it's own ldap library
if test ${OSTYPE} != solaris ; then
- LDAP_LIBRARIES="-llber -lldap_r"
+ LDAP_LIBRARIES="-llber"
fi
dnl ########################################################################
++++++ pwlib-v1_11_0-make.patch ++++++
diff -ruN pwlib_v1_11_0-orig/make/gui.mak pwlib_v1_11_0/make/gui.mak
--- pwlib_v1_11_0-orig/make/gui.mak 2001-06-15 00:58:00.000000000 +0000
+++ pwlib_v1_11_0/make/gui.mak 2010-01-14 21:42:33.055622148 +0000
@@ -86,7 +86,7 @@
#
# add GUI library
#
-LDLIBS += -l$(PWLIB_BASE)$(LIB_TYPE)
+LDLIBS += -l$(PWLIB_BASE)
ifdef GUILIB
LDLIBS += $(GUILIB)
endif
diff -ruN pwlib_v1_11_0-orig/make/lib.mak pwlib_v1_11_0/make/lib.mak
--- pwlib_v1_11_0-orig/make/lib.mak 2005-09-25 10:51:23.000000000 +0000
+++ pwlib_v1_11_0/make/lib.mak 2010-01-14 21:42:33.059622317 +0000
@@ -144,7 +144,7 @@
endif
endif
-LIB_SONAME = $(LIBNAME_PAT)
+LIB_SONAME = $(LIBNAME_MIN)
CLEAN_FILES += $(LIBDIR)/$(LIBNAME_PAT) $(LIBDIR)/$(LIB_FILENAME) $(LIBDIR)/$(LIBNAME_MAJ) $(LIBDIR)/$(LIBNAME_MIN)
diff -ruN pwlib_v1_11_0-orig/make/unix.mak pwlib_v1_11_0/make/unix.mak
--- pwlib_v1_11_0-orig/make/unix.mak 2006-05-15 23:11:26.000000000 +0000
+++ pwlib_v1_11_0/make/unix.mak 2010-01-14 21:42:33.055622148 +0000
@@ -943,14 +943,14 @@
PW_LIBDIR = $(PWLIBDIR)/lib
# set name of the PT library
-PTLIB_BASE = pt_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
-PTLIB_FILE = lib$(PTLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
+PTLIB_BASE = pt
+PTLIB_FILE = lib$(PTLIB_BASE).$(LIB_SUFFIX)
PT_OBJBASE = obj_$(PLATFORM_TYPE)_$(OBJDIR_SUFFIX)
PT_OBJDIR = $(PW_LIBDIR)/$(PT_OBJBASE)
# set name of the PW library (may not be used)
-PWLIB_BASE = pw_$(GUI_TYPE)_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
-PWLIB_FILE = lib$(PWLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
+PWLIB_BASE = pw
+PWLIB_FILE = lib$(PWLIB_BASE).$(LIB_SUFFIX)
PW_OBJBASE = obj_$(GUI_TYPE)_$(PLATFORM_TYPE)_$(OBJDIR_SUFFIX)
PW_OBJDIR = $(PW_LIBDIR)/$(PW_OBJBASE)
@@ -1008,6 +1008,6 @@
# add library directory to library path and include the library
LDFLAGS += -L$(PW_LIBDIR)
-LDLIBS += -l$(PTLIB_BASE)$(LIB_TYPE)
+LDLIBS += -l$(PTLIB_BASE)
# End of unix.mak
diff -ruN pwlib_v1_11_0-orig/Makefile.in pwlib_v1_11_0/Makefile.in
--- pwlib_v1_11_0-orig/Makefile.in 2005-04-06 10:10:54.000000000 +0000
+++ pwlib_v1_11_0/Makefile.in 2010-01-14 21:42:33.059622317 +0000
@@ -267,10 +267,6 @@
rm -f $(PTLIB_FILE) ; \
ln -sf $(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@.@BUILD_NUMBER@ $(PTLIB_FILE) \
)
- (cd $(DESTDIR)$(LIBDIR); \
- rm -f libpt.@SHAREDLIBEXT@ ; \
- ln -sf $(PTLIB_FILE) libpt.@SHAREDLIBEXT@ \
- )
ifeq (1, $(HAS_PLUGINS))
cd plugins/pwlib/device/ ; \
( for dir in ./* ;\
++++++ pwlib-v1_11_0-pstring-fix.patch ++++++
diff -ruN pwlib_v1_11_0-orig/src/ptlib/common/contain.cxx pwlib_v1_11_0/src/ptlib/common/contain.cxx
--- pwlib_v1_11_0-orig/src/ptlib/common/contain.cxx 2006-03-19 23:30:09.000000000 +0000
+++ pwlib_v1_11_0/src/ptlib/common/contain.cxx 2010-01-14 21:47:30.227516361 +0000
@@ -2465,7 +2465,7 @@
PAssert(SetSize(2000), POutOfMemory);
::vsprintf(theArray+len, fmt, arg);
#else
- PINDEX size = 0;
+ PINDEX size = len;
do {
size += 1000;
PAssert(SetSize(size), POutOfMemory);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org