November 2014 - openSUSE Commits - openSUSE Mailing Lists

commit gstreamer-plugins-bad for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '14

28 Nov '14

Hello community, here is the log from the commit of package gstreamer-plugins-bad for openSUSE:Factory checked in at 2014-11-28 08:46:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gstreamer-plugins-bad (Old) and /work/SRC/openSUSE:Factory/.gstreamer-plugins-bad.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gstreamer-plugins-bad" Changes: -------- --- /work/SRC/openSUSE:Factory/gstreamer-plugins-bad/gstreamer-plugins-bad.changes 2014-11-18 22:55:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gstreamer-plugins-bad.new/gstreamer-plugins-bad.changes 2014-11-28 08:46:05.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Nov 15 11:07:53 UTC 2014 - zaitor(a)opensuse.org + +- Enable pkgconfig(libchromaprint) BuildRequires, build + chromaprint plugin. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gstreamer-plugins-bad.spec ++++++ --- /var/tmp/diff_new_pack.aKaoyv/_old 2014-11-28 08:46:06.000000000 +0100 +++ /var/tmp/diff_new_pack.aKaoyv/_new 2014-11-28 08:46:06.000000000 +0100 @@ -33,7 +33,6 @@ # FIXME: missing BuildRequires on pkgconfig(wayland-client) # FIXME: re-enable opencv BuildRequires once bnc#748666 is fixed (we don't want to depend on libxine!) # FIXME: missing BuildRequires on libtiger (http://code.google.com/p/libtiger/) -# FIXME: missing BuildRequires on chromaprint (http://acoustid.org/chromaprint) # FIXME: missing BuildRequires on zbar (http://zbar.sourceforge.net/) %define gst_branch 1.0 Summary: GStreamer Streaming-Media Framework Plug-Ins @@ -88,8 +87,7 @@ BuildRequires: pkgconfig(kate) >= 0.1.7 BuildRequires: pkgconfig(libass) >= 0.9.4 BuildRequires: pkgconfig(libcdaudio) -# Not yet in openSUSE -#BuildRequires: pkgconfig(libchromaprint) +BuildRequires: pkgconfig(libchromaprint) BuildRequires: pkgconfig(libcrypto) BuildRequires: pkgconfig(libcurl) >= 7.21.0 BuildRequires: pkgconfig(libdc1394-2) >= 2.0.0 @@ -142,7 +140,6 @@ # Not yet in openSUSE #BuildRequires: pkgconfig(zbar) >= 0.9 BuildRequires: pkgconfig(zvbi-0.2) -# FIXME: chromaprint: Requires libchromaprint, not yet in openSUSE # FIXME: flite: Not in openSUSE # FIXME: kate: can be enhanced with libtiger. # FIXME: lv2: standard for plugins and matching host applications, @@ -480,6 +477,7 @@ %{_libdir}/gstreamer-%{gst_branch}/libgstcamerabin2.so #%{_libdir}/gstreamer-%{gst_branch}/libgstcdaudio.so #%{_libdir}/gstreamer-%{gst_branch}/libgstcdxaparse.so +%{_libdir}/gstreamer-%{gst_branch}/libgstchromaprint.so #%{_libdir}/gstreamer-%{gst_branch}/libgstcog.so %{_libdir}/gstreamer-%{gst_branch}/libgstcoloreffects.so #%{_libdir}/gstreamer-%{gst_branch}/libgstcolorspace.so -- 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 28 Nov '14

28 Nov '14

