September 2014 - openSUSE Commits - openSUSE Mailing Lists

commit nodejs-lockfile for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '14

23 Sep '14

Hello community, here is the log from the commit of package nodejs-lockfile for openSUSE:Factory checked in at 2014-09-23 17:17:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nodejs-lockfile (Old) and /work/SRC/openSUSE:Factory/.nodejs-lockfile.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nodejs-lockfile" Changes: -------- New Changes file: --- /dev/null 2014-07-24 01:57:42.080040256 +0200 +++ /work/SRC/openSUSE:Factory/.nodejs-lockfile.new/nodejs-lockfile.changes 2014-09-23 17:17:27.000000000 +0200 @@ -0,0 +1,10 @@ +------------------------------------------------------------------- +Sun Sep 21 19:57:37 UTC 2014 - i(a)marguerite.su + +- update version 1.0.0 + +------------------------------------------------------------------- +Mon Aug 18 12:39:07 UTC 2014 - jgleissner(a)suse.com + +- Initial build + New: ---- lockfile-1.0.0.tgz nodejs-lockfile.changes nodejs-lockfile.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nodejs-lockfile.spec ++++++ # # spec file for package nodejs-lockfile # # Copyright (c) 2014 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define base_name lockfile Name: nodejs-lockfile Version: 1.0.0 Release: 0 Summary: Node.js lock file utility License: BSD-2-Clause Group: Development/Languages/Other Url: https://github.com/isaacs/lockfile Source: http://registry.npmjs.org/%{base_name}/-/%{base_name}-%{version}.tgz BuildRequires: nodejs BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch %{?nodejs_requires} %description A very polite lock file utility, which endeavors to not litter, and to wait patiently for others. %prep %setup -q -n package %build %install mkdir -p %{buildroot}%{nodejs_modulesdir}/%{base_name} cp -pr package.json lockfile.js \ %{buildroot}%{nodejs_modulesdir}/%{base_name}/ %files %defattr(-,root,root,-) %doc README.md LICENSE %{nodejs_modulesdir}/%{base_name} %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nodejs-hoek for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '14

23 Sep '14

Hello community, here is the log from the commit of package nodejs-hoek for openSUSE:Factory checked in at 2014-09-23 17:17:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nodejs-hoek (Old) and /work/SRC/openSUSE:Factory/.nodejs-hoek.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nodejs-hoek" Changes: -------- New Changes file: --- /dev/null 2014-07-24 01:57:42.080040256 +0200 +++ /work/SRC/openSUSE:Factory/.nodejs-hoek.new/nodejs-hoek.changes 2014-09-23 17:17:23.000000000 +0200 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Mon Sep 22 14:40:45 UTC 2014 - i(a)marguerite.su + +- initial version 2.4.1 + New: ---- hoek-2.4.1.tgz nodejs-hoek.changes nodejs-hoek.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nodejs-hoek.spec ++++++ # # spec file for package nodejs-hoek # # Copyright (c) 2014 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define base_name hoek Name: nodejs-hoek Version: 2.4.1 Release: 0 Summary: General purpose node utilities License: BSD-2-Clause Group: Development/Languages/Other Url: https://github.com/hapijs/hoek Source: http://registry.npmjs.org/%{base_name}/-/%{base_name}-%{version}.tgz BuildRequires: nodejs BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch %{?nodejs_requires} %description General purpose node utilities. %prep %setup -q -n package chmod 0644 package.json index.js lib/*.js AUTHORS README.md LICENSE images/*.png %build %install mkdir -p %{buildroot}%{nodejs_modulesdir}/%{base_name} cp -pr package.json index.js lib images \ %{buildroot}%{nodejs_modulesdir}/%{base_name}/ %files %defattr(-,root,root,-) %doc README.md LICENSE AUTHORS %{nodejs_modulesdir}/%{base_name} %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nodejs-delayed-stream for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '14

23 Sep '14

Hello community, here is the log from the commit of package nodejs-delayed-stream for openSUSE:Factory checked in at 2014-09-23 17:17:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nodejs-delayed-stream (Old) and /work/SRC/openSUSE:Factory/.nodejs-delayed-stream.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nodejs-delayed-stream" Changes: -------- New Changes file: --- /dev/null 2014-07-24 01:57:42.080040256 +0200 +++ /work/SRC/openSUSE:Factory/.nodejs-delayed-stream.new/nodejs-delayed-stream.changes 2014-09-23 17:17:19.000000000 +0200 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Mon Sep 22 09:46:52 UTC 2014 - i(a)marguerite.su + +- initial version 0.0.5 + New: ---- delayed-stream-0.0.5.tgz nodejs-delayed-stream.changes nodejs-delayed-stream.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nodejs-delayed-stream.spec ++++++ # # spec file for package nodejs-delayed-stream # # Copyright (c) 2014 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define base_name delayed-stream Name: nodejs-delayed-stream Version: 0.0.5 Release: 0 Summary: Buffers events from a stream until you are ready to handle them License: MIT Group: Development/Languages/Other Url: https://github.com/felixge/node-delayed-stream Source: http://registry.npmjs.org/%{base_name}/-/%{base_name}-%{version}.tgz BuildRequires: nodejs BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch %{?nodejs_requires} %description Buffers events from a stream until you are ready to handle them. %prep %setup -q -n package %build %install mkdir -p %{buildroot}%{nodejs_modulesdir}/%{base_name} cp -pr package.json lib \ %{buildroot}%{nodejs_modulesdir}/%{base_name}/ %files %defattr(-,root,root,-) %doc Readme.md License %{nodejs_modulesdir}/%{base_name} %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit apper for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '14

23 Sep '14

Hello community, here is the log from the commit of package apper for openSUSE:Factory checked in at 2014-09-23 17:16:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apper (Old) and /work/SRC/openSUSE:Factory/.apper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apper" Changes: -------- --- /work/SRC/openSUSE:Factory/apper/apper.changes 2014-04-23 17:31:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apper.new/apper.changes 2014-09-23 17:16:58.000000000 +0200 @@ -1,0 +2,19 @@ +Tue Sep 23 11:22:08 UTC 2014 - coolo(a)suse.com + +- add no-popup-for-background-actions.patch to avoid popups from + background jobs + +------------------------------------------------------------------- +Sat Sep 13 16:02:24 UTC 2014 - mailaender(a)opensuse.org + +- Update to 0.9.1 + * bug fix release + +------------------------------------------------------------------- +Sat Sep 13 16:01:47 UTC 2014 - mailaender(a)opensuse.org + +- Update to 0.9.0 + * Support for the PackageKit 0.9.x API + * use async calls on PackageKit-Qt everywhere + +------------------------------------------------------------------- Old: ---- apper-0.8.2.tar.xz New: ---- apper-0.9.1.tar.xz no-popup-for-background-actions.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apper.spec ++++++ --- /var/tmp/diff_new_pack.BK3E9m/_old 2014-09-23 17:16:58.000000000 +0200 +++ /var/tmp/diff_new_pack.BK3E9m/_new 2014-09-23 17:16:58.000000000 +0200 @@ -20,7 +20,7 @@ Summary: KDE interface for PackageKit License: GPL-2.0+ and LGPL-3.0+ Group: System/Packages -Version: 0.8.2 +Version: 0.9.1 Release: 0 Source0: http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.ta… Source1: 10-opensuse-org.packagekit.updater.js @@ -29,15 +29,16 @@ Patch1: apper-no-dbus-service.diff # setting proxy requires polkit permissions - for very little gain Patch2: apper-no-user-proxy.diff +Patch3: no-popup-for-background-actions.patch Url: http://kde-apps.org/content/show.php/Apper?content=84745 BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: PackageKit-Qt-devel >= 0.8.8 +BuildRequires: PackageKit-Qt-devel >= 0.9.0 BuildRequires: kdebase4-workspace-devel BuildRequires: libkde4-devel BuildRequires: libxml2-tools Recommends: %{name}-lang = %{version} Provides: org.freedesktop.PackageKit.service -Requires: PackageKit >= 0.8.8 +Requires: PackageKit >= 0.9.2 Obsoletes: apper-plasmoid < %{version} Provides: apper-plasmoid = %{version} %kde4_runtime_requires @@ -50,6 +51,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %cmake_kde4 -d build -- -DSCREENSHOT_PROVIDER=openSUSE ++++++ apper-0.8.2.tar.xz -> apper-0.9.1.tar.xz ++++++ ++++ 164682 lines of diff (skipped) ++++++ no-popup-for-background-actions.patch ++++++ From: Stephan Kulow <coolo(a)suse.de> Subject: Avoid popup message boxes for locked or masked PK Index: apper-0.9.1/libapper/PkTransaction.cpp =================================================================== --- apper-0.9.1.orig/libapper/PkTransaction.cpp +++ apper-0.9.1/libapper/PkTransaction.cpp @@ -28,6 +28,7 @@ #include <KService> #include <KPixmapSequence> #include <KPixmapSequenceOverlayPainter> +#include <KNotification> #include <KDebug> @@ -765,11 +766,26 @@ void PkTransaction::showSorry(const QStr { PkTransactionWidget *widget = qobject_cast<PkTransactionWidget *>(d->parentWindow); if (!widget || widget->isCancelVisible()) { + // for background jobs like getupdates (triggered by a timer) we don't want a popup + if (role() == Transaction::RoleGetUpdates) { + KNotification *notify; + notify = new KNotification("TransactionMessage", 0, KNotification::Persistent); + notify->setComponentData(KComponentData("apperd")); + notify->setTitle(title); + if (details.isEmpty()) + notify->setText(description); + else + notify->setText(details); + + notify->setPixmap(KIcon("dialog-warning").pixmap(KPK_ICON_SIZE, KPK_ICON_SIZE)); + notify->sendEvent(); + } else { if (details.isEmpty()) { KMessageBox::sorry(d->parentWindow, description, title); } else { KMessageBox::detailedSorry(d->parentWindow, description, details, title); } + } } else { emit sorry(title, description, details); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rsyslog for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '14

