July 2011 - openSUSE Commits - openSUSE Mailing Lists

commit libxslt for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '11

29 Jul '11

Hello community, here is the log from the commit of package libxslt for openSUSE:Factory checked in at Fri Jul 29 13:50:13 CEST 2011. -------- --- libxslt/libxslt-python.changes 2011-07-29 06:25:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/libxslt/libxslt-python.changes 2011-07-29 11:41:55.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 29 09:37:15 UTC 2011 - idonmez(a)novell.com + +- Fix build by not using %exclude + +------------------------------------------------------------------- --- libxslt/libxslt.changes 2011-07-29 06:25:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/libxslt/libxslt.changes 2011-07-29 11:41:55.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 29 09:37:02 UTC 2011 - idonmez(a)novell.com + +- Fix build on SLE + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxslt-python.spec ++++++ --- /var/tmp/diff_new_pack.QTSpoK/_old 2011-07-29 13:48:31.000000000 +0200 +++ /var/tmp/diff_new_pack.QTSpoK/_new 2011-07-29 13:48:31.000000000 +0200 @@ -25,7 +25,7 @@ BuildRequires: libxml2-devel Summary: Python Bindings for libxslt Version: 1.1.26 -Release: 2 +Release: 3 License: MIT License (or similar) Group: Development/Libraries/Python Source: libxslt-%{version}.tar.bz2 @@ -69,20 +69,17 @@ # #223696 find %{buildroot} -type f -name "*.la" -print -delete +# Stuff we won't package +rm -rf %{buildroot}/%{_bindir}/* %{buildroot}/%{_libdir}/lib** %{buildroot}/%{_includedir}/* +rm -rf %{buildroot}/%{_mandir}/* %{buildroot}/%{_libdir}/pkgconfig/* +rm -rf %{buildroot}/%{_libdir}/xsltConf.sh %{buildroot}/%{_datadir}/aclocal/libxslt.m4 + %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) -%exclude %{_bindir}/* -%exclude %{_libdir}/lib** -%exclude %{_includedir}/* -%exclude %{_mandir}/* -%exclude %{_libdir}/pkgconfig/* -%exclude %{_libdir}/xsltConf.sh -%exclude /usr/share/aclocal/libxslt.m4 %{py_sitedir}/* -%doc python/TODO %doc python/libxslt-python-api.xml %doc python/tests/*.py %doc python/tests/*.xml ++++++ libxslt.spec ++++++ --- /var/tmp/diff_new_pack.QTSpoK/_old 2011-07-29 13:48:31.000000000 +0200 +++ /var/tmp/diff_new_pack.QTSpoK/_new 2011-07-29 13:48:31.000000000 +0200 @@ -19,14 +19,14 @@ Name: libxslt Version: 1.1.26 -Release: 5 +Release: 7 License: MIT License (or similar) Summary: XSL Transformation Library Group: System/Libraries BuildRequires: libgcrypt-devel BuildRequires: libgpg-error-devel BuildRequires: pkg-config -BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: libxml2-devel # bug437293 %ifarch ppc64 Obsoletes: libxslt-64bit @@ -56,9 +56,11 @@ The package comes with xsltproc, a command line interface to the XSLT engine. -%package -n %{name}1 +%package -n libxslt1 + Summary: XSL Transformation Library +Group: System/Libraries Provides: libxslt = %{version} Obsoletes: %{name} < %{version} Provides: xsltproc = %{version} @@ -109,11 +111,14 @@ make check %install -%make_install +%makeinstall + # Unwanted doc stuff rm -fr %{buildroot}%{_datadir}/doc + # the manual page is required install -ma=r '-t%{buildroot}%{_mandir}/man1' '%{SOURCE3}' + #kill all "la" files find %{buildroot} -type f -name "*.la" -print -delete ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 rpmlint for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '11

29 Jul '11