Hello community, here is the log from the commit of package PackageKit-Qt for openSUSE:Factory checked in at 2014-11-28 08:45:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-10-06 22:04:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.PackageKit-Qt.new/PackageKit-Qt.changes 2014-11-28 08:46:03.000000000 +0100 @@ -1,0 +2,26 @@ +Wed Nov 19 17:01:06 UTC 2014 - zaitor(a)opensuse.org + +- Update to version 0.9.5: + + New Features: Add operator== to bitfield. + + Bugfixes: + - Deprecate ::packageIcon methods. + - Disable namespacing and classes names on the generated + interfaces. + - Don't assume the target is packagekitqt5. + - Fix compilation due to not-set cmake variable. + - Fix documentation. + - Fix QPK include dir in cmake module. + - Properly export cmake targets. + - Remove daemon proxy conection to changed(). + - Remove RoleUpgradeSystem as it's not supported in 0.9.x + anymore. + - Remove the metatype registration for Transaction types. + - Support RPATH by default. + - Use GNUInstallDirs to determine most of used variables. + - Use "PackageKit" as the include namespace rather than the + library name. +- Drop PackageKit-Qt-ff-7248b030c0.patch and + 0001-Use-GNUInstallDirs-to-determine-most-of-used-variabl.patch: + Fixed upstream/No longer needed. + +------------------------------------------------------------------- PackageKit-Qt5.changes: same change Old: ---- 0001-Use-GNUInstallDirs-to-determine-most-of-used-variabl.patch PackageKit-Qt-0.9.2.tar.xz PackageKit-Qt-ff-7248b030c0.patch New: ---- PackageKit-Qt-0.9.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit-Qt.spec ++++++ --- /var/tmp/diff_new_pack.tCv5GX/_old 2014-11-28 08:46:04.000000000 +0100 +++ /var/tmp/diff_new_pack.tCv5GX/_new 2014-11-28 08:46:04.000000000 +0100 @@ -27,7 +27,7 @@ Name: PackageKit-Qt %define _name PackageKit-Qt -Version: 0.9.2 +Version: 0.9.5 Release: 0 Summary: Simple software installation management software License: LGPL-2.1+ @@ -35,10 +35,6 @@ Url: http://packagekit.org/ Source: http://www.freedesktop.org/software/PackageKit/releases/%{_name}-%{version}… Source99: pre_checkin.sh -# 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 @@ -87,8 +83,6 @@ %prep %setup -q -n %{_name}-%{version} -%patch0 -p1 -%patch1 -p1 %build mkdir build @@ -116,7 +110,7 @@ %files devel %defattr(-,root,root) -%doc TODO MAINTAINERS RELEASE +%doc TODO MAINTAINERS %{_libdir}/libpackagekitqt?.so %{_libdir}/cmake/packagekitqt?/ %{_libdir}/pkgconfig/packagekitqt?.pc ++++++ PackageKit-Qt5.spec ++++++ --- /var/tmp/diff_new_pack.tCv5GX/_old 2014-11-28 08:46:04.000000000 +0100 +++ /var/tmp/diff_new_pack.tCv5GX/_new 2014-11-28 08:46:04.000000000 +0100 @@ -27,7 +27,7 @@ Name: PackageKit-Qt5 %define _name PackageKit-Qt -Version: 0.9.2 +Version: 0.9.5 Release: 0 Summary: Simple software installation management software License: LGPL-2.1+ @@ -35,10 +35,6 @@ Url: http://packagekit.org/ Source: http://www.freedesktop.org/software/PackageKit/releases/%{_name}-%{version}… Source99: pre_checkin.sh -# 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 @@ -87,8 +83,6 @@ %prep %setup -q -n %{_name}-%{version} -%patch0 -p1 -%patch1 -p1 %build mkdir build @@ -116,7 +110,7 @@ %files devel %defattr(-,root,root) -%doc TODO MAINTAINERS RELEASE +%doc TODO MAINTAINERS %{_libdir}/libpackagekitqt?.so %{_libdir}/cmake/packagekitqt?/ %{_libdir}/pkgconfig/packagekitqt?.pc ++++++ PackageKit-Qt-0.9.2.tar.xz -> PackageKit-Qt-0.9.5.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/CMakeLists.txt new/PackageKit-Qt-0.9.5/CMakeLists.txt --- old/PackageKit-Qt-0.9.2/CMakeLists.txt 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/CMakeLists.txt 2014-10-10 17:11:54.000000000 +0200 @@ -6,9 +6,12 @@ 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 "2") +set(QPACKAGEKIT_VERSION_PATCH "5") set(QPACKAGEKIT_VERSION_SUFFIX "${VERSION_SUFFIX}") set(QPACKAGEKIT_VERSION "${QPACKAGEKIT_VERSION_MAJOR}.${QPACKAGEKIT_VERSION_MINOR}.${QPACKAGEKIT_VERSION_PATCH}") @@ -33,6 +36,8 @@ set(QT_VERSION "4") endif(USE_QT5) +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "QPK default install prefix" FORCE) @@ -41,27 +46,14 @@ # # Configure files # -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") -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}) - 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) # @@ -75,3 +67,9 @@ add_definitions(${MAINTAINER_CFLAGS}) add_subdirectory(src) + +install(EXPORT PackageKitQtTargets + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + FILE PackageKitQtTargets.cmake + NAMESPACE PK:: + COMPONENT Devel) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/NEWS new/PackageKit-Qt-0.9.5/NEWS --- old/PackageKit-Qt-0.9.2/NEWS 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/NEWS 2014-10-10 17:11:54.000000000 +0200 @@ -1,3 +1,25 @@ +Version 0.9.5 +~~~~~~~~~~~~~ +Released: 2014-10-10 + +New Features: + - Add operator== to bitfield (Daniel Nicoletti) + +Bugfixes: + - Deprecate ::packageIcon methods (Aleix Pol) + - Disable namespacing and classes names on the generated interfaces (Daniel Nicoletti) + - Don't assume the target is packagekitqt5 (Aleix Pol) + - Fix compilation due to not-set cmake variable (Matthias Klumpp) + - Fix documentation (Aleix Pol) + - Fix QPK include dir in cmake module (Matthias Klumpp) + - Properly export cmake targets (Aleix Pol) + - Remove daemon proxy conection to changed() (Daniel Nicoletti) + - Remove RoleUpgradeSystem as it's not supported in 0.9.x anymore (Daniel Nicoletti) + - Remove the metatype registration for Transaction types (Daniel Nicoletti) + - Support RPATH by default (Aleix Pol) + - Use GNUInstallDirs to determine most of used variables (Hrvoje Senjan) + - Use "PackageKit" as the include namespace rather than the library name (Aleix Pol) + Version 0.9.2 ~~~~~~~~~~~~~ Released: 2013-04-29 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/README new/PackageKit-Qt-0.9.5/README --- old/PackageKit-Qt-0.9.2/README 1970-01-01 01:00:00.000000000 +0100 +++ new/PackageKit-Qt-0.9.5/README 2014-10-10 17:11:54.000000000 +0200 @@ -0,0 +1,8 @@ +# PackageKit-Qt +Qt bindings for PackageKit + +## PackageKit +PackageKit is a DBUS abstraction layer that allows the session user to manage +packages in a secure way using a cross-distro, cross-architecture API. + +For more information, please see http://www.packagekit.org diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/RELEASE new/PackageKit-Qt-0.9.5/RELEASE --- old/PackageKit-Qt-0.9.2/RELEASE 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/RELEASE 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ -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 - --------------------------------------------------------------------------------- -Version 0.9.2 -~~~~~~~~~~~~~ -Released: 2013-xx-xx - -Notes: - -New Features: - -Bugfixes: --------------------------------------------------------------------------------- - -2. Update library version if new ABI or API in CMakeLists.txt - -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 -<gpg password> -git push --tags -git push - -4. run './release.sh --version=0.9.2 --git-tag=QPACKAGEKIT_0_9_2 --sign' - -5. Upload tarball to: - -scp *.tar.* packagekit.org:/srv/www/html/releases/ - -6. Do post release version bump in CMakeLists.txt - -7. Commit trivial changes: - -git commit -a -m "trivial: post release version bump" -git push - -8. Send an email to packagekit(a)lists.freedesktop.org - -================================================= -PackageKit-Qt 0.9.2 released! - -Tarballs available here: http://www.packagekit.org/releases/ - -================================================= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/config.h.in new/PackageKit-Qt-0.9.5/config.h.in --- old/PackageKit-Qt-0.9.2/config.h.in 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/config.h.in 2014-10-10 17:11:54.000000000 +0200 @@ -7,15 +7,6 @@ /* Gettext Package */ #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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/CMakeLists.txt new/PackageKit-Qt-0.9.5/src/CMakeLists.txt --- old/PackageKit-Qt-0.9.2/src/CMakeLists.txt 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/CMakeLists.txt 2014-10-10 17:11:54.000000000 +0200 @@ -11,16 +11,12 @@ # Set up Qt if (Qt5_FOUND) find_package(Qt5DBus REQUIRED) - find_package(Qt5Sql REQUIRED) include_directories(${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} - ${Qt5Sql_INCLUDE_DIRS} ) add_definitions(${Qt5DBus_DEFINITIONS}) - add_definitions(${Qt5Sql_DEFINITIONS}) elseif (Qt4_FOUND) set(QT_USE_QTDBUS TRUE) - set(QT_USE_QTSQL TRUE) set(QT_DONT_USE_QTGUI TRUE) include(${QT_USE_FILE}) endif () @@ -55,18 +51,19 @@ 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 +84,7 @@ if (Qt5_FOUND) add_dependencies(${LIBNAME} mocs) target_link_libraries(${LIBNAME} - ${Qt5DBus_LIBRARIES} ${Qt5Sql_LIBRARIES} + LINK_PUBLIC Qt5::DBus ) elseif (Qt4_FOUND) target_link_libraries(${LIBNAME} @@ -99,13 +96,13 @@ ${CMAKE_CURRENT_BINARY_DIR}/${LIBNAME}.pc @ONLY ) - -install(TARGETS ${LIBNAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) +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/PackageKit/${LIBNAME} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${LIBNAME}/PackageKit/ ) add_subdirectory(modules) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/bitfield.cpp new/PackageKit-Qt-0.9.5/src/bitfield.cpp --- old/PackageKit-Qt-0.9.2/src/bitfield.cpp 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/bitfield.cpp 2014-10-10 17:11:54.000000000 +0200 @@ -2,7 +2,7 @@ using namespace PackageKit; -Bitfield::Bitfield () : m_val (0) +Bitfield::Bitfield () { } @@ -61,10 +61,15 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/bitfield.h new/PackageKit-Qt-0.9.5/src/bitfield.h --- old/PackageKit-Qt-0.9.2/src/bitfield.h 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/bitfield.h 2014-10-10 17:11:54.000000000 +0200 @@ -2,6 +2,7 @@ #define PACKAGEKIT_BITFIELD_H #include <QtGlobal> +#include <QMetaType> namespace PackageKit { @@ -23,11 +24,14 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/common.h new/PackageKit-Qt-0.9.5/src/common.h --- old/PackageKit-Qt-0.9.2/src/common.h 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/common.h 2014-10-10 17:11:54.000000000 +0200 @@ -34,5 +34,3 @@ #define AUTH_SYSTEM_SOURCES_REFRESH "org.freedesktop.packagekit.system-sources-refresh" #define AUTH_SYSTEM_NETWORK_PROXY_CONFIGURE "org.freedesktop.packagekit.system-network-proxy-configure" #define AUTH_CANCEL_FOREIGN "org.freedesktop.packagekit.cancel-foreign" - -#define PK_DESKTOP_DEFAULT_DATABASE LOCALSTATEDIR "/lib/PackageKit/desktop-files.db" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/daemon.cpp new/PackageKit-Qt-0.9.5/src/daemon.cpp --- old/PackageKit-Qt-0.9.2/src/daemon.cpp 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/daemon.cpp 2014-10-10 17:11:54.000000000 +0200 @@ -19,9 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include <QtSql> -#include <QDebug> - #include "daemon.h" #include "daemonprivate.h" #include "transactionprivate.h" @@ -47,10 +44,10 @@ 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), @@ -58,33 +55,6 @@ QLatin1String("PropertiesChanged"), this, SLOT(propertiesChanged(QString,QVariantMap,QStringList))); - - // Set up database for desktop files - QSqlDatabase db; - db = QSqlDatabase::addDatabase("QSQLITE", PK_DESKTOP_DEFAULT_DATABASE); - db.setDatabaseName(PK_DESKTOP_DEFAULT_DATABASE); - 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 +64,7 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/daemon.h new/PackageKit-Qt-0.9.5/src/daemon.h --- old/PackageKit-Qt-0.9.2/src/daemon.h 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/daemon.h 2014-10-10 17:11:54.000000000 +0200 @@ -277,8 +277,10 @@ /** * Returns the package icon from the \p packageID + * + * @deprecated use Appstream to fetch icons */ - Q_INVOKABLE static QString packageIcon(const QString &packageID); + Q_INVOKABLE QT_DEPRECATED static QString packageIcon(const QString &packageID); /** * Returns the string representing the enum @@ -364,7 +366,7 @@ * \note You need to manually restart the transaction which triggered the EULA. * \sa eulaRequired() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *acceptEula(const QString &eulaID); @@ -372,7 +374,7 @@ * Download the given \p packages to a temp dir, if \p storeInCache is true * the download will be stored in the package manager cache * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *downloadPackages(const QStringList &packageIDs, bool storeInCache = false); @@ -380,7 +382,7 @@ * This is a convenience function to download this \p package * \sa downloadPackages(const QStringList &packageIDs, bool storeInCache = false) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *downloadPackage(const QString &packageID, bool storeInCache = false); @@ -389,7 +391,7 @@ * * \sa category * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getCategories(); @@ -402,7 +404,7 @@ * * \note This method emits \sa package() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *dependsOn(const QStringList &packageIDs, Transaction::Filters filters = Transaction::FilterNone, bool recursive = false); @@ -410,7 +412,7 @@ * Convenience function to get the dependencies of this \p package * \sa dependsOn(const QStringList &packageIDs, Filters filters, bool recursive = false) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *dependsOn(const QString &packageID, Transaction::Filters filters = Transaction::FilterNone, bool recursive = false); @@ -421,7 +423,7 @@ * \note This method emits \sa package() * with details set * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getDetails(const QStringList &packageIDs); @@ -429,7 +431,7 @@ * Convenience function to get the details about this \p package * \sa getDetails(const QStringList &packageIDs) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getDetails(const QString &packageID); @@ -440,7 +442,7 @@ * \note This method emits \sa package() * with details set * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getDetailsLocal(const QStringList &files); @@ -451,7 +453,7 @@ * \note This method emits \sa package() * with details set * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getDetailsLocal(const QString &file); @@ -460,7 +462,7 @@ * * \note This method emits \sa files() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getFiles(const QStringList &packageIDs); @@ -468,7 +470,7 @@ * Convenience function to get the files contained in this \p package * \sa getFiles(const QStringList &packageIDs) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getFiles(const QString &packageIDs); @@ -477,7 +479,7 @@ * * \note This method emits \sa files() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getFilesLocal(const QStringList &files); @@ -486,7 +488,7 @@ * * \note This method emits \sa files() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getFilesLocal(const QString &file); @@ -496,7 +498,7 @@ * \note You must delete these transactions yourself * \note This method emits \sa transaction() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getOldTransactions(uint number); @@ -505,7 +507,7 @@ * * \note This method emits \sa package() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getPackages(Transaction::Filters filters = Transaction::FilterNone); @@ -514,7 +516,7 @@ * * \note This method emits \sa repository() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getRepoList(Transaction::Filters filters = Transaction::FilterNone); @@ -527,7 +529,7 @@ * * \note This method emits \sa package() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *requiredBy(const QStringList &packageIDs, Transaction::Filters filters = Transaction::FilterNone, bool recursive = false); @@ -535,7 +537,7 @@ * Convenience function to get packages requiring this package * \sa requiredBy(const QStringList &packageIDs, Filters filters, bool recursive = false) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *requiredBy(const QString &packageID, Transaction::Filters filters = Transaction::FilterNone, bool recursive = false); @@ -544,7 +546,7 @@ * * \note This method emits \sa updateDetail() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getUpdatesDetails(const QStringList &packageIDs); @@ -552,7 +554,7 @@ * Convenience function to get update details * \sa getUpdateDetail(const QStringList &packageIDs) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getUpdateDetail(const QString &packageID); @@ -563,7 +565,7 @@ * * \note This method emits \sa package() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getUpdates(Transaction::Filters filters = Transaction::FilterNone); @@ -572,7 +574,7 @@ * * \note This method emits \sa distroUpgrade() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getDistroUpgrades(); @@ -583,7 +585,7 @@ * * \note This method emits \sa package() and \sa changed() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *installFiles(const QStringList &files, Transaction::TransactionFlags flags = Transaction::TransactionFlagOnlyTrusted); @@ -591,7 +593,7 @@ * Convenience function to install a file * \sa installFiles(const QStringList &files, TransactionFlags flags) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *installFile(const QString &file, Transaction::TransactionFlags flags = Transaction::TransactionFlagOnlyTrusted); @@ -602,7 +604,7 @@ * * \note This method emits \sa package() and \sa changed() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *installPackages(const QStringList &packageIDs, Transaction::TransactionFlags flags = Transaction::TransactionFlagOnlyTrusted); @@ -610,7 +612,7 @@ * Convenience function to install a package * \sa installPackages(const QStringList &packageIDs, TransactionFlags flags) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *installPackage(const QString &packageID, Transaction::TransactionFlags flags = Transaction::TransactionFlagOnlyTrusted); @@ -619,7 +621,7 @@ * * \p type, \p keyId and \p package generally come from the Transaction::repoSignatureRequired * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *installSignature(Transaction::SigType type, const QString &keyID, const QString &packageID); @@ -628,7 +630,7 @@ * * \note This method emits \sa changed() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *refreshCache(bool force); @@ -641,7 +643,7 @@ * * \note This method emits \sa package() and \sa changed() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *removePackages(const QStringList &packageIDs, bool allowDeps = false, bool autoRemove = false, Transaction::TransactionFlags flags = Transaction::TransactionFlagOnlyTrusted); @@ -650,21 +652,21 @@ * * \sa removePackages(const PackageList &packages, bool allowDeps = false, bool autoRemove = false, TransactionFlags flags) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *removePackage(const QString &packageID, bool allowDeps = false, bool autoRemove = false, Transaction::TransactionFlags flags = Transaction::TransactionFlagOnlyTrusted); /** * Repairs a broken system * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *repairSystem(Transaction::TransactionFlags flags = Transaction::TransactionFlagOnlyTrusted); /** * Activates or disables a repository * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *repoEnable(const QString &repoId, bool enable = true); @@ -673,14 +675,14 @@ * * \p autoremove packages from this repository * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *repoRemove(const QString &repoId, bool autoremove, Transaction::TransactionFlags flags = Transaction::TransactionFlagNone); /** * Sets a repository's parameter * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *repoSetData(const QString &repoId, const QString &parameter, const QString &value); @@ -691,7 +693,7 @@ * * \note This method emits \sa package() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *resolve(const QStringList &packageNames, Transaction::Filters filters = Transaction::FilterNone); @@ -699,7 +701,7 @@ * Convenience function to remove a package name * \sa resolve(const QStringList &packageNames, Transaction::Filters filters = Transaction::FilterNone) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *resolve(const QString &packageName, Transaction::Filters filters = Transaction::FilterNone); @@ -710,7 +712,7 @@ * * \note This method emits \sa package() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *searchFiles(const QStringList &search, Transaction::Filters filters = Transaction::FilterNone); @@ -718,7 +720,7 @@ * Convenience function to search for a file * \sa searchFiles(const QStringList &search, Transaction::Filters filters = Transaction::FilterNone) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *searchFiles(const QString &search, Transaction::Filters filters = Transaction::FilterNone); @@ -729,7 +731,7 @@ * * \note This method emits \sa package() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *searchDetails(const QStringList &search, Transaction::Filters filters = Transaction::FilterNone); @@ -737,7 +739,7 @@ * Convenience function to search by details * \sa searchDetails(const QStringList &search, Transaction::Filters filters = Transaction::FilterNone) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *searchDetails(const QString &search, Transaction::Filters filters = Transaction::FilterNone); @@ -750,7 +752,7 @@ * * \note This method emits \sa package() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *searchGroups(const QStringList &groups, Transaction::Filters filters = Transaction::FilterNone); @@ -758,7 +760,7 @@ * Convenience function to search by group string * \sa searchGroups(const QStringList &groups, Transaction::Filters filters = Transaction::FilterNone) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *searchGroup(const QString &group, Transaction::Filters filters = Transaction::FilterNone); @@ -766,7 +768,7 @@ * Convenience function to search by group enum * \sa searchGroups(const QStringList &groups, Transaction::Filters filters = Transaction::FilterNone) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *searchGroup(Transaction::Group group, Transaction::Filters filters = Transaction::FilterNone); @@ -777,7 +779,7 @@ * * \note This method emits \sa package() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *searchGroups(Transaction::Groups group, Transaction::Filters filters = Transaction::FilterNone); @@ -788,7 +790,7 @@ * * \note This method emits \sa package() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *searchNames(const QStringList &search, Transaction::Filters filters = Transaction::FilterNone); @@ -796,7 +798,7 @@ * Convenience function to search by names * \sa searchNames(const QStringList &search, Filters filters) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *searchNames(const QString &search, Transaction::Filters filters = Transaction::FilterNone); @@ -806,7 +808,7 @@ * \p onlyTrusted indicates if this transaction is only allowed to install trusted packages * \note This method emits \sa package() and \sa changed() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *updatePackages(const QStringList &packageIDs, Transaction::TransactionFlags flags = Transaction::TransactionFlagOnlyTrusted); @@ -814,7 +816,7 @@ * Convenience function to update a package * \sa updatePackages(const QStringList &packageIDs, TransactionFlags flags) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *updatePackage(const QString &packageID, Transaction::TransactionFlags flags = Transaction::TransactionFlagOnlyTrusted); @@ -823,7 +825,7 @@ * * \note This method emits \sa package() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *whatProvides(const QStringList &search, Transaction::Filters filters = Transaction::FilterNone); @@ -831,7 +833,7 @@ * Convenience function to search for what provides * \sa whatProvides(Provides type, const QStringList &search, Transaction::Filters filters = Transaction::FilterNone) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *whatProvides(const QString &search, Transaction::Filters filters = Transaction::FilterNone); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/daemonprivate.cpp new/PackageKit-Qt-0.9.5/src/daemonprivate.cpp --- old/PackageKit-Qt-0.9.2/src/daemonprivate.cpp 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/daemonprivate.cpp 2014-10-10 17:11:54.000000000 +0200 @@ -124,7 +124,7 @@ } 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/daemonprivate.h new/PackageKit-Qt-0.9.5/src/daemonprivate.h --- old/PackageKit-Qt-0.9.2/src/daemonprivate.h 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/daemonprivate.h 2014-10-10 17:11:54.000000000 +0200 @@ -27,7 +27,7 @@ #include "daemon.h" -class DaemonProxy; +class OrgFreedesktopPackageKitInterface; namespace PackageKit { @@ -39,7 +39,7 @@ virtual ~DaemonPrivate() {} Daemon *q_ptr; - ::DaemonProxy *daemon; + ::OrgFreedesktopPackageKitInterface *daemon; QStringList hints; QStringList connectedSignals; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/modules/packagekit-qt-config.cmake.in new/PackageKit-Qt-0.9.5/src/modules/packagekit-qt-config.cmake.in --- old/PackageKit-Qt-0.9.2/src/modules/packagekit-qt-config.cmake.in 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/modules/packagekit-qt-config.cmake.in 2014-10-10 17:11:54.000000000 +0200 @@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/packagekitqt4.pc.in new/PackageKit-Qt-0.9.5/src/packagekitqt4.pc.in --- old/PackageKit-Qt-0.9.2/src/packagekitqt4.pc.in 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/packagekitqt4.pc.in 2014-10-10 17:11:54.000000000 +0200 @@ -1,11 +1,11 @@ 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. Version: @VERSION@ -Requires: QtCore, QtDBus, QtSql, QtXml +Requires: QtCore, QtDBus, QtXml Libs: -L${libdir} -l@LIBNAME@ Cflags: -I${includedir}/PackageKit/@LIBNAME@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/packagekitqt5.pc.in new/PackageKit-Qt-0.9.5/src/packagekitqt5.pc.in --- old/PackageKit-Qt-0.9.2/src/packagekitqt5.pc.in 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/packagekitqt5.pc.in 2014-10-10 17:11:54.000000000 +0200 @@ -1,11 +1,11 @@ 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. Version: @VERSION@ -Requires: Qt5Core, Qt5DBus, Qt5Sql, Qt5Xml +Requires: Qt5Core, Qt5DBus, Qt5Xml Libs: -L${libdir} -l@LIBNAME@ Cflags: -I${includedir}/PackageKit/@LIBNAME@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/transaction.cpp new/PackageKit-Qt-0.9.5/src/transaction.cpp --- old/PackageKit-Qt-0.9.2/src/transaction.cpp 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/transaction.cpp 2014-10-10 17:11:54.000000000 +0200 @@ -26,7 +26,6 @@ #include "daemon.h" #include "common.h" -#include <QSqlQuery> #include <QDBusError> using namespace PackageKit; @@ -215,37 +214,7 @@ QString Transaction::packageIcon(const QString &packageID) { - QString path; - QSqlDatabase db = QSqlDatabase::database(PK_DESKTOP_DEFAULT_DATABASE); - if (!db.isOpen()) { - qDebug() << "Desktop files database is not open"; - return path; - } - - QSqlQuery q(db); - q.prepare("SELECT filename FROM cache WHERE package = :name"); - q.bindValue(":name", Transaction::packageName(packageID)); - if (q.exec()) { - if (q.next()) { - QFile desktopFile(q.value(0).toString()); - if (desktopFile.open(QIODevice::ReadOnly | QIODevice::Text)) { - while (!desktopFile.atEnd()) { - QByteArray line = desktopFile.readLine().trimmed(); - if (line.startsWith("Icon=")) { - path = line.mid(5); - break; - } - } - desktopFile.close(); - } else { - qDebug() << "Cannot open desktop file " << q.value(0).toString(); - } - } - } else { - qDebug() << "Error while running query " << q.executedQuery(); - } - - return path; + return QString(); } QString Transaction::lastPackage() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/transaction.h new/PackageKit-Qt-0.9.5/src/transaction.h --- old/PackageKit-Qt-0.9.2/src/transaction.h 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/transaction.h 2014-10-10 17:11:54.000000000 +0200 @@ -140,7 +140,6 @@ RoleGetDistroUpgrades, RoleGetCategories, RoleGetOldTransactions, - RoleUpgradeSystem, // Since 0.6.11 RoleRepairSystem, // Since 0.7.2 RoleGetDetailsLocal, // Since 0.8.17 RoleGetFilesLocal, // Since 0.9.1 @@ -650,7 +649,7 @@ /** * Cancels the transaction * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ Q_INVOKABLE QDBusPendingReply<> cancel(); @@ -676,8 +675,10 @@ /** * Returns the package icon from the \p packageID + * + * @deprecated use Appstream to fetch icons */ - static QString packageIcon(const QString &packageID); + static QT_DEPRECATED QString packageIcon(const QString &packageID); Q_SIGNALS: void allowCancelChanged(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/transactionprivate.cpp new/PackageKit-Qt-0.9.5/src/transactionprivate.cpp --- old/PackageKit-Qt-0.9.2/src/transactionprivate.cpp 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/transactionprivate.cpp 2014-10-10 17:11:54.000000000 +0200 @@ -46,10 +46,10 @@ 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 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/transactionprivate.h new/PackageKit-Qt-0.9.5/src/transactionprivate.h --- old/PackageKit-Qt-0.9.2/src/transactionprivate.h 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/transactionprivate.h 2014-10-10 17:11:54.000000000 +0200 @@ -29,7 +29,7 @@ #include "transaction.h" -class TransactionProxy; +class OrgFreedesktopPackageKitTransactionInterface; namespace PackageKit { @@ -45,7 +45,7 @@ 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 28 Nov '14