23 Sep '14

Hello community, here is the log from the commit of package rsyslog for openSUSE:Factory checked in at 2014-09-23 17:16:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rsyslog (Old) and /work/SRC/openSUSE:Factory/.rsyslog.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rsyslog" Changes: -------- --- /work/SRC/openSUSE:Factory/rsyslog/rsyslog.changes 2014-09-18 08:02:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rsyslog.new/rsyslog.changes 2014-09-23 17:16:56.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Sep 22 19:50:42 UTC 2014 - andreas.stieger(a)gmx.de + +- fix build with json-c 0.12 with upstream patch + rsyslog-8.4.0-json-c-0.12.patch +- json-c provides a compatibility pkg-config for "json". Add + rsyslog-8.4.0-json-c-0.12-configure.patch to check for the + required function directly. + +------------------------------------------------------------------- New: ---- rsyslog-8.4.0-json-c-0.12-configure.patch rsyslog-8.4.0-json-c-0.12.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rsyslog.spec ++++++ --- /var/tmp/diff_new_pack.vMEd5f/_old 2014-09-23 17:16:57.000000000 +0200 +++ /var/tmp/diff_new_pack.vMEd5f/_new 2014-09-23 17:16:57.000000000 +0200 @@ -90,6 +90,11 @@ Requires(pre): %insserv_prereq %fillup_prereq /etc/init.d/syslog BuildRequires: klogd %endif +# for Patch3 rsyslog-8.4.0-json-c-0.12-configure.patch +BuildRequires: autoconf >= 2.61 +BuildRequires: automake +BuildRequires: libtool +# BuildRequires: bison BuildRequires: flex BuildRequires: openssl-devel >= 0.9.7 @@ -186,6 +191,8 @@ # PATCH-FIX-OPENSUSE rsyslog-unit.patch crrodriguez(a)opensuse.org Customize upstream systemd unit for openSUSE needs. Patch0: rsyslog-unit.patch Patch1: rsyslog-8.4.0_implicit_declaration.patch +Patch2: rsyslog-8.4.0-json-c-0.12.patch +Patch3: rsyslog-8.4.0-json-c-0.12-configure.patch # this is a dirty hack since % dir does only work for the specified directory and nothing above # but I want to be able to switch this to /etc/apparmor.d once the profiles received more testing @@ -482,6 +489,8 @@ %setup -q -n %{name}-%{upstream_version} -a 14 %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 # %if %{with systemd} for file in rsyslog-service-prepare; do @@ -493,6 +502,8 @@ %endif %build +# for Patch3 rsyslog-8.4.0-json-c-0.12-configure.patch +autoreconf -fiv export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall -I../grammar -I../../grammar" # needs java # --enable-gui \ ++++++ rsyslog-8.4.0-json-c-0.12-configure.patch ++++++ From: Andreas Stieger <andreas.stieger(a)gmx.de> Subject: [PATCH] fix build with json-c 0.12 if it provides a compatibility json.pc Date: Mon, 22 Sep 2014 20:40:53 +0100 Upstream: submitting References: json-c on openSUSE provides a compatibility pkg-config for "json". The autoconf check find it first, assuming it does not provide the function json_tokener_error_desc. Check for availability of function using AC_CHECK_FUNCS instead. --- configure.ac | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) Index: rsyslog-8.4.0/configure.ac =================================================================== --- rsyslog-8.4.0.orig/configure.ac 2014-08-18 10:41:34.000000000 +0100 +++ rsyslog-8.4.0/configure.ac 2014-09-22 20:34:18.000000000 +0100 @@ -32,14 +32,16 @@ PKG_PROG_PKG_CONFIG PKG_CHECK_MODULES(LIBESTR, libestr >= 0.1.9) PKG_CHECK_MODULES(LIBLOGGING_STDLOG, liblogging-stdlog >= 1.0.3) PKG_CHECK_MODULES([JSON_C], [json],, [ - PKG_CHECK_MODULES([JSON_C], [json-c], - [AC_DEFINE([HAVE_JSON_TOKENER_ERROR_DESC], [1], [we have the newer JSON-C API])]) + PKG_CHECK_MODULES([JSON_C], [json-c],,) ]) # if int64 is supported, use it AC_CHECK_LIB(json-c, json_object_new_object,,) AC_CHECK_FUNCS(json_object_new_int64,,) +# look for newer API +AC_CHECK_FUNCS(json_tokener_error_desc,,) + case "${host}" in *-*-linux*) AC_DEFINE([OS_LINUX], [1], [Indicator for a Linux OS]) ++++++ rsyslog-8.4.0-json-c-0.12.patch ++++++ From: Rainer Gerhards <rgerhards(a)adiscon.com> Date: Tue Aug 19 11:33:41 2014 +0200 Subject: build failure on systems which don't have json_tokener_errors Upstream: Committed References: https://github.com/rsyslog/rsyslog/commit/6b47dd542d07ed557f02af9970d1004eb… bugfix: build failure on systems which don't have json_tokener_errors Older versions of json-c need to use a different API (which don't exists on newer versions, unfortunately...) Thanks to Thomas D. for reporting this problem. Build error: [ 77s] msg.c: In function 'MsgSetPropsViaJSON': [ 77s] msg.c:4077:14: error: 'json_tokener_errors' undeclared (first use in this function) [ 77s] errMsg = json_tokener_errors[err]; diff --git a/runtime/msg.c b/runtime/msg.c index 66c3b7b..81b13f9 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -4074,7 +4074,11 @@ MsgSetPropsViaJSON(msg_t *__restrict__ const pMsg, const uchar *__restrict__ con err = tokener->err; if(err != json_tokener_continue) - errMsg = json_tokener_errors[err]; +# if HAVE_JSON_TOKENER_ERROR_DESC + errMsg = json_tokener_error_desc(err); +# else + errMsg = json_tokener_errors[err]; +# endif else errMsg = "Unterminated input"; } else if(!json_object_is_type(json, json_type_object)) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit json-c for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '14

23 Sep '14