Hello community, here is the log from the commit of package rpmlint for openSUSE:Factory checked in at Fri Jul 29 13:48:19 CEST 2011. -------- --- rpmlint/rpmlint.changes 2011-07-14 11:08:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpmlint/rpmlint.changes 2011-07-29 11:29:44.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Jul 29 09:29:19 UTC 2011 - lnussel(a)suse.de + +- add org.freedesktop.DisplayManager.conf (bnc#708205) + +------------------------------------------------------------------- +Sat Jul 23 11:35:02 UTC 2011 - toddrme2178(a)gmail.com + +- remove obsolete knotification-requires check +- bump obsolete openSUSE version to 11.2 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmlint.spec ++++++ --- /var/tmp/diff_new_pack.aPeMO2/_old 2011-07-29 13:47:55.000000000 +0200 +++ /var/tmp/diff_new_pack.aPeMO2/_new 2011-07-29 13:47:55.000000000 +0200 @@ -23,7 +23,7 @@ BuildRequires: rpm-python xz Summary: Rpm correctness checker Version: 1.2 -Release: 15 +Release: 17 Source0: http://rpmlint.zarb.org/download/rpmlint-%{version}.tar.xz Source1: config Source1001: config.in ++++++ CheckKDE4Deps.py ++++++ --- /var/tmp/diff_new_pack.aPeMO2/_old 2011-07-29 13:47:55.000000000 +0200 +++ /var/tmp/diff_new_pack.aPeMO2/_new 2011-07-29 13:47:55.000000000 +0200 @@ -53,10 +53,6 @@ "libakonadiprotocolinternals.so.1", ) -_kde4_knotificationdep = ( - "libknotificationitem-1.so", -) - class KDE4Check(AbstractCheck.AbstractCheck): def __init__(self): AbstractCheck.AbstractCheck.__init__(self, "CheckKDE4Deps") @@ -108,8 +104,6 @@ printError(pkg,"suse-kde4-excessive-dependency", "%kde4_akonadi_requires") if not "akonadi-runtime" in pkg_requires and libakonadi4_dep: printError(pkg,"suse-kde4-missing-dependency", "%kde4_akonadi_requires") - if not "libknotificationitem-1" in pkg_requires and _kde4_knotificationdep: - printError(pkg, "suse-kde4-missing-dependency", "kde4_knotification_requires") check=KDE4Check() ++++++ config ++++++ --- /var/tmp/diff_new_pack.aPeMO2/_old 2011-07-29 13:47:56.000000000 +0200 +++ /var/tmp/diff_new_pack.aPeMO2/_new 2011-07-29 13:47:56.000000000 +0200 @@ -279,7 +279,6 @@ setOption("DBUSServices.WhiteList", ( "ConsoleKit.conf", "hal.conf", - "org.freedesktop.Hal.service", "cups.conf", # bnc#515977 "org.freedesktop.ConsoleKit.service", "org.freedesktop.PolicyKit.conf", @@ -434,6 +433,8 @@ # colord (bnc#698250) "org.freedesktop.ColorManager.service", "org.freedesktop.ColorManager.conf", + # lightdm (bnc#708205) + "org.freedesktop.DisplayManager.conf", )) # Output filters ++++++ suse-version.diff ++++++ --- /var/tmp/diff_new_pack.aPeMO2/_old 2011-07-29 13:47:56.000000000 +0200 +++ /var/tmp/diff_new_pack.aPeMO2/_new 2011-07-29 13:47:56.000000000 +0200 @@ -15,7 +15,7 @@ package_noarch[current_package] = True + res = suse_version_regex.search(line) -+ if res and int(res.group(1)) > 0 and int(res.group(1)) < 1110: ++ if res and int(res.group(1)) > 0 and int(res.group(1)) < 1130: + printWarning(pkg, "obsolete-suse-version-check", res.group(1)) + elif res and int(res.group(1)) > 1140: + printError(pkg, "invalid-suse-version-check", res.group(1)) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 python-bugzilla for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '11

29 Jul '11

Hello community, here is the log from the commit of package python-bugzilla for openSUSE:Factory checked in at Fri Jul 29 11:53:49 CEST 2011. -------- --- python-bugzilla/python-bugzilla.changes 2011-05-23 16:04:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-bugzilla/python-bugzilla.changes 2011-07-29 11:06:20.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Jul 29 09:04:07 UTC 2011 - mvyskocil(a)suse.cz + +- update to 0.6.2, rebased all patches + * backport --outputformat feature from git + +------------------------------------------------------------------- +Fri Jul 29 08:50:47 UTC 2011 - mvyskocil(a)suse.cz + +- add 0005-Add-Bugzilla34._query.patch fixing query command +- add 0020-allow-various-bnc-instances-in-NovellBugzilla.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 0012-Fix-for-httplib-xmlrpclib-changes-in-py2.7.patch 0016-obfuscated-password-support-in-oscrc.patch 0017-fix-typo-in-url-argument.patch 0018-novell-bugzilla-support-in-getBugzillaClassForURL.patch 0019-novell-bugzilla-run-on-3.4.patch python-bugzilla-0.6.1.tar.bz2 New: ---- 0006-cli-speedup-request-outputformat-fields-when-doing-q.patch 0007-fixup-for-cli-speedup-with-query-outputformat.patch 0013-obfuscated-password-support-in-oscrc.patch 0014-fix-typo-in-url-argument.patch 0015-novell-bugzilla-support-in-getBugzillaClassForURL.patch 0016-novell-bugzilla-run-on-3.4.patch 0017-allow-various-bnc-instances-in-NovellBugzilla.patch python-bugzilla-0.6.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-bugzilla.spec ++++++ --- /var/tmp/diff_new_pack.aoeWa7/_old 2011-07-29 11:53:00.000000000 +0200 +++ /var/tmp/diff_new_pack.aoeWa7/_new 2011-07-29 11:53:00.000000000 +0200 @@ -19,7 +19,7 @@ Name: python-bugzilla -Version: 0.6.1 +Version: 0.6.2 Release: 1 Summary: Python library for bugzilla Group: Development/Libraries/Python @@ -28,12 +28,14 @@ Source: https://fedorahosted.org/releases/p/y/python-bugzilla/%{name}-%{version}.ta… # generated from python-bugzilla/suse # https://gitorious.org/opensuse/python-bugzilla/commits/suse -# cherry-picked patches from git format-patch suse...0.6.1 -Patch0: 0012-Fix-for-httplib-xmlrpclib-changes-in-py2.7.patch -Patch1: 0016-obfuscated-password-support-in-oscrc.patch -Patch2: 0017-fix-typo-in-url-argument.patch -Patch3: 0018-novell-bugzilla-support-in-getBugzillaClassForURL.patch -Patch4: 0019-novell-bugzilla-run-on-3.4.patch +# cherry-picked patches from git format-patch 0.6.2...suse +Patch0: 0006-cli-speedup-request-outputformat-fields-when-doing-q.patch +Patch1: 0007-fixup-for-cli-speedup-with-query-outputformat.patch +Patch2: 0013-obfuscated-password-support-in-oscrc.patch +Patch3: 0014-fix-typo-in-url-argument.patch +Patch4: 0015-novell-bugzilla-support-in-getBugzillaClassForURL.patch +Patch5: 0016-novell-bugzilla-run-on-3.4.patch +Patch6: 0017-allow-various-bnc-instances-in-NovellBugzilla.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildArch: noarch @@ -57,6 +59,8 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 %build export CFLAGS="%{optflags}" ++++++ 0006-cli-speedup-request-outputformat-fields-when-doing-q.patch ++++++ >From 94338c8d931cae0d40a0343ec85018b36f7c8695 Mon Sep 17 00:00:00 2001 From: Will Woods <wwoods(a)redhat.com> Date: Mon, 13 Jun 2011 13:15:06 -0400 Subject: [PATCH 06/17] cli speedup: request --outputformat fields when doing query Add the fields listed in --outputformat to the query's 'column_list' argument. This should give us all the data we want to display right in the query result, which should greatly speed up query --outputformat. --- bin/bugzilla | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/bin/bugzilla b/bin/bugzilla index e0810eb..833c5a2 100755 --- a/bin/bugzilla +++ b/bin/bugzilla @@ -41,6 +41,8 @@ def to_encoding(ustring): return ustring return u'' +format_field_re = re.compile("%{([a-z0-9_]+)(?::([^}]*))?}") + def setup_parser(): u = "%prog [global options] COMMAND [command-options]" u += "\nCommands: %s" % ', '.join(cmdlist) @@ -551,6 +553,14 @@ def main(): if opt.output == 'oneline': q['column_list'] = [ 'bug_id', 'bug_status', 'assigned_to', 'component', 'target_milestone', 'short_desc', 'flags', 'keywords', 'blockedby' ] + if opt.outputformat: + aliases = dict(bz.field_aliases) + for fieldname, sub in format_field_re.findall(opt.outputformat): + fields.append(fieldname) + if fieldname in aliases: + fields.append(aliases.get(fieldname)) + q['column_list'] = fields + log.debug("bz.query: %s", q) if not q: parser.error("'query' command requires additional arguments") @@ -692,14 +702,12 @@ def main(): # If we're doing new/query/modify, output our results if action in ['new','query']: if opt.outputformat: - format_field_re = re.compile("%{([a-z0-9_]+)(?::([^}]*))?}") special_fields = { 'flag': lambda b,f: b.get_flag_status(f), 'whiteboard': lambda b,wb: b.getwhiteboard(wb), } def bug_field(matchobj): - fieldname = matchobj.group(1) - rest = matchobj.group(2) + (fieldname, rest) = matchobj.groups() if special_fields.has_key(fieldname): val = special_fields[fieldname](b, rest) -- 1.7.6 ++++++ 0007-fixup-for-cli-speedup-with-query-outputformat.patch ++++++ >From 1a37173fc0e63f116878d6e99718ae12708a3174 Mon Sep 17 00:00:00 2001 From: Will Woods <wwoods(a)redhat.com> Date: Mon, 13 Jun 2011 18:02:27 -0400 Subject: [PATCH 07/17] fixup for cli speedup with query --outputformat Forgot to initialize a variable. whoops. --- bin/bugzilla | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/bugzilla b/bin/bugzilla index 833c5a2..b0eeeaa 100755 --- a/bin/bugzilla +++ b/bin/bugzilla @@ -555,11 +555,12 @@ def main(): 'target_milestone', 'short_desc', 'flags', 'keywords', 'blockedby' ] if opt.outputformat: aliases = dict(bz.field_aliases) + req_fields = [] for fieldname, sub in format_field_re.findall(opt.outputformat): - fields.append(fieldname) + req_fields.append(fieldname) if fieldname in aliases: - fields.append(aliases.get(fieldname)) - q['column_list'] = fields + req_fields.append(aliases.get(fieldname)) + q['column_list'] = req_fields log.debug("bz.query: %s", q) if not q: -- 1.7.6 ++++++ 0016-obfuscated-password-support-in-oscrc.patch -> 0013-obfuscated-password-support-in-oscrc.patch ++++++ --- python-bugzilla/0016-obfuscated-password-support-in-oscrc.patch 2011-05-23 16:04:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-bugzilla/0013-obfuscated-password-support-in-oscrc.patch 2011-07-29 11:06:18.000000000 +0200 @@ -1,7 +1,7 @@ -From b8de888a2b4aad939ff4373893210334e581f270 Mon Sep 17 00:00:00 2001 +From 89ca368861e9570639e6873c1c51fb3936dd77d9 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil <mvyskocil(a)suse.cz> Date: Wed, 26 Aug 2009 11:08:36 +0200 -Subject: [PATCH 16/19] obfuscated password support in oscrc +Subject: [PATCH 13/17] obfuscated password support in oscrc The osc client introduced an obfuscated passwords (not secure, but many times requested by a community), so this patch to readconfig method adds @@ -13,7 +13,7 @@ 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/bugzilla/nvlbugzilla.py b/bugzilla/nvlbugzilla.py -index 35202a4..0d88db1 100644 +index ec2b74a..8a64f81 100644 --- a/bugzilla/nvlbugzilla.py +++ b/bugzilla/nvlbugzilla.py @@ -138,11 +138,18 @@ If you want cache the cookies and speedup the repeated connections, remove it or @@ -46,5 +46,5 @@ except NoOptionError, ne: return -- -1.7.4.1 +1.7.6 ++++++ 0017-fix-typo-in-url-argument.patch -> 0014-fix-typo-in-url-argument.patch ++++++ --- python-bugzilla/0017-fix-typo-in-url-argument.patch 2011-05-23 16:04:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-bugzilla/0014-fix-typo-in-url-argument.patch 2011-07-29 11:06:19.000000000 +0200 @@ -1,14 +1,14 @@ -From 77bbfe33af859cde6a0cf3423aa5f52748dfed50 Mon Sep 17 00:00:00 2001 +From eab4135a4611823423c1077e8a072943fd6025e9 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil <mvyskocil(a)suse.cz> Date: Fri, 4 Sep 2009 09:54:42 +0200 -Subject: [PATCH 17/19] fix typo in url argument +Subject: [PATCH 14/17] fix typo in url argument --- bugzilla/nvlbugzilla.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/bugzilla/nvlbugzilla.py b/bugzilla/nvlbugzilla.py -index 0d88db1..fe15fd6 100644 +index 8a64f81..6af3238 100644 --- a/bugzilla/nvlbugzilla.py +++ b/bugzilla/nvlbugzilla.py @@ -57,7 +57,7 @@ class NovellBugzilla(Bugzilla32): @@ -21,5 +21,5 @@ def __get_expiration(self): return self._expires -- -1.7.4.1 +1.7.6 ++++++ 0018-novell-bugzilla-support-in-getBugzillaClassForURL.patch -> 0015-novell-bugzilla-support-in-getBugzillaClassForURL.patch ++++++ --- python-bugzilla/0018-novell-bugzilla-support-in-getBugzillaClassForURL.patch 2011-05-23 16:04:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-bugzilla/0015-novell-bugzilla-support-in-getBugzillaClassForURL.patch 2011-07-29 11:06:19.000000000 +0200 @@ -1,14 +1,14 @@ -From ccea238ede22c81100c0456ede42642f2f82947b Mon Sep 17 00:00:00 2001 +From ba5277024722c6083e10ddce5e070cb622572148 Mon Sep 17 00:00:00 2001 From: Jan Matejek <jan.matejek(a)novell.com> Date: Mon, 23 May 2011 14:20:57 +0200 -Subject: [PATCH 18/19] novell bugzilla support in getBugzillaClassForURL +Subject: [PATCH 15/17] novell bugzilla support in getBugzillaClassForURL --- bugzilla/__init__.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/bugzilla/__init__.py b/bugzilla/__init__.py -index 97d8706..8b26835 100644 +index f60fd54..a3a88d2 100644 --- a/bugzilla/__init__.py +++ b/bugzilla/__init__.py @@ -23,6 +23,9 @@ classlist = ['Bugzilla3', 'Bugzilla32', 'Bugzilla34', 'Bugzilla36', @@ -22,5 +22,5 @@ rhbz = False bzversion = '' -- -1.7.4.1 +1.7.6 ++++++ 0019-novell-bugzilla-run-on-3.4.patch -> 0016-novell-bugzilla-run-on-3.4.patch ++++++ --- python-bugzilla/0019-novell-bugzilla-run-on-3.4.patch 2011-05-23 16:04:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-bugzilla/0016-novell-bugzilla-run-on-3.4.patch 2011-07-29 11:06:19.000000000 +0200 @@ -1,14 +1,14 @@ -From 82b1b6bdac75814fc94843934d9cfe4fcdef06d4 Mon Sep 17 00:00:00 2001 +From 514cdd0c94644d1096ae248b8bc4e45c5986e486 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil <mvyskocil(a)suse.cz> Date: Mon, 23 May 2011 14:24:58 +0200 -Subject: [PATCH] novell bugzilla run on 3.4 +Subject: [PATCH 16/17] novell bugzilla run on 3.4 --- bugzilla/nvlbugzilla.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bugzilla/nvlbugzilla.py b/bugzilla/nvlbugzilla.py -index fe15fd6..4acae00 100644 +index 6af3238..62b75b7 100644 --- a/bugzilla/nvlbugzilla.py +++ b/bugzilla/nvlbugzilla.py @@ -11,7 +11,7 @@ @@ -32,5 +32,5 @@ reimplements a login method which is compatible with iChain. -- -1.7.4.1 +1.7.6 ++++++ 0017-allow-various-bnc-instances-in-NovellBugzilla.patch ++++++ >From 25f24e68d5005b500dd000f90ae5ebec8a2ba70d Mon Sep 17 00:00:00 2001 From: Michal Vyskocil <mvyskocil(a)suse.cz> Date: Thu, 26 May 2011 11:00:33 +0200 Subject: [PATCH 17/17] allow various bnc instances in NovellBugzilla The older NovellBugzilla implementation was limited to bugzilla.novell.com, so using of internal testing instace was not possible. So code in NovellBugzilla.__init__ and getBugzillaClassForURL search for 'novell.com' string only. In adition NovellBugzilla.__init__ add a url= argument to kwargs if not exists or if it does not contain novell.com, so this class can be simple instantiated without arguments in some cases. --- bugzilla/__init__.py | 2 +- bugzilla/nvlbugzilla.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bugzilla/__init__.py b/bugzilla/__init__.py index a3a88d2..fcfffd6 100644 --- a/bugzilla/__init__.py +++ b/bugzilla/__init__.py @@ -23,7 +23,7 @@ classlist = ['Bugzilla3', 'Bugzilla32', 'Bugzilla34', 'Bugzilla36', def getBugzillaClassForURL(url): log.debug("Choosing subclass for %s" % url) - if url.startswith('https://bugzilla.novell.com'): + if 'novell.com' in url: return NovellBugzilla s = xmlrpclib.ServerProxy(url) diff --git a/bugzilla/nvlbugzilla.py b/bugzilla/nvlbugzilla.py index 62b75b7..15879f1 100644 --- a/bugzilla/nvlbugzilla.py +++ b/bugzilla/nvlbugzilla.py @@ -55,9 +55,11 @@ class NovellBugzilla(Bugzilla34): def __init__(self, expires=300, **kwargs): self._expires = expires + # allow proper usage of NovellBugzilla with a wrong url argument + # (without it or with an another location) + if not 'novell.com' in kwargs.get('url', ''): + kwargs['url'] = self.__class__.bugzilla_url super(NovellBugzilla, self).__init__(**kwargs) - # url argument exists only for backward compatibility, but is always set to same url - self.url = self.__class__.bugzilla_url def __get_expiration(self): return self._expires -- 1.7.6 ++++++ python-bugzilla-0.6.1.tar.bz2 -> python-bugzilla-0.6.2.tar.bz2 ++++++ ++++ 1750 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 lxpanel for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '11

29 Jul '11

Hello community, here is the log from the commit of package lxpanel for openSUSE:Factory checked in at Fri Jul 29 11:52:51 CEST 2011. -------- --- lxpanel/lxpanel.changes 2011-07-25 00:54:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/lxpanel/lxpanel.changes 2011-07-27 00:37:20.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jul 26 22:14:24 UTC 2011 - gber(a)opensuse.org + +- added lxpanel-0.5.7-fix-gcc-warnings.patch in order to fix two + typos + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- lxpanel-0.5.7-fix-typo.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxpanel.spec ++++++ --- /var/tmp/diff_new_pack.P6w1Vf/_old 2011-07-29 11:52:36.000000000 +0200 +++ /var/tmp/diff_new_pack.P6w1Vf/_new 2011-07-29 11:52:36.000000000 +0200 @@ -20,7 +20,7 @@ Name: lxpanel Version: 0.5.7 -Release: 1 +Release: 4 Summary: Lightweight X11 desktop panel based on fbpanel Group: System/GUI/LXDE License: GPL @@ -28,6 +28,7 @@ Source0: %name-%version.tar.bz2 Patch0: %name-0.5.7-fix-gtkrequisition.patch Patch1: %name-0.5.7-fix-gcc-warnings.patch +Patch2: %name-0.5.7-fix-typo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: alsa-devel intltool pkg-config update-desktop-files BuildRequires: docbook-utils gtk2-devel menu-cache-devel python-xml @@ -67,6 +68,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %configure \ ++++++ lxpanel-0.5.7-fix-typo.patch ++++++ diff -urNp lxpanel-0.5.7.orig/src/plugins/taskbar.c lxpanel-0.5.7/src/plugins/taskbar.c --- lxpanel-0.5.7.orig/src/plugins/taskbar.c 2011-07-23 22:13:48.000000000 +0200 +++ lxpanel-0.5.7/src/plugins/taskbar.c 2011-07-27 00:07:29.350999981 +0200 @@ -615,7 +615,7 @@ static GdkPixbuf * _wnck_gdk_pixbuf_get_ } /* Be sure we aren't going to fail due to visual mismatch. */ -#if GLIB_CHECK_VERSION(2,22,0) +#if GTK_CHECK_VERSION(2,22,0) if ((colormap != NULL) && (gdk_visual_get_depth(gdk_colormap_get_visual(colormap)) != depth)) #else if ((colormap != NULL) && (gdk_colormap_get_visual(colormap)->depth != depth)) @@ -1220,7 +1220,7 @@ static void taskbar_button_size_allocate #if GTK_CHECK_VERSION(2,22,0) gdk_window_get_origin(gtk_button_get_event_window(GTK_BUTTON(btn)), &x, &y); #else - gdk_window_get_origin((GTK_BUTTON(btn)->event_window, &x, &y); + gdk_window_get_origin(GTK_BUTTON(btn)->event_window, &x, &y); #endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libxslt for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '11