28 Nov '14

Hello community, here is the log from the commit of package PackageKit for openSUSE:Factory checked in at 2014-11-28 08:45:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-10-29 21:09:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.PackageKit.new/PackageKit.changes 2014-11-28 08:46:01.000000000 +0100 @@ -2 +2,19 @@ -Wed Oct 22 11:00:10 UTC 2014 - dle1gis(a)leuenberger.net +Wed Nov 19 16:47:33 UTC 2014 - zaitor(a)opensuse.org + +- Update to version 1.0.3: + + Libraries: glib: Add support for reinstallation and downgrades. + + Backends: + - hif: + . Add support for reinstall and downgrade. + . Use hif_context_set_vendor_cache_dir() to be smarter about + the vendor cache. + . Use repo loader provided by the context. + - zypp: + . Improve progress status. + . Propagate install errors to PK. + . Remap 'recommended' patches to 'BUGFIX'. + + New Features: Add reinstall and downgrade support to pkcon. +- Drop PackageKit-zypp-progress-info.patch: Fixed upstream. + +------------------------------------------------------------------- +Wed Oct 22 11:00:10 UTC 2014 - dimstar(a)opensuse.org Old: ---- PackageKit-1.0.1.tar.xz PackageKit-zypp-progress-info.patch New: ---- PackageKit-1.0.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ --- /var/tmp/diff_new_pack.aTfteT/_old 2014-11-28 08:46:02.000000000 +0100 +++ /var/tmp/diff_new_pack.aTfteT/_new 2014-11-28 08:46:02.000000000 +0100 @@ -21,7 +21,7 @@ %define with_offline_updates 1 Name: PackageKit -Version: 1.0.1 +Version: 1.0.3 Release: 0 Summary: Simple software installation management software License: GPL-2.0+ @@ -34,8 +34,6 @@ Patch1: 0001-Change-the-configuration-of-the-cron-script-to-a-sys.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-FEATURE-UPSTREAM PackageKit-zypp-progress-info.patch boo#863735 dimstar(a)opensuse.org -- Pass overall progress information to PackageKitd. -Patch4: PackageKit-zypp-progress-info.patch BuildRequires: NetworkManager-devel BuildRequires: automake BuildRequires: docbook-utils @@ -234,7 +232,6 @@ %setup -q %patch1 -p1 %patch3 -p1 -%patch4 -p1 translation-update-upstream %build ++++++ PackageKit-1.0.1.tar.xz -> PackageKit-1.0.3.tar.xz ++++++ ++++ 80826 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 suspend for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '14