Hello community, here is the log from the commit of package json-c for openSUSE:Factory checked in at 2014-09-23 17:16:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/json-c (Old) and /work/SRC/openSUSE:Factory/.json-c.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "json-c" Changes: -------- --- /work/SRC/openSUSE:Factory/json-c/json-c.changes 2014-04-11 14:40:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.json-c.new/json-c.changes 2014-09-23 17:16:54.000000000 +0200 @@ -1,0 +2,39 @@ +Sat Sep 20 12:07:25 UTC 2014 - andreas.stieger(a)gmx.de + +- json-c 0.12 + Fixes for security issues contained in this release have been + previously patched into this package, but listed for completeness: + * Address security issues: + * CVE-2013-6371: hash collision denial of service + * CVE-2013-6370: buffer overflow if size_t is larger than int +- Further changes: + * Avoid potential overflow in json_object_get_double + * Eliminate the mc_abort() function and MC_ABORT macro. + * Make the json_tokener_errors array local. It has been deprecated for + a while, and json_tokener_error_desc() should be used instead. + * change the floating point output format to %.17g so values with + more than 6 digits show up in the output. + * Remove the old libjson.so name compatibility support. The library is + only created as libjson-c.so now and headers are only installed + into the ${prefix}/json-c directory. + * When supported by the linker, add the -Bsymbolic-functions flag. + * Make strict mode more strict: + * number must not start with 0 + * no single-quote strings + * no comments + * trailing char not allowed + * only allow lowercase literals + * Added a json_object_new_double_s() convenience function to allow + an exact string representation of a double to be specified when + creating the object and use it in json_tokener_parse_ex() so + a re-serialized object more exactly matches the input. + * Add support NaN and Infinity +- packaging changes: + * json-c-hash-dos-and-overflow-random-seed-4e.patch is upstream + * Move from json-c-lfs.patch which removed warning errors and + autoconf call to json-c-0.12-unused_variable_size.patch from + upstream which fixes the warning + * except for SLE 11 where autoreconf call is required + * add licence file to main package + +------------------------------------------------------------------- Old: ---- json-c-0.11.tar.gz json-c-hash-dos-and-overflow-random-seed-4e.patch json-c-lfs.patch New: ---- json-c-0.12-unused_variable_size.patch json-c-0.12.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ json-c.spec ++++++ --- /var/tmp/diff_new_pack.httraN/_old 2014-09-23 17:16:55.000000000 +0200 +++ /var/tmp/diff_new_pack.httraN/_new 2014-09-23 17:16:55.000000000 +0200 @@ -19,23 +19,20 @@ %define libname libjson-c %define libsoname %{libname}2 %define oldlibname libjson - Name: json-c +Version: 0.12 +Release: 0 Summary: JSON implementation in C License: MIT Group: Development/Libraries/C and C++ -Version: 0.11 -Release: 0 Url: https://github.com/json-c/json-c/wiki - #Git-Clone git://github.com/json-c/json-c Source0: https://s3.amazonaws.com/json-c_releases/releases/%{name}-%{version}.tar.gz Source1: baselibs.conf -Patch0: %{name}-lfs.patch -Patch1: %{name}-hash-dos-and-overflow-random-seed-4e.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch0: json-c-0.12-unused_variable_size.patch BuildRequires: libtool BuildRequires: pkg-config +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description JSON-C implements a reference counting object model that allows you to @@ -76,7 +73,7 @@ Group: Documentation/Other Provides: %{oldlibname}-doc = %{version} Obsoletes: %{oldlibname}-doc < %{version} -%if 0%{suse_version} >= 1120 +%if 0%{?suse_version} >= 1120 BuildArch: noarch %endif @@ -91,21 +88,23 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %build +%if 0%{?suse_version} <= 1110 +sed -i 's/-Werror //g' Makefile.am.inc autoreconf -fiv +%endif %configure --disable-static --with-pic --disable-oldname-compat -%{__make} %{?_smp_mflags} +make %{?_smp_mflags} %check -%{__make} %{?_smp_mflags} check +make %{?_smp_mflags} check %install -%makeinstall DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} mandir=%{_mandir} -rm -Rf "%buildroot/%_libdir"/*.la +make DESTDIR=%{buildroot} install %{?_smp_mflags} DESTDIR=%{buildroot} libdir=%{_libdir} mandir=%{_mandir} +find %{buildroot} -type f -name "*.la" -delete -print # create a compatibilty pkg-config file for software needing it -(cd $RPM_BUILD_ROOT%{_libdir}/pkgconfig && ln -s json-c.pc json.pc) +(cd %{buildroot}%{_libdir}/pkgconfig && ln -s json-c.pc json.pc) %post -n %{libsoname} -p /sbin/ldconfig @@ -114,6 +113,7 @@ %files -n %{libsoname} %defattr(-,root,root) %{_libdir}/%{libname}.so.* +%doc COPYING %files -n %{libname}-devel %defattr(-,root,root) ++++++ json-c-0.12-unused_variable_size.patch ++++++ Author: Petar Koretić <petar.koretic(a)gmail.com> Date: Fri Apr 11 10:03:40 2014 +0200 Subject: Remove unused variable 'size' Upstream: committed References: https://github.com/json-c/json-c/commit/259c5c0b5fe87c2db41e7a989cc0ab58651… Remove unused variable 'size' [ 31s] json_tokener.c: In function 'json_tokener_parse_ex': [ 31s] json_tokener.c:355:6: error: variable 'size' set but not used [-Werror=unused-but-set-variable] [ 31s] int size; [ 31s] ^ --- json_tokener.c | 2 -- 1 file changed, 2 deletions(-) Index: json-c-0.12/json_tokener.c =================================================================== --- json-c-0.12.orig/json_tokener.c 2014-04-11 01:41:08.000000000 +0100 +++ json-c-0.12/json_tokener.c 2014-09-20 12:33:05.000000000 +0100 @@ -352,12 +352,10 @@ struct json_object* json_tokener_parse_e case json_tokener_state_inf: /* aka starts with 'i' */ { - int size; int size_inf; int is_negative = 0; printbuf_memappend_fast(tok->pb, &c, 1); - size = json_min(tok->st_pos+1, json_null_str_len); size_inf = json_min(tok->st_pos+1, json_inf_str_len); char *infbuf = tok->pb->buf; if (*infbuf == '-') ++++++ json-c-0.11.tar.gz -> json-c-0.12.tar.gz ++++++ ++++ 43918 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-qt4 for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '14

23 Sep '14

Hello community, here is the log from the commit of package python-qt4 for openSUSE:Factory checked in at 2014-09-23 17:16:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-qt4 (Old) and /work/SRC/openSUSE:Factory/.python-qt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-qt4" Changes: -------- --- /work/SRC/openSUSE:Factory/python-qt4/python-qt4.changes 2014-08-01 14:34:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-qt4.new/python-qt4.changes 2014-09-23 17:16:53.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Sep 20 19:48:11 UTC 2014 - edogawa(a)aon.at + +- tweaked python3-qt4.spec to also include the dbus support module + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-qt4.spec ++++++ --- /var/tmp/diff_new_pack.ydDo35/_old 2014-09-23 17:16:53.000000000 +0200 +++ /var/tmp/diff_new_pack.ydDo35/_new 2014-09-23 17:16:53.000000000 +0200 @@ -30,12 +30,15 @@ # PATCH-FIX-UPSTREAM: Fix .pro files not being generated by configure.py Patch3: pyqt4_add_pro_files.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: dbus-1-python-devel +BuildRequires: dbus-1-python3-devel BuildRequires: fdupes BuildRequires: libQtWebKit-devel BuildRequires: libqt4-devel BuildRequires: phonon-devel BuildRequires: python3-sip-devel >= 4.16 %requires_ge dbus-1-python +%requires_ge dbus-1-python3 %requires_ge libqt4-x11 Requires: python(abi) = %{py3_ver} %requires_python3_sip_api @@ -76,7 +79,7 @@ %build export CXXFLAGS="%{optflags}" export CFLAGS="%{optflags}" -python3 configure.py --confirm-license --qsci-api -u +python3 configure-ng.py --confirm-license --qsci-api -u -s /usr/include/dbus-1.0 make %{?_smp_mflags} @@ -102,6 +105,7 @@ %defattr(-,root,root) %doc README %{python3_sitearch}/PyQt4/ +%{python3_sitelib}/dbus/mainloop/qt.so %files devel %defattr(-,root,root) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit PackageKit-Qt for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '14

23 Sep '14

