jengelh/libzrtpcpp
SHA256
1
0
Fork 0
forked from pool/libzrtpcpp
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libzrtpcpp?expand=0&rev=4

Browse Source
This commit is contained in:
OBS User unknown 2008-05-13 10:35:00 +00:00 committed by Git OBS Bridge
parent 72ef4234dd
commit d3ac69b478
3 changed files with 47 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libzrtpcpp-1.0.1-no-return-in-nonvoid-function.patch Normal file
View File

@ -0,0 +1,24 @@
Index: src/ZrtpQueue.cxx
===================================================================
--- src/ZrtpQueue.cxx.orig 2008-02-28 02:30:54.000000000 +0100
+++ src/ZrtpQueue.cxx 2008-05-11 23:24:17.000000000 +0200
@@ -452,6 +452,7 @@ bool ZrtpQueue::srtpSecretsReady(SrtpSec
}
secureParts++;
}
+ return true;
}
void ZrtpQueue::srtpSecretsOn(const char* c, const char* s)
Index: src/ZrtpStateClass.cxx
===================================================================
--- src/ZrtpStateClass.cxx.orig 2008-05-11 23:24:17.000000000 +0200
+++ src/ZrtpStateClass.cxx 2008-05-11 23:25:25.000000000 +0200
@@ -429,6 +429,7 @@ int32_t ZrtpStateClass::evAckSent(void)
nextState(Initial);
return (Fail);
}
+ return (Fail);
}
/*
* The protocol engine got a peer's HelloAck state Detect, thus the peer got

7
libzrtpcpp.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun May 11 23:30:44 CEST 2008 - crrodriguez@suse.de
- fix no-return-in-nonvoid-function errors
- fix both buildRequires and -devel package dependencies
- remove static libraries and "la" files
-------------------------------------------------------------------
Wed Apr 2 15:49:00 CEST 2008 - hvogel@suse.de

28
libzrtpcpp.spec
View File

@ -12,15 +12,15 @@
Name: libzrtpcpp
Summary: a ccrtp extension for zrtp/Zfone support
Requires: ccrtp >= 1.5.0
BuildRequires: ccrtp-devel >= 1.5.0 gcc gcc-c++ libgcc libgcrypt-devel libstdc++-devel openssl-devel pkgconfig
BuildRequires: ccrtp-devel >= 1.5.0 gcc-c++ libgcc libgcrypt-devel pkgconfig
Version: 1.0.1
Release: 1
Release: 2
License: GPL v3 or later
Group: Development/Libraries/Other
Url: http://www.gnu.org/software/commoncpp/commoncpp.html
Source0: ftp://ftp.gnu.org/gnu/cccrtp/%{name}-%{version}.tar.bz2
Patch1: %name-%version-compiler_warnings.patch
Patch1: %name-1.0.1-compiler_warnings.patch
Patch2: libzrtpcpp-1.0.1-no-return-in-nonvoid-function.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -35,7 +35,6 @@ applications.
License: GPL v2 or later; LGPL v2.1 or later
Group: Development/Libraries/Other
Summary: a ccrtp extension for zrtp/Zfone support
Requires: ccrtp >= 1.5.0
Provides: %{name} = %{version}
Obsoletes: %{name} <= %{version}
@ -51,9 +50,7 @@ applications.
License: GPL v3 or later
Group: Development/Libraries/Other
Summary: Headers and static link library for libzrtpcpp
Requires: %{name} = %{version}
Requires: ccrtp-devel >= 1.5.0
Requires: libgcrypt-devel commoncpp2-devel openssl-devel
Requires: libzrtpcpp1 = %{version} ccrtp-devel
%description devel
This package provides the header files, link libraries, and
@ -64,13 +61,18 @@ documentation for building applications that use libzrtpcpp.
%prep
%setup -q
%patch1
%patch2
%build
%configure
make %{?jobs:-j%jobs}
%configure --disable-static --with-pic
%{__make} %{?jobs:-j%jobs}
%check
make check
%install
%makeinstall
rm -f %{buildroot}%{_libdir}/*.la
%clean
rm -rf %{buildroot}
@ -82,9 +84,7 @@ rm -rf %{buildroot}
%files devel
%defattr(-,root,root,0755)
%{_libdir}/*.a
%{_libdir}/*.so
%{_libdir}/*.la
%{_libdir}/pkgconfig/*.pc
%{_includedir}/libzrtpcpp/*.h
%dir %{_includedir}/libzrtpcpp
@ -94,6 +94,10 @@ rm -rf %{buildroot}
%postun -n libzrtpcpp1 -p /sbin/ldconfig
%changelog
* Mon May 12 2008 crrodriguez@suse.de
- fix no-return-in-nonvoid-function errors
- fix both buildRequires and -devel package dependencies
- remove static libraries and "la" files
* Wed Apr 02 2008 hvogel@suse.de
- update to version 1.0.1
* various bugfixes