From bada591b1f2924e1aba1e8a5152d725a5aa9477e9529822e39e86b54ce9703bf Mon Sep 17 00:00:00 2001 From: Werner Dittmann Date: Mon, 1 Aug 2011 15:59:26 +0000 Subject: [PATCH 1/7] Update to version 2, use new GNU uCommon and GNU ccRTP v2.0 libraries OBS-URL: https://build.opensuse.org/package/show/network:telephony/libzrtpcpp?expand=0&rev=9 --- libzrtpcpp-1.6.0.tar.bz2 | 3 -- libzrtpcpp-2.0.0.tar.bz2 | 3 ++ libzrtpcpp.changes | 6 +++ libzrtpcpp.spec | 82 +++++++++++----------------------------- 4 files changed, 31 insertions(+), 63 deletions(-) delete mode 100644 libzrtpcpp-1.6.0.tar.bz2 create mode 100644 libzrtpcpp-2.0.0.tar.bz2 diff --git a/libzrtpcpp-1.6.0.tar.bz2 b/libzrtpcpp-1.6.0.tar.bz2 deleted file mode 100644 index 7e83028..0000000 --- a/libzrtpcpp-1.6.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f23bede7665a5b99aa979b0b784c2218789417cb3a42bbc77b487d77a0c044c2 -size 328876 diff --git a/libzrtpcpp-2.0.0.tar.bz2 b/libzrtpcpp-2.0.0.tar.bz2 new file mode 100644 index 0000000..ec74339 --- /dev/null +++ b/libzrtpcpp-2.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:013e51f95ba4b8b4b01ecb9d41179182356ecbece11de4eb06110245d8ce5abd +size 160310 diff --git a/libzrtpcpp.changes b/libzrtpcpp.changes index dfd4068..392819a 100644 --- a/libzrtpcpp.changes +++ b/libzrtpcpp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 1 15:54:33 UTC 2011 - Werner.Dittmann@t-online.de + +- update to version 2.0 to be in sync with version number of GNU ccRTP + * Update configuration to use the new GNU uCommon library + ------------------------------------------------------------------- Sat Jan 8 09:10:00 MEZ 2011 - Werner.Dittmann@t-online.de diff --git a/libzrtpcpp.spec b/libzrtpcpp.spec index e5ee72e..b6b9c4c 100644 --- a/libzrtpcpp.spec +++ b/libzrtpcpp.spec @@ -1,5 +1,5 @@ # -# spec file for package libzrtpcpp (Version 1.6.0) +# spec file for package libzrtpcpp (Version 2.0.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -16,16 +16,19 @@ # Name: libzrtpcpp -Summary: A ccrtp extension for ZRTP support -BuildRequires: gcc-c++ libgcrypt-devel pkgconfig cmake -BuildRequires: libccrtp-devel >= 1.8.0 -Version: 1.6.0 +Version: 2.0.0 Release: 0 -License: GPL v3 or later -Group: Development/Libraries/Other +License: GPLv3+ +Summary: A ccrtp extension for ZRTP support Url: http://www.gnu.org/software/commoncpp/commoncpp.html +Group: Development/Libraries/Other Source0: %{name}-%{version}.tar.bz2 Source1: rpmlintrc +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: libccrtp-devel >= 2.0.0 +BuildRequires: libopenssl-devel >= 0.9.8 +BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -34,27 +37,17 @@ that offers compatibility with Phil Zimmermann's zrtp/Zfone voice encryption, and which can be directly embedded into telephony applications. - -%description -n libzrtpcpp -This library is a GPL licensed extension to the GNU RTP Stack, ccrtp, -that offers compatibility with Phil Zimmermann's zrtp/Zfone voice -encryption, and which can be directly embedded into telephony -applications. - - - %package devel -License: GPL v3 or later +License: GPLv3+ +Summary: Headers and link library for libzrtpcpp Group: Development/Libraries/Other -Summary: Headers and static link library for libzrtpcpp -Requires: libzrtpcpp = %{version} libccrtp-devel +Requires: libccrtp-devel >= 2.0.0 +Requires: libzrtpcpp = %{version} %description devel This package provides the header files, link libraries, and documentation for building applications that use libzrtpcpp. - - %prep %setup -q @@ -66,19 +59,20 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DSYSCONFDIR=%{_sysconfdir} \ -DMANDIR=%{_mandir} \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS" \ - .. + -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \ + .. make %{?_smp_mflags} %install cd build -make install DESTDIR=$RPM_BUILD_ROOT +rm -rf %{buildroot} +%make_install %clean -rm -rf "$RPM_BUILD_ROOT" +rm -rf %{buildroot} %files -n libzrtpcpp %defattr(-,root,root,0755) @@ -92,40 +86,8 @@ rm -rf "$RPM_BUILD_ROOT" %{_includedir}/libzrtpcpp/*.h %dir %{_includedir}/libzrtpcpp -%post -n libzrtpcpp -p /sbin/ldconfig +%post -p /sbin/ldconfig -%postun -n libzrtpcpp -p /sbin/ldconfig +%postun -p /sbin/ldconfig %changelog -* Mon Dec 27 2010 - Werner Dittmann -- Add Skein MAC authentication algorithm -- lots of documentation added (doxygen ready) -- some code cleanup - -* Sun Oct 11 2009 - Werner Dittmann -- Fix multistream problem -- add DH2048 mode -- update cipher selection to match latest draft (15x) -- Test with zfone3 with Ping packet mode enabled -- some code cleanup - -* Wed Jun 24 2009 - David Sugar -- Spec updated per current Fedora & CentOS policies. -- Updated release 1.4.5 has all mandatory IETF interop requirements. - -* Fri Jan 26 2009 - Werner Dittmann -- Update to version 1.4.2 to support the latest ZRTP - specification draft-zimmermann-avt-zrtp-12 - -* Fri Aug 22 2008 - David Sugar -- Adapted for newer library naming conventions. - -* Tue Dec 11 2007 - Werner Dittmann -- this is the first spec file for version 1.x.x -- remove the .la file in devel package -- use default file atttribute instead of 755 - -* Sat Apr 18 2007 - Werner Dittmann -- set version to 1.1.0 -- GNU ZRTP is compatible with the latest Zfone Beta - from April 2 2007 From 92204b4bd6e52a409c7df086e3c9ea63da28c6a322f6a19853a2c12eff6aa573 Mon Sep 17 00:00:00 2001 From: Werner Dittmann Date: Sat, 13 Aug 2011 06:36:33 +0000 Subject: [PATCH 2/7] Update NEWS and README to cover latest changes OBS-URL: https://build.opensuse.org/package/show/network:telephony/libzrtpcpp?expand=0&rev=10 --- libzrtpcpp-2.0.0.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libzrtpcpp-2.0.0.tar.bz2 b/libzrtpcpp-2.0.0.tar.bz2 index ec74339..5ffb5e4 100644 --- a/libzrtpcpp-2.0.0.tar.bz2 +++ b/libzrtpcpp-2.0.0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:013e51f95ba4b8b4b01ecb9d41179182356ecbece11de4eb06110245d8ce5abd -size 160310 +oid sha256:87d1372207eda4f583fa9623d54d62a5d8d777fa00584d5f9d20e5e23be092d1 +size 162336 From b2ce4fa130e1ba60b9c782b97a4f9c4402efeb9d2260a8d8f517b47f0f1017b0 Mon Sep 17 00:00:00 2001 From: Werner Dittmann Date: Sat, 20 Aug 2011 07:18:15 +0000 Subject: [PATCH 3/7] - Modify and rename spec file to adhere to naming policies * remove rpmlintrc file - not longer used OBS-URL: https://build.opensuse.org/package/show/network:telephony/libzrtpcpp?expand=0&rev=11 --- libzrtpcpp.changes | 6 ++++++ libzrtpcpp.spec => libzrtpcpp2.spec | 15 +++++++-------- rpmlintrc | 1 - 3 files changed, 13 insertions(+), 9 deletions(-) rename libzrtpcpp.spec => libzrtpcpp2.spec (90%) delete mode 100644 rpmlintrc diff --git a/libzrtpcpp.changes b/libzrtpcpp.changes index 392819a..237428e 100644 --- a/libzrtpcpp.changes +++ b/libzrtpcpp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Aug 20 07:17:04 UTC 2011 - Werner.Dittmann@t-online.de + +- Modify and rename spec file to adhere to naming policies + * remove rpmlintrc file - not longer used + ------------------------------------------------------------------- Mon Aug 1 15:54:33 UTC 2011 - Werner.Dittmann@t-online.de diff --git a/libzrtpcpp.spec b/libzrtpcpp2.spec similarity index 90% rename from libzrtpcpp.spec rename to libzrtpcpp2.spec index b6b9c4c..7292ddb 100644 --- a/libzrtpcpp.spec +++ b/libzrtpcpp2.spec @@ -15,18 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -Name: libzrtpcpp +Name: libzrtpcpp2 Version: 2.0.0 Release: 0 License: GPLv3+ Summary: A ccrtp extension for ZRTP support Url: http://www.gnu.org/software/commoncpp/commoncpp.html Group: Development/Libraries/Other -Source0: %{name}-%{version}.tar.bz2 -Source1: rpmlintrc +Source0: libzrtpcpp-%{version}.tar.bz2 BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: libccrtp-devel >= 2.0.0 +BuildRequires: libccrtp2-devel >= 2.0.0 BuildRequires: libopenssl-devel >= 0.9.8 BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,15 +40,15 @@ applications. License: GPLv3+ Summary: Headers and link library for libzrtpcpp Group: Development/Libraries/Other -Requires: libccrtp-devel >= 2.0.0 -Requires: libzrtpcpp = %{version} +Requires: libccrtp2-devel >= 2.0.0 +Requires: %{name} = %{version} %description devel This package provides the header files, link libraries, and documentation for building applications that use libzrtpcpp. %prep -%setup -q +%setup -q -n libzrtpcpp-%{version} %build mkdir build @@ -74,7 +73,7 @@ rm -rf %{buildroot} %clean rm -rf %{buildroot} -%files -n libzrtpcpp +%files -n libzrtpcpp2 %defattr(-,root,root,0755) %doc AUTHORS COPYING README %{_libdir}/*.so.* diff --git a/rpmlintrc b/rpmlintrc deleted file mode 100644 index 03b15a8..0000000 --- a/rpmlintrc +++ /dev/null @@ -1 +0,0 @@ -addFilter("shlib-policy-name-error .*") From 2a114ceb7fc1af7abcedae68ee249ed741c76b3d66d52c9e9bd332b070cb1ba5 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 27 Sep 2011 07:52:56 +0000 Subject: [PATCH 4/7] fix up name OBS-URL: https://build.opensuse.org/package/show/network:telephony/libzrtpcpp?expand=0&rev=12 --- libzrtpcpp2.spec => libzrtpcpp.spec | 31 +++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) rename libzrtpcpp2.spec => libzrtpcpp.spec (78%) diff --git a/libzrtpcpp2.spec b/libzrtpcpp.spec similarity index 78% rename from libzrtpcpp2.spec rename to libzrtpcpp.spec index 7292ddb..8aaa527 100644 --- a/libzrtpcpp2.spec +++ b/libzrtpcpp.spec @@ -1,7 +1,7 @@ # -# spec file for package libzrtpcpp (Version 2.0.0) +# spec file for package libzrtpcpp # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -15,7 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -Name: libzrtpcpp2 + + +Name: libzrtpcpp +%define lname libzrtpcpp2 Version: 2.0.0 Release: 0 License: GPLv3+ @@ -36,19 +39,28 @@ that offers compatibility with Phil Zimmermann's zrtp/Zfone voice encryption, and which can be directly embedded into telephony applications. +%package -n %lname +Summary: A ccrtp extension for ZRTP support + +%description -n %lname +This library is a GPL licensed extension to the GNU RTP Stack, ccrtp, +that offers compatibility with Phil Zimmermann's zrtp/Zfone voice +encryption, and which can be directly embedded into telephony +applications. + %package devel License: GPLv3+ Summary: Headers and link library for libzrtpcpp Group: Development/Libraries/Other -Requires: libccrtp2-devel >= 2.0.0 -Requires: %{name} = %{version} +Requires: ccrtp-devel >= 2.0.0 +Requires: %{lname} = %{version} %description devel This package provides the header files, link libraries, and documentation for building applications that use libzrtpcpp. %prep -%setup -q -n libzrtpcpp-%{version} +%setup -q %build mkdir build @@ -64,7 +76,6 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ make %{?_smp_mflags} - %install cd build rm -rf %{buildroot} @@ -73,7 +84,7 @@ rm -rf %{buildroot} %clean rm -rf %{buildroot} -%files -n libzrtpcpp2 +%files -n %lname %defattr(-,root,root,0755) %doc AUTHORS COPYING README %{_libdir}/*.so.* @@ -85,8 +96,8 @@ rm -rf %{buildroot} %{_includedir}/libzrtpcpp/*.h %dir %{_includedir}/libzrtpcpp -%post -p /sbin/ldconfig +%post -p /sbin/ldconfig -n %lname -%postun -p /sbin/ldconfig +%postun -p /sbin/ldconfig -n %lname %changelog From ecfa4e9f61d04264aa716560a7884e058ee00739c8f40c76a3afb5369f60ce01 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 27 Sep 2011 08:02:24 +0000 Subject: [PATCH 5/7] - fix the shared library policy packaging OBS-URL: https://build.opensuse.org/package/show/network:telephony/libzrtpcpp?expand=0&rev=13 --- libzrtpcpp.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libzrtpcpp.changes b/libzrtpcpp.changes index 237428e..d98b630 100644 --- a/libzrtpcpp.changes +++ b/libzrtpcpp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 27 08:02:08 UTC 2011 - coolo@suse.com + +- fix the shared library policy packaging + ------------------------------------------------------------------- Sat Aug 20 07:17:04 UTC 2011 - Werner.Dittmann@t-online.de From c006e57619189be844bc302a6cc7188acc4dfabe8df4eefcf03747867124238c Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 27 Sep 2011 08:02:57 +0000 Subject: [PATCH 6/7] fix up OBS-URL: https://build.opensuse.org/package/show/network:telephony/libzrtpcpp?expand=0&rev=14 --- libzrtpcpp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libzrtpcpp.spec b/libzrtpcpp.spec index 8aaa527..e4c69e8 100644 --- a/libzrtpcpp.spec +++ b/libzrtpcpp.spec @@ -28,7 +28,7 @@ Group: Development/Libraries/Other Source0: libzrtpcpp-%{version}.tar.bz2 BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: libccrtp2-devel >= 2.0.0 +BuildRequires: ccrtp-devel >= 2.0.0 BuildRequires: libopenssl-devel >= 0.9.8 BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build From 8ce4a944f54383862bbb1fb34a6d3f99b9a0cec70486172049bc2a8b02cfaa0f Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 27 Sep 2011 08:04:03 +0000 Subject: [PATCH 7/7] verbose OBS-URL: https://build.opensuse.org/package/show/network:telephony/libzrtpcpp?expand=0&rev=15 --- libzrtpcpp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libzrtpcpp.spec b/libzrtpcpp.spec index e4c69e8..27b6895 100644 --- a/libzrtpcpp.spec +++ b/libzrtpcpp.spec @@ -74,7 +74,7 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \ .. -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install cd build