Hello community, here is the log from the commit of package PackageKit-Qt for openSUSE:Factory checked in at 2014-09-23 17:16:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/PackageKit-Qt (Old) and /work/SRC/openSUSE:Factory/.PackageKit-Qt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "PackageKit-Qt" Changes: -------- --- /work/SRC/openSUSE:Factory/PackageKit-Qt/PackageKit-Qt.changes 2013-09-25 17:18:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.PackageKit-Qt.new/PackageKit-Qt.changes 2014-09-23 17:16:51.000000000 +0200 @@ -1,0 +2,52 @@ +Thu Sep 18 22:23:11 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Add + 0001-Use-GNUInstallDirs-to-determine-most-of-used-variabl.patch: + Use GNUinstallDirs to determine relevant destination directories. + Also removed unused vars. +- Pass only install prefix, the above patch takes care of the + libdir. + +------------------------------------------------------------------- +Thu Sep 18 01:03:15 UTC 2014 - dimstar(a)opensuse.org + +- Add PackageKit-Qt-ff-7248b030c0.patch: Fast forward to git + commit 7248b030c0, fixing build with PackageKit 1.0.0. +- Rename libpackagekit-qt2-6 subpackage to libpackagekitqt4-0, + following upstreams soname bump. +- Adust Requires in -devel package accordingly. + +------------------------------------------------------------------- +Wed Sep 10 09:58:37 UTC 2014 - dimstar(a)opensuse.org + +- Update to version 0.9.2: + + Notes: + - Update to new PK API 0.9. + - Applied a series of patches to port to Qt5. + + New Features: + - Add GetDetailsLocal, GetFilesLocal and RepoRemove. + - Make use of DBus Properties changed to make less blocking + calls. + + Bugfixes: + - Allow for Details to be empty constructed. + - Cleaned include directive. + - Finish the API changes to get rid of blocking calls. + - Fix CMake var names for both Qt versions. + - Fix libdir path. + - Fix reply signature for Transaction methods. + - Improve object handlying. + - I think the API level should be hidden from libname. + - Keep only one transaction flags, which is unlikely to change. + - PackageKit doesn't has a changed signal anymore. + - Properly delete private data on daemon as DaemonPrivate is + not a QObject. + - Properly handle new Details signal. + - Properly init some Daemon values. + - Queue signals so that all transaction properties are + available when needed. + - Remove debug info. + - Update Roles enum, remove Provides enum, and fix some docs + typos. +- Drop PackageKit-Qt-libdir-references.patch: fixed upstream. + +------------------------------------------------------------------- Old: ---- PackageKit-Qt-0.8.8.tar.xz PackageKit-Qt-libdir-references.patch New: ---- 0001-Use-GNUInstallDirs-to-determine-most-of-used-variabl.patch PackageKit-Qt-0.9.2.tar.xz PackageKit-Qt-ff-7248b030c0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit-Qt.spec ++++++ --- /var/tmp/diff_new_pack.6wqpow/_old 2014-09-23 17:16:52.000000000 +0200 +++ /var/tmp/diff_new_pack.6wqpow/_new 2014-09-23 17:16:52.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package PackageKit-Qt # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -17,15 +17,17 @@ Name: PackageKit-Qt -Version: 0.8.8 +Version: 0.9.2 Release: 0 Summary: Simple software installation management software License: LGPL-2.1+ Group: System/Daemons Url: http://packagekit.org/ -Source: http://www.packagekit.org/releases/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM PackageKit-Qt-libdir-references.patch alarrosa(a)suse.com -- Fix lib location written into .cmake and .pc file. -Patch0: PackageKit-Qt-libdir-references.patch +Source: http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.… +# PATCH-FIX-UPSTREAM PackageKit-Qt-ff-7248b030c0.patch dimstar(a)opensuse.org -- Fast forward to git 7248b030c +Patch0: PackageKit-Qt-ff-7248b030c0.patch +# PATCH-FIX-UPSTREAM 0001-Use-GNUInstallDirs-to-determine-most-of-used-variabl.patch hrvoje.senjan(a)gmail.com -- Use GNUinstallDirs to determine relevant destination directories. Also removed unused vars. +Patch1: 0001-Use-GNUInstallDirs-to-determine-most-of-used-variabl.patch BuildRequires: PackageKit-devel >= %{version} BuildRequires: cmake BuildRequires: kde4-filesystem @@ -38,11 +40,11 @@ use some of the latest technology like PolicyKit to make the process suck less. -%package -n libpackagekit-qt2-6 +%package -n libpackagekitqt4-0 Summary: Simple software installation management software Group: System/Libraries -%description -n libpackagekit-qt2-6 +%description -n libpackagekitqt4-0 PackageKit is a system designed to make installing and updating software on your computer easier. The primary design goal is to unify all the software graphical tools used in different distributions, and @@ -52,7 +54,7 @@ %package devel Summary: Simple software installation management software Group: Development/Libraries/C and C++ -Requires: libpackagekit-qt2-6 = %{version} +Requires: libpackagekitqt4-0 = %{version} Provides: libpackagekit-qt2-devel = %{version} Obsoletes: libpackagekit-qt2-devel < %{version} @@ -66,12 +68,13 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build mkdir build cd build cmake \ - -DCMAKE_INSTALL_LIBDIR=%{_libdir} \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ .. make %{?smp_mflags} @@ -79,22 +82,21 @@ cd build %make_install -%post -n libpackagekit-qt2-6 -p /sbin/ldconfig +%post -n libpackagekitqt4-0 -p /sbin/ldconfig -%postun -n libpackagekit-qt2-6 -p /sbin/ldconfig +%postun -n libpackagekitqt4-0 -p /sbin/ldconfig -%files -n libpackagekit-qt2-6 +%files -n libpackagekitqt4-0 %defattr(-,root,root) %doc COPYING NEWS AUTHORS -%{_libdir}/libpackagekit-qt2.so.* +%{_libdir}/libpackagekitqt4.so.* %files devel %defattr(-,root,root) %doc TODO MAINTAINERS RELEASE -%{_libdir}/libpackagekit-qt2.so -%{_libdir}/cmake/packagekit-qt2/ -%{_libdir}/pkgconfig/packagekit-qt2.pc -%dir %{_includedir}/PackageKit -%{_includedir}/PackageKit/packagekit-qt2/ +%{_libdir}/libpackagekitqt4.so +%{_libdir}/cmake/packagekitqt4/ +%{_libdir}/pkgconfig/packagekitqt4.pc +%{_includedir}/packagekitqt4/ %changelog ++++++ 0001-Use-GNUInstallDirs-to-determine-most-of-used-variabl.patch ++++++ >From 97306279fa6b5eed72187125895b313b0b51a386 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan <hrvoje.senjan(a)gmail.com> Date: Fri, 19 Sep 2014 00:17:36 +0200 Subject: [PATCH 1/1] Use GNUInstallDirs to determine most of used variables Also removed unused vars --- CMakeLists.txt | 17 +++-------------- config.h.in | 7 ------- src/CMakeLists.txt | 4 ++-- src/packagekitqt4.pc.in | 4 ++-- src/packagekitqt5.pc.in | 4 ++-- 5 files changed, 9 insertions(+), 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b1e1e97..1c77b82 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,9 @@ find_package(PkgConfig REQUIRED) set(CMAKE_BUILD_TYPE "Debug") +# Used to set installation paths +include(GNUInstallDirs) + set(QPACKAGEKIT_VERSION_MAJOR "0") set(QPACKAGEKIT_VERSION_MINOR "9") set(QPACKAGEKIT_VERSION_PATCH "3") @@ -41,28 +44,14 @@ endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) # # Configure files # -set (CMAKE_INSTALL_LIBDIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE PATH "Output directory for libraries") -set (PREFIXDIR "${CMAKE_INSTALL_PREFIX}") -set (DATADIR "${CMAKE_INSTALL_PREFIX}/share") -set (PKGDATADIR "${DATA_INSTALL_DIR}") -set (LIBDIR "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}") -set (PKGLIBDIR "${LIBDIR}/packagekit") set (GETTEXT_PACKAGE "packagekit") -set (LOCALE_DIR "${DATADIR}/locale") set (VERSION "${QPACKAGEKIT_VERSION}") -set (BUILDDIR "${CMAKE_BINARY_DIR}") set (LOCALSTATEDIR "/var") set (CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${LIBNAME}/") add_definitions("-DLOCALSTATEDIR=\"${LOCALSTATEDIR}\"") add_definitions("-std=gnu++11") -if (IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) - set (PKQT_INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR}) -else (IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) - set (PKQT_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") -endif (IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) - configure_file(config.h.in ${CMAKE_BINARY_DIR}/config.h) # diff --git a/config.h.in b/config.h.in index 782abcb..7985f30 100644 --- a/config.h.in +++ b/config.h.in @@ -8,13 +8,6 @@ #define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@" /* Paths */ -#define LOCALEDIR "@LOCALE_DIR@" -#define PKGDATADIR "@PKGDATADIR@" -#define PKGLIBDIR "@PKGLIBDIR@" -#define PREFIXDIR "@PREFIXDIR@" -#define DATADIR "@DATADIR@" -#define LIBDIR "@LIBDIR@" -#define BUILDDIR "@BUILDDIR@" /* Name of package */ #define PACKAGE_NAME "packagekit-qt" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c52e1b1..c6e16bd 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -101,13 +101,13 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${LIBNAME}.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${LIBNAME}.pc @ONLY ) -target_include_directories(${LIBNAME} INTERFACE "$<INSTALL_INTERFACE:include/${LIBNAME}/PackageKit/;include/${LIBNAME}>") +target_include_directories(${LIBNAME} INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${LIBNAME}/PackageKit/;${CMAKE_INSTALL_INCLUDEDIR}/${LIBNAME}>") install(TARGETS ${LIBNAME} EXPORT PackageKitQtTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LIBNAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) install(FILES ${packagekitqt_HEADERS} - DESTINATION include/${LIBNAME}/PackageKit/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${LIBNAME}/PackageKit/ ) add_subdirectory(modules) diff --git a/src/packagekitqt4.pc.in b/src/packagekitqt4.pc.in index 449bbe2..013e5a0 100755 --- a/src/packagekitqt4.pc.in +++ b/src/packagekitqt4.pc.in @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -includedir=${prefix}/include +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ Name: @LIBNAME@ Description: PackageKit is a system daemon for installing stuff. diff --git a/src/packagekitqt5.pc.in b/src/packagekitqt5.pc.in index 0b2f476..da6c2a9 100644 --- a/src/packagekitqt5.pc.in +++ b/src/packagekitqt5.pc.in @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=@PKQT_INSTALL_LIBDIR@ -includedir=${prefix}/include +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ Name: @LIBNAME@ Description: PackageKit is a system daemon for installing stuff. -- 2.1.0 ++++++ PackageKit-Qt-0.8.8.tar.xz -> PackageKit-Qt-0.9.2.tar.xz ++++++ ++++ 4125 lines of diff (skipped) ++++++ PackageKit-Qt-ff-7248b030c0.patch ++++++ diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b1b054..b1e1e97 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ set(CMAKE_BUILD_TYPE "Debug") set(QPACKAGEKIT_VERSION_MAJOR "0") set(QPACKAGEKIT_VERSION_MINOR "9") -set(QPACKAGEKIT_VERSION_PATCH "2") +set(QPACKAGEKIT_VERSION_PATCH "3") set(QPACKAGEKIT_VERSION_SUFFIX "${VERSION_SUFFIX}") set(QPACKAGEKIT_VERSION "${QPACKAGEKIT_VERSION_MAJOR}.${QPACKAGEKIT_VERSION_MINOR}.${QPACKAGEKIT_VERSION_PATCH}") @@ -41,6 +41,7 @@ endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) # # Configure files # +set (CMAKE_INSTALL_LIBDIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE PATH "Output directory for libraries") set (PREFIXDIR "${CMAKE_INSTALL_PREFIX}") set (DATADIR "${CMAKE_INSTALL_PREFIX}/share") set (PKGDATADIR "${DATA_INSTALL_DIR}") @@ -51,11 +52,11 @@ set (LOCALE_DIR "${DATADIR}/locale") set (VERSION "${QPACKAGEKIT_VERSION}") set (BUILDDIR "${CMAKE_BINARY_DIR}") set (LOCALSTATEDIR "/var") +set (CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${LIBNAME}/") add_definitions("-DLOCALSTATEDIR=\"${LOCALSTATEDIR}\"") add_definitions("-std=gnu++11") -set(CMAKE_INSTALL_LIBDIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE PATH "Output directory for libraries") if (IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) set (PKQT_INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR}) else (IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) @@ -75,3 +76,9 @@ endif (DISABLE_MAINTAINER_CFLAGS) add_definitions(${MAINTAINER_CFLAGS}) add_subdirectory(src) + +install(EXPORT PackageKitQtTargets + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + FILE PackageKitQtTargets.cmake + NAMESPACE PK:: + COMPONENT Devel) diff --git a/RELEASE b/RELEASE index cb1f5e3..fe6dbc9 100644 --- a/RELEASE +++ b/RELEASE @@ -2,10 +2,10 @@ PackageKit-Qt Release Notes 1. Write NEWS entries for PackageKit-Qt in the same format as usual. -git shortlog QPACKAGEKIT_0_8_8.. | grep -i -v trivial | grep -v Merge > NEWS.new +git shortlog QPACKAGEKIT_0_9_2.. | grep -i -v trivial | grep -v Merge > NEWS.new -------------------------------------------------------------------------------- -Version 0.9.2 +Version 0.9.3 ~~~~~~~~~~~~~ Released: 2013-xx-xx @@ -20,17 +20,17 @@ Bugfixes: 3. Commit changes in PackageKit-Qt git: -git commit -a -m "Release version 0.9.2" -git tag -s -f -m "Release 0.9.2" QPACKAGEKIT_0_9_2 +git commit -a -m "Release version 0.9.3" +git tag -s -f -m "Release 0.9.3" QPACKAGEKIT_0_9_3 <gpg password> git push --tags git push -4. run './release.sh --version=0.9.2 --git-tag=QPACKAGEKIT_0_9_2 --sign' +4. run './release.sh --version=0.9.3 --git-tag=QPACKAGEKIT_0_9_3 --sign' 5. Upload tarball to: -scp *.tar.* packagekit.org:/srv/www/html/releases/ +scp *.tar.* hughsient@annarchy.freedesktop.org:/srv/www.freedesktop.org/www/software/PackageKit/releases/ 6. Do post release version bump in CMakeLists.txt @@ -42,7 +42,7 @@ git push 8. Send an email to packagekit(a)lists.freedesktop.org ================================================= -PackageKit-Qt 0.9.2 released! +PackageKit-Qt 0.9.3 released! Tarballs available here: http://www.packagekit.org/releases/ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8ef7906..c52e1b1 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -55,18 +55,19 @@ set(packagekitqt_SRC details.cpp ) -find_file(PK_INTERFACE_XML org.freedesktop.PackageKit.xml - PATHS ${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/ +find_path(PK_INTERFACES_DIR org.freedesktop.PackageKit.xml + HINTS ${CMAKE_INSTALL_PREFIX} /usr + PATH_SUFFIXES share/dbus-1/interfaces/ ) -find_file(PK_TRANSACTION_INTERFACE_XML org.freedesktop.PackageKit.Transaction.xml - PATHS ${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/ -) -if (PK_INTERFACE_XML STREQUAL "PK_INTERFACE_XML-NOTFOUND" OR PK_TRANSACTION_INTERFACE_XML STREQUAL "PK_TRANSACTION_INTERFACE_XML-NOTFOUND") +set(PK_INTERFACE_XML "${PK_INTERFACES_DIR}/org.freedesktop.PackageKit.xml") +set(PK_TRANSACTION_INTERFACE_XML "${PK_INTERFACES_DIR}/org.freedesktop.PackageKit.Transaction.xml") + +if (NOT PK_INTERFACE_XML OR NOT PK_TRANSACTION_INTERFACE_XML) message (FATAL_ERROR "Unable to find PackageKit DBus specifications! Please install PackageKit to continue!") endif () -set_source_files_properties(${PK_INTERFACE_XML} PROPERTIES CLASSNAME DaemonProxy) -set_source_files_properties(${PK_TRANSACTION_INTERFACE_XML} PROPERTIES CLASSNAME TransactionProxy) +set_source_files_properties(${PK_INTERFACE_XML} PROPERTIES NO_NAMESPACE true) +set_source_files_properties(${PK_TRANSACTION_INTERFACE_XML} PROPERTIES NO_NAMESPACE true) if (Qt5_FOUND) qt5_add_dbus_interface(packagekitqt_SRC ${PK_INTERFACE_XML} daemonproxy) @@ -87,7 +88,8 @@ set_target_properties(${LIBNAME} PROPERTIES VERSION ${QPACKAGEKIT_VERSION} SOVER if (Qt5_FOUND) add_dependencies(${LIBNAME} mocs) target_link_libraries(${LIBNAME} - ${Qt5DBus_LIBRARIES} ${Qt5Sql_LIBRARIES} + LINK_PUBLIC Qt5::DBus + LINK_PRIVATE Qt5::Sql ) elseif (Qt4_FOUND) target_link_libraries(${LIBNAME} @@ -99,13 +101,13 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${LIBNAME}.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${LIBNAME}.pc @ONLY ) - -install(TARGETS ${LIBNAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) +target_include_directories(${LIBNAME} INTERFACE "$<INSTALL_INTERFACE:include/${LIBNAME}/PackageKit/;include/${LIBNAME}>") +install(TARGETS ${LIBNAME} EXPORT PackageKitQtTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LIBNAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) install(FILES ${packagekitqt_HEADERS} - DESTINATION include/PackageKit/${LIBNAME} + DESTINATION include/${LIBNAME}/PackageKit/ ) add_subdirectory(modules) diff --git a/src/bitfield.cpp b/src/bitfield.cpp index c986905..68ef80c 100644 --- a/src/bitfield.cpp +++ b/src/bitfield.cpp @@ -2,7 +2,7 @@ using namespace PackageKit; -Bitfield::Bitfield () : m_val (0) +Bitfield::Bitfield () { } @@ -61,10 +61,15 @@ Bitfield Bitfield::operator|= (Bitfield mask) Bitfield& Bitfield::operator= (const Bitfield& other) { - if (this == &other) - return *this; + if (this == &other) + return *this; - m_val = other.m_val; + m_val = other.m_val; - return *this; + return *this; +} + +bool Bitfield::operator==(const Bitfield &other) +{ + return m_val == other.m_val; } diff --git a/src/bitfield.h b/src/bitfield.h index d7dd481..8535e46 100644 --- a/src/bitfield.h +++ b/src/bitfield.h @@ -2,6 +2,7 @@ #define PACKAGEKIT_BITFIELD_H #include <QtGlobal> +#include <QMetaType> namespace PackageKit { @@ -23,11 +24,14 @@ public: Bitfield operator|= (Bitfield mask); Bitfield& operator= (const Bitfield& other); + bool operator==(const Bitfield &other); private: - qulonglong m_val; + qulonglong m_val = 0; }; } // End namespace PackageKit +Q_DECLARE_METATYPE(PackageKit::Bitfield) + #endif diff --git a/src/daemon.cpp b/src/daemon.cpp index 621fb89..442ef55 100755 --- a/src/daemon.cpp +++ b/src/daemon.cpp @@ -47,10 +47,10 @@ Daemon::Daemon(QObject *parent) : d_ptr(new DaemonPrivate(this)) { Q_D(Daemon); - d->daemon = new ::DaemonProxy(QLatin1String(PK_NAME), - QLatin1String(PK_PATH), - QDBusConnection::systemBus(), - this); + d->daemon = new ::OrgFreedesktopPackageKitInterface(QLatin1String(PK_NAME), + QLatin1String(PK_PATH), + QDBusConnection::systemBus(), + this); QDBusConnection::systemBus().connect(QLatin1String(PK_NAME), QLatin1String(PK_PATH), @@ -66,25 +66,6 @@ Daemon::Daemon(QObject *parent) : if (!db.open()) { qDebug() << "Failed to initialize the desktop files database"; } - - qRegisterMetaType<PackageKit::Daemon::Network>("PackageKit::Daemon::Network"); - qRegisterMetaType<PackageKit::Daemon::Authorize>("PackageKit::Daemon::Authorize"); - qRegisterMetaType<PackageKit::Transaction::InternalError>("PackageKit::Transaction::InternalError"); - qRegisterMetaType<PackageKit::Transaction::Role>("PackageKit::Transaction::Role"); - qRegisterMetaType<PackageKit::Transaction::Error>("PackageKit::Transaction::Error"); - qRegisterMetaType<PackageKit::Transaction::Exit>("PackageKit::Transaction::Exit"); - qRegisterMetaType<PackageKit::Transaction::Filter>("PackageKit::Transaction::Filter"); - qRegisterMetaType<PackageKit::Transaction::Message>("PackageKit::Transaction::Message"); - qRegisterMetaType<PackageKit::Transaction::Status>("PackageKit::Transaction::Status"); - qRegisterMetaType<PackageKit::Transaction::MediaType>("PackageKit::Transaction::MediaType"); - qRegisterMetaType<PackageKit::Transaction::DistroUpgrade>("PackageKit::Transaction::DistroUpgrade"); - qRegisterMetaType<PackageKit::Transaction::TransactionFlag>("PackageKit::Transaction::TransactionFlag"); - qRegisterMetaType<PackageKit::Transaction::TransactionFlags>("PackageKit::Transaction::TransactionFlags"); - qRegisterMetaType<PackageKit::Transaction::Restart>("PackageKit::Transaction::Restart"); - qRegisterMetaType<PackageKit::Transaction::UpdateState>("PackageKit::Transaction::UpdateState"); - qRegisterMetaType<PackageKit::Transaction::Group>("PackageKit::Transaction::Group"); - qRegisterMetaType<PackageKit::Transaction::Info>("PackageKit::Transaction::Info"); - qRegisterMetaType<PackageKit::Transaction::SigType>("PackageKit::Transaction::SigType"); } void DaemonPrivate::setupSignal(const QString &signal, bool connect) @@ -94,10 +75,7 @@ void DaemonPrivate::setupSignal(const QString &signal, bool connect) const char *signalToConnect = 0; const char *memberToConnect = 0; - if (signal == SIGNAL(changed())) { - signalToConnect = SIGNAL(Changed()); - memberToConnect = SIGNAL(changed()); - } else if (signal == SIGNAL(repoListChanged())) { + if (signal == SIGNAL(repoListChanged())) { signalToConnect = SIGNAL(RepoListChanged()); memberToConnect = SIGNAL(repoListChanged()); } else if (signal == SIGNAL(restartScheduled())) { diff --git a/src/daemonprivate.cpp b/src/daemonprivate.cpp index 6a52f14..25ba55b 100644 --- a/src/daemonprivate.cpp +++ b/src/daemonprivate.cpp @@ -124,7 +124,7 @@ void DaemonPrivate::updateProperties(const QVariantMap &properties) } else if (property == QLatin1String("DistroId")) { distroId = value.toString(); } else if (property == QLatin1String("Filters")) { - filters = static_cast<Transaction::Filters>(value.toULongLong()); + filters = static_cast<Transaction::Filters>(value.toUInt()); } else if (property == QLatin1String("Groups")) { groups = static_cast<Transaction::Groups>(value.toULongLong()); } else if (property == QLatin1String("Locked")) { diff --git a/src/daemonprivate.h b/src/daemonprivate.h index abc03a7..b8c2b6c 100644 --- a/src/daemonprivate.h +++ b/src/daemonprivate.h @@ -27,7 +27,7 @@ #include "daemon.h" -class DaemonProxy; +class OrgFreedesktopPackageKitInterface; namespace PackageKit { @@ -39,7 +39,7 @@ protected: virtual ~DaemonPrivate() {} Daemon *q_ptr; - ::DaemonProxy *daemon; + ::OrgFreedesktopPackageKitInterface *daemon; QStringList hints; QStringList connectedSignals; diff --git a/src/modules/packagekit-qt-config.cmake.in b/src/modules/packagekit-qt-config.cmake.in index f9f4436..3dcf3f3 100644 --- a/src/modules/packagekit-qt-config.cmake.in +++ b/src/modules/packagekit-qt-config.cmake.in @@ -1,11 +1,10 @@ # - Config information for PackageKit-Qt@QT_VERSION@ # This file defines: # -# PackageKitQt@QT_VERSION@_INCLUDE_DIR - the PackageKitQt@QT_VERSION@ include directory # PackageKitQt@QT_VERSION@_LIBRARIES - Link these to use PackageKitQt@QT_VERSION@ SET(prefix "@CMAKE_INSTALL_PREFIX@") SET(exec_prefix "@CMAKE_INSTALL_PREFIX@") -SET(PackageKitQt@QT_VERSION@_LIBRARIES "@PKQT_INSTALL_LIBDIR@/lib@LIBNAME@.so" CACHE FILEPATH "Libraries for PackageKitQt@QT_VERSION@") -SET(PackageKitQt@QT_VERSION@_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/PackageKit/@LIBNAME@" CACHE PATH "Include path for PackageKitQt@QT_VERSION@") -SET(PackageKitQt@QT_VERSION@_FOUND "TRUE") +SET(PackageKitQt@QT_VERSION@_LIBRARIES "PK::@LIBNAME@") + +include("${CMAKE_CURRENT_LIST_DIR}/PackageKitQtTargets.cmake") diff --git a/src/transaction.h b/src/transaction.h index 2b03f41..7b17fc5 100644 --- a/src/transaction.h +++ b/src/transaction.h @@ -140,7 +140,6 @@ public: RoleGetDistroUpgrades, RoleGetCategories, RoleGetOldTransactions, - RoleUpgradeSystem, // Since 0.6.11 RoleRepairSystem, // Since 0.7.2 RoleGetDetailsLocal, // Since 0.8.17 RoleGetFilesLocal, // Since 0.9.1 diff --git a/src/transactionprivate.cpp b/src/transactionprivate.cpp index 7a87aec..2c73899 100644 --- a/src/transactionprivate.cpp +++ b/src/transactionprivate.cpp @@ -46,10 +46,10 @@ void TransactionPrivate::setup(const QDBusObjectPath &transactionId) Q_Q(Transaction); tid = transactionId; - p = new TransactionProxy(QLatin1String(PK_NAME), - tid.path(), - QDBusConnection::systemBus(), - q); + p = new OrgFreedesktopPackageKitTransactionInterface(QLatin1String(PK_NAME), + tid.path(), + QDBusConnection::systemBus(), + q); if (!Daemon::global()->hints().isEmpty()) { q->setHints(Daemon::global()->hints()); } @@ -329,7 +329,7 @@ void TransactionPrivate::updateProperties(const QVariantMap &properties) status = static_cast<Transaction::Status>(value.toUInt()); QMetaObject::invokeMethod(q, "statusChanged", Qt::QueuedConnection); } else if (property == QLatin1String("TransactionFlags")) { - transactionFlags = static_cast<Transaction::TransactionFlags>(value.toULongLong()); + transactionFlags = static_cast<Transaction::TransactionFlags>(value.toUInt()); QMetaObject::invokeMethod(q, "transactionFlagsChanged", Qt::QueuedConnection); } else if (property == QLatin1String("Uid")) { uid = value.toUInt(); diff --git a/src/transactionprivate.h b/src/transactionprivate.h index 895cfac..72860d8 100644 --- a/src/transactionprivate.h +++ b/src/transactionprivate.h @@ -29,7 +29,7 @@ #include "transaction.h" -class TransactionProxy; +class OrgFreedesktopPackageKitTransactionInterface; namespace PackageKit { @@ -45,7 +45,7 @@ protected: void runQueuedTransaction(); QDBusObjectPath tid; - ::TransactionProxy* p = 0; + ::OrgFreedesktopPackageKitTransactionInterface* p = 0; Transaction *q_ptr; QStringList connectedSignals; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit PackageKit for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '14