29 Jul '11

Hello community, here is the log from the commit of package libxslt for openSUSE:Factory checked in at Fri Jul 29 10:35:18 CEST 2011. -------- --- libxslt/libxslt-python.changes 2010-07-21 15:24:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/libxslt/libxslt-python.changes 2011-07-29 06:25:45.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 29 03:46:57 UTC 2011 - crrodriguez(a)opensuse.org + +- Rework build of this package in a sane way. + +------------------------------------------------------------------- --- libxslt/libxslt.changes 2010-07-21 15:24:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/libxslt/libxslt.changes 2011-07-29 06:25:47.000000000 +0200 @@ -1,0 +2,18 @@ +Fri Jul 29 01:53:38 UTC 2011 - crrodriguez(a)opensuse.org + +- Fix broken requires,provides,Obsoletes causing "have choice.." + build system errors +- Remove all "la" files since they are no longer needed +- Fix -devel pacakge requires and messed up -config scripts + this may cause build fails of already broken dependant packages + that do not link all the needed libraries in an explicit manner + (This is not a bug here, it is expected to cause it) + +------------------------------------------------------------------- +Wed Jul 27 09:14:25 UTC 2011 - giecrilj(a)stegny.2a.pl + +- package clean-up: + - include library version number in the name of the binary package + - add an alias for xsltproc (required by package xmlto) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libxslt-config-fixes.patch xslt-config.1.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxslt-python.spec ++++++ --- /var/tmp/diff_new_pack.dv2E2O/_old 2011-07-29 10:34:08.000000000 +0200 +++ /var/tmp/diff_new_pack.dv2E2O/_new 2011-07-29 10:34:08.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libxslt-python (Version 1.1.26) +# spec file for package libxslt-python # -# 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 @@ -19,10 +19,13 @@ Name: libxslt-python -BuildRequires: libxml2-python libxslt-devel python-devel +BuildRequires: libxml2-python python-devel +BuildRequires: libgcrypt-devel +BuildRequires: libgpg-error-devel +BuildRequires: libxml2-devel Summary: Python Bindings for libxslt Version: 1.1.26 -Release: 1 +Release: 2 License: MIT License (or similar) Group: Development/Libraries/Python Source: libxslt-%{version}.tar.bz2 @@ -31,8 +34,8 @@ Patch0: libxslt-1.1.24-linkflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{py_requires} -Requires: libxml2 >= 2.6.27 Url: http://xmlsoft.org/XSLT/ +#BuildArch: noarch %description The libxslt-python package contains a module that permits applications @@ -56,33 +59,29 @@ %build autoreconf --force --install -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ -%configure -# use libxslt as built by libxslt source package -mkdir libxslt/.libs libexslt/.libs -cp -v %{_libdir}/libxslt.la libxslt -cp -v %{_libdir}/libexslt.la libexslt -make -C python +%configure --with-python --with-pic --disable-static +make %{?_smp_mflags} PYTHON_SITE_PACKAGES=%{py_sitedir} pythondir=%{py_sitedir} %install -export RPM_BUILD_ROOT -make -C python install \ - DESTDIR=$RPM_BUILD_ROOT \ - pythondir=%{py_sitedir} \ - PYTHON_SITE_PACKAGES=%{py_sitedir} +make install PYTHON_SITE_PACKAGES=%{py_sitedir} pythondir=%{py_sitedir} DESTDIR=$RPM_BUILD_ROOT # Unwanted doc stuff rm -fr $RPM_BUILD_ROOT%{_datadir}/doc # #223696 -rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a} +find %{buildroot} -type f -name "*.la" -print -delete %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) +%exclude %{_bindir}/* +%exclude %{_libdir}/lib** +%exclude %{_includedir}/* +%exclude %{_mandir}/* +%exclude %{_libdir}/pkgconfig/* +%exclude %{_libdir}/xsltConf.sh +%exclude /usr/share/aclocal/libxslt.m4 %{py_sitedir}/* -# %{python_sitepath}/libxslt.py -# %{python_sitepath}/libxsltmod.so %doc python/TODO %doc python/libxslt-python-api.xml %doc python/tests/*.py ++++++ libxslt.spec ++++++ --- /var/tmp/diff_new_pack.dv2E2O/_old 2011-07-29 10:34:08.000000000 +0200 +++ /var/tmp/diff_new_pack.dv2E2O/_new 2011-07-29 10:34:08.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libxslt (Version 1.1.26) +# spec file for package libxslt # -# 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 @@ -15,27 +15,30 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: libxslt -BuildRequires: libgcrypt libgcrypt-devel libgpg-error libgpg-error-devel libxml2-devel pkg-config -Summary: XSL Transformation Library Version: 1.1.26 -Release: 1 +Release: 5 License: MIT License (or similar) +Summary: XSL Transformation Library Group: System/Libraries +BuildRequires: libgcrypt-devel +BuildRequires: libgpg-error-devel +BuildRequires: pkg-config +BuildRequires: pkgconfig(libxml-2.0) # bug437293 %ifarch ppc64 Obsoletes: libxslt-64bit %endif +Url: http://xmlsoft.org/XSLT/ # Source: %{name}-%{version}.tar.bz2 Source2: baselibs.conf +Source3: xslt-config.1.gz Patch0: %{name}-1.1.24-no-net-autobuild.patch +Patch1: libxslt-config-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: libxml2 >= 2.6.27 -Url: http://xmlsoft.org/XSLT/ %description This C library allows you to transform XML files into other XML files @@ -53,6 +56,29 @@ The package comes with xsltproc, a command line interface to the XSLT engine. +%package -n %{name}1 + +Summary: XSL Transformation Library +Provides: libxslt = %{version} +Obsoletes: %{name} < %{version} +Provides: xsltproc = %{version} + +%description -n libxslt1 +This C library allows you to transform XML files into other XML files +(or HTML, text, and more) using the standard XSLT stylesheet +transformation mechanism. + +It is based on libxml (version 2) for XML parsing, tree manipulation, +and XPath support. It is written in plain C, making as few assumptions +as possible and sticks closely to ANSI C/POSIX for easy embedding. +Although not primarily designed with performance in mind, libxslt seems +to be a relatively fast processor. It also includes full support for +the EXSLT set of extension functions as well as some common extensions +present in other XSLT engines. + +The package comes with xsltproc, a command line interface to the XSLT +engine. + %package devel License: LGPLv2.1+ Summary: Include Files and Libraries mandatory for Development @@ -61,10 +87,9 @@ %ifarch ppc64 Obsoletes: libxslt-devel-64bit %endif -# -Requires: %{name} = %{version} -Requires: libxml2-devel >= 2.6.27 -Requires: libgcrypt-devel libgpg-error-devel glibc-devel pkg-config +Requires: %{name}1 = %{version} +Requires: glibc-devel +#libxml is automatically required with pkgconfig %description devel This package contains all necessary include files and libraries needed @@ -73,47 +98,49 @@ %prep %setup -q %patch0 +%patch1 %build autoreconf --force --install -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ %configure --disable-static --with-pic --without-python -%{__make} %{?jobs:-j%jobs} +make %{?_smp_mflags} %check make check %install -make DESTDIR=$RPM_BUILD_ROOT install +%make_install # Unwanted doc stuff -rm -fr $RPM_BUILD_ROOT%{_datadir}/doc -# libxslt-python uses these -#%{__rm} -f %{buildroot}%{_libdir}/*.la +rm -fr %{buildroot}%{_datadir}/doc +# the manual page is required +install -ma=r '-t%{buildroot}%{_mandir}/man1' '%{SOURCE3}' +#kill all "la" files +find %{buildroot} -type f -name "*.la" -print -delete %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -%post -p /sbin/ldconfig +%post -n %{name}1 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n %{name}1 -p /sbin/ldconfig -%files +%files -n %{name}1 %defattr(-, root, root) %doc AUTHORS NEWS README COPYING* Copyright TODO FEATURES %{_libdir}/lib*.so.* %{_bindir}/xsltproc -%{_mandir}/man1/xsltproc.1* +%doc %{_mandir}/man1/xsltproc.* %files devel %defattr(-, root, root) %{_libdir}/lib*.so %{_libdir}/*.sh %{_libdir}/pkgconfig/*.pc -%{_libdir}/lib*.la %{_includedir}/* %{_datadir}/aclocal/* %{_bindir}/xslt-config -%{_mandir}/man3/* +%doc %{_mandir}/man1/xslt-config.* +%doc %{_mandir}/man3/* # not available doc/*.png %doc doc/*.html doc/html doc/tutorial doc/*.gif ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.dv2E2O/_old 2011-07-29 10:34:08.000000000 +0200 +++ /var/tmp/diff_new_pack.dv2E2O/_new 2011-07-29 10:34:09.000000000 +0200 @@ -1,2 +1,2 @@ -libxslt +libxslt1 libxslt-devel ++++++ libxslt-config-fixes.patch ++++++ --- xslt-config.in.orig +++ xslt-config.in @@ -89,7 +89,7 @@ while test $# -gt 0; do shift done -the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@" +the_libs="-lxslt" if test "$includedir" != "/usr/include"; then the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`" else --- xsltConf.sh.in.orig +++ xsltConf.sh.in @@ -2,6 +2,6 @@ # Configuration file for using the xslt library # XSLT_LIBDIR="@XSLT_LIBDIR@" -XSLT_LIBS="@XSLT_LIBS@" +XSLT_LIBS="-lxslt" XSLT_INCLUDEDIR="@XSLT_INCLUDEDIR@" MODULE_VERSION="xslt-@VERSION@" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 lxdm for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '11

