Hello community, here is the log from the commit of package gsd for openSUSE:Factory checked in at 2013-09-17 16:14:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gsd (Old) and /work/SRC/openSUSE:Factory/.gsd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gsd" Changes: -------- --- /work/SRC/openSUSE:Factory/gsd/gsd.changes 2012-06-14 17:15:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gsd.new/gsd.changes 2013-09-17 16:19:35.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Sep 13 14:32:58 UTC 2013 - johann.l...@wanadoo.fr + +- fix %changelog problem in spec file for factory + +------------------------------------------------------------------- +Mon May 20 09:48:21 UTC 2013 - johann.l...@wanadoo.fr + +- move to security:OpenVAS:STABLE:v6 +- added patches + * gsd-build-with-qt-no-keywords.patch + * gsd-qt-compat.patch + +------------------------------------------------------------------- Old: ---- debian.changelog debian.compat debian.control debian.gsd.dirs debian.gsd.install debian.rules debian.series gsd.dsc New: ---- gsd-build-with-qt-no-keywords.patch gsd-qt-compat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gsd.spec ++++++ --- /var/tmp/diff_new_pack.p0NBJA/_old 2013-09-17 16:19:37.000000000 +0200 +++ /var/tmp/diff_new_pack.p0NBJA/_new 2013-09-17 16:19:37.000000000 +0200 @@ -18,11 +18,13 @@ Name: gsd Version: 1.2.2 -Release: 0 +Release: 33.9 Url: http://www.openvas.org Source: %{name}-%{version}.tar.gz Patch0: gsd-1.2.0-linking.patch Patch1: gsd-gcc47-compat.patch +Patch2: gsd-qt-compat.patch +Patch3: gsd-build-with-qt-no-keywords.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: doxygen @@ -57,13 +59,20 @@ %setup -q %patch0 %patch1 -p1 +%if 0%{?sles_version} >= 11 +%patch2 +%endif +%if 0%{?mandriva_version} || 0%{?suse_version} +%patch3 -p1 +%endif %build export CXXFLAGS="$RPM_OPT_FLAGS" %__mkdir build cd build -cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON \ +cmake .. -Wno-dev \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DSYSCONFDIR=%{_sysconfdir} \ -DLOCALSTATEDIR=%{_localstatedir} \ ++++++ gsd-build-with-qt-no-keywords.patch ++++++ ++++ 2103 lines (skipped) ++++++ gsd-qt-compat.patch ++++++ diff -uNr ../gsd-1.2.2.orig/src/dock_details.cpp ./src/dock_details.cpp --- ../gsd-1.2.2.orig/src/dock_details.cpp 2012-04-20 23:23:00.000000000 +0200 +++ ./src/dock_details.cpp 2012-07-02 16:32:52.090349041 +0200 @@ -593,7 +593,7 @@ QVariant var_prot_version = qApp->property("protocol_version"); float protocol_version = -1; if (var_prot_version.isValid()) - protocol_version = var_prot_version.toFloat(); + protocol_version = var_prot_version.toDouble(); if (id == NULL || id.compare ("") == 0) return; diff -uNr ../gsd-1.2.2.orig/src/omp_command.cpp ./src/omp_command.cpp --- ../gsd-1.2.2.orig/src/omp_command.cpp 2012-04-20 23:23:00.000000000 +0200 +++ ./src/omp_command.cpp 2012-07-02 16:47:58.193510097 +0200 @@ -523,7 +523,7 @@ QVariant var_prot_version = qApp->property("protocol_version"); float protocol_version = -1; if (var_prot_version.isValid()) - protocol_version = var_prot_version.toFloat(); + protocol_version = var_prot_version.toDouble(); QString str_type (""); omp_utilities::omp_type type; diff -uNr ../gsd-1.2.2.orig/src/omp_string_builder.cpp ./src/omp_string_builder.cpp --- ../gsd-1.2.2.orig/src/omp_string_builder.cpp 2012-04-20 23:23:00.000000000 +0200 +++ ./src/omp_string_builder.cpp 2012-07-02 16:49:08.377430111 +0200 @@ -56,7 +56,7 @@ QVariant var_prot_version = qApp->property("protocol_version"); float protocol_version = -1; if (var_prot_version.isValid()) - protocol_version = var_prot_version.toFloat(); + protocol_version = var_prot_version.toDouble(); QString command ("<get_"); switch (type) @@ -150,7 +150,7 @@ QVariant var_prot_version = qApp->property("protocol_version"); float protocol_version = -1; if (var_prot_version.isValid()) - protocol_version = var_prot_version.toFloat(); + protocol_version = var_prot_version.toDouble(); QString command ("<create_"); QString typeStr; @@ -209,7 +209,7 @@ QVariant var_prot_version = qApp->property("protocol_version"); float protocol_version = -1; if (var_prot_version.isValid()) - protocol_version = var_prot_version.toFloat(); + protocol_version = var_prot_version.toDouble(); QString command ("<delete_"); QString typeString; @@ -419,7 +419,7 @@ QVariant var_prot_version = qApp->property("protocol_version"); float protocol_version = -1; if (var_prot_version.isValid()) - protocol_version = var_prot_version.toFloat(); + protocol_version = var_prot_version.toDouble(); QString com (""); if (type == omp_utilities::TASK) @@ -864,7 +864,7 @@ QVariant var_prot_version = qApp->property("protocol_version"); float protocol_version = -1; if (var_prot_version.isValid()) - protocol_version = var_prot_version.toFloat(); + protocol_version = var_prot_version.toDouble(); if (type == omp_utilities::TASK) { if (!parameter.contains ("task_id")) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