23 Sep '14

Hello community, here is the log from the commit of package PackageKit for openSUSE:Factory checked in at 2014-09-23 17:16:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/PackageKit (Old) and /work/SRC/openSUSE:Factory/.PackageKit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "PackageKit" Changes: -------- --- /work/SRC/openSUSE:Factory/PackageKit/PackageKit.changes 2014-08-11 10:09:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.PackageKit.new/PackageKit.changes 2014-09-23 17:16:49.000000000 +0200 @@ -1,0 +2,95 @@ +Fri Sep 12 12:17:30 UTC 2014 - dimstar(a)opensuse.org + +- Update to version 1.0.0: + + The offline update functionality has moved to a proper D-Bus + interface and the pkexec helpers have been removed. Offline + updates is an important feature that no longer deserves to be + bolted-on. All the existing users have been ported to the new + interface, but you need 3.13.92 if you're running GNOME from + unstable or jhbuild. + + No more plugins. Both in-tree and out-of-tree plugins were the + biggest source of crashes, and with the systemd offline updates + merged into the core daemon they are just not reuired anymore. + All affected projects have been notified. + + No more conary, opkg, smart or yum plugins. These have been + unmaintained and broken for over two years, so time to give + them the heave-ho. + + The alpm, aptcc, hif and zypp plugins have had lots of love, + and are up to date with the latest features and working well. + + New Features: + - Add a D-Bus interface and helpers for offline support. + - Add a repo-set-data command to packagekit-direct. + - Add a simple script that generates some offline metadata. + - Add pk_backend_job_get_cancellable(). + - Add pk_backend_job_is_cancelled(). + - Add pk_backend_set_user_data(). + - Add pk_offline_get_prepared_sack() and use it in the + systemd-updates plugin. + - Remove pk-debuginfo-install. + - Remove support for distros not supporting /etc/os-release. + - Remove the --enable-systemd-updates configure switch. + - Remove the events/pre-transaction.d functionality. + - Remove the pkexec systemd helpers. + - Remove the plugin interface. + - Remove various options from the config file. + + Bugfixes: + - Automatically do pk_backend_job_finished() for threaded + backends. + - Do not shutdown the daemon on idle by default. + - Fix compile of the ConnMan network support. + - Fix packagekit-offline-update.service generation. + - Increase the default transaction limits. + - Prefer npapi-sdk over mozilla-plugins. + - Refresh the NetworkManager state when the daemon starts. +- Add rcpackagekitd and rcpackagekitd-offline-update symlinks. +- Shorten the Summary of PackageKit-branding-upstream a bit. + +------------------------------------------------------------------- +Wed Sep 10 09:21:22 UTC 2014 - dimstar(a)opensuse.org + +- Update to version 0.9.6 (git master/0fcee3c): + + Fix a multitude of possible crashers. +- Drop 0002-Build-against-npapi-sdk-instead-of-xulrunner.patch and + PackageKit-zypp-0.9.patch: fixed upstream. + +------------------------------------------------------------------- +Tue Sep 9 20:16:24 UTC 2014 - dimstar(a)opensuse.org + +- Update to version 0.9.5: + + New Features: + - Add --allow-untrusted option to pkcon. + - Add a new tool called packagekit-direct that can run without + a daemon. + - Remove remaining time reporting. + - Remove the desktop.db plugin. + + Bugfixes: + - Do not commit the transaction manually but instead set the + correct state. + - Do not log a critical warning when idle exiting. + - Fix a crash when we are cancelling a transaction that has not + yet been run. + - Make browser-plugin search for npapi-sdk or mozilla-plugin. + - Never ever use g_main_context_iteration() manually. + + Backend fixes. + + For changes from version 0.9.1 up to 0.9.4: please see NEWS + file. +- No longer pass --with-security-framework to configure: not known + anymore. +- Rebase 0002-Build-against-npapi-sdk-instead-of-xulrunner.patch + and PackageKit-dbus-location.patch. +- Drop PackageKit-zypp-filter-uninstalled-packages.patch: fixed + upstream. +- Add PackageKit-zypp-0.9.patch: port zypp backend to PK 0.9.x. +- Drop typelib-1_0-PackageKitPlugin-1_0 subpackage: the plugin + architecture does no longer exist. +- Rename libpackagekit-glib2-16 subpackage to + libpackagekit-glib2-18, following upstreams soname change. +- Rework for GStreamer 1.0 support: + + Remove gstreamer-0_10-devel and + gstreamer-0_10-plugins-base-devel BuildRequires. + + Add gstreamer-devel and gstreamer-plugins-base-devel + BuildRequires. + + Change supplements in gstreamer-plugin to + packageand(%{name}:gstreamer-plugins-base). + +------------------------------------------------------------------- Old: ---- 0002-Build-against-npapi-sdk-instead-of-xulrunner.patch PackageKit-0.8.17.tar.xz PackageKit-zypp-filter-uninstalled-packages.patch New: ---- PackageKit-1.0.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ --- /var/tmp/diff_new_pack.zKe7GE/_old 2014-09-23 17:16:50.000000000 +0200 +++ /var/tmp/diff_new_pack.zKe7GE/_new 2014-09-23 17:16:50.000000000 +0200 @@ -21,37 +21,27 @@ %define with_offline_updates 1 Name: PackageKit -Version: 0.8.17 +Version: 1.0.0 Release: 0 Summary: Simple software installation management software License: GPL-2.0+ Group: System/Daemons Url: http://packagekit.org/ +# We currently have a locally created dist file.. 0.9.6 won't ever be released Source: http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.… Source2: baselibs.conf # PATCH-FEATURE-OPENSUSE 0001-Change-the-configuration-of-the-cron-script-to-a-sys.patch vuntz(a)opensuse.org -- Change the configuration of the cron script to a sysconfig-like config Patch1: 0001-Change-the-configuration-of-the-cron-script-to-a-sys.patch -# PATCH-FIX-UPSTREAM PackageKit-npapi.patch fdo#40026 wr(a)rosenauer.org -- Build against npapi-sdk instead of xulrunner -Patch2: 0002-Build-against-npapi-sdk-instead-of-xulrunner.patch # PATCH-FIX-UPSTREAM PackageKit-dbus-location.patch bnc#829944 dimstar(a)opensuse.org -- Look for dbus socket in /run instead of /var/run. Sent to upstream. Patch3: PackageKit-dbus-location.patch -# PATCH-FIX-OPENSUSE PackageKit-zypp-filter-uninstalled-packages.patch fate#316921 hpj(a)suse.com -- GStreamer codec installation would prompt to install already installed packages. -Patch4: PackageKit-zypp-filter-uninstalled-packages.patch -# To update this package, please git-format-patch the tag of the -# tarball version (eg: PACKAGEKIT_0_6_19) vs the distro tag (eg: openSUSE_Factory) -# in https://github.com/openSUSE/PackageKit and keep the patches -# in that git repository for easier tracking and merging. -# When updating the package you can rebase the distro branch against -# the new release tag. -# BuildRequires: NetworkManager-devel BuildRequires: automake BuildRequires: docbook-utils BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gobject-introspection-devel -BuildRequires: gstreamer-0_10-devel -BuildRequires: gstreamer-0_10-plugins-base-devel +BuildRequires: gstreamer-devel +BuildRequires: gstreamer-plugins-base-devel BuildRequires: gtk-doc BuildRequires: gtk2-devel BuildRequires: gtk3-devel @@ -109,21 +99,6 @@ use some of the latest technology like PolicyKit to make the process suck less. -%package -n typelib-1_0-PackageKitPlugin-1_0 -Summary: Simple software installation management software -- Plugin library, Introspection bindings -License: GPL-2.0+ -Group: System/Libraries - -%description -n typelib-1_0-PackageKitPlugin-1_0 -PackageKit is a system designed to make installing and updating -software on your computer easier. The primary design goal is to unify -all the software graphical tools used in different distributions, and -use some of the latest technology like PolicyKit to make the process -suck less. - -This package provides the GObject Introspection bindings for the -PackageKit plugin library. - %package gstreamer-plugin Summary: Simple software installation management software License: GPL-2.0+ @@ -131,7 +106,7 @@ Requires(post): update-alternatives Requires(postun): update-alternatives Recommends: %{name} = %{version} -Supplements: packageand(%{name}:gstreamer-0_10-plugins-base) +Supplements: packageand(%{name}:gstreamer-plugins-base) Provides: opensuse-codecs-installer = 10.3.1 Obsoletes: opensuse-codecs-installer <= 10.3.1 @@ -163,14 +138,13 @@ Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: libpackagekit-glib2-devel -Requires: typelib-1_0-PackageKitPlugin-1_0 = %{version} %description devel This package contains all necessary include files, libraries, configuration files and development tools (with manual pages) needed to compile and link applications using PackageKit. -%package -n libpackagekit-glib2-16 +%package -n libpackagekit-glib2-18 Summary: Simple software installation management software License: LGPL-2.1+ Group: System/Libraries @@ -179,7 +153,7 @@ Provides: libpackagekit-glib12 = %{version} Obsoletes: libpackagekit-glib12 < %{version} -%description -n libpackagekit-glib2-16 +%description -n libpackagekit-glib2-18 PackageKit is a system designed to make installing and updating software on your computer easier. The primary design goal is to unify all the software graphical tools used in different distributions, and @@ -205,7 +179,7 @@ Summary: Simple software installation management software License: LGPL-2.1+ Group: Development/Libraries/GNOME -Requires: libpackagekit-glib2-16 = %{version} +Requires: libpackagekit-glib2-18 = %{version} Requires: typelib-1_0-PackageKitGlib-1_0 = %{version} Provides: libpackagekit-glib12-devel = %{version} Obsoletes: libpackagekit-glib12-devel < %{version} @@ -233,7 +207,7 @@ suck less. %package branding-upstream -Summary: Simple software installation management software -- Upstream default configuration +Summary: Simple software installation management software -- Upstream configuration License: GPL-2.0+ Group: System/Daemons Requires: %{name} = %{version} @@ -257,9 +231,7 @@ %prep %setup -q %patch1 -p1 -%patch2 -p1 %patch3 -p1 -%patch4 -p1 translation-update-upstream %build @@ -270,7 +242,6 @@ --enable-zypp \ --enable-gstreamer-plugin \ --with-default-backend=zypp \ - --with-security-framework=polkit \ --with-mozilla-plugin-dir=%{_libdir}/browser-plugins \ %if ! %BUILD_CNF --disable-command-not-found \ @@ -294,6 +265,13 @@ mv %{buildroot}%{_sysconfdir}/sysconfig/packagekit-background %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.packagekit-background # create ghost file touch %{buildroot}%{_libexecdir}/gst-install-plugins-helper +# Add rcFOO symlinks +mkdir -p %{buildroot}%{_sbindir} +ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcpackagekit +%if %{with_offline_updates} +ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcpackagekit-offline-update +%endif + %find_lang %{name} %{?no_lang_C} %fdupes $RPM_BUILD_ROOT @@ -348,9 +326,9 @@ %postun gtk3-module %glib2_gsettings_schema_postun -%post -n libpackagekit-glib2-16 -p /sbin/ldconfig +%post -n libpackagekit-glib2-18 -p /sbin/ldconfig -%postun -n libpackagekit-glib2-16 -p /sbin/ldconfig +%postun -n libpackagekit-glib2-18 -p /sbin/ldconfig %files lang -f %{name}.lang @@ -358,35 +336,24 @@ %defattr(-,root,root) %doc AUTHORS COPYING HACKING NEWS README %dir %{_sysconfdir}/PackageKit -%dir %{_sysconfdir}/PackageKit/events -%dir %{_sysconfdir}/PackageKit/events/post-transaction.d -%dir %{_sysconfdir}/PackageKit/events/pre-transaction.d %dir %{_datadir}/PackageKit %dir %{_datadir}/PackageKit/helpers %dir %{_datadir}/PackageKit/helpers/test_spawn %dir %{_libdir}/packagekit-backend -%dir %{_libdir}/packagekit-plugins %dir %{python_sitelib}/packagekit %dir %{_localstatedir}/lib/PackageKit %{_datadir}/bash-completion/completions/pkcon -%{_sysconfdir}/PackageKit/events/post-transaction.d/README -%{_sysconfdir}/PackageKit/events/pre-transaction.d/README %{_sysconfdir}/cron.daily/packagekit-background.cron %{_sysconfdir}/dbus-1/system.d/org.freedesktop.PackageKit.conf %if %BUILD_CNF %{_sysconfdir}/profile.d/PackageKit.sh %endif %{_localstatedir}/adm/fillup-templates/sysconfig.packagekit-background -%{_bindir}/packagekit-bugreport.sh -%{_bindir}/pk-debuginfo-install %{_bindir}/pkcon %{_bindir}/pkmon %{_libdir}/packagekit-backend/libpk_backend_dummy.so -%{_libdir}/packagekit-plugins/libpk_plugin-scan-desktop-files.so -%{_libdir}/packagekit-plugins/libpk_plugin_scripts.so -%{_libdir}/packagekit-plugins/libpk_plugin-systemd-updates.so -%{_libdir}/packagekit-plugins/libpk_plugin-update-package-cache.so %{_libexecdir}/packagekitd +%{_libexecdir}/packagekit-direct %if %BUILD_CNF %{_libexecdir}/pk-command-not-found %endif @@ -399,23 +366,19 @@ %{_datadir}/polkit-1/rules.d/org.freedesktop.packagekit.rules %{_datadir}/dbus-1/system-services/* %{_unitdir}/packagekit.service +%{_sbindir}/rcpackagekit %doc %{_mandir}/man?/*.* %verify(not md5 size mtime) %{_localstatedir}/lib/PackageKit/transactions.db %if %{with_offline_updates} -%{_libexecdir}/pk-clear-offline-update %{_libexecdir}/pk-offline-update -%{_libexecdir}/pk-trigger-offline-update %{_unitdir}/packagekit-offline-update.service +%{_sbindir}/rcpackagekit-offline-update %endif %files backend-zypp %defattr(-,root,root) %{_libdir}/packagekit-backend/libpk_backend_zypp.so -%files -n typelib-1_0-PackageKitPlugin-1_0 -%defattr(-,root,root) -%{_libdir}/girepository-1.0/PackageKitPlugin-1.0.typelib - %files gstreamer-plugin %defattr(-,root,root) %ghost %attr(755,root,root) %{_libexecdir}/gst-install-plugins-helper @@ -438,12 +401,9 @@ %{_libdir}/packagekit-backend/libpk_backend_test_spawn.so %{_libdir}/packagekit-backend/libpk_backend_test_succeed.so %{_libdir}/packagekit-backend/libpk_backend_test_thread.so -%{_libdir}/pkgconfig/packagekit-plugin.pc %dir %{_includedir}/PackageKit -%{_includedir}/PackageKit/plugin/ -%{_datadir}/gir-1.0/PackageKitPlugin-1.0.gir -%files -n libpackagekit-glib2-16 +%files -n libpackagekit-glib2-18 %defattr(-,root,root) %doc lib/packagekit-glib2/COPYING %{_libdir}/libpackagekit-glib2.so.* ++++++ PackageKit-0.8.17.tar.xz -> PackageKit-1.0.0.tar.xz ++++++ ++++ 236951 lines of diff (skipped) ++++++ PackageKit-dbus-location.patch ++++++ --- /var/tmp/diff_new_pack.zKe7GE/_old 2014-09-23 17:16:51.000000000 +0200 +++ /var/tmp/diff_new_pack.zKe7GE/_new 2014-09-23 17:16:51.000000000 +0200 @@ -1,9 +1,9 @@ -Index: PackageKit-0.8.12/contrib/command-not-found/PackageKit.sh.in +Index: PackageKit-0.9.5/contrib/command-not-found/PackageKit.sh.in =================================================================== ---- PackageKit-0.8.12.orig/contrib/command-not-found/PackageKit.sh.in -+++ PackageKit-0.8.12/contrib/command-not-found/PackageKit.sh.in -@@ -11,7 +11,7 @@ command_not_found_handle () { - retval=127 +--- PackageKit-0.9.5.orig/contrib/command-not-found/PackageKit.sh.in ++++ PackageKit-0.9.5/contrib/command-not-found/PackageKit.sh.in +@@ -14,7 +14,7 @@ command_not_found_handle () { + [[ $- =~ i ]] || runcnf=0 # don't run if DBus isn't running - [ ! -S /var/run/dbus/system_bus_socket ] && runcnf=0 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit PackageKit-branding-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 23 Sep '14