29 Jul '11

Hello community, here is the log from the commit of package lxdm for openSUSE:Factory checked in at Fri Jul 29 10:03:05 CEST 2011. -------- --- lxdm/lxdm.changes 2011-07-21 16:45:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/lxdm/lxdm.changes 2011-07-29 00:35:16.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jul 28 22:34:27 UTC 2011 - andrea(a)opensuse.org + +- improved lxdm-0.4.0-use-sysconfig.patch to allow lxdm-config + to support suse specific sysconfig. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxdm.spec ++++++ --- /var/tmp/diff_new_pack.tOgqbp/_old 2011-07-29 10:02:12.000000000 +0200 +++ /var/tmp/diff_new_pack.tOgqbp/_new 2011-07-29 10:02:12.000000000 +0200 @@ -21,7 +21,7 @@ Name: lxdm Summary: LXDE Display Manager Version: 0.4.0 -Release: 1 +Release: 3 License: GPLv2 and LGPLv2 Group: System/GUI/LXDE Url: http://lxde.org/ ++++++ lxdm-0.4.0-use-sysconfig.patch ++++++ --- /var/tmp/diff_new_pack.tOgqbp/_old 2011-07-29 10:02:12.000000000 +0200 +++ /var/tmp/diff_new_pack.tOgqbp/_new 2011-07-29 10:02:12.000000000 +0200 @@ -1,6 +1,6 @@ -diff -urNp lxdm-0.4.0.git.1310644223.orig/data/lxdm.conf.in lxdm-0.4.0.git.1310644223/data/lxdm.conf.in ---- lxdm-0.4.0.git.1310644223.orig/data/lxdm.conf.in 2011-07-15 16:39:32.000000000 +0200 -+++ lxdm-0.4.0.git.1310644223/data/lxdm.conf.in 2011-07-15 16:43:04.000000000 +0200 +diff -uNr old-lxdm-0.4.0//data/lxdm.conf.in lxdm-0.4.0/data/lxdm.conf.in +--- old-lxdm-0.4.0//data/lxdm.conf.in 2011-07-28 00:01:57.537862491 +0200 ++++ lxdm-0.4.0/data/lxdm.conf.in 2011-07-28 00:02:14.276862487 +0200 @@ -1,14 +1,8 @@ [base] -## uncomment and set autologin username to enable autologin @@ -16,10 +16,53 @@ ## uncomment and set to set numlock on your keyboard # numlock=0 -diff -urNp lxdm-0.4.0.git.1310644223.orig/src/gdm/gdm-sysconfig.c lxdm-0.4.0.git.1310644223/src/gdm/gdm-sysconfig.c ---- lxdm-0.4.0.git.1310644223.orig/src/gdm/gdm-sysconfig.c 1970-01-01 01:00:00.000000000 +0100 -+++ lxdm-0.4.0.git.1310644223/src/gdm/gdm-sysconfig.c 2011-07-15 16:41:52.000000000 +0200 -@@ -0,0 +1,439 @@ +diff -uNr old-lxdm-0.4.0//src/config.c lxdm-0.4.0/src/config.c +--- old-lxdm-0.4.0//src/config.c 2011-07-28 00:01:57.536862491 +0200 ++++ lxdm-0.4.0/src/config.c 2011-07-29 00:33:16.802620577 +0200 +@@ -30,6 +30,8 @@ + #include <pwd.h> + #include <unistd.h> + ++#include "suse-sysconfig.h" ++ + #define CONFIG_UI_FILE LXDM_DATA_DIR"/config.ui" + //#define CONFIG_UI_FILE "../data/config.ui" + #define FACES_DIR "/usr/share/pixmaps/faces" +@@ -372,13 +374,18 @@ + gtk_label_set_text(GTK_LABEL(w),user_name); + } + +-void on_user_autologin_toggled(GtkToggleButton *togglebutton,gpointer user_data) ++int on_user_autologin_toggled(GtkToggleButton *togglebutton,gpointer user_data) + { ++ int result; + if(gtk_toggle_button_get_active(togglebutton)) +- g_key_file_set_string(config,"base","autologin",user_name); ++ result = gdm_sysconfig_save_value(SYSCONFIG_AUTOLOGIN_FILE, SYSCONFIG_AUTOLOGIN_KEY, user_name); + else +- g_key_file_remove_key(config,"base","autologin",NULL); ++/* I don't have a gdm_sysconfig_remove_value(), so just replace with a "save" with empty string ++ * g_key_file_remove_key(config,"base","autologin",NULL); ++ */ ++ result = gdm_sysconfig_save_value(SYSCONFIG_AUTOLOGIN_FILE, SYSCONFIG_AUTOLOGIN_KEY, ""); + dirty++; ++ return result; + } + + void prepare_user_autologin(GtkBuilder *builder) +@@ -388,7 +395,7 @@ + w=(GtkWidget*)gtk_builder_get_object(builder,"user-autologin"); + if(!root) gtk_widget_set_sensitive(w,FALSE); + g_signal_connect(w,"toggled",G_CALLBACK(on_user_autologin_toggled),NULL); +- name=g_key_file_get_string(config,"base","autologin",NULL); ++ name=gdm_sysconfig_load_value(SYSCONFIG_AUTOLOGIN_FILE, SYSCONFIG_AUTOLOGIN_KEY); + if(!name) return; + if(!strcmp(name,user_name)) + { +diff -uNr old-lxdm-0.4.0//src/gdm/gdm-sysconfig.c lxdm-0.4.0/src/gdm/gdm-sysconfig.c +--- old-lxdm-0.4.0//src/gdm/gdm-sysconfig.c 1970-01-01 01:00:00.000000000 +0100 ++++ lxdm-0.4.0/src/gdm/gdm-sysconfig.c 2011-07-29 00:09:51.029620578 +0200 +@@ -0,0 +1,484 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * + * Copyright (C) 2008 Hans Petter Jansson <hpj(a)novell.com> @@ -60,6 +103,7 @@ + +#include <glib.h> +#include <glib/gi18n.h> ++#include <glib/gstdio.h> + +#include "gdm-sysconfig.h" + @@ -96,7 +140,7 @@ + g_debug ("%s", str); + } else { + g_ptr_array_add (lines, g_strdup ("")); -+ g_debug ("", str); ++ g_debug ("%s", ""); + } + } + @@ -279,7 +323,7 @@ + value = g_strdup (""); + } + } else { -+ temp = g_strndup (p0, p1 - p0); ++ temp = g_strndup (p0, p1 - p0); + value = g_strcompress (temp); + g_free (temp); + g_strchomp (value); @@ -325,7 +369,8 @@ + const gchar *p0, *p1, *p2; + gchar quotes; + gchar *escaped_value; -+ gint escaped_value_len; ++ gchar *quoted_escaped_value; ++ gint quoted_escaped_value_len; + gchar *new_line; + gint len; + @@ -334,20 +379,22 @@ + return NULL; + + escaped_value = g_strescape (value, ""); -+ escaped_value_len = strlen (escaped_value); ++ quoted_escaped_value = g_strdup_printf ("\"%s\"", escaped_value); ++ g_free (escaped_value); ++ quoted_escaped_value_len = strlen (quoted_escaped_value); + + p1 = skip_over_value (p0, &quotes); + p2 = p1 + strlen (p1); -+ len = (p0 - line) + escaped_value_len + (p2 - p1); ++ len = (p0 - line) + quoted_escaped_value_len + (p2 - p1); + + new_line = g_malloc (len + 1); -+ memcpy (new_line, line, p0 - line); -+ memcpy (new_line + (p0 - line), escaped_value, escaped_value_len); -+ memcpy (new_line + (p0 - line) + escaped_value_len, p1, p2 - p1); ++ memcpy (new_line, line, p0 - line); ++ memcpy (new_line + (p0 - line), quoted_escaped_value, quoted_escaped_value_len); ++ memcpy (new_line + (p0 - line) + quoted_escaped_value_len, p1, p2 - p1); + -+ *(new_line + len - 1) = '\0'; ++ *(new_line + len) = '\0'; + -+ g_free (escaped_value); ++ g_free (quoted_escaped_value); + + return new_line; +} @@ -419,6 +466,47 @@ + return set_value (sysconfig, key, value); +} + ++gboolean ++gdm_sysconfig_get_value_boolean (const gchar **sysconfig, const gchar *key, gboolean *value) ++{ ++ char *val; ++ gboolean val_bool; ++ ++ g_return_val_if_fail (sysconfig != NULL, FALSE); ++ g_return_val_if_fail (key != NULL, FALSE); ++ ++ val = get_value (sysconfig, key); ++ if (val == NULL) { ++ return FALSE; ++ } ++ ++ if (!strcasecmp (val, "yes")) { ++ val_bool = TRUE; ++ } else if (!strcasecmp (val, "no")) { ++ val_bool = FALSE; ++ } else { ++ g_free (val); ++ return FALSE; ++ } ++ ++ g_free (val); ++ ++ if (value != NULL) { ++ *value = val_bool; ++ } ++ ++ return TRUE; ++} ++ ++gboolean ++gdm_sysconfig_set_value_boolean (gchar **sysconfig, const gchar *key, gboolean value) ++{ ++ g_return_val_if_fail (sysconfig != NULL, FALSE); ++ g_return_val_if_fail (key != NULL, FALSE); ++ ++ return set_value (sysconfig, key, value ? "yes" : "no"); ++} ++ +gchar * +gdm_sysconfig_load_value (const gchar *file_name, const gchar *key) +{ @@ -459,10 +547,10 @@ + g_strfreev (lines); + return result; +} -diff -urNp lxdm-0.4.0.git.1310644223.orig/src/gdm/gdm-sysconfig.h lxdm-0.4.0.git.1310644223/src/gdm/gdm-sysconfig.h ---- lxdm-0.4.0.git.1310644223.orig/src/gdm/gdm-sysconfig.h 1970-01-01 01:00:00.000000000 +0100 -+++ lxdm-0.4.0.git.1310644223/src/gdm/gdm-sysconfig.h 2011-07-15 16:41:52.000000000 +0200 -@@ -0,0 +1,41 @@ +diff -uNr old-lxdm-0.4.0//src/gdm/gdm-sysconfig.h lxdm-0.4.0/src/gdm/gdm-sysconfig.h +--- old-lxdm-0.4.0//src/gdm/gdm-sysconfig.h 1970-01-01 01:00:00.000000000 +0100 ++++ lxdm-0.4.0/src/gdm/gdm-sysconfig.h 2011-07-29 00:09:51.029620578 +0200 +@@ -0,0 +1,43 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * + * Copyright (C) 2008 Hans Petter Jansson <hpj(a)novell.com> @@ -488,7 +576,6 @@ +#define __GDM_SYSCONFIG_H + +#include <glib-object.h> -+#include <glib/gstdio.h> + +G_BEGIN_DECLS + @@ -498,31 +585,28 @@ +gchar *gdm_sysconfig_get_value (const gchar **sysconfig, const gchar *key); +gboolean gdm_sysconfig_set_value (gchar **sysconfig, const gchar *key, const gchar *value); + ++gboolean gdm_sysconfig_get_value_boolean (const gchar **sysconfig, const gchar *key, gboolean *value); ++gboolean gdm_sysconfig_set_value_boolean (gchar **sysconfig, const gchar *key, gboolean value); ++ +gchar *gdm_sysconfig_load_value (const gchar *file_name, const gchar *key); +gboolean gdm_sysconfig_save_value (const gchar *file_name, const gchar *key, const gchar *value); + +G_END_DECLS + +#endif /* __GDM_SYSCONFIG_H */ -diff -urNp lxdm-0.4.0.git.1310644223.orig/src/lxdm.c lxdm-0.4.0.git.1310644223/src/lxdm.c ---- lxdm-0.4.0.git.1310644223.orig/src/lxdm.c 2011-07-15 16:39:32.000000000 +0200 -+++ lxdm-0.4.0.git.1310644223/src/lxdm.c 2011-07-15 16:41:52.000000000 +0200 -@@ -72,6 +72,14 @@ +diff -uNr old-lxdm-0.4.0//src/lxdm.c lxdm-0.4.0/src/lxdm.c +--- old-lxdm-0.4.0//src/lxdm.c 2011-07-28 00:01:57.536862491 +0200 ++++ lxdm-0.4.0/src/lxdm.c 2011-07-28 00:05:33.632862492 +0200 +@@ -72,6 +72,8 @@ #define LOGFILE "/var/log/lxdm.log" -+#include "gdm/gdm-sysconfig.h" -+ -+#define SYSCONFIG_AUTOLOGIN_KEY "DISPLAYMANAGER_AUTOLOGIN" -+#define SYSCONFIG_AUTOLOGIN_FILE "/etc/sysconfig/displaymanager" -+ -+#define SYSCONFIG_SESSION_KEY "DEFAULT_WM" -+#define SYSCONFIG_SESSION_FILE "/etc/sysconfig/windowmanager" ++#include "suse-sysconfig.h" + typedef struct{ gboolean idle; gboolean greeter; -@@ -1209,7 +1217,7 @@ gboolean lxdm_get_session_info(char *ses +@@ -1209,7 +1211,7 @@ char *name=NULL,*exec=NULL; if(!session || !session[0]) { @@ -531,7 +615,7 @@ if(!name && getenv("PREFERRED")) name = g_strdup(getenv("PREFERRED")); if(!session && getenv("DESKTOP")) -@@ -1538,7 +1546,7 @@ int lxdm_do_auto_login(void) +@@ -1538,7 +1540,7 @@ int i,count,ret; int success=0; @@ -540,14 +624,57 @@ if(!p) return 0; users=g_strsplit(p," ",8); g_free(p); -diff -urNp lxdm-0.4.0.git.1310644223.orig/src/Makefile.am lxdm-0.4.0.git.1310644223/src/Makefile.am ---- lxdm-0.4.0.git.1310644223.orig/src/Makefile.am 2011-07-15 16:39:32.000000000 +0200 -+++ lxdm-0.4.0.git.1310644223/src/Makefile.am 2011-07-15 16:44:08.000000000 +0200 -@@ -21,6 +21,7 @@ lxdm_binary_LDADD = \ +diff -uNr old-lxdm-0.4.0//src/Makefile.am lxdm-0.4.0/src/Makefile.am +--- old-lxdm-0.4.0//src/Makefile.am 2011-07-28 00:01:57.536862491 +0200 ++++ lxdm-0.4.0/src/Makefile.am 2011-07-28 00:16:01.647862492 +0200 +@@ -21,6 +21,7 @@ lxdm_binary_SOURCES = \ lxdm.c lxdm.h ui.c lxcom.c lxcom.h xconn.c xconn.h \ -+ gdm/gdm-sysconfig.c gdm/gdm-sysconfig.h \ ++ gdm/gdm-sysconfig.c gdm/gdm-sysconfig.h suse-sysconfig.h\ $(NULL) libexec_PROGRAMS = lxdm-greeter-gdk lxdm-numlock lxdm-greeter-gtk +@@ -98,5 +99,6 @@ + + lxdm_config_SOURCES = \ + config.c \ ++ gdm/gdm-sysconfig.c gdm/gdm-sysconfig.h suse-sysconfig.h\ + $(NULL) + +diff -uNr old-lxdm-0.4.0//src/suse-sysconfig.h lxdm-0.4.0/src/suse-sysconfig.h +--- old-lxdm-0.4.0//src/suse-sysconfig.h 1970-01-01 01:00:00.000000000 +0100 ++++ lxdm-0.4.0/src/suse-sysconfig.h 2011-07-28 00:24:29.437862492 +0200 +@@ -0,0 +1,32 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- ++ * ++ * Copyright (C) 2011 Andrea Florio <andrea(a)opensuse.org> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * ++ */ ++ ++#ifndef __SUSE_SYSCONFIG_H ++#define __SUSE_SYSCONFIG_H ++ ++#include "gdm/gdm-sysconfig.h" ++ ++#define SYSCONFIG_AUTOLOGIN_KEY "DISPLAYMANAGER_AUTOLOGIN" ++#define SYSCONFIG_AUTOLOGIN_FILE "/etc/sysconfig/displaymanager" ++ ++#define SYSCONFIG_SESSION_KEY "DEFAULT_WM" ++#define SYSCONFIG_SESSION_FILE "/etc/sysconfig/windowmanager" ++ ++#endif /* end of suse_sysconfig */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 rfc for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '11

