Hello community, here is the log from the commit of package synergy for openSUSE:Factory checked in at 2013-10-29 09:35:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/synergy (Old) and /work/SRC/openSUSE:Factory/.synergy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "synergy" Changes: -------- --- /work/SRC/openSUSE:Factory/synergy/synergy.changes 2013-09-30 17:49:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.synergy.new/synergy.changes 2013-10-29 09:35:59.000000000 +0100 @@ -1,0 +2,17 @@ +Sat Oct 26 18:28:28 UTC 2013 - [email protected] + +- Add desktop file icon and modify desktop file. +- Add build requires for SLE target. +- Minor spec file changes for man pages. + +------------------------------------------------------------------- +Sat Oct 26 16:28:55 UTC 2013 - [email protected] + +- Version bump to 1.4.15: + * fix broken GCM, CTR and OFB encryption +- Modify patch to apply: + * synergy-1.4.12-cryptopp.patch +- Add new patch to link properly to pthread: + * synergy-pthread.patch + +------------------------------------------------------------------- Old: ---- synergy-1.4.12-Source.tar.gz New: ---- qsynergy.png synergy-1.4.15-Source.tar.gz synergy-pthread.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ synergy.spec ++++++ --- /var/tmp/diff_new_pack.8LLjxY/_old 2013-10-29 09:36:00.000000000 +0100 +++ /var/tmp/diff_new_pack.8LLjxY/_new 2013-10-29 09:36:00.000000000 +0100 @@ -17,7 +17,7 @@ Name: synergy -Version: 1.4.12 +Version: 1.4.15 Release: 0 Summary: Mouse, keyboard and clipboard sharing utility License: GPL-2.0+ @@ -26,14 +26,21 @@ Source: http://synergy.googlecode.com/files/synergy-%{version}-Source.tar.gz Source1: synergy-firewall-services Source2: qsynergy.desktop +Source3: qsynergy.png Patch0: synergy-1.4.12-cryptopp.patch +Patch1: synergy-pthread.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libcryptopp-devel BuildRequires: libqt4-devel BuildRequires: update-desktop-files +%if 0%{?suse_version} >= 1220 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xtst) +%else +BuildRequires: xorg-x11-devel +BuildRequires: xorg-x11-libX11-devel +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq Provides: synergy-plus = %{version} @@ -66,6 +73,7 @@ %prep %setup -q -n "synergy-%{version}-Source" %patch0 -p1 +%patch1 -p1 cp %{SOURCE2} . @@ -73,7 +81,8 @@ cmake -G "Unix Makefiles" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_FLAGS_RELEASE="%{optflags} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS_RELEASE="%{optflags} -DNDEBUG" + -DCMAKE_CXX_FLAGS_RELEASE="%{optflags} -DNDEBUG" \ + . make VERBOSE=1 %{?_smp_mflags} # GUI build @@ -93,11 +102,18 @@ # GUI package install -Dm 0755 bin/%{name} %{buildroot}%{_bindir}/q%{name} -%suse_update_desktop_file -i q%{name} -r DesktopUtility -# we need some icon +%suse_update_desktop_file -i q%{name} %post %{fillup_only} +%if 0%{?suse_version} >= 1140 +%desktop_database_post +%endif + +%if 0%{?suse_version} >= 1140 +%postun +%desktop_database_postun +%endif %files %defattr(-, root, root) @@ -106,13 +122,14 @@ %{_bindir}/synergyc %{_bindir}/synergys %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/synergy -%doc %{_mandir}/man1/synergys.1.gz -%doc %{_mandir}/man1/synergyc.1.gz +%doc %{_mandir}/man1/synergys.1%{?ext_man} +%doc %{_mandir}/man1/synergyc.1%{?ext_man} %files -n qsynergy %defattr(-,root,root) %doc COPYING %{_bindir}/q%{name} %{_datadir}/applications/q%{name}.desktop +%{_datadir}/pixmaps/q%{name}.png %changelog ++++++ qsynergy.desktop ++++++ --- /var/tmp/diff_new_pack.8LLjxY/_old 2013-10-29 09:36:00.000000000 +0100 +++ /var/tmp/diff_new_pack.8LLjxY/_new 2013-10-29 09:36:00.000000000 +0100 @@ -1,9 +1,10 @@ [Desktop Entry] -Exec=qsynergy +Encoding=UTF-8 Name=qsynergy -GenericName=qsynergy -StartupNotify=false +Comment=Share your mouse and keyboard between multiple computers on your desk +Icon=qsynergy +Exec=qsynergy Terminal=false -TerminalOptions= Type=Application +Categories=Utility;DesktopUtility; X-KDE-autostart-after=kdesktop ++++++ synergy-1.4.12-cryptopp.patch ++++++ --- /var/tmp/diff_new_pack.8LLjxY/_old 2013-10-29 09:36:00.000000000 +0100 +++ /var/tmp/diff_new_pack.8LLjxY/_new 2013-10-29 09:36:00.000000000 +0100 @@ -1,51 +1,20 @@ ---- a/tools/CMakeLists.txt -+++ b/tools/CMakeLists.txt -@@ -13,24 +13,6 @@ - # You should have received a copy of the GNU General Public License - # along with this program. If not, see <http://www.gnu.org/licenses/>. - --set(cpp_dir cryptopp562) -- --file(GLOB cpp_src ${cpp_dir}/*.cpp) -- --if (WIN32) -- file(GLOB cpp_hdr ${cpp_dir}/*.h) -- list(APPEND cpp_src ${cpp_hdr}) --endif() -- --file(GLOB cpp_ignore -- ${cpp_dir}/simple.cpp -- ${cpp_dir}/strciphr.cpp -- ${cpp_dir}/polynomi.cpp -- ${cpp_dir}/eprecomp.cpp -- ${cpp_dir}/eccrypto.cpp -- ${cpp_dir}/algebra.cpp) --list(REMOVE_ITEM cpp_src ${cpp_ignore}) -- - # if 64-bit windows, compile asm file. - if (CMAKE_CL_64) - list(APPEND cpp_src ${cpp_dir}/x64dll.asm ${cpp_dir}/x64masm.asm) -@@ -60,5 +42,3 @@ - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") - endif() - endif() -- --add_library(cryptopp STATIC ${cpp_src}) ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -128,6 +128,10 @@ - - endif() +diff -urN synergy-1.4.15-Source.old/CMakeLists.txt synergy-1.4.15-Source/CMakeLists.txt +--- synergy-1.4.15-Source.old/CMakeLists.txt 2013-10-26 18:46:59.682245976 +0200 ++++ synergy-1.4.15-Source/CMakeLists.txt 2013-10-26 18:51:00.606245947 +0200 +@@ -133,6 +133,10 @@ + check_type_size(long SIZEOF_LONG) + check_type_size(short SIZEOF_SHORT) + set(CMAKE_REQUIRED_LIBRARIES crypto++) + set(CMAKE_REQUIRED_LIBRARIES) + set(CMAKE_INCLUDE_DIRECTORIES) + - check_type_size(char SIZEOF_CHAR) - check_type_size(int SIZEOF_INT) - check_type_size(long SIZEOF_LONG) ---- a/src/lib/synergy/CCryptoMode.h -+++ b/src/lib/synergy/CCryptoMode.h + # pthread is used on both Linux and Mac + check_library_exists("pthread" pthread_create "" HAVE_PTHREAD) + if (HAVE_PTHREAD) +diff -urN synergy-1.4.15-Source.old/src/lib/io/CCryptoMode.h synergy-1.4.15-Source/src/lib/io/CCryptoMode.h +--- synergy-1.4.15-Source.old/src/lib/io/CCryptoMode.h 2013-10-26 18:46:59.679245976 +0200 ++++ synergy-1.4.15-Source/src/lib/io/CCryptoMode.h 2013-10-26 18:51:00.606245947 +0200 @@ -17,9 +17,9 @@ #pragma once @@ -59,8 +28,9 @@ #include "ECryptoMode.h" #include "CString.h" ---- a/src/lib/synergy/CCryptoStream.h -+++ b/src/lib/synergy/CCryptoStream.h +diff -urN synergy-1.4.15-Source.old/src/lib/io/CCryptoStream.h synergy-1.4.15-Source/src/lib/io/CCryptoStream.h +--- synergy-1.4.15-Source.old/src/lib/io/CCryptoStream.h 2013-10-26 18:46:59.679245976 +0200 ++++ synergy-1.4.15-Source/src/lib/io/CCryptoStream.h 2013-10-26 18:51:00.607245947 +0200 @@ -20,8 +20,8 @@ #include "BasicTypes.h" #include "CStreamFilter.h" @@ -72,3 +42,60 @@ class CCryptoOptions; +diff -urN synergy-1.4.15-Source.old/tools/CMakeLists.txt synergy-1.4.15-Source/tools/CMakeLists.txt +--- synergy-1.4.15-Source.old/tools/CMakeLists.txt 2013-10-26 18:46:59.668245976 +0200 ++++ synergy-1.4.15-Source/tools/CMakeLists.txt 2013-10-26 18:51:00.606245947 +0200 +@@ -13,47 +13,6 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see <http://www.gnu.org/licenses/>. + +-set(cryptopp_dir cryptopp562) +- +-# only compile the crypto++ files we need. +-set(cryptopp_src +- ${cryptopp_dir}/3way.cpp +- ${cryptopp_dir}/algparam.cpp +- ${cryptopp_dir}/asn.cpp +- ${cryptopp_dir}/authenc.cpp +- ${cryptopp_dir}/basecode.cpp +- ${cryptopp_dir}/cpu.cpp +- ${cryptopp_dir}/cryptlib.cpp +- ${cryptopp_dir}/des.cpp +- ${cryptopp_dir}/dessp.cpp +- ${cryptopp_dir}/dll.cpp +- ${cryptopp_dir}/ec2n.cpp +- ${cryptopp_dir}/ecp.cpp +- ${cryptopp_dir}/filters.cpp +- ${cryptopp_dir}/fips140.cpp +- ${cryptopp_dir}/gcm.cpp +- ${cryptopp_dir}/gf2n.cpp +- ${cryptopp_dir}/gfpcrypt.cpp +- ${cryptopp_dir}/hex.cpp +- ${cryptopp_dir}/hmac.cpp +- ${cryptopp_dir}/hrtimer.cpp +- ${cryptopp_dir}/integer.cpp +- ${cryptopp_dir}/iterhash.cpp +- ${cryptopp_dir}/misc.cpp +- ${cryptopp_dir}/modes.cpp +- ${cryptopp_dir}/mqueue.cpp +- ${cryptopp_dir}/nbtheory.cpp +- ${cryptopp_dir}/oaep.cpp +- ${cryptopp_dir}/osrng.cpp +- ${cryptopp_dir}/pubkey.cpp +- ${cryptopp_dir}/queue.cpp +- ${cryptopp_dir}/randpool.cpp +- ${cryptopp_dir}/rdtables.cpp +- ${cryptopp_dir}/rijndael.cpp +- ${cryptopp_dir}/rng.cpp +- ${cryptopp_dir}/sha.cpp +-) +- + # if 64-bit windows, compile asm file. + if (CMAKE_CL_64) + list(APPEND cryptopp_src ${cryptopp_dir}/x64dll.asm ${cryptopp_dir}/x64masm.asm) +@@ -83,5 +42,3 @@ + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") + endif() + endif() +- +-add_library(cryptopp STATIC ${cryptopp_src}) ++++++ synergy-1.4.12-Source.tar.gz -> synergy-1.4.15-Source.tar.gz ++++++ ++++ 74029 lines of diff (skipped) ++++++ synergy-pthread.patch ++++++ --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,7 +140,8 @@ # pthread is used on both Linux and Mac check_library_exists("pthread" pthread_create "" HAVE_PTHREAD) if (HAVE_PTHREAD) - list(APPEND libs pthread) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") else (HAVE_PTHREAD) message(FATAL_ERROR "Missing library: pthread") endif() -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
