August 2011 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-wagon for openSUSE:Factory
by root＠hilbert.suse.de 02 Aug '11

02 Aug '11

Hello community, here is the log from the commit of package yast2-wagon for openSUSE:Factory checked in at Tue Aug 2 09:03:16 CEST 2011. -------- --- yast2-wagon/yast2-wagon.changes 2011-07-18 15:26:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-wagon/yast2-wagon.changes 2011-08-01 14:06:42.000000000 +0200 @@ -1,0 +2,23 @@ +Mon Aug 1 11:40:57 UTC 2011 - lslezak(a)suse.cz + +- 2.21.4 + +------------------------------------------------------------------- +Fri Jul 29 07:12:14 UTC 2011 - lslezak(a)suse.cz + +- display solver error in the migration propsal, do not allow + starting migration when there is an unsolved problem (bnc#708676) +- do not disable current repositories, minimal migration uses + "DUP from" feature so they can stay enabled (bnc#708632) + +------------------------------------------------------------------- +Thu Jul 28 11:56:48 UTC 2011 - lslezak(a)suse.cz + +- fixed registration status check when registering against SMT + (bnc#708888) +- properly display selected migration type when going back in + the migration workflow (bnc#708667) +- reset and repropose package selection when migration type is + changed (bnc#708641) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-wagon-2.21.3.tar.bz2 New: ---- yast2-wagon-2.21.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-wagon.spec ++++++ --- /var/tmp/diff_new_pack.mIniIZ/_old 2011-08-02 09:01:04.000000000 +0200 +++ /var/tmp/diff_new_pack.mIniIZ/_new 2011-08-02 09:01:04.000000000 +0200 @@ -19,11 +19,11 @@ Name: yast2-wagon -Version: 2.21.3 +Version: 2.21.4 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-wagon-2.21.3.tar.bz2 +Source0: yast2-wagon-2.21.4.tar.bz2 Prefix: /usr @@ -74,7 +74,7 @@ through command line tools. %prep -%setup -n yast2-wagon-2.21.3 +%setup -n yast2-wagon-2.21.4 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-wagon-2.21.3.tar.bz2 -> yast2-wagon-2.21.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.21.3/VERSION new/yast2-wagon-2.21.4/VERSION --- old/yast2-wagon-2.21.3/VERSION 2011-07-18 15:04:17.000000000 +0200 +++ new/yast2-wagon-2.21.4/VERSION 2011-08-01 14:04:36.000000000 +0200 @@ -1 +1 @@ -2.21.3 +2.21.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.21.3/configure new/yast2-wagon-2.21.4/configure --- old/yast2-wagon-2.21.3/configure 2011-07-18 15:25:47.000000000 +0200 +++ new/yast2-wagon-2.21.4/configure 2011-08-01 14:06:10.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-wagon 2.21.3. +# Generated by GNU Autoconf 2.68 for yast2-wagon 2.21.4. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-wagon' PACKAGE_TARNAME='yast2-wagon' -PACKAGE_VERSION='2.21.3' -PACKAGE_STRING='yast2-wagon 2.21.3' +PACKAGE_VERSION='2.21.4' +PACKAGE_STRING='yast2-wagon 2.21.4' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1229,7 +1229,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-wagon 2.21.3 to adapt to many kinds of systems. +\`configure' configures yast2-wagon 2.21.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1300,7 +1300,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-wagon 2.21.3:";; + short | recursive ) echo "Configuration of yast2-wagon 2.21.4:";; esac cat <<\_ACEOF @@ -1380,7 +1380,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-wagon configure 2.21.3 +yast2-wagon configure 2.21.4 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1397,7 +1397,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-wagon $as_me 2.21.3, which was +It was created by yast2-wagon $as_me 2.21.4, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2327,7 +2327,7 @@ # Define the identity of the package. PACKAGE='yast2-wagon' - VERSION='2.21.3' + VERSION='2.21.4' cat >>confdefs.h <<_ACEOF @@ -2449,7 +2449,7 @@ -VERSION="2.21.3" +VERSION="2.21.4" RPMNAME="yast2-wagon" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" @@ -3386,7 +3386,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-wagon $as_me 2.21.3, which was +This file was extended by yast2-wagon $as_me 2.21.4, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3439,7 +3439,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-wagon config.status 2.21.3 +yast2-wagon config.status 2.21.4 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.21.3/configure.in new/yast2-wagon-2.21.4/configure.in --- old/yast2-wagon-2.21.3/configure.in 2011-07-18 15:25:45.000000000 +0200 +++ new/yast2-wagon-2.21.4/configure.in 2011-08-01 14:06:08.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-wagon, 2.21.3, http://bugs.opensuse.org/, yast2-wagon) +AC_INIT(yast2-wagon, 2.21.4, http://bugs.opensuse.org/, yast2-wagon) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.21.3" +VERSION="2.21.4" RPMNAME="yast2-wagon" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.21.3/src/clients/wagon_dup_repositories.ycp new/yast2-wagon-2.21.4/src/clients/wagon_dup_repositories.ycp --- old/yast2-wagon-2.21.3/src/clients/wagon_dup_repositories.ycp 2011-07-18 14:37:07.000000000 +0200 +++ new/yast2-wagon-2.21.4/src/clients/wagon_dup_repositories.ycp 2011-08-01 14:04:03.000000000 +0200 @@ -22,6 +22,7 @@ import "Wizard"; import "Popup"; + include "wagon/common_func.ycp"; define list TableContent() { @@ -154,6 +155,8 @@ { // heading text string heading_text = _("Migration Type"); + // full migration? + boolean full = sort(Wagon::DupRepos()) == sort(Pkg::SourceGetCurrent(true)); term contents = `VBox( // frame label @@ -163,9 +166,9 @@ `RadioButtonGroup(`id(`migration_type), `VBox( // radio button - `Left(`RadioButton(`id(`minimal), _("&Minimal migration (only the core packages)"), true)), + `Left(`RadioButton(`id(`minimal), _("&Minimal - upgrade from repositories added by registration"), !full)), // radio button - `Left(`RadioButton(`id(`full), _("&Full migration (all packages)"))) + `Left(`RadioButton(`id(`full), _("&Full - upgrade from all repositories"), full)) ) ) ) @@ -181,7 +184,9 @@ // help text string help_text = "" + _("Select the requested migration type.") // help text - + "" + _("Minimal migration migrates only minimal set of packages (the core packages providing basic system functionality), full migration migrates all installed packages.") + ""; + + "" + _("Minimal migration only uses the repositories added by registration, full migration migrates all packages to the latest version available in any enabled repository. Full migration might use third party repositories.") + // help text + + "" + _("Press Advanced button to manually select the repositories used for upgrading.") + ""; Wizard::SetContents (heading_text, contents, help_text, GetInstArgs::enable_back(), GetInstArgs::enable_next()); @@ -193,8 +198,12 @@ symbol ret = nil; + list<integer> prev_dup_repos = Wagon::DupRepos(); + boolean prev_manual_selection = Wagon::ManualRepoSelection(); + while (true) { - ret = (symbol)UI::UserInput(); + // go to advanced config it was used previously + ret = (Wagon::ManualRepoSelection()) ? `advanced : (symbol)UI::UserInput(); if (ret == `next) { @@ -207,6 +216,7 @@ // DUP: all repositories y2milestone("Selected full migration, using %1 repositories", size(Pkg::SourceGetCurrent(true))); Wagon::SetDupRepos(Pkg::SourceGetCurrent(true)); + Wagon::SetManualRepoSelection(false); } else if (mtype == `minimal) { @@ -229,6 +239,7 @@ y2milestone("Converted aliases to ids: %1", added_repos); Wagon::SetDupRepos(added_repos); + Wagon::SetManualRepoSelection(false); } else { @@ -255,14 +266,20 @@ y2milestone("Manual DUP repository selection selected"); ret = DupSelectionDialog(); - if (ret == `abort || ret == `close || ret == `next) + if (ret == `abort || ret == `close) + { + break; + } + else if (ret == `next) { + Wagon::SetManualRepoSelection(true); break; } else if (ret == `back) { // refresh the dialog SetMigrationSelectionDialogContent(); + Wagon::SetManualRepoSelection(false); } else { @@ -275,6 +292,15 @@ } } + if (ret == `next && (prev_dup_repos != Wagon::DupRepos() || prev_manual_selection != Wagon::ManualRepoSelection())) + { + y2milestone("DUP repository config has been changed, repropose package selection"); + Wagon::ResetDUPProposal(); + + // reset current package selection + ResetPackager(); + } + return ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.21.3/src/clients/wagon_migration_products.ycp new/yast2-wagon-2.21.4/src/clients/wagon_migration_products.ycp --- old/yast2-wagon-2.21.3/src/clients/wagon_migration_products.ycp 2010-03-24 08:23:28.000000000 +0100 +++ new/yast2-wagon-2.21.4/src/clients/wagon_migration_products.ycp 2011-08-01 14:04:03.000000000 +0200 @@ -290,9 +290,6 @@ ResetPackager(); - // Remembers all repositories that will be disabled later (after registration run) - FindOldRepositoriesToBeDisabled(); - y2milestone ("Returning: %1", ret); return ret; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.21.3/src/clients/wagon_registration_check.ycp new/yast2-wagon-2.21.4/src/clients/wagon_registration_check.ycp --- old/yast2-wagon-2.21.3/src/clients/wagon_registration_check.ycp 2011-06-30 10:52:38.000000000 +0200 +++ new/yast2-wagon-2.21.4/src/clients/wagon_registration_check.ycp 2011-08-01 14:04:03.000000000 +0200 @@ -232,6 +232,14 @@ // some other problem and user has to be informed about it define boolean Interactive(map<string,any> status) { + // SMT doesn't write /var/lib/suseRegister/registration-status.xml file + // so we cannot get any registration details, assume the system is fully registered + if (status["ncc"]:nil == false) + { + y2milestone("SMT server is used, assuming fully registered system"); + return false; + } + // the system is not registered at all if (status["registered_system"]:false) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.21.3/src/include/common_func.ycp new/yast2-wagon-2.21.4/src/include/common_func.ycp --- old/yast2-wagon-2.21.3/src/include/common_func.ycp 2011-06-30 10:50:59.000000000 +0200 +++ new/yast2-wagon-2.21.4/src/include/common_func.ycp 2011-08-01 14:04:03.000000000 +0200 @@ -126,24 +126,23 @@ ); y2milestone ("Resetting Pkg"); - Pkg::PkgApplReset(); - Pkg::PkgReset(); - symbol status = nil; - string name = nil; + list<integer> repos = Pkg::GetUpgradeRepos(); + if (size(repos) > 0) + { + y2milestone("Resetting upgrade repos config"); + foreach(integer repo, repos, {Pkg::RemoveUpgradeRepo(repo);}); + } - y2milestone ("Neutralizing all resolvables"); - foreach (symbol resolvable, [`pattern, `patch, `package, `product, `srcpackage], { - Pkg::ResolvableNeutral ("" /* all */, resolvable, true /* force */); - }); - - y2milestone ("Running solver"); - Pkg::PkgSolve (true); + // reset solver flags + Pkg::SetSolverFlags($["reset" : true]); Pkg::TargetFinish(); Pkg::SourceFinishAll(); Wagon::InitPkg(); + + y2milestone ("Running solver"); Pkg::PkgSolve (true); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.21.3/src/modules/Wagon.ycp new/yast2-wagon-2.21.4/src/modules/Wagon.ycp --- old/yast2-wagon-2.21.3/src/modules/Wagon.ycp 2011-07-18 15:25:43.000000000 +0200 +++ new/yast2-wagon-2.21.4/src/modules/Wagon.ycp 2011-08-01 14:06:03.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Lukas Ocilka <locilka(a)suse.cz> * Internal * - * $Id: Wagon.ycp 64872 2011-07-18 13:25:42Z lslezak $ + * $Id: Wagon.ycp 65108 2011-08-01 12:06:02Z lslezak $ * * Module for handling WAGON. * @@ -123,6 +123,20 @@ dup_repos = repos; } + boolean manual_repo_selection = false; + + // manual or automatic DUP repo selection? + global boolean ManualRepoSelection() + { + return manual_repo_selection; + } + + global void SetManualRepoSelection(boolean manual) + { + y2milestone("Manual DUP repo selection: %1", manual); + manual_repo_selection = manual; + } + // list of repositories (aliases) added by suse_register list<string> new_registration_repos = []; @@ -437,7 +451,8 @@ Pkg::SetSolverFlags($["ignoreAlreadyRecommended" : true]); } - Pkg::PkgSolve(true); + // set the solve error flag for packages proposal + Update::solve_errors = Pkg::PkgSolve(true) ? 0 : Pkg::PkgSolveErrors(); already_proposed = true; @@ -761,6 +776,50 @@ return true; } + /** + * Check whether NCC or SMT is used for registration + */ + define boolean NCCUsed() + { + // check /etc/suseRegister.conf content + string conf = (string)SCR::Read(.target.string, "/etc/suseRegister.conf"); + + if (conf == nil) + { + y2error("Cannot read /etc/suseRegister.conf"); + return nil; + } + + list<string> lines = splitstring(conf, "\n"); + + boolean found_url = false; + boolean found_ncc = false; + + foreach(string line, lines, { + if (regexpmatch(line, "^[ \t]*url[ \t]*=[ \t]*")) + { + found_url = true; + y2milestone("Found registration URL option: %1", line); + + if (regexpmatch(line, "^[ \t]*url[ \t]*=[ \t]*https://secure-www.novell.com/center/regsvc/*[ \t]*(#*.*)*")) + { + found_ncc = true; + y2milestone("NCC URL found"); + } + } + }); + + if (!found_url) + { + y2error("No url option found in /etc/suseRegister.conf"); + return nil; + } + + y2milestone("Found NCC registration server: %1", found_ncc); + + return found_ncc; + } + /* * Read registration status and sort products according their status * @param file Read this registration status file @@ -873,6 +932,7 @@ * @return map<string,any> result: $[ * "registered_system" : (boolean) - true registration was run, false registration has never run or there is no product to register (e.g. openSUSE installation) or the registration completely failed + "ncc" : (boolean) - true - NCC is used for registration, false - a SMT server is configured, nil - not configured or other error "timestamp" : (integer) - time when the status was saved (unix time), -1 in an unregistered system "registered" : (list<string>) - registered products "provisional" : (list<string>) - products with provisional subscription (registered, but no updates available) @@ -884,7 +944,10 @@ */ global define map<string,any> RegistrationStatus() { - return RegistrationStatusFromFile(RegistrationStatus::RegFile()); + map<string,any> ret = RegistrationStatusFromFile(RegistrationStatus::RegFile()); + ret["ncc"] = NCCUsed(); + + return ret; } /* EOF */ } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nagios-plugins for openSUSE:Factory
by root＠hilbert.suse.de 02 Aug '11

02 Aug '11

Hello community, here is the log from the commit of package nagios-plugins for openSUSE:Factory checked in at Tue Aug 2 09:00:47 CEST 2011. -------- --- nagios-plugins/nagios-plugins.changes 2010-10-08 14:28:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/nagios-plugins/nagios-plugins.changes 2011-08-01 21:51:49.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 1 19:51:08 UTC 2011 - lars(a)linux-schulserver.de + +- added info about check_dhcp in README.SuSE (see bnc #640367) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios-plugins.spec ++++++ --- /var/tmp/diff_new_pack.WXTwIi/_old 2011-08-02 08:58:02.000000000 +0200 +++ /var/tmp/diff_new_pack.WXTwIi/_new 2011-08-02 08:58:02.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package nagios-plugins (Version 1.4.15) +# spec file for package nagios-plugins # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ Name: nagios-plugins Summary: The Nagios Plug-Ins Version: 1.4.15 -Release: 2 +Release: 6 License: GPLv2+ Group: System/Monitoring Url: http://nagiosplugins.org/ ++++++ nagios-plugins-README.SuSE ++++++ --- /var/tmp/diff_new_pack.WXTwIi/_old 2011-08-02 08:58:02.000000000 +0200 +++ /var/tmp/diff_new_pack.WXTwIi/_new 2011-08-02 08:58:02.000000000 +0200 @@ -22,6 +22,12 @@ suid bit set. There are two recommended ways about overriding this on your system: +== check_dhcp == + +If you run the check_dhcp script on the server, please make sure your +UDP ports 67 and 68 on the _client_ are opened in the firewall. Otherwise +the script will be unable to detect anything. + === Set the suid bit === Note: Please choose only those examples you need. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit marble for openSUSE:Factory
by root＠hilbert.suse.de 02 Aug '11

02 Aug '11

Hello community, here is the log from the commit of package marble for openSUSE:Factory checked in at Tue Aug 2 08:57:45 CEST 2011. -------- --- marble/marble.changes 2011-07-22 20:28:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/marble/marble.changes 2011-08-01 16:23:10.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 1 14:15:36 UTC 2011 - idonmez(a)novell.com + +- Provide marble-data subpackage again + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 4_6_BRANCH.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ marble.spec ++++++ --- /var/tmp/diff_new_pack.Fu2Vww/_old 2011-08-02 08:56:42.000000000 +0200 +++ /var/tmp/diff_new_pack.Fu2Vww/_new 2011-08-02 08:56:42.000000000 +0200 @@ -18,89 +18,87 @@ Name: marble -BuildRequires: kdebase4-workspace-devel -BuildRequires: libkdeedu4-devel -BuildRequires: fdupes -BuildRequires: perl +Version: 4.7.0 +Release: 3 License: LGPLv2.1+ -Group: Amusements/Teaching/Other Summary: A generic map viewer Url: http://edu.kde.org -Version: 4.7.0 -Release: 1 -Source0: %{name}-%version.tar.bz2 -Patch0: 4_6_BRANCH.diff +Group: Amusements/Teaching/Other +Source0: %{name}-%{version}.tar.bz2 Patch1: marble-designer-plugin.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires +BuildRequires: fdupes +BuildRequires: kdebase4-workspace-devel +BuildRequires: libkdeedu4-devel +BuildRequires: perl Requires: libkeduvocdocument4 +Requires: marble-data = %{version} Suggests: libkeduvocdocument4 Provides: kde4-marble = 4.3.0 Obsoletes: kde4-marble < 4.3.0 -Provides: marble-data = %{version} -Obsoletes: marble-data < %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%kde4_runtime_requires %description Marble is a viewer of map data - -Authors: --------- - The KDE Team <kde(a)kde.org> - %prep -%setup -q -n %{name}-%version -%patch0 -p0 +%setup -q -n %{name}-%{version} %patch1 -p1 %build %ifarch ppc ppc64 -export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc" +export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif %cmake_kde4 -d build %make_jobs %install cd build - %makeinstall +%make_install %suse_update_desktop_file %{name} Education Geography %kde_post_install - %if %suse_version > 1020 - %fdupes -s $RPM_BUILD_ROOT - %endif - -%clean - rm -rf $RPM_BUILD_ROOT + %fdupes -s %{buildroot} %package devel License: LGPLv2.1+ -Group: Amusements/Teaching/Other Summary: A generic map viewer: Build Environment +Group: Amusements/Teaching/Other Requires: marble Provides: kde4-marble-devel = 4.3.0 Obsoletes: kde4-marble-devel < 4.3.0 %description devel -Marble is a viewer of map data +Development headers and libraries for Marble. +%package data +BuildArch: noarch +License: LGPLv2.1+ +Group: Amusements/Teaching/Other +Summary: Generic map viewer data +Provides: kde4-marble-data = 4.3.0 +Obsoletes: kde4-marble-data < 4.3.0 +%description data +Marble is a viewer of map data. This package contains its data. -Authors: --------- - The KDE Team <kde(a)kde.org> +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig %files devel %defattr(-,root,root) -/usr/include/marble/ +%{_includedir}/marble/ %_kde4_libdir/libmarblewidget.so %_kde4_appsdir/cmake/modules/FindMarble.cmake -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%files data +%defattr(-,root,root) +%dir %{_datadir}/kde4/apps/marble +%_kde_share_dir/apps/marble/data %files %defattr(-,root,root) +%exclude %_kde_share_dir/apps/marble/data %_kde4_bindir/geodatatest %_kde4_bindir/marble %_kde4_bindir/routing-instructions ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mkinitrd for openSUSE:Factory
by root＠hilbert.suse.de 02 Aug '11

02 Aug '11

Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at Tue Aug 2 08:56:33 CEST 2011. -------- --- mkinitrd/mkinitrd.changes 2011-07-29 16:04:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2011-08-01 17:18:46.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 1 15:09:15 UTC 2011 - mmarek(a)suse.cz + +- Only copy /usr/bin/on_ac_power if it exists (bnc#708326). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.RLeiS1/_old 2011-08-02 08:55:44.000000000 +0200 +++ /var/tmp/diff_new_pack.RLeiS1/_new 2011-08-02 08:55:44.000000000 +0200 @@ -31,7 +31,7 @@ %endif AutoReqProv: on Version: 2.7.0 -Release: 23 +Release: 25 Conflicts: udev < 118 Requires: dhcpcd PreReq: %fillup_prereq ++++++ mkinitrd.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes new/mkinitrd-2.7.0/mkinitrd.changes --- old/mkinitrd-2.7.0/mkinitrd.changes 2011-07-29 15:47:20.000000000 +0200 +++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-08-01 17:10:21.000000000 +0200 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Aug 1 15:09:15 UTC 2011 - mmarek(a)suse.cz + +- Only copy /usr/bin/on_ac_power if it exists (bnc#708326). + +------------------------------------------------------------------- Fri Jul 29 13:46:54 UTC 2011 - mmarek(a)suse.cz - Add the dmesg utility for easier debugging. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-mount.sh new/mkinitrd-2.7.0/scripts/boot-mount.sh --- old/mkinitrd-2.7.0/scripts/boot-mount.sh 2011-07-29 15:47:20.000000000 +0200 +++ new/mkinitrd-2.7.0/scripts/boot-mount.sh 2011-08-01 17:10:21.000000000 +0200 @@ -3,7 +3,7 @@ #%stage: filesystem #%depends: resume # -#%programs: /sbin/fsck $rootfsck /bin/on_ac_power +#%programs: /sbin/fsck $rootfsck #%if: ! "$root_already_mounted" #%dontshow # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-mount.sh new/mkinitrd-2.7.0/scripts/setup-mount.sh --- old/mkinitrd-2.7.0/scripts/setup-mount.sh 2011-07-29 15:47:20.000000000 +0200 +++ new/mkinitrd-2.7.0/scripts/setup-mount.sh 2011-08-01 17:10:21.000000000 +0200 @@ -20,5 +20,12 @@ verbose "[MOUNT] Root:\t$rootdev" +for file in {/usr,}/bin/on_ac_power; do + if test -e $file; then + cp_bin $file $tmp_mnt/usr/bin + break + fi +done + save_var rootdev save_var rootfsck ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sysvinit for openSUSE:Factory
by root＠hilbert.suse.de 02 Aug '11

02 Aug '11

Hello community, here is the log from the commit of package sysvinit for openSUSE:Factory checked in at Tue Aug 2 08:55:35 CEST 2011. -------- --- sysvinit/sysvinit.changes 2011-07-27 15:22:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/sysvinit/sysvinit.changes 2011-08-01 16:48:32.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Aug 1 14:25:56 UTC 2011 - werner(a)suse.de + +- libblogger: check for SIGPIPE and block SIGPIPE during write, this + also does help startpar not to die on SIGPIPE (bnc#679671) +- blogd: add a further check for nsigsys in writelog() (bnc#679671) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysvinit.spec ++++++ --- /var/tmp/diff_new_pack.ltEFC2/_old 2011-08-02 08:50:17.000000000 +0200 +++ /var/tmp/diff_new_pack.ltEFC2/_new 2011-08-02 08:50:17.000000000 +0200 @@ -29,7 +29,7 @@ Group: System/Base AutoReqProv: on Version: 2.88+ -Release: 56 +Release: 58 Summary: SysV-Style init BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: audit-devel libselinux-devel libsepol-devel pam-devel ++++++ showconsole-1.14.dif ++++++ --- /var/tmp/diff_new_pack.ltEFC2/_old 2011-08-02 08:50:17.000000000 +0200 +++ /var/tmp/diff_new_pack.ltEFC2/_new 2011-08-02 08:50:17.000000000 +0200 @@ -170,8 +170,123 @@ .SH FILES .TP .I /dev/console +--- libblogger.c ++++ libblogger.c 2011-08-01 14:32:47.599926864 +0000 +@@ -15,6 +15,7 @@ + #include <errno.h> + #include <fcntl.h> + #include <paths.h> ++#include <signal.h> + #include <stdarg.h> + #include <stdio.h> + #include <stdlib.h> +@@ -40,9 +41,58 @@ + #define ESNS "skipped" /* Skipped */ + #define ESNU "unused" /* Unused */ + ++static struct sigaction saved_sigpipe; ++static volatile sig_atomic_t broken = 0; + static int fdfifo = -1; + static char * fifo_name = _PATH_BLOG_FIFO; + ++static void sigpipe(int sig __attribute__((__unused__))) ++{ ++ broken++; ++} ++ ++static void set_signal(int sig, struct sigaction *old, sighandler_t handler) ++{ ++ do { ++ if (sigaction(sig, NULL, old) == 0) ++ break; ++ } while (errno == EINTR); ++ ++ if (old && old->sa_handler != handler) { ++ struct sigaction new; ++ sigset_t sigset; ++ ++ new.sa_handler = handler; ++ sigemptyset(&new.sa_mask); ++ new.sa_flags = SA_RESTART; ++ do { ++ if (sigaction(sig, &new, NULL) == 0) ++ break; ++ } while (errno == EINTR); ++ ++ sigemptyset(&sigset); ++ sigaddset(&sigset, sig); ++ sigprocmask(SIG_UNBLOCK, &sigset, NULL); ++ } ++} ++ ++static void reset_signal(int sig, struct sigaction *old) ++{ ++ struct sigaction cur; ++ ++ do { ++ if (sigaction(sig, NULL, &cur) == 0) ++ break; ++ } while (errno == EINTR); ++ ++ if (old && old->sa_handler == cur.sa_handler) { ++ do { ++ if (sigaction(sig, old, NULL) == 0) ++ break; ++ } while (errno == EINTR); ++ } ++} ++ + static int bootlog_init(const int lvl __attribute__((__unused__))) + { + int ret = -1; +@@ -57,6 +107,8 @@ static int bootlog_init(const int lvl __ + if ((fdfifo = open(fifo_name, O_WRONLY|O_NONBLOCK|O_NOCTTY|O_CLOEXEC)) < 0) + goto out; + ++ set_signal(SIGPIPE, &saved_sigpipe, sigpipe); ++ + ret = 0; + out: + return ret; +@@ -66,6 +118,9 @@ void closeblog() + { + if (fdfifo < 0) + goto out; ++ ++ reset_signal(SIGPIPE, &saved_sigpipe); ++ + (void)close(fdfifo); + out: + return; +@@ -77,6 +132,7 @@ int bootlog(const int lvl, const char *f + int ret = -1; + char * head = ESNN; + char buf[4096]; ++ sigset_t blockpipe, oldpipe; + + if (fdfifo < 0 && bootlog_init(lvl) < 0) + goto out; +@@ -106,6 +162,9 @@ int bootlog(const int lvl, const char *f + break; + } + ++ sigprocmask(SIG_BLOCK, &blockpipe, &oldpipe); ++ if (broken) ++ goto pipe; + if (head) { + const struct tm *local; + struct timeval now; +@@ -124,6 +183,8 @@ int bootlog(const int lvl, const char *f + vsnprintf(buf, sizeof(buf), fmt, ap); + va_end(ap); + write(fdfifo, buf, strlen(buf)); ++pipe: ++ sigprocmask(SIG_SETMASK, &oldpipe, NULL); + out: + return ret; + } --- libconsole.c -+++ libconsole.c 2011-04-20 11:13:46.815926166 +0000 ++++ libconsole.c 2011-08-01 14:00:51.311926463 +0000 @@ -59,6 +59,27 @@ #include "listing.h" @@ -345,11 +460,13 @@ clearerr(flog); lock(&llock); while (avail > 0) { -@@ -412,7 +440,7 @@ static inline void writelog(void) +@@ -411,8 +439,8 @@ static inline void writelog(void) + if (avail > TRANS_BUFFER_SIZE) ret = TRANS_BUFFER_SIZE; - if (!flog) +- if (!flog) - goto xout;; ++ if (!flog || nsigsys) + break; ret = fwrite(head, sizeof(unsigned char), ret, flog); if (!ret && ferror(flog)) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cmake for openSUSE:Factory
by root＠hilbert.suse.de 02 Aug '11

02 Aug '11

Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at Tue Aug 2 08:50:05 CEST 2011. -------- --- cmake/cmake-gui.changes 2010-11-11 15:08:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/cmake/cmake-gui.changes 2011-07-29 18:20:24.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jul 29 16:19:45 UTC 2011 - puzel(a)novell.com + +- update to 2.8.5 + - see /usr/share/doc/packages/cmake/Changelog for changes + +------------------------------------------------------------------- --- cmake/cmake.changes 2011-04-04 16:49:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/cmake/cmake.changes 2011-07-29 18:20:25.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Jul 29 16:19:27 UTC 2011 - puzel(a)novell.com + +- update to 2.8.5 + - see /usr/share/doc/packages/cmake/Changelog for changes + +------------------------------------------------------------------- +Tue Apr 5 10:49:54 UTC 2011 - puzel(a)novell.com + +- use --no-system-libarchive for openSUSE < 11.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- cmake-2.8.4.tar.bz2 New: ---- cmake-2.8.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake-gui.spec ++++++ --- /var/tmp/diff_new_pack.LOsi0h/_old 2011-08-02 08:49:29.000000000 +0200 +++ /var/tmp/diff_new_pack.LOsi0h/_new 2011-08-02 08:49:29.000000000 +0200 @@ -19,12 +19,12 @@ Name: cmake-gui -Version: 2.8.4 +Version: 2.8.5 Release: 1 License: BSD3c Group: Development/Tools/Building Url: http://www.cmake.org/ -Source0: cmake-%{version}.tar.bz2 +Source0: http://www.cmake.org/files/v2.8/cmake-%{version}.tar.gz Patch4: cmake-disable-builtin-chrpath.diff Summary: CMake graphical user interface BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -39,10 +39,12 @@ BuildRequires: curl-devel BuildRequires: gcc-c++ BuildRequires: libqt4-devel -BuildRequires: libarchive-devel BuildRequires: openssl-devel BuildRequires: update-desktop-files BuildRequires: zlib-devel +%if 0%{?suse_version} > 1130 +BuildRequires: libarchive-devel +%endif Requires: cmake %description @@ -67,7 +69,15 @@ --datadir=/share/cmake \ --docdir=/share/doc/packages/cmake \ --mandir=/share/man \ +%if 0%{?suse_version} > 1130 --system-libs \ +%else + --system-curl \ + --system-expat \ + --system-zlib \ + --system-bzip2 \ + --no-system-libarchive \ +%endif --parallel=0%jobs \ --qt-gui make VERBOSE=1 %{?jobs:-j %jobs} ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.LOsi0h/_old 2011-08-02 08:49:29.000000000 +0200 +++ /var/tmp/diff_new_pack.LOsi0h/_new 2011-08-02 08:49:29.000000000 +0200 @@ -19,12 +19,12 @@ Name: cmake -Version: 2.8.4 +Version: 2.8.5 Release: 1 License: BSD3c Group: Development/Tools/Building Url: http://www.cmake.org/ -Source0: %{name}-%{version}.tar.bz2 +Source0: http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz Patch4: cmake-disable-builtin-chrpath.diff # Should appear in cmake-2.8.3 Summary: Cross-platform, open-source make system @@ -39,10 +39,12 @@ %endif BuildRequires: curl-devel BuildRequires: gcc-c++ -BuildRequires: libarchive-devel BuildRequires: ncurses-devel BuildRequires: openssl-devel BuildRequires: zlib-devel +%if 0%{?suse_version} > 1130 +BuildRequires: libarchive-devel +%endif Requires: make %description @@ -64,7 +66,15 @@ --datadir=/share/%{name} \ --docdir=/share/doc/packages/%{name} \ --mandir=/share/man \ +%if 0%{?suse_version} > 1130 --system-libs \ +%else + --system-curl \ + --system-expat \ + --system-zlib \ + --system-bzip2 \ + --no-system-libarchive \ +%endif --parallel=0%jobs \ --no-qt-gui make VERBOSE=1 %{?jobs:-j %jobs} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit snapper for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '11

01 Aug '11

Hello community, here is the log from the commit of package snapper for openSUSE:Factory checked in at Mon Aug 1 16:11:45 CEST 2011. -------- --- snapper/snapper.changes 2011-06-28 12:51:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/snapper/snapper.changes 2011-08-01 14:50:48.000000000 +0200 @@ -1,0 +2,16 @@ +Mon Aug 01 14:42:16 CEST 2011 - aschnell(a)suse.de + +- preparations for supporting multiple filesystem types +- version 0.0.7 + +------------------------------------------------------------------- +Mon Aug 01 12:34:40 CEST 2011 - aschnell(a)suse.de + +- updated translations + +------------------------------------------------------------------- +Sat Jul 30 16:15:42 CEST 2011 - aschnell(a)suse.de + +- added missing shell quoting + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- snapper-0.0.6.tar.bz2 New: ---- snapper-0.0.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snapper.spec ++++++ --- /var/tmp/diff_new_pack.utSbjt/_old 2011-08-01 16:11:22.000000000 +0200 +++ /var/tmp/diff_new_pack.utSbjt/_new 2011-08-01 16:11:22.000000000 +0200 @@ -19,8 +19,8 @@ Name: snapper -Version: 0.0.6 -Release: 5 +Version: 0.0.7 +Release: 1 License: GPL Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ snapper-0.0.6.tar.bz2 -> snapper-0.0.7.tar.bz2 ++++++ ++++ 1895 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit plasma-addons for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '11

01 Aug '11

Hello community, here is the log from the commit of package plasma-addons for openSUSE:Factory checked in at Mon Aug 1 16:11:09 CEST 2011. -------- --- plasma-addons/plasma-addons.changes 2011-07-22 20:21:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/plasma-addons/plasma-addons.changes 2011-07-30 20:10:18.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Jul 30 18:03:55 UTC 2011 - idonmez(a)novell.com + +- Add bko-278222.patch, fix plasma crash with grid desktop. Upstream + commit 67b5c56e564f5052238bab38342a85e5f4af570b + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- bko-278222.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma-addons.spec ++++++ --- /var/tmp/diff_new_pack.kQdUwg/_old 2011-08-01 16:10:05.000000000 +0200 +++ /var/tmp/diff_new_pack.kQdUwg/_new 2011-08-01 16:10:05.000000000 +0200 @@ -19,7 +19,7 @@ Name: plasma-addons Version: 4.7.0 -Release: 1 +Release: 2 License: GPLv2+ Summary: Additional Plasma Widgets Url: http://www.kde.org/ @@ -27,6 +27,7 @@ Source0: kdeplasma-addons-%{version}.tar.bz2 Patch1: krunner-akonadi-dont-cause-start.diff Patch2: lancelot-suse.diff +Patch3: bko-278222.patch BuildRequires: fdupes BuildRequires: kdebase4-workspace-devel BuildRequires: kopete @@ -90,6 +91,7 @@ %setup -q -n kdeplasma-addons-%{version} %patch1 %patch2 +%patch3 -p1 %build %cmake_kde4 -d build ++++++ bko-278222.patch ++++++ commit 67b5c56e564f5052238bab38342a85e5f4af570b Author: Christoph Feck <christoph(a)maxiom.de> Date: Sat Jul 30 19:15:28 2011 +0200 Fix assignment operator and add copy constructor This fixes the crash in Grid Desktop and Grouping Desktop. Thanks to Aaron Seigo for investigation and patch review. BUG: 278222 FIXED-IN: 4.7.1 diff --git a/containments/groupingdesktop/lib/groupinfo.cpp b/containments/groupingdesktop/lib/groupinfo.cpp index 2106cca..c945551 100644 --- a/containments/groupingdesktop/lib/groupinfo.cpp +++ b/containments/groupingdesktop/lib/groupinfo.cpp @@ -43,6 +43,12 @@ GroupInfo::GroupInfo(const QString &name, const QString &prettyName) d->prettyName = prettyName; } +GroupInfo::GroupInfo(const GroupInfo &other) + : d(new GroupInfoPrivate()) +{ + *d = *other.d; +} + GroupInfo::~GroupInfo() { delete d; @@ -78,13 +84,12 @@ QString GroupInfo::icon() const return d->icon; } -GroupInfo GroupInfo::operator=(const GroupInfo &gi) +GroupInfo &GroupInfo::operator=(const GroupInfo &gi) { - GroupInfo g(gi.name(), gi.prettyName()); - g.setFormFactors(gi.formFactors()); - g.setIcon(gi.icon()); - - return g; + if (this != &gi) { + *d = *gi.d; + } + return *this; } bool GroupInfo::operator==(const GroupInfo &gi) const diff --git a/containments/groupingdesktop/lib/groupinfo.h b/containments/groupingdesktop/lib/groupinfo.h index f8cc66f..320c800 100644 --- a/containments/groupingdesktop/lib/groupinfo.h +++ b/containments/groupingdesktop/lib/groupinfo.h @@ -31,6 +31,7 @@ class GroupInfo { public: explicit GroupInfo(const QString &name, const QString &prettyName = QString()); + GroupInfo(const GroupInfo &other); ~GroupInfo(); void setFormFactors(QSet<Plasma::FormFactor> formFactors); void setIcon(const QString &icon); @@ -40,7 +41,7 @@ class GroupInfo QSet<Plasma::FormFactor> formFactors() const; QString icon() const; - GroupInfo operator=(const GroupInfo &gi); + GroupInfo &operator=(const GroupInfo &gi); bool operator==(const GroupInfo &gi) const; bool operator<(const GroupInfo &gi) const; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mx for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '11

01 Aug '11

Hello community, here is the log from the commit of package mx for openSUSE:Factory checked in at Mon Aug 1 16:09:38 CEST 2011. -------- --- mx/mx.changes 2011-07-18 10:10:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/mx/mx.changes 2011-07-30 15:12:27.000000000 +0200 @@ -1,0 +2,13 @@ +Sat Jul 30 15:07:04 CEST 2011 - vuntz(a)opensuse.org + +- Update to version 1.3.0: + + Various performance optimisations and bug fixes + + Add a remove_all() method to MxComboBox + + Bugs fixed: bco#2666, bco#2663, bco#2662, bco#2646, bco#2645, + bco#2671. +- Drop mx-no-G_CONST_RETURN.patch: fixed upstream. +- Add xz BuildRequires because we can't build a package for a + xz-compressed tarball without explicitly specifying that... See + bnc#697467 for more details. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- mx-1.2.0.tar.bz2 New: ---- mx-1.3.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mx.spec ++++++ --- /var/tmp/diff_new_pack.ZztbnA/_old 2011-08-01 16:08:57.000000000 +0200 +++ /var/tmp/diff_new_pack.ZztbnA/_new 2011-08-01 16:08:57.000000000 +0200 @@ -18,17 +18,17 @@ Name: mx -Version: 1.2.0 -Release: 2 +Version: 1.3.0 +Release: 1 License: LGPLv2.1 Summary: Clutter-based Toolkit Url: http://www.clutter-project.org/ Group: System/Libraries -Source0: %{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM mx-no-G_CONST_RETURN.patch bco#2669 vuntz(a)opensuse.org -- Stop using deprecated G_CONST_RETURN -Patch0: mx-no-G_CONST_RETURN.patch +Source0: http://source.clutter-project.org/sources/mx/1.3/%{name}-%{version}.tar.xz BuildRequires: fdupes BuildRequires: intltool +# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 +BuildRequires: xz BuildRequires: pkgconfig(clutter-1.0) BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gdk-pixbuf-2.0) @@ -107,7 +107,6 @@ %lang_package %prep %setup -q -%patch0 -p1 %build %configure \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit choqok for openSUSE:Factory
by root＠hilbert.suse.de 01 Aug '11

01 Aug '11

Hello community, here is the log from the commit of package choqok for openSUSE:Factory checked in at Mon Aug 1 16:08:40 CEST 2011. -------- --- KDE/choqok/choqok.changes 2011-04-04 09:39:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/choqok/choqok.changes 2011-07-28 18:38:56.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jul 28 16:36:53 UTC 2011 - javier(a)opensuse.org + +- Add user friends list bugfix (bko#275185) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- userfriends.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ choqok.spec ++++++ --- /var/tmp/diff_new_pack.kgWHcI/_old 2011-08-01 16:07:07.000000000 +0200 +++ /var/tmp/diff_new_pack.kgWHcI/_new 2011-08-01 16:07:07.000000000 +0200 @@ -24,10 +24,11 @@ Group: Productivity/Networking/Other Summary: Micro-Blogging Client for KDE Version: 1.1 -Release: 1 +Release: 8 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %{name}-%{version}.tar.bz2 Url: http://choqok.gnufolks.org +Patch0: userfriends.diff %kde4_runtime_requires %description @@ -61,6 +62,7 @@ %prep %setup -q -n %{name}-%{version} +%patch0 -p1 %build %cmake_kde4 -d build ++++++ userfriends.diff ++++++ commit 9053b699c33d998d3933a6c11e4ff624846620e5 Author: Mehrdad Momeny <mehrdad.momeny(a)gmail.com> Date: Sun Jul 24 11:30:49 2011 +0800 BUG:275185 Get user friends list bug fixed diff --git a/helperlibs/twitterapihelper/twitterapimicroblog.cpp b/helperlibs/twitterapihelper/twitterapimicroblog.cpp index 1efbb1f..1a87d61 100644 --- a/helperlibs/twitterapihelper/twitterapimicroblog.cpp +++ b/helperlibs/twitterapihelper/twitterapimicroblog.cpp @@ -681,14 +681,18 @@ void TwitterApiMicroBlog::requestFriendsScreenName(TwitterApiAccount* theAccount TwitterApiAccount* account = qobject_cast<TwitterApiAccount*>(theAccount); KUrl url = account->apiUrl(); url.addPath( QString("/statuses/friends.xml") ); + KUrl tmpUrl(url); url.addQueryItem( "cursor", d->friendsCursor ); + QOAuth::ParamMap params; + params.insert("cursor", d->friendsCursor.toLatin1()); KIO::StoredTransferJob *job = KIO::storedGet( url, KIO::Reload, KIO::HideProgressInfo ) ; if ( !job ) { kDebug() << "Cannot create an http GET request!"; return; } - job->addMetaData("customHTTPHeader", "Authorization: " + authorizationHeader(account, url, QOAuth::GET)); + job->addMetaData("customHTTPHeader", "Authorization: " + authorizationHeader(account, tmpUrl, + QOAuth::GET, params)); mJobsAccount[job] = theAccount; connect( job, SIGNAL( result( KJob* ) ), this, SLOT( slotRequestFriendsScreenName(KJob*) ) ); job->start(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0