29 Jul '11

Hello community, here is the log from the commit of package rfc for openSUSE:Factory checked in at Fri Jul 29 10:02:00 CEST 2011. -------- --- AUTO/all/rfc/rfc.changes 2011-07-22 01:42:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/rfc/rfc.changes 2011-07-29 02:42:39.000000000 +0200 @@ -2 +2 @@ -Fri Jul 22 01:42:24 CEST 2011 - autobuild(a)suse.de +Fri Jul 29 02:42:39 CEST 2011 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2011-07-22 +- automated update on 2011-07-29 calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rfc.spec ++++++ --- /var/tmp/diff_new_pack.QZbgQi/_old 2011-07-29 10:01:37.000000000 +0200 +++ /var/tmp/diff_new_pack.QZbgQi/_new 2011-07-29 10:01:37.000000000 +0200 @@ -25,7 +25,7 @@ Summary: The RFCs (Request For Comments) Source: rfc.tgz BuildArch: noarch -Version: 2011.7.21 +Version: 2011.7.29 Release: 1 Url: ftp://ftp.isi.edu/in-notes BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ rfc.tgz ++++++ AUTO/all/rfc/rfc.tgz /mounts/work_src_done/STABLE/rfc/rfc.tgz differ: char 5, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 squirrelmail-beta for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '11