23 Sep '14

Hello community, here is the log from the commit of package PackageKit-branding-openSUSE for openSUSE:Factory checked in at 2014-09-23 17:16:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/PackageKit-branding-openSUSE (Old) and /work/SRC/openSUSE:Factory/.PackageKit-branding-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "PackageKit-branding-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/PackageKit-branding-openSUSE/PackageKit-branding-openSUSE.changes 2014-05-05 21:18:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.PackageKit-branding-openSUSE.new/PackageKit-branding-openSUSE.changes 2014-09-23 17:16:48.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Sep 10 15:00:03 UTC 2014 - dimstar(a)opensuse.org + +- Rebase PackageKit-branding-default-config.patch for + PackageKit 0.9.6. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit-branding-default-config.patch ++++++ --- /var/tmp/diff_new_pack.wt6k8x/_old 2014-09-23 17:16:49.000000000 +0200 +++ /var/tmp/diff_new_pack.wt6k8x/_new 2014-09-23 17:16:49.000000000 +0200 @@ -1,20 +1,15 @@ ---- PackageKit.conf.orig 2013-12-23 15:09:37.018505990 +0100 -+++ PackageKit.conf 2013-12-23 15:10:06.895787569 +0100 -@@ -6,7 +6,7 @@ - # Shut down the daemon after this many seconds idle. 0 means don't shutdown. - # - # default=300 --ShutdownTimeout=300 -+ShutdownTimeout=15 - - # Unlock the backend after this many seconds idle. - # -@@ -46,7 +46,7 @@ - # NOTE: Don't enable this for backends that are slow doing SearchFile() - # - # default=true --ScanDesktopFiles=true -+ScanDesktopFiles=false +diff -ur a/PackageKit.conf b/PackageKit.conf +--- PackageKit.conf 2014-09-10 16:55:20.039417673 +0200 ++++ PackageKit.conf 2014-09-10 16:59:09.762454591 +0200 +@@ -2,3 +2,11 @@ + # should not have to change anything. - # Update the package cache on PackageKit transactions - # The cache is used by client applications to fetch + [Daemon] ++ ++# Shut down the daemon after this many seconds idle. 0 means don't shutdown. ++# ++# default=300 ++# ++# for openSUSE, we want this shorter so it does not interfere with zypp/yast all the time ++ShutdownTimeout=15 ++ ++++++ PackageKit-branding.spec.in ++++++ --- /var/tmp/diff_new_pack.wt6k8x/_old 2014-09-23 17:16:49.000000000 +0200 +++ /var/tmp/diff_new_pack.wt6k8x/_new 2014-09-23 17:16:49.000000000 +0200 @@ -32,11 +32,11 @@ Patch0: PackageKit-branding-vendor.patch # PATCH-FEATURE-OPENSUSE PackageKit-branding-default-config.patch vuntz(a)opensues.org -- Change some default configuration Patch1: PackageKit-branding-default-config.patch -BuildRequires: PackageKit >= 0.8 +BuildRequires: PackageKit >= 0.9.6 # To be in sync with upstream defaults, do branding as a patch for upstream file. # WARNING: As this package conflicts with PackageKit-branding-%{branding_name}, you cannot # reuse build root. You have to build in a clean build root every time! -BuildRequires: PackageKit-branding-upstream >= 0.8.14 +BuildRequires: PackageKit-branding-upstream >= 0.9.6 %define packagekit_version %(rpm -q --qf '%%{version}' PackageKit) Requires: PackageKit = %{packagekit_version} Provides: PackageKit-branding = %{packagekit_version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0