28 Nov '14

Hello community, here is the log from the commit of package suspend for openSUSE:Factory checked in at 2014-11-28 08:45:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/suspend (Old) and /work/SRC/openSUSE:Factory/.suspend.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "suspend" Changes: -------- --- /work/SRC/openSUSE:Factory/suspend/suspend.changes 2014-05-14 10:26:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.suspend.new/suspend.changes 2014-11-28 08:45:59.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 21 12:59:44 UTC 2014 - seife+obs(a)b1-systems.com + +- remove mkinitrd scripts, mkinitrd is no longer used and it seems + to work with dracut already (bsc#893574) + +------------------------------------------------------------------- Old: ---- mkinitrd-boot.kernel.sh mkinitrd-boot.userspace.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suspend.spec ++++++ --- /var/tmp/diff_new_pack.088OFP/_old 2014-11-28 08:46:00.000000000 +0100 +++ /var/tmp/diff_new_pack.088OFP/_new 2014-11-28 08:46:00.000000000 +0100 @@ -48,8 +48,6 @@ Source: http://sourceforge.net/projects/suspend/files/suspend/suspend-1.0/%name-uti… Source2: configure-suspend-encryption.sh Source3: README.scripts -Source4: mkinitrd-boot.kernel.sh -Source5: mkinitrd-boot.userspace.sh Patch1: suspend-comment-configfile-options.diff Patch2: suspend-susescripts.diff Patch3: suspend-default-compress.diff @@ -134,9 +132,6 @@ %install install -d $RPM_BUILD_ROOT/etc make install DESTDIR=$RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts -install -m 755 %{S:4} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-resume.kernel.sh -install -m 755 %{S:5} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-resume.userspace.sh %if 0%{?suse_version} < 1320 install -m 755 %{S:2} $RPM_BUILD_ROOT/usr/sbin/ touch $RPM_BUILD_ROOT/etc/suspend.key @@ -188,10 +183,6 @@ %files %defattr (-,root,root) %config /etc/suspend.conf -%dir /lib/mkinitrd -%dir /lib/mkinitrd/scripts -/lib/mkinitrd/scripts/boot-resume.kernel.sh -/lib/mkinitrd/scripts/boot-resume.userspace.sh /usr/sbin/s2disk /usr/sbin/s2ram /usr/sbin/s2both -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit desktop-data-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '14

28 Nov '14

Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at 2014-11-28 08:45:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/desktop-data-openSUSE (Old) and /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "desktop-data-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data-openSUSE.changes 2014-11-14 09:18:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new/desktop-data-openSUSE.changes 2014-11-28 08:45:55.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 14 13:04:22 UTC 2014 - gber(a)opensuse.org + +- Remove package-manager.desktop again, yast2-packager now provides + yast2-packager.desktop which handles rpm files again +- optimize update_rpm script and fix git URL + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ desktop-data-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.7RBWny/_old 2014-11-28 08:45:59.000000000 +0100 +++ /var/tmp/diff_new_pack.7RBWny/_new 2014-11-28 08:45:59.000000000 +0100 @@ -109,7 +109,6 @@ do %suse_update_desktop_file "$i" done -%suse_update_desktop_file package-manager # # define default mouse cursor # @@ -163,7 +162,6 @@ %dir /usr/share/icons/oxygen/32x32/apps /usr/share/icons/oxygen/*/*/* /usr/share/pixmaps/* -/usr/share/applications/package-manager.desktop /etc/profile.d/desktop-data.* /var/adm/fillup-templates/sysconfig.windowmanager-%name /usr/bin/call-browser ++++++ desktop-data.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data.tar.bz2 /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new/desktop-data.tar.bz2 differ: char 11, line 1 ++++++ update_rpm ++++++ --- /var/tmp/diff_new_pack.7RBWny/_old 2014-11-28 08:45:59.000000000 +0100 +++ /var/tmp/diff_new_pack.7RBWny/_new 2014-11-28 08:45:59.000000000 +0100 @@ -1,11 +1,10 @@ #! /bin/sh -opwd=$PWD -tdir=`mktemp -d` -cd $tdir || exit 1 -git clone git://gitorious.org/opensuse/desktop-data.git +opwd="$PWD" +trap '[ -n "${tdir}" ] && { cd /; rm -rf -- "${tdir}"; }' EXIT +tdir="$(mktemp -d)" +cd "${tdir}" || exit 1 +git clone https://github.com/openSUSE/desktop-data.git || exit 1 rm desktop-data/update_rpm rm -rf desktop-data/.git -tar -cvj -f $opwd/desktop-data.tar.bz2 desktop-data -cd / -rm -rf $tdir +tar -cvj -f "${opwd}/desktop-data.tar.bz2" desktop-data -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-country for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '14

28 Nov '14

Hello community, here is the log from the commit of package yast2-country for openSUSE:Factory checked in at 2014-11-28 08:45:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-country (Old) and /work/SRC/openSUSE:Factory/.yast2-country.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-country" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes 2014-09-18 07:12:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-country.new/yast2-country.changes 2014-11-28 08:45:54.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Nov 20 09:05:36 UTC 2014 - ancor(a)suse.com + +- More intuitive order when navigating with the tab key + in the timezone selection screen (bnc#872341). +- 3.1.14 + +------------------------------------------------------------------- Old: ---- yast2-country-3.1.13.tar.bz2 New: ---- yast2-country-3.1.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.8S2xhe/_old 2014-11-28 08:45:55.000000000 +0100 +++ /var/tmp/diff_new_pack.8S2xhe/_new 2014-11-28 08:45:55.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 3.1.13 +Version: 3.1.14 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-country-3.1.13.tar.bz2 -> yast2-country-3.1.14.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.13/.travis.yml new/yast2-country-3.1.14/.travis.yml --- old/yast2-country-3.1.13/.travis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-country-3.1.14/.travis.yml 2014-11-21 11:44:12.000000000 +0100 @@ -0,0 +1,16 @@ +language: cpp +compiler: + - gcc +before_install: + # disable rvm, use system Ruby + - rvm reset + - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/tr… + - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2 yast2-ruby-bindings yast2-perl-bindings" -g "rspec:2.14.1 yast-rake gettext" +script: + - rake check:syntax + - rake check:pot + - make -f Makefile.cvs + - make + - sudo make install + - make check + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.13/MAINTAINER new/yast2-country-3.1.14/MAINTAINER --- old/yast2-country-3.1.13/MAINTAINER 2014-09-15 17:04:10.000000000 +0200 +++ new/yast2-country-3.1.14/MAINTAINER 2014-11-21 11:44:12.000000000 +0100 @@ -1 +1 @@ -Jiri Suchomel <jsuchome(a)suse.cz> +Deprecated file. Use `osc maintainer yast2-country` instead. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.13/README.markdown new/yast2-country-3.1.14/README.markdown --- old/yast2-country-3.1.13/README.markdown 2014-09-15 17:04:10.000000000 +0200 +++ new/yast2-country-3.1.14/README.markdown 2014-11-21 11:44:12.000000000 +0100 @@ -1,4 +1,7 @@ -# YaST - The basic libraries # +# YaST - The Basic Libraries # + +[![Travis Build](https://travis-ci.org/yast/yast-country.svg?branch=master)](https://… +[![Jenkins Build](http://img.shields.io/jenkins/s/https/ci.opensuse.org/yast-country-m… Country specific data and configuration modules (language, keyboard, timezone) for YaST2. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.13/package/yast2-country.changes new/yast2-country-3.1.14/package/yast2-country.changes --- old/yast2-country-3.1.13/package/yast2-country.changes 2014-09-15 17:04:11.000000000 +0200 +++ new/yast2-country-3.1.14/package/yast2-country.changes 2014-11-21 11:44:12.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Nov 20 09:05:36 UTC 2014 - ancor(a)suse.com + +- More intuitive order when navigating with the tab key + in the timezone selection screen (bnc#872341). +- 3.1.14 + +------------------------------------------------------------------- Fri Sep 12 11:07:44 UTC 2014 - ancor(a)suse.com - Added support for inferring the missing keyboard layout from the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.13/package/yast2-country.spec new/yast2-country-3.1.14/package/yast2-country.spec --- old/yast2-country-3.1.13/package/yast2-country.spec 2014-09-15 17:04:11.000000000 +0200 +++ new/yast2-country-3.1.14/package/yast2-country.spec 2014-11-21 11:44:12.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 3.1.13 +Version: 3.1.14 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.13/timezone/src/include/timezone/dialogs.rb new/yast2-country-3.1.14/timezone/src/include/timezone/dialogs.rb --- old/yast2-country-3.1.13/timezone/src/include/timezone/dialogs.rb 2014-09-15 17:04:11.000000000 +0200 +++ new/yast2-country-3.1.14/timezone/src/include/timezone/dialogs.rb 2014-11-21 11:44:12.000000000 +0100 @@ -654,11 +654,7 @@ HSpacing(), HWeight( 2, - ReplacePoint( - Id(:tzsel), - # title for combo box 'timezone' - ComboBox(Id(:timezone), Opt(:notify), _("Time &Zone")) - ) + ComboBox(Id(:timezone), Opt(:notify), _("Time &Zone")) ), HSpacing(), HWeight(1, HStretch()) @@ -689,11 +685,7 @@ Timezone.Region ), HSpacing(), - ReplacePoint( - Id(:tzsel), - # title for selection box 'timezone' - SelectionBox(Id(:timezone), Opt(:notify), _("Time &Zone")) - ) + SelectionBox(Id(:timezone), Opt(:notify), _("Time &Zone")) ), HBox( HSpacing(), @@ -758,23 +750,10 @@ UI.ChangeWidget(Id(:region), :CurrentItem, sel2) end - UI.ReplaceWidget( - Id(:tzsel), - timezone_selector ? - ComboBox( - Id(:timezone), - Opt(:notify), - # label text - _("Time &Zone"), - get_timezones_for_region.call(sel2, zone) - ) : - SelectionBox( - Id(:timezone), - Opt(:notify), - # label text - _("Time &Zone"), - get_timezones_for_region.call(sel2, zone) - ) + UI.ChangeWidget( + Id(:timezone), + :Items, + get_timezones_for_region.call(sel2, zone) ) nil -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit thai-fonts for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '14

28 Nov '14

Hello community, here is the log from the commit of package thai-fonts for openSUSE:Factory checked in at 2014-11-28 08:45:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/thai-fonts (Old) and /work/SRC/openSUSE:Factory/.thai-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "thai-fonts" Changes: -------- --- /work/SRC/openSUSE:Factory/thai-fonts/thai-fonts.changes 2014-03-31 20:45:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.thai-fonts.new/thai-fonts.changes 2014-11-28 08:45:51.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Nov 18 14:56:21 UTC 2014 - pgajdos(a)suse.com + +- updated to 0.6.1: + * New font: Laksaman (Sarabun derivative). + * Split fontconfig files to allow individual fonts installation. + * LaTeX options for setting default fonts. + +------------------------------------------------------------------- Old: ---- fonts-tlwg-0.6.0.tar.xz New: ---- fonts-tlwg-0.6.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ thai-fonts.spec ++++++ --- /var/tmp/diff_new_pack.MnGQhY/_old 2014-11-28 08:45:52.000000000 +0100 +++ /var/tmp/diff_new_pack.MnGQhY/_new 2014-11-28 08:45:52.000000000 +0100 @@ -17,7 +17,7 @@ Name: thai-fonts -Version: 0.6.0 +Version: 0.6.1 Release: 0 Summary: A Collection of Thai TrueType Fonts License: GPL-2.0-with-font-exception and LPPL-1.3c @@ -63,7 +63,21 @@ %doc AUTHORS COPYING NEWS README ChangeLog %{_ttfontsdir} %files_fontsconf_availdir -%files_fontsconf_file 64-ttf-thai-tlwg.conf -%files_fontsconf_file 89-ttf-thai-tlwg-synthetic.conf +%files_fontsconf_file 64-01-tlwg-kinnari.conf +%files_fontsconf_file 64-02-tlwg-norasi.conf +%files_fontsconf_file 64-11-tlwg-waree.conf +%files_fontsconf_file 64-12-tlwg-loma.conf +%files_fontsconf_file 64-13-tlwg-garuda.conf +%files_fontsconf_file 64-14-tlwg-umpush.conf +%files_fontsconf_file 64-15-laksaman.conf +%files_fontsconf_file 64-21-tlwg-typo.conf +%files_fontsconf_file 64-22-tlwg-typist.conf +%files_fontsconf_file 64-23-tlwg-mono.conf +%files_fontsconf_file 89-tlwg-garuda-synthetic.conf +%files_fontsconf_file 89-tlwg-kinnari-synthetic.conf +%files_fontsconf_file 89-tlwg-loma-synthetic.conf +%files_fontsconf_file 89-tlwg-umpush-synthetic.conf +%files_fontsconf_file 89-tlwg-waree-synthetic.conf +%files_fontsconf_file 89-tlwg-laksaman-synthetic.conf %changelog ++++++ fonts-tlwg-0.6.0.tar.xz -> fonts-tlwg-0.6.1.tar.xz ++++++ ++++ 95121 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 vm-install for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '14

28 Nov '14

Hello community, here is the log from the commit of package vm-install for openSUSE:Factory checked in at 2014-11-28 08:44:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vm-install (Old) and /work/SRC/openSUSE:Factory/.vm-install.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vm-install" Changes: -------- --- /work/SRC/openSUSE:Factory/vm-install/vm-install.changes 2014-09-05 09:34:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vm-install.new/vm-install.changes 2014-11-28 08:45:02.000000000 +0100 @@ -1,0 +2,15 @@ +Tue Nov 4 16:20:03 MST 2014 - carnold(a)suse.com + +- bnc#906248 - opensuse 13.2 i586 bit not installable as xen pv-guest +- Add i686 arch for kernel/initrd lookup +- Remove unused ia64 code +- Version 0.8.34 + +------------------------------------------------------------------- +Tue Nov 4 16:20:03 MST 2014 - carnold(a)suse.com + +- bnc#886623 - vm-install: GtkWarning: IA__gtk_widget_event: + assertion 'WIDGET_REALIZED_FOR_EVENT (widget, event)' failed gtk.main() +- Version 0.8.33 + +------------------------------------------------------------------- Old: ---- vm-install-0.8.32.tar.bz2 New: ---- vm-install-0.8.34.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vm-install.spec ++++++ --- /var/tmp/diff_new_pack.0hns2A/_old 2014-11-28 08:45:04.000000000 +0100 +++ /var/tmp/diff_new_pack.0hns2A/_new 2014-11-28 08:45:04.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: vm-install %if %suse_version <= 1230 %define with_vminstall_as_default_installer 1 @@ -26,12 +27,12 @@ %endif # For directory ownership: BuildRequires: yast2 -Version: 0.8.32 +Version: 0.8.34 Release: 0 Summary: Tool to Define a Virtual Machine and Install Its Operating System License: GPL-2.0 Group: System/Emulators/PC -Source0: %{name}-0.8.32.tar.bz2 +Source0: %{name}-0.8.34.tar.bz2 Source1: vm-install.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 s390x ppc64le ++++++ vm-install-0.8.32.tar.bz2 -> vm-install-0.8.34.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.32/Makefile new/vm-install-0.8.34/Makefile --- old/vm-install-0.8.32/Makefile 2014-09-03 23:29:58.000000000 +0200 +++ new/vm-install-0.8.34/Makefile 2014-11-20 22:11:12.000000000 +0100 @@ -1,5 +1,5 @@ PACKAGE = vm-install -VER = 0.8.32 +VER = 0.8.34 default: @echo "Run 'make install DESTDIR=$destdir' to install." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.32/setup.py new/vm-install-0.8.34/setup.py --- old/vm-install-0.8.32/setup.py 2014-09-03 23:29:54.000000000 +0200 +++ new/vm-install-0.8.34/setup.py 2014-11-20 22:11:06.000000000 +0100 @@ -1,7 +1,7 @@ from distutils.core import setup setup(name='vminstall', - version='0.8.32', + version='0.8.34', description='Define a virtual machine and install its operating system', author='Charles Coffing', author_email='ccoffing(a)novell.com', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.32/src/vminstall/VMSUSE.py new/vm-install-0.8.34/src/vminstall/VMSUSE.py --- old/vm-install-0.8.32/src/vminstall/VMSUSE.py 2014-05-14 21:17:13.000000000 +0200 +++ new/vm-install-0.8.34/src/vminstall/VMSUSE.py 2014-11-20 21:54:16.000000000 +0100 @@ -79,7 +79,13 @@ # The packages may or may not have a version. # There may or may not be a leading path component, specifying the disc. kre = re.compile('\.(/[a-zA-Z0-9]*)?/suse/%s/%s(-[0-9][-_\.0-9a-zA-Z]*)?\.rpm' % (arch, kernel)) - ire = re.compile('\.(/[a-zA-Z0-9]*)?/suse/%s/%s(-[0-9][-_\.0-9a-zA-Z]*)?\.rpm' % (arch, 'install-initrd')) + ire = re.compile('\.(/[a-zA-Z0-9]*)?/suse/%s/%s(-[a-zA-Z0-9]*)?([-_\.0-9a-zA-Z]*)?\.rpm' % (arch, 'install-initrd')) + # Fix old assumption that install-initrd.rpm and kernel-xen.rpm are in same <arch> directory (not true for 13.x 32bit) + if arch == 'i686': + alt_initrd_arch = 'i586' + alt_ire = re.compile('\.(/[a-zA-Z0-9]*)?/suse/%s/%s(-[a-zA-Z0-9]*)?([-_\.0-9a-zA-Z]*)?\.rpm' % (alt_initrd_arch, 'install-initrd')) + else: + alt_ire = alt_initrd_arch = None for line in lines: m = kre.match(line) if m: @@ -92,6 +98,8 @@ break else: m = ire.match(line) + if m is None and alt_ire: + m = alt_ire.match(line) if m: log.debug("Found initrd line: '%s'" % (line,)) paths = line.split('/') @@ -103,7 +111,7 @@ if not kernel_rpm or not initrd_rpm: raise InstSrcError(err=InstSrcError.E_BAD, details=msg.suse_kernel_not_found) - return [kernel_disc, kernel_rpm, initrd_disc, initrd_rpm] + return [alt_initrd_arch, kernel_disc, kernel_rpm, initrd_disc, initrd_rpm] def _buildInitrd(self, krpm, irpm, progress=lambda f:None): (fd, ifn) = tempfile.mkstemp(prefix='inst-initrd.') @@ -213,7 +221,7 @@ fobj = open(index_path) except: raise InstSrcError(InstSrcError.E_BAD, details='\n'.join(searched)) - (arch, ext, kernel_disc, kernel_rpm, initrd_disc, initrd_rpm) = self._getPackageNames(root, fobj, supports_32nonpae) + (arch, ext, alt_initrd_arch, kernel_disc, kernel_rpm, initrd_disc, initrd_rpm) = self._getPackageNames(root, fobj, supports_32nonpae) # FIXME: may have to prompt to swap CDs... @@ -221,7 +229,10 @@ krpm = util.copy_to_temp(kfd, prefix='kernel.', progress=lambda f:progress(f*0.1)) kfd.close() - ifd = open('%s/suse/%s/%s' % (root, arch, initrd_rpm), 'r') + if alt_initrd_arch: + ifd = open('%s/suse/%s/%s' % (root, alt_initrd_arch, initrd_rpm), 'r') + else: + ifd = open('%s/suse/%s/%s' % (root, arch, initrd_rpm), 'r') irpm = util.copy_to_temp(ifd, prefix='install-initrd.', progress=lambda f:progress(0.1+f*0.1)) ifd.close() self.ifn = self._buildInitrd(krpm, irpm, lambda f:progress(0.2+f*0.4)) @@ -293,7 +304,7 @@ try: url = base + '/INDEX.gz' fobj = urlopen(url) - (arch, ext, kernel_disc, kernel_rpm, initrd_disc, initrd_rpm) = self._getPackageNames(base, fobj, supports_32nonpae) + (arch, ext, alt_initrd_arch, kernel_disc, kernel_rpm, initrd_disc, initrd_rpm) = self._getPackageNames(base, fobj, supports_32nonpae) # This is a heuristic: If both are on DVD1 (or CD1, or foo1, ...) # or the disc isn't listed at all, then don't rewrite. If the discs @@ -319,7 +330,10 @@ kfd.close() progress(0.15) - iurl = '/suse/%s/%s' % (arch, initrd_rpm) + if alt_initrd_arch: + iurl = '/suse/%s/%s' % (alt_initrd_arch, initrd_rpm) + else: + iurl = '/suse/%s/%s' % (arch, initrd_rpm) log.debug("URL of initrd is %s" % iurl) url = ibase + iurl ifd = urlopen(url) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.32/src/vminstall/caps.py new/vm-install-0.8.34/src/vminstall/caps.py --- old/vm-install-0.8.32/src/vminstall/caps.py 2014-07-22 16:04:20.000000000 +0200 +++ new/vm-install-0.8.34/src/vminstall/caps.py 2014-11-20 21:57:27.000000000 +0100 @@ -127,20 +127,18 @@ if is_kvm() or is_qemu(): k_arch = kvm_arch() if k_arch == 'x86_64': - arches = [['x86_64', 'default'], ['i586', 'default'], ['i386', 'default']] + arches = [['x86_64', 'default'], ['i686', 'default'], ['i586', 'default'], ['i386', 'default']] elif k_arch == 'i686': - arches = [['i386', 'default'], ['i586', 'default']] + arches = [['i386', 'default'], ['i586', 'default'], ['i686', 'default']] else: arches = [['s390x', 'default']] return arches - if is_ia64_capable(): - arches = [['ia64', 'xen']] - elif is_x86_64_capable(): + if is_x86_64_capable(): if not supports_32nonpae: # SLE11 and newer 32bit support is pae only but is just 'kernel-xen', not 'kernel-xenpae'. - arches = [['i386', 'xen'], ['i586', 'xen'], ['x86_64', 'xen']] + arches = [['i386', 'xen'], ['i586', 'xen'], ['i686', 'xen'], ['x86_64', 'xen']] else: - arches = [['i386', 'xenpae'], ['i586', 'xenpae'], ['x86_64', 'xen']] + arches = [['i386', 'xenpae'], ['i586', 'xenpae'], ['i686', 'xenpae'], ['x86_64', 'xen']] # x86-64 can do either, but prefer to match dom0. if arch() == 'x86_64': arches.reverse() @@ -148,11 +146,11 @@ if is_pae_capable(): if not supports_32nonpae: # SLE11 and newer 32bit support is pae only but is just 'kernel-xen', not 'kernel-xenpae'. - arches = [['i386', 'xen'], ['i586', 'xen']] + arches = [['i386', 'xen'], ['i586', 'xen'], ['i686', 'xen']] else: - arches = [['i386', 'xenpae'], ['i586', 'xenpae']] + arches = [['i386', 'xenpae'], ['i586', 'xenpae'], ['i686', 'xenpae']] else: - arches = [['i386', 'xen'], ['i586', 'xen']] + arches = [['i386', 'xen'], ['i586', 'xen'], ['i686', 'xen']] return arches def kvm_arch(): @@ -168,8 +166,6 @@ if not is_xen(): log.debug("xen_arch.__del__") raise XenError(XenError.E_NO_XEN) - if is_ia64_capable(): - return 'ia64' if is_x86_64_capable(): return 'x86_64' return 'i586' @@ -182,9 +178,6 @@ _caps = open('/sys/hypervisor/properties/capabilities').read().split() return _caps -def is_ia64_capable(): - return 'xen-3.0-ia64' in xen_caps() - def is_x86_64_capable(): return 'xen-3.0-x86_64' in xen_caps() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.32/src/vminstall/gtk/interface.py new/vm-install-0.8.34/src/vminstall/gtk/interface.py --- old/vm-install-0.8.32/src/vminstall/gtk/interface.py 2014-06-13 02:17:53.000000000 +0200 +++ new/vm-install-0.8.34/src/vminstall/gtk/interface.py 2014-11-20 21:52:10.000000000 +0100 @@ -22,6 +22,7 @@ import threading import time import webbrowser +import warnings from disk_widgets import * from gjob import GJob @@ -2232,5 +2233,7 @@ window.topwin.connect("delete-event", gtk.main_quit) window.connect("vmmcreate-closing", gtk.main_quit) window.show() + if not options.debug: + warnings.simplefilter('ignore', Warning) gtk.main() -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit easytag for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '14

28 Nov '14

Hello community, here is the log from the commit of package easytag for openSUSE:Factory checked in at 2014-11-28 08:44:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/easytag (Old) and /work/SRC/openSUSE:Factory/.easytag.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "easytag" Changes: -------- --- /work/SRC/openSUSE:Factory/easytag/easytag.changes 2014-09-30 19:41:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.easytag.new/easytag.changes 2014-11-28 08:44:58.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Nov 25 10:29:38 UTC 2014 - badshah400(a)gmail.com + +- Update to version 2.2.5: + + Fix many memory leaks in the CDDB search dialog. + + Clear empty cover art and album artist fields in MP4 tags. + + Fix a memory leak and invalid read in the MP4 tagging code. + + Improve ID3v2 handling with Ogg files. + + Improve file list selection handling. + + Fix several memory leaks in the file browser. + + Show updated images in the Windows installer. + + Updated translations. + +------------------------------------------------------------------- Old: ---- easytag-2.2.4.tar.xz New: ---- easytag-2.2.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ easytag.spec ++++++ --- /var/tmp/diff_new_pack.yc662v/_old 2014-11-28 08:44:59.000000000 +0100 +++ /var/tmp/diff_new_pack.yc662v/_new 2014-11-28 08:44:59.000000000 +0100 @@ -17,7 +17,7 @@ Name: easytag -Version: 2.2.4 +Version: 2.2.5 Release: 0 Summary: GTK+ tag editor for audio files License: GPL-2.0+ ++++++ easytag-2.2.4.tar.xz -> easytag-2.2.5.tar.xz ++++++ ++++ 6945 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 SDL_ttf for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '14

28 Nov '14

Hello community, here is the log from the commit of package SDL_ttf for openSUSE:Factory checked in at 2014-11-28 08:44:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/SDL_ttf (Old) and /work/SRC/openSUSE:Factory/.SDL_ttf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "SDL_ttf" Changes: -------- --- /work/SRC/openSUSE:Factory/SDL_ttf/SDL_ttf.changes 2013-08-27 21:22:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.SDL_ttf.new/SDL_ttf.changes 2014-11-28 08:44:57.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 20 14:24:16 UTC 2014 - olaf(a)aepfle.de + +- Remove self-obsoletes + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SDL_ttf.spec ++++++ --- /var/tmp/diff_new_pack.zfSj18/_old 2014-11-28 08:44:58.000000000 +0100 +++ /var/tmp/diff_new_pack.zfSj18/_new 2014-11-28 08:44:58.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package SDL_ttf # -# 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 @@ -41,8 +41,8 @@ %package -n %lname Summary: Simple DirectMedia Layer - Truetype Library Group: System/Libraries -Provides: SDL_ttf = %{version} -Obsoletes: SDL_ttf <= %{version} +Provides: SDL_ttf = %version-%release +Obsoletes: SDL_ttf < %version-%release %description -n %lname This is a sample library that allows you to use TrueType fonts in your @@ -53,8 +53,8 @@ Group: Development/Libraries/X11 Requires: %lname = %{version} Requires: libSDL-devel -Provides: SDL_ttf-devel = %{version} -Obsoletes: SDL_ttf-devel <= %{version} +Provides: SDL_ttf-devel = %version-%release +Obsoletes: SDL_ttf-devel < %version-%release %description -n libSDL_ttf-devel This is a sample library that allows you to use TrueType fonts in your -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0