29 Jul '11

Hello community, here is the log from the commit of package squirrelmail-beta for openSUSE:Factory checked in at Fri Jul 29 10:01:22 CEST 2011. -------- --- squirrelmail-beta/squirrelmail-beta.changes 2011-04-19 14:32:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/squirrelmail-beta/squirrelmail-beta.changes 2011-07-28 18:09:20.000000000 +0200 @@ -1,0 +2,16 @@ +Thu Jul 28 15:54:31 UTC 2011 - jengelh(a)medozas.de + +- Change "Requires: php-mhash" to php-hash, which is the new name + +------------------------------------------------------------------- +Tue Jul 19 09:58:05 UTC 2011 - jengelh(a)medozas.de + +- Update to 1.5.2-20110719 +* fixes CVE-2011-2023 "XSS problem with unsanitized style tags" +* fixes CVE-2011-2753/CVE-2010-4555 "XSS holes in generic options + inputs, XSS hole in the SquirrelSpell plugin, added anti-CSRF + protection to the empty trash feature" +* fixes CVE-2010-4554 "Add clickjacking protection" +- Avoid packaging certain files twice + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- squirrelmail-20110414_0200-SVN.devel.tar.xz squirrelmail-20110414_0200-SVN.locales.tar.xz New: ---- squirrelmail-20110719_0200-SVN.devel.tar.xz squirrelmail-20110719_0200-SVN.locales.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squirrelmail-beta.spec ++++++ --- /var/tmp/diff_new_pack.VXSetd/_old 2011-07-29 10:00:27.000000000 +0200 +++ /var/tmp/diff_new_pack.VXSetd/_new 2011-07-29 10:00:27.000000000 +0200 @@ -20,14 +20,14 @@ Name: squirrelmail-beta Version: 1.5.2 -Release: 1 +Release: 3 Requires: mod_php_any Requires: php-ctype Requires: php-gettext Requires: php-iconv Requires: php-mbstring Requires: php-mcrypt -Requires: php-mhash +Requires: php-hash Requires: php-openssl Requires: php-posix Requires: php-session @@ -40,14 +40,19 @@ %define b_sqm_path %buildroot%sqm_path %define sqm_doc %_defaultdocdir/squirrelmail %define b_sqm_doc %buidroot%sqm_doc -Source: squirrelmail-20110414_0200-SVN.devel.tar.xz -Source2: squirrelmail-20110414_0200-SVN.locales.tar.xz + +#DL-URL: http://squirrelmail.org/download.php +#Source: http://snapshots.squirrelmail.org/squirrelmail-20110719_0200-SVN.devel.tar.… +Source: squirrelmail-20110719_0200-SVN.devel.tar.xz +Source2: squirrelmail-20110719_0200-SVN.locales.tar.xz Source3: config.php Source4: README.SUSE Source5: squirrelmail.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -BuildRequires: xz +BuildRequires: fdupes xz + +%define with_lang 1 %description Squirrelmail is a web-mail reader and writer written in php4. It @@ -70,7 +75,6 @@ %package lang - Group: Productivity/Networking/Email/Clients Summary: The Translations for squirrelmail @@ -89,10 +93,19 @@ cp %{S:4} . find . -type f -iname "*.php" -print0 | \ xargs -0 grep -Zl '#!/usr/bin/php\b' | \ - xargs -0 perl -i -pe 's{#!/usr/bin/php\b}{#!/usr/bin/php5}g'; + xargs -0 perl -i -pe 's{#!/usr/bin/php\b}{#!%_bindir/php5}g'; %install install -d -m 0755 %b_sqm_path + +%if 0%{?with_lang} +pushd squirrelmail.locales/ +cp -a locale help images %b_sqm_path/ +popd +%endif +rm -Rf squirrelmail.locales; + +# webinterface itself cp -a * %b_sqm_path/ rm -rf %b_sqm_path/plugins/calendar # demo is disabled @@ -108,10 +121,7 @@ # cleanup rm -rf %buildroot%sqm_path/contrib -# language packs -pushd squirrelmail.locales/ -cp -a locale help images %b_sqm_path/ -popd +%fdupes %buildroot %files %defattr(-,root,root) @@ -130,120 +140,118 @@ %sqm_path/css %sqm_path/class %sqm_path/configure -%sqm_path/[^c]* +%sqm_path/doc +%sqm_path/functions +%dir %sqm_path/help +%sqm_path/help/index.php +%sqm_path/help/en_US +%sqm_path/images +%sqm_path/include +%sqm_path/index.php +%dir %sqm_path/locale +%sqm_path/locale/README.locales +%sqm_path/locale/index.php +%sqm_path/plugins +%sqm_path/po +%sqm_path/src +%sqm_path/templates +%sqm_path/themes +%sqm_path/README* %dir %attr(-,root,www) /var/lib/squirrelmail %dir %attr(-,root,www) /var/lib/squirrelmail/attach %dir %attr(-,root,www) /var/lib/squirrelmail/data +%if 0%{?with_lang} + %files lang %defattr(-,root,root) +%dir %sqm_path/help +%dir %sqm_path/locale +%sqm_path/locale/README.locales %lang(ar) %sqm_path/locale/ar -#%lang(ar) %sqm_path/help/ar -%lang(bg_BG) %sqm_path/locale/bg_BG %lang(bg_BG) %sqm_path/help/bg_BG -%lang(bn_IN) %sqm_path/locale/bn_IN -#%lang(bn_IN) %sqm_path/help/bn_IN +%lang(bg_BG) %sqm_path/locale/bg_BG %lang(bn_BD) %sqm_path/locale/bn_BD -#%lang(bn_BD) %sqm_path/help/bn_BD -%lang(ca_ES) %sqm_path/locale/ca_ES +%lang(bn_IN) %sqm_path/locale/bn_IN %lang(ca_ES) %sqm_path/help/ca_ES -%lang(cs_CZ) %sqm_path/locale/cs_CZ +%lang(ca_ES) %sqm_path/locale/ca_ES %lang(cs_CZ) %sqm_path/help/cs_CZ -%lang(cy_GB) %sqm_path/locale/cy_GB +%lang(cs_CZ) %sqm_path/locale/cs_CZ %lang(cy_GB) %sqm_path/help/cy_GB -%lang(da_DK) %sqm_path/locale/da_DK +%lang(cy_GB) %sqm_path/locale/cy_GB %lang(da_DK) %sqm_path/help/da_DK -%lang(de_DE) %sqm_path/locale/de_DE +%lang(da_DK) %sqm_path/locale/da_DK %lang(de_DE) %sqm_path/help/de_DE +%lang(de_DE) %sqm_path/locale/de_DE %lang(el_GR) %sqm_path/locale/el_GR -#%lang(el_GR) %sqm_path/help/el_GR -#%lang(en_GB) %sqm_path/locale/en_GB -#%lang(en_GB) %sqm_path/help/en_GB -#%lang(en_US) %sqm_path/locale/en_US -%lang(en_US) %sqm_path/help/en_US -%lang(es_ES) %sqm_path/locale/es_ES +%lang(en_GB) %sqm_path/help/en_GB +%lang(en_GB) %sqm_path/locale/en_GB %lang(es_ES) %sqm_path/help/es_ES +%lang(es_ES) %sqm_path/locale/es_ES %lang(et_EE) %sqm_path/locale/et_EE -#%lang(et_EE) %sqm_path/help/et_EE %lang(eu_ES) %sqm_path/locale/eu_ES -#%lang(eu_ES) %sqm_path/help/eu_ES -%lang(fa_IR) %sqm_path/locale/fa_IR %lang(fa_IR) %sqm_path/help/fa_IR -%lang(fi_FI) %sqm_path/locale/fi_FI +%lang(fa_IR) %sqm_path/locale/fa_IR %lang(fi_FI) %sqm_path/help/fi_FI +%lang(fi_FI) %sqm_path/locale/fi_FI %lang(fo_FO) %sqm_path/locale/fo_FO -#%lang(fo_FO) %sqm_path/help/fo_FO -%lang(fr_FR) %sqm_path/locale/fr_FR %lang(fr_FR) %sqm_path/help/fr_FR +%lang(fr_FR) %sqm_path/locale/fr_FR %lang(fy) %sqm_path/locale/fy -#%lang(fy) %sqm_path/help/fy %lang(he_IL) %sqm_path/locale/he_IL -#%lang(he_IL) %sqm_path/help/he_IL %lang(hr_HR) %sqm_path/locale/hr_HR -#%lang(hr_HR) %sqm_path/help/hr_HR %lang(hu_HU) %sqm_path/locale/hu_HU -#%lang(hu_HU) %sqm_path/help/hu_HU -%lang(id_ID) %sqm_path/locale/id_ID %lang(id_ID) %sqm_path/help/id_ID +%lang(id_ID) %sqm_path/locale/id_ID %lang(is_IS) %sqm_path/locale/is_IS -#%lang(is_IS) %sqm_path/help/is_IS -%lang(it_IT) %sqm_path/locale/it_IT %lang(it_IT) %sqm_path/help/it_IT -%lang(ja_JP) %sqm_path/locale/ja_JP +%lang(it_IT) %sqm_path/locale/it_IT %lang(ja_JP) %sqm_path/help/ja_JP +%lang(ja_JP) %sqm_path/locale/ja_JP %lang(ka) %sqm_path/locale/ka -#%lang(ka) %sqm_path/help/ka %lang(km) %sqm_path/locale/km -#%lang(km) %sqm_path/help/km -%lang(ko_KR) %sqm_path/locale/ko_KR %lang(ko_KR) %sqm_path/help/ko_KR -%lang(lt_LT) %sqm_path/locale/lt_LT +%lang(ko_KR) %sqm_path/locale/ko_KR %lang(lt_LT) %sqm_path/help/lt_LT +%lang(lt_LT) %sqm_path/locale/lt_LT %lang(lv_LV) %sqm_path/locale/lv_LV -#%lang(lv_LV) %sqm_path/help/lv_LV %lang(mk) %sqm_path/locale/mk -#%lang(mk) %sqm_path/help/mk %lang(ms_MY) %sqm_path/locale/ms_MY -#%lang(ms_MY) %sqm_path/help/ms_MY %lang(nb_NO) %sqm_path/locale/nb_NO -#%lang(nb_NO) %sqm_path/help/nb_NO -%lang(nl_NL) %sqm_path/locale/nl_NL %lang(nl_NL) %sqm_path/help/nl_NL +%lang(nl_NL) %sqm_path/locale/nl_NL %lang(nn_NO) %sqm_path/locale/nn_NO -#%lang(nn_NO) %sqm_path/help/nn_NO -%lang(pl_PL) %sqm_path/locale/pl_PL %lang(pl_PL) %sqm_path/help/pl_PL -%lang(pt_BR) %sqm_path/locale/pt_BR +%lang(pl_PL) %sqm_path/locale/pl_PL %lang(pt_BR) %sqm_path/help/pt_BR -%lang(pt_PT) %sqm_path/locale/pt_PT +%lang(pt_BR) %sqm_path/locale/pt_BR %lang(pt_PT) %sqm_path/help/pt_PT +%lang(pt_PT) %sqm_path/locale/pt_PT %lang(ro_RO) %sqm_path/locale/ro_RO -#%lang(ro_RO) %sqm_path/help/ro_RO -%lang(ru_RU) %sqm_path/locale/ru_RU %lang(ru_RU) %sqm_path/help/ru_RU -%lang(sk_SK) %sqm_path/locale/sk_SK +%lang(ru_RU) %sqm_path/locale/ru_RU +%lang(ru_UA) %sqm_path/locale/ru_UA +%lang(si_LK) %sqm_path/locale/si_LK %lang(sk_SK) %sqm_path/help/sk_SK -%lang(sl_SI) %sqm_path/locale/sl_SI +%lang(sk_SK) %sqm_path/locale/sk_SK %lang(sl_SI) %sqm_path/help/sl_SI -%lang(sr_YU) %sqm_path/locale/sr_YU +%lang(sl_SI) %sqm_path/locale/sl_SI %lang(sr_YU) %sqm_path/help/sr_YU -%lang(sv_SE) %sqm_path/locale/sv_SE +%lang(sr_YU) %sqm_path/locale/sr_YU %lang(sv_SE) %sqm_path/help/sv_SE +%lang(sv_SE) %sqm_path/locale/sv_SE %lang(ta_LK) %sqm_path/locale/ta_LK -#%lang(ta_LK) %sqm_path/help/ta_LK +%lang(th_TH) %sqm_path/help/th_TH +%lang(th_TH) %sqm_path/locale/th_TH +%lang(tl_PH) %sqm_path/locale/tl_PH %lang(tr_TR) %sqm_path/locale/tr_TR -#%lang(tr_TR) %sqm_path/help/tr_TR -#%lang(th_TH) %sqm_path/locale/th_TH -#%lang(th_TH) %sqm_path/help/th_TH -%lang(uk_UA) %sqm_path/locale/uk_UA +%lang(ug) %sqm_path/locale/ug %lang(uk_UA) %sqm_path/help/uk_UA +%lang(uk_UA) %sqm_path/locale/uk_UA %lang(vi_VN) %sqm_path/locale/vi_VN -#%lang(vi_VN) %sqm_path/help/vi_VN -%lang(zh_CN) %sqm_path/locale/zh_CN %lang(zh_CN) %sqm_path/help/zh_CN -%lang(ug) %sqm_path/locale/ug -#%lang(ug) %sqm_path/help/ug +%lang(zh_CN) %sqm_path/locale/zh_CN %lang(zh_TW) %sqm_path/locale/zh_TW -#%lang(zh_TW) %sqm_path/help/zh_TW +%endif %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 virt-viewer for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '11

29 Jul '11

Hello community, here is the log from the commit of package virt-viewer for openSUSE:Factory checked in at Fri Jul 29 10:00:11 CEST 2011. -------- --- virt-viewer/virt-viewer.changes 2011-05-12 18:10:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/virt-viewer/virt-viewer.changes 2011-07-28 20:51:00.000000000 +0200 @@ -1,0 +2,23 @@ +Thu Jul 28 12:42:52 MDT 2011 - carnold(a)novell.com + +- Fixed error "Using GTK+ 2.x and GTK+ 3 in the same process is + not supported" + +------------------------------------------------------------------- +Tue Jul 12 11:19:11 MDT 2011 - carnold(a)novell.com + +- Fixed spec file rpmlint warnings for language files. +- Patch cleanup and re-enabled vnc-listen.patch + +------------------------------------------------------------------- +Mon Jul 11 10:04:06 MDT 2011 - carnold(a)novell.com + +- Fix re-connect after authentication failure + virtview-reconnect-fix.patch + +------------------------------------------------------------------- +Tue Jul 5 13:29:51 MDT 2011 - carnold(a)novell.com + +- Fix "directories not owned by a package:" warnings. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- keymap.diff New: ---- virtview-reconnect-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-viewer.spec ++++++ --- /var/tmp/diff_new_pack.vfY2vw/_old 2011-07-29 09:56:57.000000000 +0200 +++ /var/tmp/diff_new_pack.vfY2vw/_new 2011-07-29 09:56:57.000000000 +0200 @@ -19,24 +19,28 @@ Name: virt-viewer Version: 0.3.1 -Release: 3 +Release: 5 Summary: Virtual Machine Viewer Group: System/Monitoring License: GPLv2+ Url: http://www.virt-manager.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: virt-viewer-0.3.1.tar.gz -Patch0: netcat.diff -Patch1: vnc-listen.patch -Patch2: windows-keycombo.patch -Patch3: netware-keycombo.patch -Patch4: glade-keycombo.patch -Patch5: keymap.diff -Patch6: report-error.patch +Patch0: virtview-reconnect-fix.patch +Patch10: netcat.diff +Patch11: vnc-listen.patch +Patch12: windows-keycombo.patch +Patch13: netware-keycombo.patch +Patch14: glade-keycombo.patch +Patch15: report-error.patch BuildRequires: gtk2-devel BuildRequires: libvirt-devel >= 0.6.0 BuildRequires: libxml2-devel +%if %suse_version > 1140 +BuildRequires: gtk-vnc2-devel +%else BuildRequires: gtk-vnc-devel >= 0.3.8 +%endif BuildRequires: libglade2-devel %if %suse_version > 1130 BuildRequires: libpixman-1-0-devel @@ -44,7 +48,7 @@ BuildRequires: libpixman %endif BuildRequires: intltool -#our build requirements +# Our build requirements BuildRequires: xen-devel Requires: netcat ExclusiveArch: %ix86 x86_64 @@ -63,37 +67,32 @@ %prep %setup -q %patch0 -p1 -#%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -#%patch5 -p1 -%patch6 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 %build -# Note: remote GTKVNC_CFLAGS and GTKVNC_LIBS when gtk-vnc.pc is fixed in STABLE -%if %suse_version > 1140 -%configure GTKVNC_CFLAGS=-I/usr/include/gtk-vnc-2.0 GTKVNC_LIBS=-lgtk-vnc-2.0 -%else %configure GTKVNC_CFLAGS=-I/usr/include/gtk-vnc-1.0 GTKVNC_LIBS=-lgtk-vnc-1.0 -%endif make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +%{find_lang} %{name} %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc COPYING AUTHORS ChangeLog %{_bindir}/%{name} %{_mandir}/man1/%{name}* %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/ui -%dir %{_datadir}/locale/*/*/*.mo /usr/share/virt-viewer/ui/about.glade /usr/share/virt-viewer/ui/auth.glade /usr/share/virt-viewer/ui/viewer.glade ++++++ report-error.patch ++++++ --- /var/tmp/diff_new_pack.vfY2vw/_old 2011-07-29 09:56:57.000000000 +0200 +++ /var/tmp/diff_new_pack.vfY2vw/_new 2011-07-29 09:56:57.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- virt-viewer-0.3.1.orig/src/viewer.c +++ virt-viewer-0.3.1/src/viewer.c -@@ -1105,6 +1105,7 @@ static int viewer_initial_connect(VirtVi +@@ -1118,6 +1118,7 @@ static int viewer_initial_connect(VirtVi } else { viewer_simple_message_dialog(viewer->window, _("Cannot find guest domain %s"), viewer->domkey); ++++++ virtview-reconnect-fix.patch ++++++ Subject: Fix re-connect after authentication failure From: Daniel P. Berrange berrange(a)redhat.com Mon May 23 12:41:12 2011 +0100 Date: Mon May 23 12:41:12 2011 +0100: Git: 6234a2e1f4f904a8ed8f625a7d8fe1705fe5478a viewer->display will be non-NULL if we have already attempted a connection. So, remove the check for it being NULL, and instead skip the widget setup step. Index: virt-viewer-0.3.1/src/viewer.c =================================================================== --- virt-viewer-0.3.1.orig/src/viewer.c +++ virt-viewer-0.3.1/src/viewer.c @@ -899,18 +899,18 @@ static int viewer_activate(VirtViewer *v int fd = -1; int ret = -1; - g_return_val_if_fail(viewer->display == NULL, -1); - if (viewer->active) goto cleanup; - if (!viewer_extract_connect_info(viewer, dom)) - goto cleanup; + if (viewer->display == NULL) { + if (!viewer_extract_connect_info(viewer, dom)) + goto cleanup; - if (viewer->gport) - viewer->pretty_address = g_strdup_printf("%s:%s", viewer->host, viewer->gport); - else - viewer->pretty_address = g_strdup_printf("%s:%s", viewer->host, viewer->unixsock); + if (viewer->gport) + viewer->pretty_address = g_strdup_printf("%s:%s", viewer->host, viewer->gport); + else + viewer->pretty_address = g_strdup_printf("%s:%s", viewer->host, viewer->unixsock); + } #if defined(HAVE_SOCKETPAIR) && defined(HAVE_FORK) if (viewer->transport && ++++++ vnc-listen.patch ++++++ --- /var/tmp/diff_new_pack.vfY2vw/_old 2011-07-29 09:56:57.000000000 +0200 +++ /var/tmp/diff_new_pack.vfY2vw/_new 2011-07-29 09:56:57.000000000 +0200 @@ -1,67 +1,39 @@ -Index: virt-viewer-0.2.1/src/viewer.c +Index: virt-viewer-0.3.1/src/viewer.c =================================================================== ---- virt-viewer-0.2.1.orig/src/viewer.c -+++ virt-viewer-0.2.1/src/viewer.c -@@ -696,7 +696,7 @@ static int viewer_matches_domain(VirtVie - return 0; - } - --static char * viewer_extract_vnc_port(virDomainPtr dom) -+static char * viewer_extract_vnc_port(virDomainPtr dom, char **host) +--- virt-viewer-0.3.1.orig/src/viewer.c ++++ virt-viewer-0.3.1/src/viewer.c +@@ -896,12 +896,25 @@ void viewer_channel_open_fd(VirtViewer * + static int viewer_activate(VirtViewer *viewer, + virDomainPtr dom) { - char *xmldesc = virDomainGetXMLDesc(dom, 0); - xmlDocPtr xml = NULL; -@@ -709,6 +709,14 @@ static char * viewer_extract_vnc_port(vi - if (!pctxt || !pctxt->sax) - goto error; ++ xmlXPathContextPtr ctxt = NULL; ++ xmlXPathObjectPtr obj = NULL; ++ char *vnchost = NULL; + int fd = -1; + int ret = -1; + + if (viewer->active) + goto cleanup; + obj = xmlXPathEval((const xmlChar *)"string(/domain/devices/graphics[@type='vnc']/@listen)", ctxt); + if (obj && obj->type == XPATH_STRING && + obj->stringval && obj->stringval[0]) { -+ *host = strdup((const char*)obj->stringval); ++ vnchost = strdup((const char*)obj->stringval); + xmlXPathFreeObject(obj); + obj = NULL; + } -+ - xml = xmlCtxtReadDoc(pctxt, (const xmlChar *)xmldesc, "domain.xml", NULL, - XML_PARSE_NOENT | XML_PARSE_NONET | - XML_PARSE_NOWARNING); -@@ -868,15 +876,18 @@ static int viewer_activate(VirtViewer *v - char *host = NULL; - char *transport = NULL; - char *user = NULL; -+ char *vnchost = NULL; - int port, fd = -1; - int ret = -1; - - if (viewer->active) - goto cleanup; - -- if ((vncport = viewer_extract_vnc_port(dom)) == NULL) { -+ if ((vncport = viewer_extract_vnc_port(dom, &vnchost)) == NULL) { - viewer_simple_message_dialog(viewer->window, _("Cannot determine the VNC port for the guest %s"), - viewer->domkey); -+ free(vnchost); -+ vnchost = NULL; - goto cleanup; - } - -@@ -886,6 +897,9 @@ static int viewer_activate(VirtViewer *v - goto cleanup; - } - + if (vnchost == NULL) + vnchost = strdup("127.0.0.1"); + - DEBUG_LOG("Remote host is %s and transport %s user %s", - host, transport ? transport : "", user ? user : ""); - -@@ -901,7 +915,7 @@ static int viewer_activate(VirtViewer *v - if (fd >= 0) { - vnc_display_open_fd(VNC_DISPLAY(viewer->vnc), fd); + if (viewer->display == NULL) { + if (!viewer_extract_connect_info(viewer, dom)) + goto cleanup; +@@ -935,7 +948,7 @@ static int viewer_activate(VirtViewer *v } else { -- vnc_display_open_host(VNC_DISPLAY(viewer->vnc), host, vncport); -+ vnc_display_open_host(VNC_DISPLAY(viewer->vnc), vnchost, vncport); + DEBUG_LOG("Connecting to TCP socket %s:%s", viewer->host, viewer->gport); + ret = virt_viewer_display_open_host(viewer->display, +- viewer->host, viewer->gport); ++ vnchost, viewer->gport); } - viewer_set_status(viewer, "Connecting to VNC server"); + viewer_set_status(viewer, "Connecting to graphic server"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mono-qt4 for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '11

29 Jul '11

Hello community, here is the log from the commit of package mono-qt4 for openSUSE:Factory checked in at Fri Jul 29 09:56:39 CEST 2011. -------- --- mono-qt4/mono-qt4.changes 2011-07-22 20:31:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/mono-qt4/mono-qt4.changes 2011-07-28 17:49:51.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jul 28 17:49:39 CEST 2011 - dmueller(a)suse.de + +- add provides/obsoletes on mono-qt + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mono-qt4.spec ++++++ --- /var/tmp/diff_new_pack.duUll2/_old 2011-07-29 09:55:55.000000000 +0200 +++ /var/tmp/diff_new_pack.duUll2/_new 2011-07-29 09:55:55.000000000 +0200 @@ -36,9 +36,11 @@ Summary: Mono Qt4 kdebindings library Url: https://projects.kde.org/projects/kde/kdebindings/csharp/qyoto Version: 4.7.0 -Release: 1 +Release: 3 Source0: qyoto-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build +Provides: mono-qt = 4.7.0 +Obsoletes: mono-qt <= 4.7.0 Requires: libqyoto2 = %version %description ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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