openSUSE Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
June 2009
- 1 participants
- 769 discussions
Hello community,
here is the log from the commit of package yast2-installation for openSUSE:Factory
checked in at Mon Jun 29 16:56:34 CEST 2009.
--------
--- yast2-installation/yast2-installation.changes 2009-06-11 13:39:55.000000000 +0200
+++ yast2-installation/yast2-installation.changes 2009-06-22 20:21:14.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Jun 22 20:20:18 CEST 2009 - coolo(a)novell.com
+
+- fix build with automake 1.11
+- 2.18.18
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-installation-2.18.17.tar.bz2
New:
----
yast2-installation-2.18.18.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.Zb9107/_old 2009-06-29 16:56:15.000000000 +0200
+++ /var/tmp/diff_new_pack.Zb9107/_new 2009-06-29 16:56:15.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.18.17)
+# spec file for package yast2-installation (Version 2.18.18)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,13 +19,13 @@
Name: yast2-installation
-Version: 2.18.17
+Version: 2.18.18
Release: 1
-License: GPL v2 or later
-Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.18.17.tar.bz2
+Source0: yast2-installation-2.18.18.tar.bz2
Prefix: /usr
+Group: System/YaST
+License: GPL v2 or later
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite
# xmllint
BuildRequires: libxml2
@@ -99,31 +99,11 @@
%description
System installation code as present on installation media.
-
-
-Authors:
---------
- Stefan Hundhammer <sh(a)suse.de>
- Klaus Kaempf <kkaempf(a)suse.de>
- Arvin Schnell <arvin(a)suse.de>
- Jiri Srain <jsrain(a)suse.cz>
- Lukas Ocilka <locilka(a)suse.cz>
-
%description devel-doc
System installation code as present on installation media.
-
-
-Authors:
---------
- Stefan Hundhammer <sh(a)suse.de>
- Klaus Kaempf <kkaempf(a)suse.de>
- Arvin Schnell <arvin(a)suse.de>
- Jiri Srain <jsrain(a)suse.cz>
- Lukas Ocilka <locilka(a)suse.cz>
-
%prep
-%setup -n yast2-installation-2.18.17
+%setup -n yast2-installation-2.18.18
%build
%{prefix}/bin/y2tool y2autoconf
@@ -133,7 +113,9 @@
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
%{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
-make %{?jobs:-j%jobs}
+# V=1: verbose build in case we used AM_SILENT_RULES(yes)
+# so that RPM_OPT_FLAGS check works
+make %{?jobs:-j%jobs} V=1
%install
make install DESTDIR="$RPM_BUILD_ROOT"
@@ -146,8 +128,6 @@
%clean
rm -rf "$RPM_BUILD_ROOT"
-%pre
-
%post
%{fillup_only -ns security checksig}
++++++ yast2-installation-2.18.17.tar.bz2 -> yast2-installation-2.18.18.tar.bz2 ++++++
++++ 3297 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.18.17/configure.in new/yast2-installation-2.18.18/configure.in
--- old/yast2-installation-2.18.17/configure.in 2009-06-11 13:38:53.000000000 +0200
+++ new/yast2-installation-2.18.18/configure.in 2009-06-22 20:20:56.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-installation
dnl
-dnl -- This file is generated by y2autoconf 2.18.5 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.18.8 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.18.17, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.18.18, http://bugs.opensuse.org/, yast2-installation)
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.18.17"
+VERSION="2.18.18"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.18.17/control/docs/Makefile.am new/yast2-installation-2.18.18/control/docs/Makefile.am
--- old/yast2-installation-2.18.17/control/docs/Makefile.am 2009-02-04 13:14:16.000000000 +0100
+++ new/yast2-installation-2.18.18/control/docs/Makefile.am 2009-06-22 20:20:47.000000000 +0200
@@ -8,9 +8,10 @@
xml_files = $(wildcard *.xml)
html_DATA = $(wildcard html/*.html) \
- html/index.html \
html/yast2docs.css
+all-local: html/index.html
+
pdf: control-doc.pdf
html/index.html: $(xml_files)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.18.17/doc/autodocs/Makefile.am new/yast2-installation-2.18.18/doc/autodocs/Makefile.am
--- old/yast2-installation-2.18.17/doc/autodocs/Makefile.am 2007-05-18 10:06:51.000000000 +0200
+++ new/yast2-installation-2.18.18/doc/autodocs/Makefile.am 2009-06-22 18:35:52.000000000 +0200
@@ -2,11 +2,14 @@
htmldir = $(docdir)/autodocs
-html_DATA = index.html $(wildcard *.html)
+html_DATA = $(wildcard *.html)
CLEANFILES = $(html_DATA)
+all-local: index.html
+
# Note that we look one _and_ two subdirectories deep.
# There might be some duplicate filenames
# but let's solve that later. For now we want to find all Modules::.
index.html: $(srcdir)/../../src/*/*.ycp
${YCPDOC} -d. $^
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.18.17/doc/features/Makefile.am new/yast2-installation-2.18.18/doc/features/Makefile.am
--- old/yast2-installation-2.18.17/doc/features/Makefile.am 2008-08-19 15:44:55.000000000 +0200
+++ new/yast2-installation-2.18.18/doc/features/Makefile.am 2009-06-22 20:20:47.000000000 +0200
@@ -3,9 +3,10 @@
xml_files = $(wildcard *.xml)
html_DATA = $(wildcard html/*.html) \
- html/index.html \
html/yast2docs.css
+all-local: html/index.html
+
html/index.html: features-doc.xml
XML_CATALOG_FILES=@XML_CATALOG@ \
@XSLTPROC@ @XSLTPROC_FLAGS@ --xinclude \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.18.17/doc/inst_images/Makefile.am new/yast2-installation-2.18.18/doc/inst_images/Makefile.am
--- old/yast2-installation-2.18.17/doc/inst_images/Makefile.am 2009-04-23 16:36:21.000000000 +0200
+++ new/yast2-installation-2.18.18/doc/inst_images/Makefile.am 2009-06-22 20:20:47.000000000 +0200
@@ -3,9 +3,10 @@
xml_files = $(wildcard *.xml)
html_DATA = $(wildcard html/*.html) \
- html/index.html \
html/yast2docs.css
+all-local: html/index.html
+
html/index.html: inst_images.xml
XML_CATALOG_FILES=@XML_CATALOG@ \
@XSLTPROC@ @XSLTPROC_FLAGS@ --xinclude \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.18.17/doc/proposal/Makefile.am new/yast2-installation-2.18.18/doc/proposal/Makefile.am
--- old/yast2-installation-2.18.17/doc/proposal/Makefile.am 2008-08-19 15:44:54.000000000 +0200
+++ new/yast2-installation-2.18.18/doc/proposal/Makefile.am 2009-06-22 20:00:11.000000000 +0200
@@ -2,9 +2,10 @@
xml_files = $(wildcard *.xml)
html_DATA = $(wildcard html/*.html) \
- html/index.html \
html/yast2docs.css
+all-local: html/index.html
+
html/index.html: proposal-API-doc.xml
XML_CATALOG_FILES=@XML_CATALOG@ \
@XSLTPROC@ @XSLTPROC_FLAGS@ --xinclude \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.18.17/VERSION new/yast2-installation-2.18.18/VERSION
--- old/yast2-installation-2.18.17/VERSION 2009-06-11 12:57:36.000000000 +0200
+++ new/yast2-installation-2.18.18/VERSION 2009-06-22 20:20:47.000000000 +0200
@@ -1 +1 @@
-2.18.17
+2.18.18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package yast2-transfer for openSUSE:Factory
checked in at Mon Jun 29 16:56:00 CEST 2009.
--------
--- yast2-transfer/yast2-transfer.changes 2009-05-25 16:58:58.000000000 +0200
+++ yast2-transfer/yast2-transfer.changes 2009-06-19 12:32:42.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Jun 19 12:31:51 CEST 2009 - mvidner(a)suse.cz
+
+- Using autodocs-cc.ami, which contains a fix for automake 1.11.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-transfer.spec ++++++
--- /var/tmp/diff_new_pack.Bc8127/_old 2009-06-29 16:55:33.000000000 +0200
+++ /var/tmp/diff_new_pack.Bc8127/_new 2009-06-29 16:55:33.000000000 +0200
@@ -17,12 +17,11 @@
# norootforbuild
-Url: http://www.suse.de/
Name: yast2-transfer
Version: 2.18.0
-Release: 1
-License: GPL v2 or later
+Release: 2
+License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-transfer-2.18.0.tar.bz2
@@ -36,12 +35,6 @@
%description
A YaST2 Agent for various Transfer Protocols: FTP, HTTP, and TFTP.
-
-
-Authors:
---------
- Anas Nashif <nashif(a)suse.de>
-
%prep
%setup -n yast2-transfer-2.18.0
@@ -82,63 +75,3 @@
#/usr/share/YaST2/include/transfer/url.ycp
%doc %{prefix}/share/doc/packages/yast2-transfer
%changelog
-* Mon May 25 2009 ug(a)suse.de
-- send ACK package for the last DATA package that was received
- via TFTP
-- 2.18.0
-* Fri Jan 04 2008 ug(a)suse.de
-- follow HTTP code 301 and 302 (#344123)
-- version 2.16.1
-* Tue Sep 25 2007 ug(a)suse.de
-- version 2.16.0
-* Thu Jan 11 2007 ug(a)suse.de
-- *.la files removed
-* Wed Nov 29 2006 ug(a)suse.de
-- version 2.15.0
-* Thu Nov 09 2006 ug(a)suse.de
-- version 2.14.0
-* Thu Sep 14 2006 ro(a)suse.de
-- added yast2-core-devel to BuildRequires·
-* Thu Jun 01 2006 locilka(a)suse.cz
-- Marking FTP, TFTP and HTTP modules as Stable.
-* Mon Mar 06 2006 locilka(a)suse.cz
-- Ajusted BuildRequires for package
-- 2.13.3
-* Thu Jan 05 2006 locilka(a)suse.cz
-- Adding enhancement wanted and created by ug(a)suse.de
- Adding functionality which allows to disable the strict HTTPS
- more to more useful. The default behavior is unchanged.
-- 2.13.2
-* Thu Dec 15 2005 locilka(a)suse.cz
-- Fixed bug #135829
- Curl library was called with wrong data-type. The bug appeared on
- big-endian 64bits only (Such as s390x).
-- 2.13.1
-* Wed Nov 30 2005 locilka(a)suse.cz
-- Added debugging message into the Curl::Get function
-- 2.13.0
-* Thu Apr 28 2005 locilka(a)suse.cz
-- Changing package maintainer to locilka(a)suse.cz
-- 2.12.0
-* Wed May 05 2004 nashif(a)suse.de
-- Fixed bug #39996: fixed tftp 'put'
-* Fri Apr 02 2004 nashif(a)suse.de
-- License changed to GPL
-* Fri Mar 19 2004 mvidner(a)suse.cz
-- added AGENT_LIBADD so that agents work from standalone Perl
-* Sun Jan 25 2004 nashif(a)suse.de
-- First version with new interpreter
-- 2.9.1
-* Thu Jun 12 2003 nashif(a)suse.de
-- Fixed file list
-* Tue Feb 04 2003 nashif(a)suse.de
-- Added FTP Get
-- 2.7.0
-* Mon Aug 05 2002 nashif(a)suse.de
-- Added URI parser
-- 2.6.1
-* Wed Jul 17 2002 nashif(a)suse.de
-- Merged tftp and curl agents
-- 2.6.0
-* Fri Jul 12 2002 nashif(a)suse.de
-- Initial version
++++++ yast2-transfer-2.18.0.tar.bz2 ++++++
++++ 16582 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
Hello community,
here is the log from the commit of package yast2-country for openSUSE:Factory
checked in at Mon Jun 29 16:55:21 CEST 2009.
--------
--- yast2-country/yast2-country.changes 2009-06-16 08:09:13.000000000 +0200
+++ yast2-country/yast2-country.changes 2009-06-29 08:39:42.000000000 +0200
@@ -1,0 +2,16 @@
+Mon Jun 29 08:45:58 CEST 2009 - jreidinger(a)suse.cz
+
+- really update version
+
+-------------------------------------------------------------------
+Tue Jun 23 16:14:50 CEST 2009 - jreidinger(a)suse.cz
+
+- update YaPI
+- 2.18.9
+
+-------------------------------------------------------------------
+Tue Jun 16 16:05:38 CEST 2009 - mvidner(a)suse.cz
+
+- Using autodocs-ycp.ami, which contains a fix for automake 1.11.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-country-2.18.8.tar.bz2
New:
----
org.opensuse.yast.modules.yapi.language.policy
org.opensuse.yast.modules.yapi.time.policy
yast2-country-2.18.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-country.spec ++++++
--- /var/tmp/diff_new_pack.mh4392/_old 2009-06-29 16:53:55.000000000 +0200
+++ /var/tmp/diff_new_pack.mh4392/_new 2009-06-29 16:53:55.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-country (Version 2.18.8)
+# spec file for package yast2-country (Version 2.18.9)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,13 +19,16 @@
Name: yast2-country
-Version: 2.18.8
+Version: 2.18.9
Release: 1
-License: GPL v2 or later
-Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-country-2.18.8.tar.bz2
+Source0: yast2-country-2.18.9.tar.bz2
Prefix: /usr
+Group: System/YaST
+License: GPL v2 or later
+#policy files for YaPI dbus interface
+Source1: org.opensuse.yast.modules.yapi.time.policy
+Source2: org.opensuse.yast.modules.yapi.language.policy
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite
Requires: yast2-trans-stats yast2-perl-bindings timezone
# XVersion.ycp
@@ -69,15 +72,8 @@
Country specific data and configuration modules (language, keyboard,
timezone) for yast2.
-
-
-Authors:
---------
- Thomas Fehr <fehr(a)suse.de>
- Jiri Suchomel <jsuchome(a)suse.cz>
-
%prep
-%setup -n yast2-country-2.18.8
+%setup -n yast2-country-2.18.9
%build
%{prefix}/bin/y2tool y2autoconf
@@ -87,7 +83,9 @@
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
%{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
-make %{?jobs:-j%jobs}
+# V=1: verbose build in case we used AM_SILENT_RULES(yes)
+# so that RPM_OPT_FLAGS check works
+make %{?jobs:-j%jobs} V=1
%install
make install DESTDIR="$RPM_BUILD_ROOT"
@@ -99,6 +97,10 @@
%ifarch s390 s390x
rm -f $RPM_BUILD_ROOT%{prefix}/share/applications/YaST2/keyboard.desktop
%endif
+# Policies
+mkdir -p $RPM_BUILD_ROOT/usr/share/PolicyKit/policy
+install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/PolicyKit/policy/
+install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/PolicyKit/policy/
%clean
rm -rf "$RPM_BUILD_ROOT"
@@ -125,6 +127,7 @@
%endif
%{prefix}/share/applications/YaST2/yast-language.desktop
%{prefix}/share/applications/YaST2/timezone.desktop
+%attr(644,root,root) %config /usr/share/PolicyKit/policy/org.opensuse.yast.modules.yapi.*.policy
%package data
License: GPL v2 or later
@@ -135,13 +138,6 @@
Data files for yast2-country together with the most often used API
functions (Language module)
-
-
-Authors:
---------
- Thomas Fehr <fehr(a)suse.de>
- Jiri Suchomel <jsuchome(a)suse.cz>
-
%files data
%defattr(-,root,root)
%dir /usr/share/YaST2/data/languages
++++++ org.opensuse.yast.modules.yapi.language.policy ++++++
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE policyconfig PUBLIC
"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
"http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
<policyconfig>
<vendor>YaST Webservice Project</vendor>
<vendor_url>http://en.opensuse.org/YAST</vendor_url>
<!--
Rights for languages
-->
<action id="org.opensuse.yast.modules.yapi.language.read">
<description>Reading languages settings</description>
<message>Authentication is required to read languages settings</message>
<defaults>
<allow_inactive>no</allow_inactive>
<allow_active>no</allow_active>
</defaults>
</action>
<action id="org.opensuse.yast.modules.yapi.language.write">
<description>Writing new language settings</description>
<message>Authentication is required to edit language settings</message>
<defaults>
<allow_inactive>no</allow_inactive>
<allow_active>no</allow_active>
</defaults>
</action>
</policyconfig>++++++ org.opensuse.yast.modules.yapi.time.policy ++++++
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE policyconfig PUBLIC
"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
"http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
<policyconfig>
<vendor>YaST Webservice Project</vendor>
<vendor_url>http://en.opensuse.org/YAST</vendor_url>
<!--
Rights for system.time
-->
<action id="org.opensuse.yast.modules.yapi.time.read">
<description>Reading system time settings</description>
<message>Authentication is required to read system time settings</message>
<defaults>
<allow_inactive>no</allow_inactive>
<allow_active>no</allow_active>
</defaults>
</action>
<action id="org.opensuse.yast.modules.yapi.time.write">
<description>Writing system time settings</description>
<message>Authentication is required to read system time settings</message>
<defaults>
<allow_inactive>no</allow_inactive>
<allow_active>no</allow_active>
</defaults>
</action>
</policyconfig>
++++++ yast2-country-2.18.8.tar.bz2 -> yast2-country-2.18.9.tar.bz2 ++++++
++++ 5575 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.18.8/autodocs-ycp.ami new/yast2-country-2.18.9/autodocs-ycp.ami
--- old/yast2-country-2.18.8/autodocs-ycp.ami 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-country-2.18.9/autodocs-ycp.ami 2009-06-25 16:15:09.000000000 +0200
@@ -0,0 +1,32 @@
+# -*- makefile -*- Automake include file
+# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $
+
+# Builds source documentation for YCP sources
+# Uses ycpdoc
+# PARAMETERS:
+# AUTODOCS_YCP: Files that the ycp autodocs is built from
+# Optional - the default is $(srcdir)/../../src/*.ycp
+# AUTODOCS_PM: Files that the perl autodocs is built from
+# Optional - the default is $(srcdir)/../../src/*.pm
+# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs
+# Optional - the default is no subdir, $(docdir)/autodocs
+# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __
+# Optional - the default is $(srcdir)/../../src
+
+htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
+
+html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
+CLEANFILES = $(html_DATA) pod2htm*.tmp
+
+AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
+AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+AUTODOCS_STRIP ?= $(srcdir)/../../src
+
+index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
+#including *.pm, for the index
+ ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP)
+ for i in $(AUTODOCS_PM); do \
+ b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \
+ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
+ echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \
+ done
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.18.8/configure.in new/yast2-country-2.18.9/configure.in
--- old/yast2-country-2.18.8/configure.in 2009-02-10 16:12:17.000000000 +0100
+++ new/yast2-country-2.18.9/configure.in 2009-06-25 16:15:08.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-country
dnl
-dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-country, 2.18.2, http://bugs.opensuse.org/, yast2-country)
+AC_INIT(yast2-country, 2.18.9, http://bugs.opensuse.org/, yast2-country)
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.18.2"
+VERSION="2.18.9"
RPMNAME="yast2-country"
MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.18.8/keyboard/doc/autodocs/Makefile.am new/yast2-country-2.18.9/keyboard/doc/autodocs/Makefile.am
--- old/yast2-country-2.18.8/keyboard/doc/autodocs/Makefile.am 2008-10-29 14:42:00.000000000 +0100
+++ new/yast2-country-2.18.9/keyboard/doc/autodocs/Makefile.am 2009-06-22 11:46:28.000000000 +0200
@@ -1,10 +1,4 @@
-#
-# Makefile.am for country/keyboard/doc/autodocs
+# Makefile.am for YCP module .../doc/autodocs
-htmldir = @docdir@/autodocs
-
-html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA)
-
-index.html: $(srcdir)/../../src/*.ycp $(srcdir)/../../src/*/*.ycp
- ${YCPDOC} -d. $^
+AUTODOCS_YCP=$(srcdir)/../../src/*.ycp $(srcdir)/../../src/*/*.ycp
+include $(top_srcdir)/autodocs-ycp.ami
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.18.8/language/doc/autodocs/Makefile.am new/yast2-country-2.18.9/language/doc/autodocs/Makefile.am
--- old/yast2-country-2.18.8/language/doc/autodocs/Makefile.am 2008-10-29 14:42:00.000000000 +0100
+++ new/yast2-country-2.18.9/language/doc/autodocs/Makefile.am 2009-06-22 11:46:28.000000000 +0200
@@ -1,10 +1,4 @@
-#
-# Makefile.am for country/language/doc/autodocs
+# Makefile.am for YCP module .../doc/autodocs
-htmldir = @docdir@/autodocs
-
-html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA)
-
-index.html: $(srcdir)/../../src/*.ycp $(srcdir)/../../src/*/*.ycp
- ${YCPDOC} -d. $^
+AUTODOCS_YCP=$(srcdir)/../../src/*.ycp $(srcdir)/../../src/*/*.ycp
+include $(top_srcdir)/autodocs-ycp.ami
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.18.8/language/src/YaPI/LANGUAGE.pm new/yast2-country-2.18.9/language/src/YaPI/LANGUAGE.pm
--- old/yast2-country-2.18.8/language/src/YaPI/LANGUAGE.pm 2009-06-11 16:39:30.000000000 +0200
+++ new/yast2-country-2.18.9/language/src/YaPI/LANGUAGE.pm 2009-06-22 13:28:27.000000000 +0200
@@ -14,71 +14,48 @@
our @CAPABILITIES = ('SLES9');
our %TYPEINFO;
-BEGIN{$TYPEINFO{GetLanguages} = ["function",
- ["list","string"]];
-# "string"];
-}
-sub GetLanguages {
- my $ret = [];
- my $languages = Language->GetLanguagesMap(0);
- while ( my ($key, $value) = each (%$languages)){
- push @$ret, "$key---".$value->[0];
- }
- return $ret;
-}
-BEGIN{$TYPEINFO{GetCurrentLanguage} = ["function",
- "string"];
+BEGIN{$TYPEINFO{Read} = ["function",
+ ["map","string","any"]
+,["map","string","string"]];
}
-sub GetCurrentLanguage {
- return Language->language;
-}
-
-BEGIN{$TYPEINFO{SetCurrentLanguage} = ["function",
- "boolean","string"];
-}
-sub SetCurrentLanguage {
+sub Read {
my $self = shift;
- my $value = shift;
- Language->QuickSet($value);
- Language->Save();
- return 1;
-}
-
-BEGIN{$TYPEINFO{IsUTF8} = ["function",
- "boolean"];
-}
-sub IsUTF8 {
- return Language->GetExpertValues->{"use_utf8"};
-}
-
-BEGIN{$TYPEINFO{SetUTF8} = ["function",
- "boolean","boolean"];
-}
-sub SetUTF8 {
- my $self = shift;
- my $value = shift;
- my $arg = { "use_utf8" => YaST::YCP::Boolean($value) };
- Language->SetExpertValues($arg);
- Language->Save();
- return 1;
-}
-
-BEGIN{$TYPEINFO{GetRootLang} = ["function",
- "string"];
-}
-sub GetRootLang {
- return Language->GetExpertValues->{"rootlang"};
+ my $values = shift;
+ my $ret = {};
+ if ($values->{"languages"} eq "true"){
+ $ret->{"languages"} = Language->GetLanguagesMap(0);
+ }
+ if ($values->{"current"} eq "true"){
+ $ret->{"current"} = Language->language;
+ }
+ my $expr = Language->GetExpertValues();
+ if ($values->{"utf8"} eq "true"){
+ $ret->{"utf8"} = $expr->{"use_utf8"}?"true":"false";
+ }
+ if ($values->{"rootlang"} eq "true"){
+ $ret->{"rootlang"} = $expr->{"rootlang"};
+ }
+ return $ret;
}
-BEGIN{$TYPEINFO{SetRootLang} = ["function",
- "boolean","string"];
+BEGIN{$TYPEINFO{Write} = ["function",
+ "boolean",["map","string","string"]];
}
-sub SetRootLang {
+sub Write {
my $self = shift;
- my $value = shift;
- my $arg = { "rootlang" => $value };
- Language->SetExpertValues($arg);
+ my $values = shift;
+ if ( defined $values->{"current"}){
+ Language->QuickSet($values->{"current"});
+ }
+ my $expr = {};
+ if (defined $values->{"utf8"}){
+ $expr->{"use_utf8"} = YaST::YCP::Boolean($values->{"utf8"} eq "true");
+ }
+ if (defined $values->{"rootlang"}){
+ $expr->{"rootlang"} = $values->{"rootlang"};
+ }
+ Language->SetExpertValues($expr);
Language->Save();
return 1;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.18.8/Makefile.am new/yast2-country-2.18.9/Makefile.am
--- old/yast2-country-2.18.8/Makefile.am 2009-02-10 16:12:17.000000000 +0100
+++ new/yast2-country-2.18.9/Makefile.am 2009-06-25 16:15:09.000000000 +0200
@@ -32,10 +32,10 @@
# less strict; prefer bzip2
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
-# where devtools instal m4 snippets
+# where devtools install m4 snippets
# argh, executed literally
#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
-ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
+ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
cmp -s $< $@ || cp -f $< $@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.18.8/timezone/doc/autodocs/Makefile.am new/yast2-country-2.18.9/timezone/doc/autodocs/Makefile.am
--- old/yast2-country-2.18.8/timezone/doc/autodocs/Makefile.am 2008-10-29 14:42:00.000000000 +0100
+++ new/yast2-country-2.18.9/timezone/doc/autodocs/Makefile.am 2009-06-22 11:46:28.000000000 +0200
@@ -1,10 +1,4 @@
-#
-# Makefile.am for country/timezone/doc/autodocs
+# Makefile.am for YCP module .../doc/autodocs
-htmldir = @docdir@/autodocs
-
-html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA)
-
-index.html: $(srcdir)/../../src/*.ycp
- ${YCPDOC} -d. $^
+AUTODOCS_YCP=$(srcdir)/../../src/*.ycp $(srcdir)/../../src/*/*.ycp
+include $(top_srcdir)/autodocs-ycp.ami
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.18.8/timezone/src/YaPI/TIME.pm new/yast2-country-2.18.9/timezone/src/YaPI/TIME.pm
--- old/yast2-country-2.18.8/timezone/src/YaPI/TIME.pm 2009-06-16 07:57:06.000000000 +0200
+++ new/yast2-country-2.18.9/timezone/src/YaPI/TIME.pm 2009-06-25 13:51:13.000000000 +0200
@@ -14,38 +14,65 @@
our @CAPABILITIES = ('SLES9');
our %TYPEINFO;
-BEGIN{$TYPEINFO{GetZoneMap} = ["function",
- ["list",["map","string","string"]]];
+BEGIN{$TYPEINFO{Read} = ["function",
+ ["map","string","any"],["map","string","string"]];
}
-sub GetZoneMap {
- my $ret = [];
- my $zones = Timezone->get_zonemap();
-#code entries to one string for dbus limitation
- foreach my $zone (@$zones){
- my $finalstring = "";
- while ( my ($key, $value) = each (%{$zone->{"entries"}})){
- $finalstring = "$finalstring;$key->$value";
+sub Read {
+ my $self = shift;
+ my $args = shift;
+ my $ret = {};
+ Timezone->Read();
+ if ($args->{"zones"} eq "true")
+ {
+ $ret->{"zones"} = Timezone->get_zonemap();
+ }
+ if ($args->{"utcstatus"} eq "true"){
+ if (Timezone->utc_only()){
+ $ret->{"utcstatus"} = "UTConly";
+ } elsif (Timezone->hwclock eq "-u") {
+ $ret->{"utcstatus"} = "UTC";
+ } else {
+ $ret->{"utcstatus"} = "local";
}
- $zone->{"entries"} = $finalstring;
}
- return $zones;
+ if ($args->{"currenttime"} eq "true"){
+ $ret->{"time"} = Timezone->GetDateTime(YaST::YCP::Boolean(1),YaST::YCP::Boolean(0));
+ }
+ if ($args->{"timezone"} eq "true"){
+ $ret->{"timezone"} = Timezone->timezone;
+ }
+ return $ret;
}
-BEGIN{$TYPEINFO{UTCStatus} = ["function",
- "string"];
-}
-sub UTCStatus {
- return "UTConly" if (Timezone->utc_only());
- return "UTC" if (Timezone->hwclock eq "-u");
- return "local";
+BEGIN{$TYPEINFO{Write} = ["function",
+ "boolean",["map","string","string"]];
}
+sub Write {
+ my $self = shift;
+ my $args = shift;
+ Timezone->Read();
+ if (defined $args->{"utcstatus"}){
+ if (Timezone->utc_only()){
+ #do nothink as utc cannot be change
+ } elsif ($args->{"utcstatus"} eq "UTC") {
+ Timezone->hwclock("-u");
+ } else {
+ Timezone->hwclock("--localtime");
+ }
+ }
+ if (defined $args->{"timezone"}){
+ Timezone->Set($args->{"timezone"},YaST::YCP::Boolean(1));
+ }
+ if (defined $args->{"currenttime"}){
+#format yyyy-dd-mm - hh:mm:ss
+ if ($args->{"currenttime"} =~ m/(\d+)-(\d+)-(\d+) - (\d+):(\d+):(\d+)/)
+ {
+ Timezone->SetTime(int($1),int($3),int($2),int($4),int($5),int($6));
+ }
+ }
-BEGIN{$TYPEINFO{GetTime} = ["function",
- "string"];
+ Timezone->Save();
+ return 1;
}
-sub GetTime {
- return Timezone->GetDateTime(YaST::YCP::Boolean(1),YaST::YCP::Boolean(0));
-}
-
1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.18.8/VERSION new/yast2-country-2.18.9/VERSION
--- old/yast2-country-2.18.8/VERSION 2009-06-16 07:59:14.000000000 +0200
+++ new/yast2-country-2.18.9/VERSION 2009-06-23 16:16:13.000000000 +0200
@@ -1 +1 @@
-2.18.8
+2.18.9
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package yast2-slp for openSUSE:Factory
checked in at Mon Jun 29 16:53:42 CEST 2009.
--------
--- yast2-slp/yast2-slp.changes 2008-04-14 10:17:35.000000000 +0200
+++ yast2-slp/yast2-slp.changes 2009-06-17 16:38:21.000000000 +0200
@@ -1,0 +2,11 @@
+Tue Jun 16 14:58:01 CEST 2009 - mvidner(a)suse.cz
+
+- Using autodocs-ycp.ami, which contains a fix for automake 1.11.
+
+-------------------------------------------------------------------
+Fri May 16 16:40:22 CEST 2008 - jsrain(a)suse.cz
+
+- added categories Settings and System into desktop file
+ (bnc #382778)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-slp.spec ++++++
--- /var/tmp/diff_new_pack.Px3630/_old 2009-06-29 16:53:13.000000000 +0200
+++ /var/tmp/diff_new_pack.Px3630/_new 2009-06-29 16:53:13.000000000 +0200
@@ -17,12 +17,11 @@
# norootforbuild
-Url: http://www.suse.com/
Name: yast2-slp
Version: 2.16.0
-Release: 80
-License: GPL v2 or later
+Release: 81
+License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-slp-2.16.0.tar.bz2
@@ -35,12 +34,6 @@
This modules enables YaST modules to register services with SLP.
Additionally, it offers a simple browser of SLP registered services.
-
-
-Authors:
---------
- Anas Nashif
-
%prep
%setup -n yast2-slp-2.16.0
@@ -75,77 +68,4 @@
#%{prefix}/share/applications/YaST2/slp.desktop
/usr/share/YaST2/modules/SLP.y*
%doc %{prefix}/share/doc/packages/yast2-slp
-
%changelog
-* Mon Apr 14 2008 jsuchome(a)suse.cz
-- 2.16.0
-* Mon Mar 17 2008 jsrain(a)suse.cz
-- added 'StartupNotify=true' to the desktop file (bnc #304964)
-* Wed Feb 27 2008 lslezak(a)suse.cz
-- configure.in.in - added check for slp.h (report missing
- openslp-devel package when compiling from SVN)
-* Fri Aug 10 2007 jsuchome(a)suse.cz
-- new version for new product
-- 2.15.0
-* Mon Nov 20 2006 jsuchome(a)suse.cz
-- adapted to new API of SLPGetPeer (#222611)
-- 2.14.1
-* Mon Nov 06 2006 jsuchome(a)suse.cz
-- new version for new package
-- 2.14.0
-* Fri Sep 22 2006 jsuchome(a)suse.cz
-- use dlsym to check if SLPGetPeer is available (F300619, cont.)
-- 2.13.3
-* Wed Sep 13 2006 jsuchome(a)suse.cz
-- added support for unicast queries and peerinfo (F300619)
-- 2.13.2
-* Mon Feb 20 2006 jsuchome(a)suse.cz
-- reduced BuildRequires
-- 2.13.1
-* Fri Dec 02 2005 jsuchome(a)suse.cz
-- updated for current devtools
-- 2.13.0
-* Wed Aug 10 2005 jsuchome(a)suse.cz
-- 2.12.0
-* Fri Sep 17 2004 nashif(a)suse.de
-- Fixed function comments
-- Removed desktop file. slp browser is just a test script for the
- SLP agent. (#
-* Mon Jun 07 2004 nashif(a)suse.de
-- Fixed attribute summary when showing list attributes (#41707)
-- 2.9.11
-* Mon Apr 26 2004 nashif(a)suse.de
-- abort on close window event (#39370)
-- 2.9.10
-* Tue Apr 06 2004 nashif(a)suse.de
-- Fixed splitting of returns attribute string (#38525)
-- 2.9.9
-* Tue Apr 06 2004 nashif(a)suse.de
-- Fixed tree widget in ncurses mode (#38493)
-- 2.9.8
-* Sat Apr 03 2004 nashif(a)suse.de
-- Use new tree wizard (#37581)
-- Version 2.9.7
-* Fri Apr 02 2004 nashif(a)suse.de
-- License changed to GPL
-* Fri Mar 19 2004 mvidner(a)suse.cz
-- added AGENT_LIBADD so that agents work from standalone Perl
-* Fri Mar 12 2004 nashif(a)suse.de
-- Adapt to new wizard, use generic wizard now
-- added desktop file
-- 2.9.5
-* Sun Mar 07 2004 nashif(a)suse.de
-- New function to match a service type and return all relevant data
-- 2.9.4
-* Fri Mar 05 2004 nashif(a)suse.de
-- stricter types
-- 2.9.3
-* Wed Feb 25 2004 nashif(a)suse.de
-- Add function to register services via /etc/slp.reg.d
-- 2.9.2
-* Tue Feb 24 2004 nashif(a)suse.de
-- Added some caching,
-- fixed showing attributes
-- 2.9.1
-* Sun Feb 08 2004 nashif(a)suse.de
-- Initial version
++++++ yast2-slp-2.16.0.tar.bz2 ++++++
++++ 63087 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
Hello community,
here is the log from the commit of package gpgme for openSUSE:Factory
checked in at Mon Jun 29 16:50:42 CEST 2009.
--------
--- gpgme/gpgme.changes 2009-06-11 11:20:52.000000000 +0200
+++ gpgme/gpgme.changes 2009-06-23 14:07:13.000000000 +0200
@@ -1,0 +2,20 @@
+Tue Jun 23 14:00:38 CEST 2009 - puzel(a)novell.com
+
+- update to gpgme-1.2.0
+ * New encryption flag GPGME_ENCRYPT_NO_ENCRYPT_TO to disable default
+ recipients.
+ * gpgme_new will fail if gpgme_check_version was not called, or a
+ selftest failed (for example, if -mms-bitfields was not used on
+ MingW32 targets).
+ * New functions gpgme_io_read and gpgme_io_write for use with
+ gpgme_passphrase_cb_t and gpgme_edit_cb_t functions.
+ * New functions gpgme_result_ref and gpgme_result_unref to detach
+ result structures from a context.
+ * New functions gpgme_op_export_keys_start and gpgme_op_export_keys
+ that allow to specify exported keys through gpgme_key_t objects
+ instead of patterns.
+ * New mode of operation gpgme_export_mode_t that allows exporting
+ external keys.
+- drop unneeded BRs: libgcrypt-devel, libksba-devel
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
gpgme-1.1.8.tar.bz2
New:
----
gpgme-1.2.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gpgme.spec ++++++
--- /var/tmp/diff_new_pack.y24864/_old 2009-06-29 16:44:45.000000000 +0200
+++ /var/tmp/diff_new_pack.y24864/_new 2009-06-29 16:44:45.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package gpgme (Version 1.1.8)
+# spec file for package gpgme (Version 1.2.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,15 +19,17 @@
Name: gpgme
-BuildRequires: gpg2 libgcrypt-devel libksba-devel libpth-devel
+BuildRequires: gpg2 >= 2.0.10
+BuildRequires: libpth-devel >= 2.0.7
+BuildRequires: libgpg-error-devel >= 1.4
License: GPL v2 or later
Group: Productivity/Security
PreReq: %install_info_prereq
AutoReqProv: on
-Version: 1.1.8
-Release: 4
+Version: 1.2.0
+Release: 1
Source: ftp://ftp.gnupg.org/gcrypt/gpgme/%{name}-%{version}.tar.bz2
-Patch1: %{name}-%{version}-makecheck.patch
+Patch1: %{name}-1.1.8-makecheck.patch
Url: http://www.gnupg.org/related_software/gpgme/
Summary: A Library Designed to Give Applications Easy Access to GnuPG
Requires: gpg2
@@ -197,141 +199,3 @@
%{_includedir}/gpgme.h
%changelog
-* Thu Jun 11 2009 puzel(a)suse.cz
-- change BuildRequires: (pth-devel -> libpth-devel)
-* Tue Jun 02 2009 dmueller(a)suse.de
-- fix requires of devel package
-* Mon Jun 01 2009 puzel(a)suse.cz
-- BuildRequires: pth-devel
-* Wed Feb 18 2009 puzel(a)suse.cz
-- update to 1.1.8
- * SIGPIPE is now again ignored as described in the manual. Fixes
- regresion introduced with 1.1.6.
-* Mon Dec 08 2008 puzel(a)suse.cz
-- update to 1.1.7
- - using GPGME_KEYLIST_MODE_LOCAL combined with
- GPGME_KEYLIST_MODE_EXTERN is now supported
- - the encoding of gpgme_data_t objects can affect the output encoding
- of export, sign and encrypt operations now
- - the reference manual now includes the specification of "The GnuPG
- UI Server protocol"
- - a new function gpgme_cancel_async can be used to asynchronously
- cancel any pending operation at any time, from any thread
-- remove gpgme-1.1.6-from-upstream.patch (fixed upstream)
-- remove gpgme-1.1.4-warning.patch (fixed upstream)
-- fix obsolete usage of run_ldconfig
-* Thu Apr 10 2008 ro(a)suse.de
-- added baselibs.conf file to build xxbit packages
- for multilib support
-* Wed Feb 06 2008 bk(a)suse.de
-- update to version 1.1.6: API extensions, eg for gpgconf thru gpgme
-- add upstream patches to run the testsuite non-interactively
-* Thu Dec 27 2007 crrodriguez(a)suse.de
-- fix library-without-ldconfig-post* errors
-- remove "la" files
-* Wed Aug 08 2007 ro(a)suse.de
-- remove devel requires from library package
-* Tue Aug 07 2007 mrueckert(a)suse.de
-- add defattr to the lib package
-* Mon Aug 06 2007 zpetrova(a)suse.cz
-- split gpgme to libgpgme11 and gpgme.
-* Fri Jul 27 2007 zpetrova(a)suse.cz
-- update to version 1.1.5
- - small bug and portability fixes.
-* Wed May 16 2007 zpetrova(a)suse.cz
-- removed gpg from Requires list. (#273491)
-* Mon Mar 12 2007 zpetrova(a)suse.cz
-- updated filelist
-* Fri Mar 09 2007 ltinkl(a)suse.cz
-- update to latest version (1.1.4), needed for gpa
- * Detect and bail out on double plaintext messages. This is required
- so that applications can properly detect the signed parts of a
- message. Actual there is now a double protection as GnuPG 1.4.7
- will detect this case too.
- * Fixed a memory leak in gpgme_data_release_and_get_mem.
- * Fixed a bug in Windows command line quoting.
-* Mon Feb 05 2007 ro(a)suse.de
-- updated filelist
-* Wed Sep 20 2006 anosek(a)suse.cz
-- fixed compiler warning: variable "key" is used before its value
- is set [#159104] (warning.patch)
-* Mon Jul 17 2006 nadvornik(a)suse.cz
-- fixed pthread support in gpgme-config
-* Wed Jun 28 2006 zpetrova(a)suse.cz
-- update to version 1.1.2
-* Thu Jan 26 2006 sbrabec(a)suse.cz
-- Added %%install_info_prereq.
-* Wed Jan 25 2006 mls(a)suse.de
-- converted neededforbuild to BuildRequires
-* Sun Jan 15 2006 kukuk(a)suse.de
-- Create devel subpackage [#140727]
-* Sat Dec 03 2005 meissner(a)suse.de
-- require libgpg-error-devel (since we include headers that
- include headers from there).
-* Mon Nov 28 2005 zpetrova(a)suse.cz
-- Update to version 1.0.3 (#135395).
-* Thu Feb 17 2005 didge(a)suse.de
-- update to stable version 1.0.2
-- update of url
-* Mon Jul 12 2004 adrian(a)suse.de
-- update to version 0.9.0
- * support for gpg2
-* Thu Mar 18 2004 didge(a)suse.de
-- fixed bug #36194
-* Fri Feb 27 2004 ro(a)suse.de
-- added libgpg-error to neededforbuild
-* Mon Feb 09 2004 didge(a)suse.de
-- version 0.3.16
-* Sat Jan 10 2004 adrian(a)suse.de
-- add %%run_ldconfig
-* Tue Sep 02 2003 mc(a)suse.de
-- add newpg, libgcrypt and libksba to neededforbuild again
- it is needed to support kmail with cryptplug
- fixed #29620, #29641 and #29642
-* Mon Aug 11 2003 adrian(a)suse.de
-- cleanup #neededforbuild and requires
-* Tue Aug 05 2003 adrian(a)suse.de
-- fix libtool handling to get shared libraries
-* Thu May 22 2003 coolo(a)suse.de
-- fixing info pages
-* Wed Apr 16 2003 coolo(a)suse.de
-- use BuildRoot
-* Fri Feb 21 2003 mc(a)suse.de
-- fixed -fPIC and lib64 Problems
-* Thu Feb 20 2003 mc(a)suse.de
-- update to version 0.3.15
-* Thu Jan 30 2003 didge(a)suse.de
-- Version 0.3.14
-* Mon Oct 21 2002 didge(a)suse.de
-- Version 0.3.12
-* Wed Sep 25 2002 ro(a)suse.de
-- removed bogus self-provides again
-* Wed Sep 25 2002 didge(a)suse.de
-- Version 0.3.11
-* Tue Sep 10 2002 didge(a)suse.de
-- Version 0.3.10
-* Wed Jul 31 2002 didge(a)suse.de
-- Version 0.3.8
-* Fri Jun 21 2002 didge(a)suse.de
-- New Version 0.3.7
-* Fri May 10 2002 didge(a)suse.de
-- New Version 0.3.6
-* Tue May 07 2002 ro(a)suse.de
-- fixed specfile: no macro allowed in Version: line
-* Fri Mar 08 2002 didge(a)suse.de
-- New Version 0.3.4
-* Thu Feb 14 2002 didge(a)suse.de
-- New Version 0.3.3
-* Fri Jan 04 2002 didge(a)suse.de
-- New Version 0.3.0
-* Wed Oct 31 2001 didge(a)suse.de
-- Fixed patch
-* Mon Oct 29 2001 didge(a)suse.de
-- Needs a patch to build on other platforms than i386
-* Tue Oct 09 2001 didge(a)suse.de
-- Version 0.2.3
-- needs a patch to build because something is broken?!
-* Thu Sep 13 2001 didge(a)suse.de
-- Fix a bug to build under AXP
-* Wed Aug 22 2001 didge(a)suse.de
-- First build, Verison 0.2.2
++++++ gpgme-1.1.8.tar.bz2 -> gpgme-1.2.0.tar.bz2 ++++++
++++ 37445 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
Hello community,
here is the log from the commit of package yast2 for openSUSE:Factory
checked in at Mon Jun 29 16:43:45 CEST 2009.
--------
--- yast2/yast2.changes 2009-06-03 12:30:42.000000000 +0200
+++ yast2/yast2.changes 2009-06-19 16:05:10.000000000 +0200
@@ -1,0 +2,24 @@
+Fri Jun 19 13:01:19 CEST 2009 - jsrain(a)suse.cz
+
+- removed cyclic dependency between YCP modules preventing from
+ correct build
+- 2.18.18
+
+-------------------------------------------------------------------
+Tue Jun 16 16:44:49 CEST 2009 - mvidner(a)suse.cz
+
+- Using autodocs-ycp.ami, which contains a fix for automake 1.11.
+
+-------------------------------------------------------------------
+Thu Jun 11 18:09:25 CEST 2009 - lslezak(a)suse.cz
+
+- use float::tolstring() function in String::FormatSize() and
+ String::FormatSizeWithPrecision() to use the current
+ locale decimal separator (bnc#372671)
+
+-------------------------------------------------------------------
+Thu Jun 11 15:55:55 CEST 2009 - jsrain(a)suse.cz
+
+- Getting hostname info from /etc/HOSTNAME only if the file exists.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-2.18.17.tar.bz2
New:
----
yast2-2.18.18.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.E12747/_old 2009-06-29 16:39:18.000000000 +0200
+++ /var/tmp/diff_new_pack.E12747/_new 2009-06-29 16:39:18.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.18.17)
+# spec file for package yast2 (Version 2.18.18)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,21 +19,21 @@
Name: yast2
-Version: 2.18.17
-Release: 2
-License: GPL v2 or later
+Version: 2.18.18
+Release: 1
+License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.18.17.tar.bz2
+Source0: yast2-2.18.18.tar.bz2
Prefix: /usr
Source1: yast2-rpmlintrc
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite
# Needed already in build time
-BuildRequires: yast2-core >= 2.17.1 yast2-pkg-bindings >= 2.17.32 yast2-ycp-ui-bindings >= 2.18.4
+BuildRequires: yast2-core >= 2.18.12 yast2-pkg-bindings >= 2.17.32 yast2-ycp-ui-bindings >= 2.18.4
# pre-requires for filling the sysconfig template (sysconfig.yast2)
PreReq: %fillup_prereq
-# y2base foo -S (hello) UI, list:: namespace
-Requires: yast2-core >= 2.17.1
+# float::tolstring builtin
+Requires: yast2-core >= 2.18.12
# Mod_UI
# new UI::OpenContextMenu
Requires: yast2-ycp-ui-bindings >= 2.18.4
@@ -93,32 +93,10 @@
This package contains scripts and data needed for SuSE Linux
installation with YaST2
-
-
-Authors:
---------
- Michael Andres <ma(a)suse.de>
- Waldo Bastian <bastian(a)suse.de>
- Michael Hager <mike(a)suse.de>
- Stefan Hundhammer <sh(a)suse.de>
- Klaus Kaempf <kkaempf(a)suse.de>
- Mathias Kettner <kettner(a)suse.de>
- Thomas Roelz <tom(a)suse.de>
- Arvin Schnell <arvin(a)suse.de>
- Stefan Schubert <schubi(a)suse.de>
- Andreas Schwab <schwab(a)suse.de>
- Steffen Winterfeldt <snwint(a)suse.de>
- Martin Vidner <mvidner(a)suse.cz>
- Jiri Srain <jsrain(a)suse.cz>
- Lukas Ocilka <locilka(a)suse.cz>
- Stanislav Visnovsky <visnov(a)suse.cz>
- Jiri Suchomel <jsuchome(a)suse.cz>
- Ladislav Slezak <lslezak(a)suse.cz>
-
%package devel-doc
-License: GPL v2 or later
+License: GPL
Requires: yast2 = %version
-Group: System/YaST
+Group: Development/Libraries
Provides: yast2-lib-sequencer-devel
Obsoletes: yast2-lib-sequencer-devel
Obsoletes: yast2-devel
@@ -130,24 +108,8 @@
This package contains scripts and data needed for a SUSE Linux
installation with YaST2.
-
-
-Authors:
---------
- Michael Andres <ma(a)suse.de>
- Waldo Bastian <bastian(a)suse.de>
- Michael Hager <mike(a)suse.de>
- Stefan Hundhammer <sh(a)suse.de>
- Klaus Kaempf <kkaempf(a)suse.de>
- Mathias Kettner <kettner(a)suse.de>
- Thomas Roelz <tom(a)suse.de>
- Arvin Schnell <arvin(a)suse.de>
- Stefan Schubert <schubi(a)suse.de>
- Andreas Schwab <schwab(a)suse.de>
- Steffen Winterfeldt <snwint(a)suse.de>
-
%prep
-%setup -n yast2-2.18.17
+%setup -n yast2-2.18.18
%build
%{prefix}/bin/y2tool y2autoconf
@@ -238,6 +200,7 @@
%defattr(-,root,root)
%doc %{prefix}/share/doc/packages/yast2/autodocs
%doc %{prefix}/share/doc/packages/yast2/commandline
+%doc %{prefix}/share/doc/packages/yast2/control
%doc %{prefix}/share/doc/packages/yast2/cron
%doc %{prefix}/share/doc/packages/yast2/cwm
%doc %{prefix}/share/doc/packages/yast2/desktop
@@ -250,3 +213,5 @@
%doc %{prefix}/share/doc/packages/yast2/system
%doc %{prefix}/share/doc/packages/yast2/types
%doc %{prefix}/share/doc/packages/yast2/wizard
+%doc %{prefix}/share/doc/packages/yast2/xml
+
++++++ yast2-2.18.17.tar.bz2 -> yast2-2.18.18.tar.bz2 ++++++
++++ 1882 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/autodocs-ycp.ami new/yast2-2.18.18/autodocs-ycp.ami
--- old/yast2-2.18.17/autodocs-ycp.ami 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.18.18/autodocs-ycp.ami 2009-06-22 08:00:48.000000000 +0200
@@ -0,0 +1,27 @@
+# -*- makefile -*- Automake include file
+# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $
+
+# Builds source documentation for YCP sources
+# Uses ycpdoc
+# PARAMETERS:
+# AUTODOCS_YCP: Files that the ycp autodocs is built from
+# Optional - the default is $(srcdir)/../../src/*.ycp
+# AUTODOCS_PM: Files that the perl autodocs is built from
+# Optional - the default is $(srcdir)/../../src/*.pm
+
+htmldir = $(docdir)/autodocs
+
+html_DATA = index.html $(wildcard *.html)
+CLEANFILES = $(html_DATA) pod2htm*.tmp
+
+AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
+AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+
+index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
+#including *.pm, for the index
+ ${YCPDOC} -d. $^
+ for i in $(AUTODOCS_PM); do \
+ b=`basename $$i`; b=$${b%.pm}; \
+ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
+ echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \
+ done
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/configure.in new/yast2-2.18.18/configure.in
--- old/yast2-2.18.17/configure.in 2009-06-04 11:30:23.000000000 +0200
+++ new/yast2-2.18.18/configure.in 2009-06-22 08:00:48.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.5 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.18.17, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.18.18, http://bugs.opensuse.org/, yast2)
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.18.17"
+VERSION="2.18.18"
RPMNAME="yast2"
MAINTAINER="Jiri Srain <jsrain(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/doc/autodocs/Makefile.am new/yast2-2.18.18/doc/autodocs/Makefile.am
--- old/yast2-2.18.17/doc/autodocs/Makefile.am 2007-12-05 10:05:42.000000000 +0100
+++ new/yast2-2.18.18/doc/autodocs/Makefile.am 2009-06-16 16:45:05.000000000 +0200
@@ -1,10 +1,4 @@
-# Makefile.am for yast2/doc/autodocs
+# Makefile.am for YCP module .../doc/autodocs
-htmldir = @docdir@/autodocs
-
-html_DATA = index.html $(wildcard *.html)
-
-CLEANFILES = $(html_DATA)
-
-index.html: $(srcdir)/../../library/*/*.ycp
- ${YCPDOC} -d. $(srcdir)/../../library/*/*.ycp
+AUTODOCS_YCP=$(srcdir)/../../library/*/*.ycp
+include $(top_srcdir)/autodocs-ycp.ami
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/library/commandline/doc/autodocs/Makefile.am new/yast2-2.18.18/library/commandline/doc/autodocs/Makefile.am
--- old/yast2-2.18.17/library/commandline/doc/autodocs/Makefile.am 2007-12-05 10:05:38.000000000 +0100
+++ new/yast2-2.18.18/library/commandline/doc/autodocs/Makefile.am 2009-06-16 16:45:05.000000000 +0200
@@ -1,11 +1,4 @@
# Makefile.am for YCP module .../doc/autodocs
-htmldir = @docdir@/commandline/autodocs
-
-html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA)
-
-index.html: $(srcdir)/../../src/*.ycp
- ${YCPDOC} -d. $(srcdir)/../../src/*.ycp
-
-
+AUTODOCS_SUBDIR=commandline
+include $(top_srcdir)/autodocs-ycp.ami
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/library/control/doc/autodocs/Makefile.am new/yast2-2.18.18/library/control/doc/autodocs/Makefile.am
--- old/yast2-2.18.17/library/control/doc/autodocs/Makefile.am 2007-12-05 10:05:37.000000000 +0100
+++ new/yast2-2.18.18/library/control/doc/autodocs/Makefile.am 2009-06-16 16:45:05.000000000 +0200
@@ -1,12 +1,4 @@
-#
-# Makefile.am for xml/module/doc/autodocs
-#
+# Makefile.am for YCP module .../doc/autodocs
-htmldir = $(docdir)/autodocs
-
-index.html: $(srcdir)/../../src/*.ycp
- ${YCPDOC} -d. $^
-
-html_DATA = index.html $(wildcard *.html)
-
-CLEANFILES = $(html_DATA)
+AUTODOCS_SUBDIR=control
+include $(top_srcdir)/autodocs-ycp.ami
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/library/cron/doc/autodocs/Makefile.am new/yast2-2.18.18/library/cron/doc/autodocs/Makefile.am
--- old/yast2-2.18.17/library/cron/doc/autodocs/Makefile.am 2007-12-05 10:05:41.000000000 +0100
+++ new/yast2-2.18.18/library/cron/doc/autodocs/Makefile.am 2009-06-16 16:45:05.000000000 +0200
@@ -1,11 +1,4 @@
# Makefile.am for YCP module .../doc/autodocs
-htmldir = $(docdir)/cron/autodocs
-
-html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA)
-
-index.html: $(srcdir)/../../src/*.ycp
- ${YCPDOC} -d. $(srcdir)/../../src/*.ycp
-
-
+AUTODOCS_SUBDIR=cron
+include $(top_srcdir)/autodocs-ycp.ami
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/library/cwm/doc/autodocs/Makefile.am new/yast2-2.18.18/library/cwm/doc/autodocs/Makefile.am
--- old/yast2-2.18.17/library/cwm/doc/autodocs/Makefile.am 2007-12-05 10:05:38.000000000 +0100
+++ new/yast2-2.18.18/library/cwm/doc/autodocs/Makefile.am 2009-06-16 16:45:05.000000000 +0200
@@ -1,10 +1,4 @@
# Makefile.am for YCP module .../doc/autodocs
-htmldir = @docdir@/cwm/autodocs
-
-html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA)
-
-index.html: $(srcdir)/../../src/*.ycp
- ${YCPDOC} -d. $(srcdir)/../../src/*.ycp
-
+AUTODOCS_SUBDIR=cwm
+include $(top_srcdir)/autodocs-ycp.ami
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/library/desktop/doc/autodocs/Makefile.am new/yast2-2.18.18/library/desktop/doc/autodocs/Makefile.am
--- old/yast2-2.18.17/library/desktop/doc/autodocs/Makefile.am 2007-12-05 10:05:41.000000000 +0100
+++ new/yast2-2.18.18/library/desktop/doc/autodocs/Makefile.am 2009-06-16 16:45:05.000000000 +0200
@@ -1,11 +1,4 @@
# Makefile.am for YCP module .../doc/autodocs
-htmldir = $(docdir)/desktop/autodocs
-
-html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA)
-
-index.html: $(srcdir)/../../src/*.ycp
- ${YCPDOC} -d. $(srcdir)/../../src/*.ycp
-
-
+AUTODOCS_SUBDIR=desktop
+include $(top_srcdir)/autodocs-ycp.ami
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/library/gpg/doc/autodocs/Makefile.am new/yast2-2.18.18/library/gpg/doc/autodocs/Makefile.am
--- old/yast2-2.18.17/library/gpg/doc/autodocs/Makefile.am 2007-12-05 10:05:42.000000000 +0100
+++ new/yast2-2.18.18/library/gpg/doc/autodocs/Makefile.am 2009-06-16 16:45:05.000000000 +0200
@@ -1,10 +1,4 @@
# Makefile.am for YCP module .../doc/autodocs
-htmldir = @docdir@/gpg/autodocs
-
-html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA)
-
-index.html: $(srcdir)/../../src/*.ycp
- ${YCPDOC} -d. $(srcdir)/../../src/*.ycp
-
+AUTODOCS_SUBDIR=gpg
+include $(top_srcdir)/autodocs-ycp.ami
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/library/log/doc/autodocs/Makefile.am new/yast2-2.18.18/library/log/doc/autodocs/Makefile.am
--- old/yast2-2.18.17/library/log/doc/autodocs/Makefile.am 2007-12-05 10:05:37.000000000 +0100
+++ new/yast2-2.18.18/library/log/doc/autodocs/Makefile.am 2009-06-16 16:45:05.000000000 +0200
@@ -1,11 +1,4 @@
# Makefile.am for YCP module .../doc/autodocs
-htmldir = $(docdir)/log/autodocs
-
-html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA)
-
-index.html: $(srcdir)/../../src/*.ycp
- ${YCPDOC} -d. $(srcdir)/../../src/*.ycp
-
-
+AUTODOCS_SUBDIR=log
+include $(top_srcdir)/autodocs-ycp.ami
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/library/modules/Version.ycp new/yast2-2.18.18/library/modules/Version.ycp
--- old/yast2-2.18.17/library/modules/Version.ycp 2009-06-04 11:30:35.000000000 +0200
+++ new/yast2-2.18.18/library/modules/Version.ycp 2009-06-22 08:00:58.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.18.17";
+global string yast2 = "2.18.18";
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/library/network/doc/autodocs/Makefile.am new/yast2-2.18.18/library/network/doc/autodocs/Makefile.am
--- old/yast2-2.18.17/library/network/doc/autodocs/Makefile.am 2007-12-05 10:05:39.000000000 +0100
+++ new/yast2-2.18.18/library/network/doc/autodocs/Makefile.am 2009-06-16 16:45:05.000000000 +0200
@@ -1,11 +1,4 @@
# Makefile.am for YCP module .../doc/autodocs
-htmldir = ${docdir}/network/autodocs
-
-html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA)
-
-index.html: $(srcdir)/../../src/*.ycp
- ${YCPDOC} -d. $^
-
-
+AUTODOCS_SUBDIR=network
+include $(top_srcdir)/autodocs-ycp.ami
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/library/packages/doc/autodocs/Makefile.am new/yast2-2.18.18/library/packages/doc/autodocs/Makefile.am
--- old/yast2-2.18.17/library/packages/doc/autodocs/Makefile.am 2007-12-05 10:05:42.000000000 +0100
+++ new/yast2-2.18.18/library/packages/doc/autodocs/Makefile.am 2009-06-16 16:45:05.000000000 +0200
@@ -1,9 +1,4 @@
# Makefile.am for YCP module .../doc/autodocs
-htmldir = $(docdir)/packages/autodocs
-
-html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA)
-
-index.html: $(srcdir)/../../src/*.ycp
- ${YCPDOC} -d. $(srcdir)/../../src/*.ycp
+AUTODOCS_SUBDIR=packages
+include $(top_srcdir)/autodocs-ycp.ami
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/library/runlevel/doc/autodocs/Makefile.am new/yast2-2.18.18/library/runlevel/doc/autodocs/Makefile.am
--- old/yast2-2.18.17/library/runlevel/doc/autodocs/Makefile.am 2007-12-05 10:05:40.000000000 +0100
+++ new/yast2-2.18.18/library/runlevel/doc/autodocs/Makefile.am 2009-06-16 16:45:05.000000000 +0200
@@ -1,11 +1,4 @@
# Makefile.am for YCP module .../doc/autodocs
-htmldir = $(docdir)/cron/autodocs
-
-html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA)
-
-index.html: $(srcdir)/../../src/*.ycp
- ${YCPDOC} -d. $(srcdir)/../../src/*.ycp
-
-
+AUTODOCS_SUBDIR=runlevel
+include $(top_srcdir)/autodocs-ycp.ami
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/library/sequencer/doc/autodocs/Makefile.am new/yast2-2.18.18/library/sequencer/doc/autodocs/Makefile.am
--- old/yast2-2.18.17/library/sequencer/doc/autodocs/Makefile.am 2007-12-05 10:05:39.000000000 +0100
+++ new/yast2-2.18.18/library/sequencer/doc/autodocs/Makefile.am 2009-06-16 16:45:05.000000000 +0200
@@ -1,9 +1,4 @@
# Makefile.am for YCP module .../doc/autodocs
-htmldir = $(docdir)/sequencer/autodocs
-
-html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA)
-
-index.html: $(srcdir)/../../src/*.ycp
- ${YCPDOC} -d. $(srcdir)/../../src/*.ycp
+AUTODOCS_SUBDIR=sequencer
+include $(top_srcdir)/autodocs-ycp.ami
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/library/system/doc/autodocs/Makefile.am new/yast2-2.18.18/library/system/doc/autodocs/Makefile.am
--- old/yast2-2.18.17/library/system/doc/autodocs/Makefile.am 2007-12-05 10:05:37.000000000 +0100
+++ new/yast2-2.18.18/library/system/doc/autodocs/Makefile.am 2009-06-16 16:45:05.000000000 +0200
@@ -1,11 +1,4 @@
# Makefile.am for YCP module .../doc/autodocs
-htmldir = $(docdir)/system/autodocs
-
-html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA)
-
-index.html: $(srcdir)/../../src/*.ycp
- ${YCPDOC} -d. $(srcdir)/../../src/*.ycp
-
-
+AUTODOCS_SUBDIR=system
+include $(top_srcdir)/autodocs-ycp.ami
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/library/types/doc/autodocs/Makefile.am new/yast2-2.18.18/library/types/doc/autodocs/Makefile.am
--- old/yast2-2.18.17/library/types/doc/autodocs/Makefile.am 2007-12-05 10:05:41.000000000 +0100
+++ new/yast2-2.18.18/library/types/doc/autodocs/Makefile.am 2009-06-16 16:45:05.000000000 +0200
@@ -1,9 +1,4 @@
# Makefile.am for YCP module .../doc/autodocs
-htmldir = $(docdir)/types/autodocs
-
-html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA)
-
-index.html: $(srcdir)/../../src/*.ycp
- ${YCPDOC} -d. $(srcdir)/../../src/*.ycp
+AUTODOCS_SUBDIR=types
+include $(top_srcdir)/autodocs-ycp.ami
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/library/types/src/Hostname.ycp new/yast2-2.18.18/library/types/src/Hostname.ycp
--- old/yast2-2.18.17/library/types/src/Hostname.ycp 2008-11-03 11:17:03.000000000 +0100
+++ new/yast2-2.18.18/library/types/src/Hostname.ycp 2009-06-19 13:09:18.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Michal Svec <msvec(a)suse.cz>
* Flags: Stable
*
- * $Id: Hostname.ycp 51775 2008-10-02 09:31:01Z kmachalkova $
+ * $Id: Hostname.ycp 57655 2009-06-19 11:09:18Z jsrain $
*/
{
@@ -144,7 +144,7 @@
map hostname_data = (map) SCR::Execute(.target.bash_output, "hostname --fqdn");
if (hostname_data == nil || hostname_data["exit"]:-1 != 0 )
{
- fqhostname = (string) SCR::Read(.target.string, "/etc/HOSTNAME");
+ fqhostname = ($[] != (map) SCR::Read(.target.stat, "/etc/HOSTNAME") ? (string) SCR::Read(.target.string, "/etc/HOSTNAME"):"");
if ( fqhostname == "" || fqhostname == nil )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/library/types/src/String.ycp new/yast2-2.18.18/library/types/src/String.ycp
--- old/yast2-2.18.17/library/types/src/String.ycp 2009-02-12 12:34:49.000000000 +0100
+++ new/yast2-2.18.18/library/types/src/String.ycp 2009-06-11 18:48:30.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: String manipulation routines
* Authors: Michal Svec <msvec(a)suse.cz>
*
- * $Id: String.ycp 55083 2009-01-27 15:50:50Z aschnell $
+ * $Id: String.ycp 57542 2009-06-11 16:48:30Z lslezak $
*/
{
@@ -81,10 +81,13 @@
* Return a pretty description of a byte count with required precision
* and using B, kB, MB, GB or TB as unit as appropriate.
*
+ * Uses the current locale defined decimal separator
+ * (i.e. the result is language dependant).
+ *
* @param bytes size (e.g. free diskspace, memory size) in Bytes
* @param precision number of fraction digits in output
* @param omit_zeroes if true then do not add zeroes
- * (usefull for memory size - 128 MB RAM looks better than 128.00 MB RAM)
+ * (useful for memory size - 128 MB RAM looks better than 128.00 MB RAM)
* @return formatted string
*
* @example FormatSizeWithPrecision(128, 2, true) -> "128 B"
@@ -122,7 +125,7 @@
precision = 0;
}
- return tostring(whole, precision) + " " + units[index]:"";
+ return float::tolstring(whole, precision) + " " + units[index]:"";
}
/**
@@ -131,6 +134,9 @@
* Return a pretty description of a byte count, with two fraction digits
* and using B, kB, MB, GB or TB as unit as appropriate.
*
+ * Uses the current locale defined decimal separator
+ * (i.e. the result is language dependant).
+ *
* @param bytes size (e.g. free diskspace) in Bytes
* @return formatted string
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/library/types/testsuite/tests/Address.ycp new/yast2-2.18.18/library/types/testsuite/tests/Address.ycp
--- old/yast2-2.18.17/library/types/testsuite/tests/Address.ycp 2007-12-05 10:05:41.000000000 +0100
+++ new/yast2-2.18.18/library/types/testsuite/tests/Address.ycp 2009-06-12 09:00:07.000000000 +0200
@@ -1,12 +1,20 @@
{
include "testsuite.ycp";
+
+map READ = $[
+ "target" : $[
+ "tmpdir" : "/tmp"
+ ]
+];
+TESTSUITE_INIT ([READ], nil);
+
import "Address";
DUMP("Address::Check");
-TEST(``(Address::Check(nil)), [], nil);
-TEST(``(Address::Check("")), [], nil);
-TEST(``(Address::Check("1.2.3.4")), [], nil);
-TEST(``(Address::Check("::1")), [], nil);
+TEST(``(Address::Check(nil)), [READ], nil);
+TEST(``(Address::Check("")), [READ], nil);
+TEST(``(Address::Check("1.2.3.4")), [READ], nil);
+TEST(``(Address::Check("::1")), [READ], nil);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/library/types/testsuite/tests/enumtype.ycp new/yast2-2.18.18/library/types/testsuite/tests/enumtype.ycp
--- old/yast2-2.18.17/library/types/testsuite/tests/enumtype.ycp 2007-12-05 10:05:41.000000000 +0100
+++ new/yast2-2.18.18/library/types/testsuite/tests/enumtype.ycp 2009-06-12 09:00:07.000000000 +0200
@@ -4,12 +4,19 @@
* Summary: enumerated type generic validator test
* Author: Stanislav Visnovsky <visnov(a)suse.cz>
*
- * $Id: enumtype.ycp 13263 2004-01-19 07:51:01Z jsrain $
+ * $Id: enumtype.ycp 57543 2009-06-12 07:00:07Z jsrain $
*/
{
include "testsuite.ycp";
+map READ = $[
+ "target" : $[
+ "tmpdir" : "/tmp"
+ ]
+];
+TESTSUITE_INIT ([READ], nil);
+
import "TypeRepository";
TEST(``(TypeRepository::enum_validator( ["a","b","c"], "a" )),[],nil);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/library/types/testsuite/tests/Hostname.ycp new/yast2-2.18.18/library/types/testsuite/tests/Hostname.ycp
--- old/yast2-2.18.17/library/types/testsuite/tests/Hostname.ycp 2007-12-05 10:05:41.000000000 +0100
+++ new/yast2-2.18.18/library/types/testsuite/tests/Hostname.ycp 2009-06-12 09:00:07.000000000 +0200
@@ -1,6 +1,12 @@
{
include "testsuite.ycp";
+map READ = $[
+ "target" : $[
+ "tmpdir" : "/tmp"
+ ]
+];
+TESTSUITE_INIT ([READ], nil);
import "Hostname";
DUMP("Hostname::Check");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/library/types/testsuite/tests/IPvalidation.ycp new/yast2-2.18.18/library/types/testsuite/tests/IPvalidation.ycp
--- old/yast2-2.18.17/library/types/testsuite/tests/IPvalidation.ycp 2007-12-05 10:05:41.000000000 +0100
+++ new/yast2-2.18.18/library/types/testsuite/tests/IPvalidation.ycp 2009-06-12 09:00:07.000000000 +0200
@@ -4,12 +4,19 @@
* Summary: ipaddress type validation test
* Author: Stanislav Visnovsky <visnov(a)suse.cz>
*
- * $Id: IPvalidation.ycp 13263 2004-01-19 07:51:01Z jsrain $
+ * $Id: IPvalidation.ycp 57543 2009-06-12 07:00:07Z jsrain $
*/
{
include "testsuite.ycp";
+map READ = $[
+ "target" : $[
+ "tmpdir" : "/tmp"
+ ]
+];
+TESTSUITE_INIT ([READ], nil);
+
import "TypeRepository";
// correct IPv4
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/library/types/testsuite/tests/regextype.ycp new/yast2-2.18.18/library/types/testsuite/tests/regextype.ycp
--- old/yast2-2.18.17/library/types/testsuite/tests/regextype.ycp 2007-12-05 10:05:41.000000000 +0100
+++ new/yast2-2.18.18/library/types/testsuite/tests/regextype.ycp 2009-06-12 09:00:07.000000000 +0200
@@ -4,12 +4,19 @@
* Summary: regular expression generic validator test
* Author: Stanislav Visnovsky <visnov(a)suse.cz>
*
- * $Id: regextype.ycp 13263 2004-01-19 07:51:01Z jsrain $
+ * $Id: regextype.ycp 57543 2009-06-12 07:00:07Z jsrain $
*/
{
include "testsuite.ycp";
+map READ = $[
+ "target" : $[
+ "tmpdir" : "/tmp"
+ ]
+];
+TESTSUITE_INIT ([READ], nil);
+
import "TypeRepository";
TEST(``(TypeRepository::regex_validator( "^[abc]+.*m$", "blem" )),[],nil);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/library/types/testsuite/tests/undefinedtype.ycp new/yast2-2.18.18/library/types/testsuite/tests/undefinedtype.ycp
--- old/yast2-2.18.17/library/types/testsuite/tests/undefinedtype.ycp 2007-12-05 10:05:41.000000000 +0100
+++ new/yast2-2.18.18/library/types/testsuite/tests/undefinedtype.ycp 2009-06-12 09:00:07.000000000 +0200
@@ -4,12 +4,19 @@
* Summary: undefined type validation test
* Author: Stanislav Visnovsky <visnov(a)suse.cz>
*
- * $Id: undefinedtype.ycp 13263 2004-01-19 07:51:01Z jsrain $
+ * $Id: undefinedtype.ycp 57543 2009-06-12 07:00:07Z jsrain $
*/
{
include "testsuite.ycp";
+map READ = $[
+ "target" : $[
+ "tmpdir" : "/tmp"
+ ]
+];
+TESTSUITE_INIT ([READ], nil);
+
import "TypeRepository";
// blem is undefined type
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/library/types/testsuite/tests/URL.ycp new/yast2-2.18.18/library/types/testsuite/tests/URL.ycp
--- old/yast2-2.18.17/library/types/testsuite/tests/URL.ycp 2009-06-04 11:22:59.000000000 +0200
+++ new/yast2-2.18.18/library/types/testsuite/tests/URL.ycp 2009-06-12 09:00:07.000000000 +0200
@@ -4,12 +4,19 @@
* Summary: XXXXXX
* Author: Michal Svec <msvec(a)suse.cz>
*
- * $Id: URL.ycp 57013 2009-04-28 15:09:55Z lslezak $
+ * $Id: URL.ycp 57543 2009-06-12 07:00:07Z jsrain $
*/
{
include "testsuite.ycp";
+map READ = $[
+ "target" : $[
+ "tmpdir" : "/tmp"
+ ]
+];
+TESTSUITE_INIT ([READ], nil);
+
import "URL";
TEST(``(URL::Parse("http://name:pass@www.suse.cz:80/path/index.html?question#part")), [], nil);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/library/wizard/doc/autodocs/Makefile.am new/yast2-2.18.18/library/wizard/doc/autodocs/Makefile.am
--- old/yast2-2.18.17/library/wizard/doc/autodocs/Makefile.am 2007-12-05 10:05:40.000000000 +0100
+++ new/yast2-2.18.18/library/wizard/doc/autodocs/Makefile.am 2009-06-16 16:45:05.000000000 +0200
@@ -1,9 +1,4 @@
# Makefile.am for YCP module .../doc/autodocs
-htmldir = $(docdir)/wizard/autodocs
-
-html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA)
-
-index.html: $(srcdir)/../../src/*.ycp
- ${YCPDOC} -d. $(srcdir)/../../src/*.ycp
+AUTODOCS_SUBDIR=wizard
+include $(top_srcdir)/autodocs-ycp.ami
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/library/xml/doc/autodocs/Makefile.am new/yast2-2.18.18/library/xml/doc/autodocs/Makefile.am
--- old/yast2-2.18.17/library/xml/doc/autodocs/Makefile.am 2007-12-05 10:05:40.000000000 +0100
+++ new/yast2-2.18.18/library/xml/doc/autodocs/Makefile.am 2009-06-16 16:45:05.000000000 +0200
@@ -1,12 +1,4 @@
-#
-# Makefile.am for xml/module/doc/autodocs
-#
+# Makefile.am for YCP module .../doc/autodocs
-htmldir = $(docdir)/autodocs
-
-index.html: $(srcdir)/../../src/*.ycp
- ${YCPDOC} -d. $^
-
-html_DATA = index.html $(wildcard *.html)
-
-CLEANFILES = $(html_DATA)
+AUTODOCS_SUBDIR=xml
+include $(top_srcdir)/autodocs-ycp.ami
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.18.17/VERSION new/yast2-2.18.18/VERSION
--- old/yast2-2.18.17/VERSION 2009-06-04 11:22:59.000000000 +0200
+++ new/yast2-2.18.18/VERSION 2009-06-19 16:03:48.000000000 +0200
@@ -1 +1 @@
-2.18.17
+2.18.18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package yast2-testsuite for openSUSE:Factory
checked in at Mon Jun 29 16:39:04 CEST 2009.
--------
--- yast2-testsuite/yast2-testsuite.changes 2008-04-08 13:09:50.000000000 +0200
+++ yast2-testsuite/yast2-testsuite.changes 2009-06-29 12:28:24.000000000 +0200
@@ -1,0 +2,10 @@
+Mon Jun 29 12:19:01 CEST 2009 - mvidner(a)suse.cz
+
+- Moved Summary and Description from PDB to spec.
+
+-------------------------------------------------------------------
+Tue Jun 16 14:29:30 CEST 2009 - mvidner(a)suse.cz
+
+- Using autodocs-ycp.ami, which contains a fix for automake 1.11.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-testsuite.spec ++++++
--- /var/tmp/diff_new_pack.D11414/_old 2009-06-29 16:37:41.000000000 +0200
+++ /var/tmp/diff_new_pack.D11414/_new 2009-06-29 16:37:41.000000000 +0200
@@ -20,12 +20,12 @@
Name: yast2-testsuite
Version: 2.16.2
-Release: 62
-License: GPL v2 or later
-Group: System/YaST
+Release: 63
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-testsuite-2.16.2.tar.bz2
Prefix: /usr
+Group: System/YaST
+License: GPL v2 or later
BuildRequires: openslp-devel perl-XML-Writer popt-devel yast2-core-devel yast2-devtools yast2-ycp-ui-bindings
Requires: expect dejagnu
# y2base -I includepath -M modulepath
@@ -37,12 +37,6 @@
This is a package for the YaST2 modules testsuite preparation and
execution.
-
-
-Authors:
---------
- Michal Svec <msvec(a)suse.cz>
-
%prep
%setup -n yast2-testsuite-2.16.2
@@ -54,7 +48,9 @@
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
%{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
-make %{?jobs:-j%jobs}
+# V=1: verbose build in case we used AM_SILENT_RULES(yes)
+# so that RPM_OPT_FLAGS check works
+make %{?jobs:-j%jobs} V=1
%install
make install DESTDIR="$RPM_BUILD_ROOT"
@@ -73,247 +69,4 @@
/usr/share/YaST2/data
/usr/share/YaST2/include
%doc %{prefix}/share/doc/packages/yast2-testsuite
-
%changelog
-* Tue Apr 08 2008 mvidner(a)suse.cz
-- Enable make check before make install, by telling y2base to search
- first in ../src (fate#2306).
-- 2.16.2
-* Fri Feb 29 2008 coolo(a)suse.de
-- fix buildrequires after yast2-core split
-- 2.16.1
-* Mon Nov 05 2007 mvidner(a)suse.cz
-- Use ./test.ycp instead of test.ycp when building (#330965).
-- 2.16.0
-* Fri Aug 10 2007 mvidner(a)suse.cz
-- Finished integrating Feature #120292, UI as a namespace callable
- from yast2-*-bindings.
-- 2.15.1
-* Wed Aug 08 2007 mvidner(a)suse.cz
-- Adapted to changes in yast2-core needed for making UI callable from
- yast2-*-bindings.
- (The testsuite component is no longer usable because it does not
- provide the UI namespace)
-- 2.15.0.1
-* Thu Jul 12 2007 locilka(a)suse.cz
-- 2.15.0
-* Mon Nov 13 2006 jsrain(a)suse.cz
-- 2.14.0
-* Wed Sep 13 2006 mvidner(a)suse.cz
-- Using yast2-devtools.pc instead of yast2-core.pc is fine.
- Now using --print-errors too.
-- 2.13.3
-* Wed Sep 13 2006 ro(a)suse.de
-- temporary fix to run testsuite without yast2-core-devel
-* Tue Sep 12 2006 mvidner(a)suse.cz
-- Require only yast2-core, not yast2-core-devel.
-- 2.13.2
-* Tue Mar 21 2006 mvidner(a)suse.cz
-- converted neededforbuild to BuildRequires,
- removed yast2-packagemanager
-- 2.13.1
-* Tue Jan 10 2006 mvidner(a)suse.cz
-- Just bumped to 2.13
-- 2.13.0
-* Wed Jul 20 2005 mvidner(a)suse.cz
-- Added libxml2[-devel] to NFB because of yast2-packagemanager.
-- 2.12.3
-* Fri Jul 08 2005 visnov(a)suse.cz
-- Adapt build requirements for blocxx
-- 2.12.2
-* Tue May 03 2005 mvidner(a)suse.cz
-- Do not use "default" as an identifier.
-- 2.12.1
-* Tue Dec 14 2004 mvidner(a)suse.cz
-- Log y2errors from Perl the same way as from YCP (#41448).
-- 2.11.2
-* Fri Oct 29 2004 mvidner(a)suse.cz
-- Added pkgconfig support.
-- Prepared for passing options to y2base during testsuite run.
-- 2.11.1
-* Mon Oct 18 2004 visnov(a)suse.de
-- Removed Pkg testing
-- 2.11.0
-* Mon Jun 14 2004 msvec(a)suse.cz
-- added Testsuite module
-- 2.10.0
-* Sat Apr 03 2004 kkaempf(a)suse.de
-- filter [Y2PMrc] messages from logfile (#38235)
-- 2.9.9
-* Fri Apr 02 2004 msvec(a)suse.cz
-- changed license to GPL
-- 2.9.8
-* Sat Feb 28 2004 kkaempf(a)suse.de
-- add openslp, openslp-devel to neededforbuild
-- 2.9.7
-* Wed Feb 25 2004 msvec(a)suse.cz
-- fixed files filtering (support files with path)
-- 2.9.6
-* Thu Feb 05 2004 msvec(a)suse.cz
-- possibility to limit testsuite output only to some files
-- 2.9.5
-* Fri Jan 30 2004 msvec(a)suse.cz
-- log also the empty lines (and files) in DUMP and DUMPFILE
-- 2.9.4
-* Fri Jan 23 2004 msvec(a)suse.cz
-- take advantage of a custom log.conf
-- the full logging (Y2DEBUG) is not required any more
-- 2.9.3
-* Fri Jan 23 2004 arvin(a)suse.de
-- fixed for brand new interpreter
-* Fri Jan 16 2004 msvec(a)suse.cz
-- updates for NI
-- 2.9.1
-* Tue Dec 02 2003 msvec(a)suse.cz
-- sync with current dummy agent
-- simplified log handling
-- 2.9.0
-* Mon Sep 08 2003 msvec(a)suse.cz
-- makefiles updates by arvin and schwab
-- 2.8.3
-* Fri Jul 11 2003 mvidner(a)suse.cz
-- mentioned wdiff in the docs.
-* Thu Jun 12 2003 arvin(a)suse.de
-- fixed file list
-* Wed Feb 05 2003 lslezak(a)suse.cz
-- added TargetInit and TargetProducts into Pkg.ycp
-- version 2.7.7
-* Mon Jan 27 2003 arvin(a)suse.de
-- added popt to neededforbuild
-* Mon Jan 20 2003 msvec(a)suse.de
-- better (non-conflicting) local name variable
-- 2.7.5
-* Mon Dec 09 2002 msvec(a)suse.cz
-- added another Pkg:: function
-- fixed for new log component names
-- 2.7.4
-* Thu Dec 05 2002 mvidner(a)suse.cz
-- Fixed a typo to make it really work.
-- 2.7.3
-* Thu Dec 05 2002 mvidner(a)suse.cz
-- Faked a bunch of Pkg:: functions that are used in the PackageCallbacks
- constructor.
- This should prevent the testsuite failures of yast2-mail etc.
-- 2.7.2
-* Tue Dec 03 2002 ro(a)suse.de
-- added curl and openssl to neededforbuild
-* Wed Oct 23 2002 ro(a)suse.de
-- added perl-XML-Writer to neededforbuild
-* Thu Aug 29 2002 msvec(a)suse.cz
-- provide Pkg::SourceProductData for modules using Installation.ycp
-- 2.6.9
-* Fri Aug 23 2002 mvidner(a)suse.cz
-- Added a dummy Pkg module for faking Pkg::Is{Provided,Available}
- (needed for the new packagemanager).
-- 2.6.8
-* Mon Jul 15 2002 mvidner(a)suse.cz
-- yast2 not needed for build nor at runtime.
-- 2.6.7
-* Fri Jul 12 2002 kkaempf(a)suse.de
-- use "testsuite" server instead of "scr" server in order
- to get a wfm-based (instead of scr based) runtime environment.
-- 2.6.6
-* Thu Jul 04 2002 arvin(a)suse.de
-- move non binary file from /usr/lib/YaST2 to /usr/share/YaST2
-- updated documentation
-- 2.6.5
-* Mon Jul 01 2002 msvec(a)suse.cz
-- new version for new yast2 scheme
-- 2.6.4
-* Wed Jun 26 2002 mvidner(a)suse.cz
-- Fix build errors (automake version mismatch) by not overwriting Makefile.am
-- Run tests in alphabetical order.
-- 2.6.3
-* Fri May 31 2002 msvec(a)suse.cz
-- possibility to test constructors
-- 2.6.2
-* Fri May 10 2002 msvec(a)suse.cz
-- accept the new broken Wizard constructor
-- 2.6.1
-* Wed Apr 03 2002 msvec(a)suse.cz
-- use devtools create-spec and y2autoconf
-- updated for the new system agent
-- 2.6.0
-* Thu Dec 13 2001 arvin(a)suse.de
-- adapted to renaming of y2bignfat to y2base
-- 2.5.3
-* Fri Nov 30 2001 msvec(a)suse.cz
-- make all ycp symbols global for testing local functions
-- removed some duplicated code
-- 2.5.2
-* Thu Nov 29 2001 pblahos(a)suse.cz
-- Added 3rd parameter to select to satisfy new libycp.
-- 2.5.1
-* Mon Nov 12 2001 msvec(a)suse.cz
-- use yast2-devtools
-- fixed lookup default parameter
-- 2.5.0
-* Wed Sep 26 2001 msvec(a)suse.cz
-- fixed DUMP for non-string variables
-- updated testsuite
-- 2.4.6
-* Wed Sep 26 2001 msvec(a)suse.cz
-- minor makefiles fixes
-- added some missing files
-- fixed DUMPFILE (new system agent)
-- fixed DUMP (multiple lines)
-- testsuite update
-- 2.4.5
-* Tue Aug 28 2001 msvec(a)suse.cz
-- parseycp during check
-- return the retcode
-- 2.4.4
-* Tue Aug 21 2001 msvec(a)suse.cz
-- unset all locale variables before testing
-- use faster SCR::
-- 2.4.3
-* Thu Aug 09 2001 msvec(a)suse.cz
-- report signal number if yast2 exit with failure
-- accept new Dir behavior
-- 2.4.2
-* Tue Jul 17 2001 msvec(a)suse.cz
-- don't ignore white-space in diffs
-- changes due to again renamed target.scr
-- don't accept declarations with '|'
-- exchange err and out outputs
-- minor fix of filtering
-- 2.4.1
-* Tue Jul 10 2001 ro(a)suse.de
-- removed yast2-core-translator from neededforbuild
-* Tue Jul 03 2001 msvec(a)suse.cz
-- adapted to new system agent split of y2scr
-- 2.4.0
-* Tue Apr 17 2001 msvec(a)suse.cz
-- major documentation rewrite
-- removed isnils
-- 2.3.7
-* Fri Apr 13 2001 msvec(a)suse.cz
-- run diff on the last failed test
-- enabled abuild checking
-- 2.3.6
-* Tue Apr 10 2001 msvec(a)suse.cz
-- enabled maps as arguments for TEST
-- stop after the first failed test
-- 2.3.5
-* Wed Apr 04 2001 msvec(a)suse.cz
-- minor documentation update
-- documentation moved to $RPMNAME
-- fixed new target agent output
-- fixed logconf.ycp handling
-- 2.3.4
-* Tue Mar 27 2001 msvec(a)suse.cz
-- new libycp adoptation
-- output beautification (final)
-- testsuite
-- 2.3.3
-* Mon Mar 19 2001 arvin(a)suse.de
-- don't check for gperf in configure
-- 2.3.2
-* Fri Mar 16 2001 msvec(a)suse.cz
-- autobuild checking changes
-- 2.3.1
-* Wed Mar 07 2001 msvec(a)suse.cz
-- Initial version
-- Incorporates y2scr/ag_target change: .target.tmpdir is now
- deleted when target agent is unmounetd. <pblahos>
-- DUMP function <gs>
++++++ yast2-testsuite-2.16.2.tar.bz2 ++++++
++++ 7763 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-testsuite-2.16.2/autodocs-ycp.ami new/yast2-testsuite-2.16.2/autodocs-ycp.ami
--- old/yast2-testsuite-2.16.2/autodocs-ycp.ami 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-testsuite-2.16.2/autodocs-ycp.ami 2009-06-29 12:20:10.000000000 +0200
@@ -0,0 +1,32 @@
+# -*- makefile -*- Automake include file
+# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $
+
+# Builds source documentation for YCP sources
+# Uses ycpdoc
+# PARAMETERS:
+# AUTODOCS_YCP: Files that the ycp autodocs is built from
+# Optional - the default is $(srcdir)/../../src/*.ycp
+# AUTODOCS_PM: Files that the perl autodocs is built from
+# Optional - the default is $(srcdir)/../../src/*.pm
+# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs
+# Optional - the default is no subdir, $(docdir)/autodocs
+# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __
+# Optional - the default is $(srcdir)/../../src
+
+htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
+
+html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
+CLEANFILES = $(html_DATA) pod2htm*.tmp
+
+AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
+AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+AUTODOCS_STRIP ?= $(srcdir)/../../src
+
+index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
+#including *.pm, for the index
+ ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP)
+ for i in $(AUTODOCS_PM); do \
+ b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \
+ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
+ echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \
+ done
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-testsuite-2.16.2/configure.in new/yast2-testsuite-2.16.2/configure.in
--- old/yast2-testsuite-2.16.2/configure.in 2008-04-08 18:30:40.000000000 +0200
+++ new/yast2-testsuite-2.16.2/configure.in 2009-06-29 12:20:10.000000000 +0200
@@ -1,6 +1,6 @@
dnl configure.in for yast2-testsuite
dnl
-dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.18.8 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
AC_INIT(yast2-testsuite, 2.16.2, http://bugs.opensuse.org/, yast2-testsuite)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-testsuite-2.16.2/doc/autodocs/Makefile.am new/yast2-testsuite-2.16.2/doc/autodocs/Makefile.am
--- old/yast2-testsuite-2.16.2/doc/autodocs/Makefile.am 2006-10-10 14:05:42.000000000 +0200
+++ new/yast2-testsuite-2.16.2/doc/autodocs/Makefile.am 2009-06-15 16:55:50.000000000 +0200
@@ -1,9 +1,3 @@
# Makefile.am for YCP module .../doc/autodocs
-htmldir = @docdir@/autodocs
-
-html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA)
-
-index.html: $(srcdir)/../../src/*.ycp
- ${YCPDOC} -d. $(srcdir)/../../src/*.ycp
+include $(top_srcdir)/autodocs-ycp.ami
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-testsuite-2.16.2/Makefile.am new/yast2-testsuite-2.16.2/Makefile.am
--- old/yast2-testsuite-2.16.2/Makefile.am 2008-04-08 18:30:40.000000000 +0200
+++ new/yast2-testsuite-2.16.2/Makefile.am 2009-06-29 12:20:10.000000000 +0200
@@ -32,10 +32,10 @@
# less strict; prefer bzip2
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
-# where devtools instal m4 snippets
+# where devtools install m4 snippets
# argh, executed literally
#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
-ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
+ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
cmp -s $< $@ || cp -f $< $@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-testsuite-2.16.2/missing new/yast2-testsuite-2.16.2/missing
--- old/yast2-testsuite-2.16.2/missing 2008-04-08 18:30:46.000000000 +0200
+++ new/yast2-testsuite-2.16.2/missing 2009-06-29 12:20:17.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# 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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to <bug-automake(a)gnu.org>."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
-# the program).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package hwinfo for openSUSE:Factory
checked in at Mon Jun 29 16:37:27 CEST 2009.
--------
--- hwinfo/hwinfo.changes 2009-06-19 11:01:36.000000000 +0200
+++ hwinfo/hwinfo.changes 2009-06-24 15:22:50.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Jun 24 15:22:27 CEST 2009 - snwint(a)suse.de
+
+- --log without other options assumes --all (bnc #243103)
+- rewrote man page, help text & README (bnc #178662)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
hwinfo-16.2.tar.bz2
New:
----
hwinfo-16.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hwinfo.spec ++++++
--- /var/tmp/diff_new_pack.VD5228/_old 2009-06-29 16:33:43.000000000 +0200
+++ /var/tmp/diff_new_pack.VD5228/_new 2009-06-29 16:33:43.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package hwinfo (Version 16.2)
+# spec file for package hwinfo (Version 16.3)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -31,9 +31,9 @@
PreReq: /sbin/ldconfig %insserv_prereq %fillup_prereq
AutoReqProv: on
Summary: Hardware Library
-Version: 16.2
-Release: 2
-Source: hwinfo-16.2.tar.bz2
+Version: 16.3
+Release: 1
+Source: hwinfo-16.3.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
++++++ hwinfo-16.2.tar.bz2 -> hwinfo-16.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-16.2/Changelog new/hwinfo-16.3/Changelog
--- old/hwinfo-16.2/Changelog 2009-06-15 11:32:08.000000000 +0200
+++ new/hwinfo-16.3/Changelog 2009-06-24 15:21:35.000000000 +0200
@@ -1,3 +1,7 @@
+24/6/2009: v16.3
+ - --log without other options assumes --all (bnc #243103)
+ - rewrote man page, help text & README (bnc #178662)
+
15/6/2009: v16.2
- fix build on non-x86 archs
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-16.2/doc/hwinfo.8 new/hwinfo-16.3/doc/hwinfo.8
--- old/hwinfo-16.2/doc/hwinfo.8 2009-05-12 12:10:34.000000000 +0200
+++ new/hwinfo-16.3/doc/hwinfo.8 2009-06-24 15:04:30.000000000 +0200
@@ -1,92 +1,118 @@
-.\" Michal Svec <msvec(a)suse.cz>
-.\"
-.\" Process this file with
-.\" groff -man -Tascii foo.1
-.\"
-.\"
-.TH HWINFO 8 "January 2003" "hwinfo" "System configuration"
-.\"
+.TH HWINFO 8 "June 2009" "hwinfo" "System configuration"
.\"
.SH NAME
hwinfo \- probe for hardware
.\"
-.\"
.SH SYNOPSIS
.B hwinfo [
-.I options
+.I OPTIONS
.B ]
.\"
-.\"
.SH DESCRIPTION
.B hwinfo
-is used to probe for the hardware present in the system. It can be used
-to generate a system overview log which can be later used for support.
-.\"
+is used to probe for the hardware present in the system. It can be used to
+generate a system overview log which can be later used for support.
.\"
.SH OPTIONS
-.\"
-.TP
-.BI --debug " " level
-Set debug
-.B level.
-The debug info is shown only in the log file. If you specify a log file,
-the debug level is implicitly set to a reasonable value.
-.\"
+Note that running \fBhwinfo\fR without any options is roughly equivalent
+to 'hwinfo --all --log=-'.
.TP
-.BI --dump-db " " n
-Dump hardware data base,
-.B n
-is either
-.B 0
-for the external data base, or
-.B 1
-for the internal data base.
-.\"
-.TP
-.BI --help
-Print a usage and exit.
-.\"
-.TP
-.BI --log " " logfile
-Write info to
-.B logfile.
-.\"
-.TP
-.BI --short
-Just a short listing.
+\fB--<\f[BI]HARDWARE_ITEM\fB>\fR
+This option can be given more than once.
+Probe for a particular \fIHARDWARE_ITEM\fR. Available hardware items are:
+
+all, arch, bios, block, bluetooth, braille, bridge, camera, cdrom, chipcard,
+cpu, disk, dsl, dvb, fingerprint, floppy, framebuffer, gfxcard, hub, ide,
+isapnp, isdn, joystick, keyboard, memory, modem, monitor, mouse, netcard,
+network, partition, pci, pcmcia, pcmcia-ctrl, pppoe, printer, redasd,
+reallyall, scanner, scsi, smp, sound, storage-ctrl, sys, tape, tv, uml, usb,
+usb-ctrl, vbe, wlan, xen, zip
+.TP
+\fB--short\fR
+Show only a summary. Use this option in addition to a hardware probing
+option.
+.TP
+\fB--listmd\fR
+Normally hwinfo does not report RAID devices. Add this option to see them.
+.TP
+\fB--only \fIDEVNAME\fR
+This option can be given more than once. If you add this option, only data
+about devices with \fIDEVNAME\fR will be shown.
+.TP
+\fB--save-config \fISPEC\fR
+Store config for a particular device below /var/lib/hardware. \fISPEC\fR
+can be a device name, an UDI, or 'all'. This option must be given in addition to
+a hardware probing option.
+.TP
+\fB--show-config \fIUDI\fR
+Show saved config data for a particular device.
+.TP
+\fB--map\fR
+If disk names have changed (e.g. after a kernel update) this prints a list
+of disk name mappings. Note that you must have used --save-config at some
+point before for this can work.
+.TP
+\fB--debug \fIN\fR
+Set debug level to \fIN\fR. The debug info is shown only in the log file.
+If you specify a log file, the debug level is implicitly set to a reasonable value.
+.TP
+\fB--verbose\fR
+Increase verbosity. Only together with --map.
+.TP
+\fB--log \fIFILE\fR
+Write log info to \fIFILE\fR.
+.TP
+\fB--dump-db \fIN\fR
+Dump hardware data base. \fIN\fR is either 0 for the external data base in
+/var/lib/hardware, or 1 for the internal data base.
+.TP
+\fB--version\fR
+Print libhd version.
+.TP
+\fB--help\fR
+Print usage.
+.\"
+.SH ENVIRONMENT
+\fBhwprobe\fR can hold a comma-separated list of probing flags preceded by '+'
+or '-' to be turned on or off. To get a complete list of supported flags,
+run 'hwinfo -all' (note: not '--all') and look at the top of the output.
+
+hwinfo also looks at /proc/cmdline for a \fBhwprobe\fR option.
+.\"
+.SH EXAMPLES
+.TP
+- show all disks
+hwinfo --disk
+.TP
+- just an overview
+hwinfo --short --block
+.TP
+- show a particular disk
+hwinfo --disk --only /dev/sdb
+.TP
+- save disk config state
+hwinfo --disk --save-config=all
+.TP
+- try 4 graphics card ports for monitor data (default: 3)
+hwprobe=bios.ddc.ports=4 hwinfo --monitor
+.TP
+- monitor detection runs the Video BIOS to get the monitor data; dump a complete BIOS code execution trace to the log
+hwprobe=bios.ddc.ports=1,x86emu=trace:dump:trace.only=0:dump.only=0 \
+hwinfo --monitor --log=foo
.\"
+.SH FILES
.TP
-.BI --version
-Show libhd version.
-.\"
+\fB/var/lib/hardware/hd.ids\fR
+External hardware data base (in readable text form). Try the --dump-db option to see the format.
.TP
-.BI --<hwitem>
-Probe for the particular hardware item. Available hardware items are:
-.B all, bios, block, bluetooth, braille, bridge, camera, cdrom, chipcard, cpu,
-.B disk, dsl, dvb, fingerprint, floppy, framebuffer, gfxcard, hub, ide, isapnp, isdn,
-.B joystick, keyboard, memory, modem, monitor, mouse, netcard, network,
-.B partition, pci, pcmcia, pcmcia-ctrl, pppoe, printer, scanner, scsi, smp,
-.B sound, storage-ctrl, sys, tape, tv, usb, usb-ctrl, vbe, wlan,
-and
-.B zip.
-.\"
-.\"
-.SH FILES
-.B /var/lib/hardware/*
-.\"
+\fB/var/lib/hardware/udi\fR
+Directory where persistent config data are stored (see --save-config option).
.\"
.SH BUGS
Not all hardware can be detected.
.\"
-.\"
-.SH AUTHOR
-.nf
-Steffen Winterfeldt <snwint(a)suse.de> - hwinfo
-Michal Svec <msvec(a)suse.cz> - manual page
-.fi
-.\"
-.\"
.SH "SEE ALSO"
-Documentation in /usr/share/doc/packages/hwinfo.
+More documentation in /usr/share/doc/packages/hwinfo.
+.br
+Source repository: git://git.opensuse.org/projects/hwinfo.git.
.\"
-.\" EOF
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-16.2/hwinfo.c new/hwinfo-16.3/hwinfo.c
--- old/hwinfo-16.2/hwinfo.c 2009-06-08 17:22:49.000000000 +0200
+++ new/hwinfo-16.3/hwinfo.c 2009-06-24 14:59:14.000000000 +0200
@@ -322,13 +322,15 @@
break;
case 1000 ... 1100:
- if(hw_items < (int) (sizeof hw_item / sizeof *hw_item) - 1)
+ if(hw_items < sizeof hw_item / sizeof *hw_item - 1) {
hw_item[hw_items++] = i - 1000;
+ }
break;
case 2000 ... 2005:
- if(hw_items < (int) (sizeof hw_item / sizeof *hw_item) - 1)
+ if(hw_items < sizeof hw_item / sizeof *hw_item - 1) {
hw_item[hw_items++] = i;
+ }
break;
default:
@@ -337,7 +339,7 @@
}
}
- if(!hw_items && is_short) hw_item[hw_items++] = 2000; /* all */
+ if(!hw_items) hw_item[hw_items++] = 2000; /* all */
if(hw_items >= 0 || showconfig || saveconfig) {
if(*log_file) {
@@ -785,24 +787,53 @@
void help()
{
fprintf(stderr,
- "Usage: hwinfo [options]\n"
+ "Usage: hwinfo [OPTIONS]\n"
"Probe for hardware.\n"
- " --short just a short listing\n"
- " --log logfile write info to logfile\n"
- " --debug level set debuglevel\n"
- " --version show libhd version\n"
- " --dump-db n dump hardware data base, 0: external, 1: internal\n"
- " --hw_item probe for hw_item\n"
- " hw_item is one of:\n"
- " all, bios, block, bluetooth, braille, bridge, camera, cdrom, chipcard,\n"
- " cpu, disk, dsl, dvb, fingerprint, floppy, framebuffer, gfxcard, hub,\n"
- " ide, isapnp, isdn, joystick, keyboard, memory, modem, monitor, mouse,\n"
- " netcard, network, partition, pci, pcmcia, pcmcia-ctrl, pppoe, printer,\n"
- " scanner, scsi, smp, sound, storage-ctrl, sys, tape, tv, usb, usb-ctrl,\n"
- " vbe, wlan, zip\n"
- "\n"
- " Note: debug info is shown only in the log file. (If you specify a\n"
- " log file the debug level is implicitly set to a reasonable value.)\n"
+ "Options:\n"
+ " --<HARDWARE_ITEM>\n"
+ " This option can be given more than once. Probe for a particular\n"
+ " HARDWARE_ITEM. Available hardware items are:\n"
+ " all, arch, bios, block, bluetooth, braille, bridge, camera,\n"
+ " cdrom, chipcard, cpu, disk, dsl, dvb, fingerprint, floppy,\n"
+ " framebuffer, gfxcard, hub, ide, isapnp, isdn, joystick, keyboard,\n"
+ " memory, modem, monitor, mouse, netcard, network, partition,\n"
+ " pci, pcmcia, pcmcia-ctrl, pppoe, printer, redasd,\n"
+ " reallyall, scanner, scsi, smp, sound, storage-ctrl, sys, tape,\n"
+ " tv, uml, usb, usb-ctrl, vbe, wlan, xen, zip\n"
+ " --short\n"
+ " Show only a summary. Use this option in addition to a hardware\n"
+ " probing option.\n"
+ " --listmd\n"
+ " Normally hwinfo does not report RAID devices. Add this option to\n"
+ " see them.\n"
+ " --only DEVNAME\n"
+ " This option can be given more than once. If you add this option,\n"
+ " only data about devices with DEVNAME will be shown.\n"
+ " --save-config SPEC\n"
+ " Store config for a particular device below /var/lib/hardware.\n"
+ " SPEC can be a device name, an UDI, or 'all'. This option must be\n"
+ " given in addition to a hardware probing option.\n"
+ " --show-config UDI\n"
+ " Show saved config data for a particular device.\n"
+ " --map\n"
+ " If disk names have changed (e.g. after a kernel update) this\n"
+ " prints a list of disk name mappings. Note that you must have\n"
+ " used --save-config at some point before for this can work.\n"
+ " --debug N\n"
+ " Set debug level to N. The debug info is shown only in the log\n"
+ " file. If you specify a log file, the debug level is implicitly\n"
+ " set to a reasonable value.\n"
+ " --verbose\n"
+ " Increase verbosity. Only together with --map.\n"
+ " --log FILE\n"
+ " Write log info to FILE.\n"
+ " --dump-db N\n"
+ " Dump hardware data base. N is either 0 for the external data\n"
+ " base in /var/lib/hardware, or 1 for the internal data base.\n"
+ " --version\n"
+ " Print libhd version.\n"
+ " --help\n"
+ " Print usage.\n"
);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-16.2/README new/hwinfo-16.3/README
--- old/hwinfo-16.2/README 2009-05-12 12:10:34.000000000 +0200
+++ new/hwinfo-16.3/README 2009-06-24 15:20:33.000000000 +0200
@@ -1,5 +1,15 @@
-1. Usage
-========
+See hwinfo man page for general usage instructions.
+
+This document describes some legacy features and the "hwprobe" environment variable.
+
+
+1. Legacy
+=========
+
+*** Note: please do not do this, this is only kept to assist debugging. ***
+
+Legacy mode is activated when no option starting with "--" is given. In this case hwinfo
+works as follows:
hwinfo [debug=deb_flag] [log=log_file] [list[+]=hw_item] [[+|-]probe_option1] [[+|-]probe_option2] ...
@@ -16,51 +26,35 @@
*** Please don't use "hwinfo >some_log 2>&1" to store the output into a
log file! ***
- hwinfo -all +ide
- - probe for ide drives only
+ hwinfo -all +pci +int
+ - probe for pci devices
- hwinfo +all -isapnp -floppy
- - probe for everything *except* isapnp and floppies
+Note that "int" should almost always be active.
Some probing flags do not stand for complete modules but enable additional
-features; e.g. "pci.range" or "cdrom.info".
+features; e.g. "bios.vesa" or "block.cdrom".
Example:
- hwinfo -all +cdrom
- gives a list of all cdrom's
+ hwinfo -all +block +int
+ gives a list of all block devs
- hwinfo -all +cdrom.info
+ hwinfo -all +block.cdrom +int
additionally reads the iso9660 info
-To get a list of all supported probing flags, call 'hwinfo -all'.
+The list of supported flags varies from version to version. To get a list of
+the actual set of probing flags, call "hwinfo -all" and look at the top of
+the log.
-2. Environment variables/kernel cmdline parameters
-==================================================
+2. Environment variable/kernel cmdline parameter
+================================================
You can control the hardware probing using the environment variable
-"hwprobe" and the kernel cmdline parameters "hwprobe" & "x11".
+"hwprobe" and the kernel cmdline parameter "hwprobe".
If "hwprobe" is set on the kernel cmdline, the environment variable
"hwprobe" is ignored. Otherwise, the meaning of both is exactly the same.
- x11
- - Controls the X server/X version to prefer. It is either "3" or "4" or the
- name of the X server/X server module to use (XF3: server name without
- the leading "XF86_", XF4: the server module name).
-
- Examples:
- x11=3
- o prefer XFree86 3.x over 4.x (if possible)
-
- x11=SVGA
- o use the XF86_SVGA server (*** Even if the server does not
- support the card! ***)
-
- x11=nv
- o use the XF4 nv_drv.o driver (*** Even if the module does not
- support the card! ***)
-
hwprobe
- Controls which probing flags should *always* be set/cleared. (These
settings *cannot* be overridden by command line switches.)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-16.2/src/Makefile new/hwinfo-16.3/src/Makefile
--- old/hwinfo-16.2/src/Makefile 2009-06-08 17:22:49.000000000 +0200
+++ new/hwinfo-16.3/src/Makefile 2009-06-18 10:00:43.000000000 +0200
@@ -17,9 +17,9 @@
ifdef SHARED_FLAGS
$(LIBHD_SO): $(LIBHD)
- $(CC) -shared $(SO_LIBS) -Wl,--whole-archive $(LIBHD) -Wl,--no-whole-archive \
+ $(CC) -shared -Wl,--whole-archive $(LIBHD) -Wl,--no-whole-archive \
-Wl,-soname=$(LIBHD_SONAME) \
- -o $(LIBHD_SO)
+ -o $(LIBHD_SO) $(SO_LIBS)
ln -snf $(LIBHD_NAME) $(LIBHD_SONAME)
ln -snf $(LIBHD_SONAME) $(LIBHD_BASE).so
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-16.2/VERSION new/hwinfo-16.3/VERSION
--- old/hwinfo-16.2/VERSION 2009-06-15 11:31:45.000000000 +0200
+++ new/hwinfo-16.3/VERSION 2009-06-23 14:52:52.000000000 +0200
@@ -1 +1 @@
-16.2
+16.3
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package yast2-core for openSUSE:Factory
checked in at Mon Jun 29 16:33:29 CEST 2009.
--------
--- yast2-core/yast2-core.changes 2009-06-15 18:19:51.000000000 +0200
+++ yast2-core/yast2-core.changes 2009-06-19 15:49:08.000000000 +0200
@@ -1,0 +2,18 @@
+Fri Jun 19 14:14:13 CEST 2009 - mvidner(a)suse.cz
+
+- float::tolstring fixed to use the fixed notation
+- 2.18.14
+
+-------------------------------------------------------------------
+Thu Jun 18 16:59:49 CEST 2009 - lslezak(a)suse.cz
+
+- DBus service - fixed returning "any" values (bnc#513503),
+ return correct signatures in DBus introspection data, return the
+ values according to it (bnc#513571), added basic testuite
+
+-------------------------------------------------------------------
+Wed Jun 17 13:53:30 CEST 2009 - mvidner(a)suse.cz
+
+- DBusServerBase: exit properly if the connection got closed
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-core-2.18.13.tar.bz2
New:
----
yast2-core-2.18.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-core.spec ++++++
--- /var/tmp/diff_new_pack.Hz1648/_old 2009-06-29 16:30:43.000000000 +0200
+++ /var/tmp/diff_new_pack.Hz1648/_new 2009-06-29 16:30:43.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-core (Version 2.18.13)
+# spec file for package yast2-core (Version 2.18.14)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-core
-Version: 2.18.13
+Version: 2.18.14
Release: 1
-License: GPL v2 or later
+License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-core-2.18.13.tar.bz2
+Source0: yast2-core-2.18.14.tar.bz2
Prefix: /usr
# obviously
BuildRequires: gcc-c++
@@ -46,7 +46,7 @@
# libycp includes crypto built-ins
BuildRequires: libxcrypt-devel
# for SCR DBus service
-BuildRequires: PolicyKit-devel dbus-1-devel
+BuildRequires: PolicyKit-devel dbus-1-devel dbus-1-x11
Summary: YaST2 - Core Libraries
Requires: perl = %{perl_version}
Provides: liby2util = 2.16.1
@@ -56,20 +56,11 @@
This package contains the scanner, parser, and interpreter runtime
library for the YCP scripting language used in YaST2.
-
-
-Authors:
---------
- Arvin Schnell <arvin(a)suse.de>
- Klaus Kaempf <kkaempf(a)suse.de>
- Mathias Kettner <kettner(a)suse.de>
- Stefan Hundhammer <sh(a)suse.de>
-
%package devel
-License: GPL v2 or later
+License: GPL
Requires: yast2-core = %version
-Group: Development/Libraries/YaST
-Summary: YaST2 - Include Files and Documentation for Core Libraries
+Group: Development/Libraries
+Summary: YaST2 - Core Libraries
Provides: liby2util-devel = 2.16.1
Obsoletes: liby2util-devel < 2.16.1
Requires: libxcrypt-devel hwinfo-devel
@@ -84,20 +75,11 @@
This package contains include and documentation files for developing
applications using the YaST2 YCP interpreter.
-
-
-Authors:
---------
- Arvin Schnell <arvin(a)suse.de>
- Klaus Kaempf <kkaempf(a)suse.de>
- Mathias Kettner <kettner(a)suse.de>
- Stefan Hundhammer <sh(a)suse.de>
- Stanislav Visnovsky <visnov(a)suse.cz>
-
%prep
-%setup -n yast2-core-2.18.13
+%setup -n yast2-core-2.18.14
%build
+export SUSE_ASNEEDED=0
%{prefix}/bin/y2tool y2autoconf
%{prefix}/bin/y2tool y2automake
autoreconf --force --install
++++++ yast2-core-2.18.13.tar.bz2 -> yast2-core-2.18.14.tar.bz2 ++++++
++++ 2412 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.13/agent-system/src/SystemAgent.cc new/yast2-core-2.18.14/agent-system/src/SystemAgent.cc
--- old/yast2-core-2.18.13/agent-system/src/SystemAgent.cc 2009-04-10 09:50:28.000000000 +0200
+++ new/yast2-core-2.18.14/agent-system/src/SystemAgent.cc 2009-06-18 10:24:56.000000000 +0200
@@ -7,7 +7,7 @@
* Michal Svec <msvec(a)suse.cz>
* Petr Blahos <pblahos(a)suse.cz>
*
- * $Id: SystemAgent.cc 54455 2009-01-07 16:34:16Z aschnell $
+ * $Id: SystemAgent.cc 57633 2009-06-18 08:24:56Z mvidner $
*/
#include "config.h"
@@ -63,7 +63,7 @@
* @param path path to remove
* @param depth max. depth
*/
-static const void
+static void
remove_directory (const string& path, int depth)
{
struct stat buf;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.13/configure.in new/yast2-core-2.18.14/configure.in
--- old/yast2-core-2.18.13/configure.in 2009-06-15 18:10:10.000000000 +0200
+++ new/yast2-core-2.18.14/configure.in 2009-06-22 08:02:47.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.5 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-core, 2.18.13, http://bugs.opensuse.org/, yast2-core)
+AC_INIT(yast2-core, 2.18.14, http://bugs.opensuse.org/, yast2-core)
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.18.13"
+VERSION="2.18.14"
RPMNAME="yast2-core"
MAINTAINER="Martin Vidner <mvidner(a)suse.cz>"
@@ -477,6 +477,8 @@
dbus/SCR_service/Makefile
dbus/namespace_service/src/Makefile
dbus/namespace_service/doc/Makefile
+dbus/namespace_service/testsuite/modules/Makefile
+dbus/namespace_service/testsuite/Makefile
dbus/namespace_service/Makefile
dbus/Makefile)
AC_OUTPUT
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.13/dbus/namespace_service/Makefile.am new/yast2-core-2.18.14/dbus/namespace_service/Makefile.am
--- old/yast2-core-2.18.13/dbus/namespace_service/Makefile.am 2009-04-10 09:50:43.000000000 +0200
+++ new/yast2-core-2.18.14/dbus/namespace_service/Makefile.am 2009-06-17 11:10:45.000000000 +0200
@@ -2,4 +2,4 @@
# Makefile.am for core/dbus/namespace_service
#
-SUBDIRS=src doc
+SUBDIRS=src doc testsuite
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.13/dbus/namespace_service/src/DBusModulesServer.cc new/yast2-core-2.18.14/dbus/namespace_service/src/DBusModulesServer.cc
--- old/yast2-core-2.18.13/dbus/namespace_service/src/DBusModulesServer.cc 2009-05-14 15:06:13.000000000 +0200
+++ new/yast2-core-2.18.14/dbus/namespace_service/src/DBusModulesServer.cc 2009-06-19 14:50:43.000000000 +0200
@@ -1,4 +1,3 @@
-
/*
DBus server
@@ -23,6 +22,7 @@
#include "yast_dbus_names.h"
+
void DBusModulesServer::init_wfm()
{
if (Y2WFMComponent::instance() == NULL)
@@ -114,17 +114,31 @@
DBusSignature sig_marshalled;
DBusSignature sig_raw;
+ bool params_ok_raw = true;
- // add return type
- std::string rett(Y2Dtype(rettype));
+ std::string rett;
- if (!rett.empty())
+ try
+ {
+ // add return type
+ rett = DBusMsg::YCPTypeSignature(rettype);
+ }
+ catch (const SignatureException &excpt)
{
- sig_raw.retval = DBusArgument("ret", rett);
+ y2error("Ignoring function %s::%s in raw interface, unsupported return type: %s", nspace.c_str(), fname, rettype->toString().c_str());
+ params_ok_raw = false;
}
- // TODO FIXME void() ?
- sig_marshalled.retval = DBusArgument("ret", "(bsv)");
+ // check void()
+ if (!rettype->isVoid() && !rettype->isNil())
+ {
+ if (params_ok_raw)
+ {
+ sig_raw.retval = DBusArgument("ret", rett);
+ }
+
+ sig_marshalled.retval = DBusArgument("ret", "(bsv)");
+ }
// add parameter types
int params = fptr->parameterCount();
@@ -132,20 +146,20 @@
DBusSignature::Params p_marshalled;
DBusSignature::Params p_raw;
- bool params_ok_raw = true;
while(parindex < params)
{
- std::string partype_raw(Y2Dtype(fptr->parameterType(parindex)));
-
- if (!partype_raw.empty())
+ try
{
+ std::string partype_raw(DBusMsg::YCPTypeSignature(fptr->parameterType(parindex)));
+
DBusArgument param("param", partype_raw);
p_raw.push_back(param);
}
- else
+ catch (const SignatureException &excpt)
{
- y2warning("Function %s is not exported due to an unsupported parameter type", fname);
+ y2warning("Function %s::%s is not exported due to an unsupported type of parameter number %d",
+ nspace.c_str(), fname, parindex);
params_ok_raw = false;
}
@@ -215,7 +229,12 @@
}
-DBusModulesServer::DBusModulesServer(const NameSpaceList &name_spaces) : e(this), manager_callback(this), wfm(NULL)
+DBusModulesServer::DBusModulesServer(const NameSpaceList &name_spaces, bool test_mode)
+ : DBusServerBase(test_mode)
+ , e(this)
+ , manager_callback(this)
+ , wfm(NULL)
+ , m_test_mode(test_mode)
{
init_wfm();
@@ -256,33 +275,6 @@
register_method(YAST_DBUS_OBJ_PREFIX, YAST_DBUS_MGR_INTERFACE, YAST_DBUS_MANAGER_LOCK_METHOD, void_sig, manager_callback);
}
-std::string DBusModulesServer::Y2Dtype(constTypePtr type) const
-{
- YCPValueType vt = type->valueType();
- std::string ret;
-
- switch (vt)
- {
- case(YT_VOID) : ret = ""; break;
- case(YT_BOOLEAN) : ret = DBUS_TYPE_BOOLEAN_AS_STRING; break;
- case(YT_INTEGER) : ret = DBUS_TYPE_INT64_AS_STRING; break;
- case(YT_FLOAT) : ret = DBUS_TYPE_DOUBLE_AS_STRING; break;
- case(YT_STRING) : ret = DBUS_TYPE_STRING_AS_STRING; break;
- case(YT_PATH) : ret = DBUS_TYPE_STRING_AS_STRING; break;
- case(YT_SYMBOL) : ret = DBUS_TYPE_STRING_AS_STRING; break;
- case(YT_LIST) : ret = DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_VARIANT_AS_STRING; break; /* av */
- case(YT_MAP) : ret = DBUS_TYPE_ARRAY_AS_STRING
- DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING DBUS_TYPE_STRING_AS_STRING
- DBUS_TYPE_VARIANT_AS_STRING DBUS_DICT_ENTRY_END_CHAR_AS_STRING; break; /* a{sv} */
- case(YT_TERM) : ret = DBUS_TYPE_STRING_AS_STRING; break;
-// case(YT_CODE) : ret = DBUS_TYPE_STRING_AS_STRING; break;
-
- default : y2warning("Value type %d is not supported", vt); break;
- }
-
- return ret;
-}
-
constTypePtr DBusModulesServer::searchFuncType(const std::string &objname, const std::string &fname) const
{
if (nsmap.find(objname) == nsmap.end())
@@ -326,7 +318,8 @@
bool DBusModulesServer::connect()
{
registerManager();
- return DBusServerBase::connect(SYSTEM, YAST_DBUS_SERVICE_NAME);
+ return DBusServerBase::connect(m_test_mode ? SESSION : SYSTEM,
+ YAST_DBUS_SERVICE_NAME);
}
/*
@@ -409,6 +402,7 @@
y2debug("Requested object: %s, interface: %s, method: %s", object.c_str(), interface.c_str(), method.c_str());
constTypePtr t = searchFuncType(object, method);
+ constTypePtr rettype = NULL;
if (t)
{
@@ -416,6 +410,8 @@
if (fptr)
{
+ rettype = fptr->returnType();
+
int reqarg = fptr->parameterCount();
if (request.arguments() == reqarg)
@@ -524,7 +520,7 @@
if (interface == YAST_DBUS_RAW_INTERFACE)
{
y2debug("Returning direct DBus value");
- reply.addValue(ret);
+ reply.addValueAs(ret, rettype);
}
else
{
@@ -552,7 +548,7 @@
y2milestone("ModuleManager request: object: %s, method: %s, interface: %s",
object.c_str(), method.c_str(), interface.c_str());
- YCPValue ret;
+ reply.createReply(request);
if (object == YAST_DBUS_OBJ_PREFIX)
{
@@ -573,18 +569,20 @@
if (arg->isString())
{
std::string required_namespace(arg->asString()->value());
+ bool ret;
NameSpaceMap::const_iterator nsiter = nsmap.find(required_namespace);
if (nsiter != nsmap.end())
{
- ret = YCPBoolean(true);
+ ret = true;
}
else
{
- bool retval = importNamespace(arg->asString()->value());
-
- ret = YCPBoolean(retval);
+ ret = importNamespace(arg->asString()->value());
}
+
+ y2milestone("Result: %s", ret ? "true" : "false");
+ reply.addBoolean(ret);
}
else
{
@@ -609,14 +607,6 @@
}
}
- reply.createReply(request);
-
- if (!ret.isNull())
- {
- y2milestone("Result: %s", ret->toString().c_str());
- reply.addValue(ret);
- }
-
return reply;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.13/dbus/namespace_service/src/DBusModulesServer.h new/yast2-core-2.18.14/dbus/namespace_service/src/DBusModulesServer.h
--- old/yast2-core-2.18.13/dbus/namespace_service/src/DBusModulesServer.h 2009-04-10 09:50:43.000000000 +0200
+++ new/yast2-core-2.18.14/dbus/namespace_service/src/DBusModulesServer.h 2009-06-18 16:44:22.000000000 +0200
@@ -1,4 +1,3 @@
-
/*
DBusModulesServer.h
*/
@@ -25,7 +24,7 @@
typedef std::list<std::string> NameSpaceList;
- DBusModulesServer(const NameSpaceList &name_spaces);
+ DBusModulesServer(const NameSpaceList &name_spaces, bool test_mode);
virtual ~DBusModulesServer();
virtual bool connect();
@@ -95,8 +94,9 @@
Y2Component *wfm;
void init_wfm();
+
+ bool m_test_mode;
};
#endif
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.13/dbus/namespace_service/src/yast_modules_dbus_server.cc new/yast2-core-2.18.14/dbus/namespace_service/src/yast_modules_dbus_server.cc
--- old/yast2-core-2.18.13/dbus/namespace_service/src/yast_modules_dbus_server.cc 2009-04-10 09:50:43.000000000 +0200
+++ new/yast2-core-2.18.14/dbus/namespace_service/src/yast_modules_dbus_server.cc 2009-06-18 16:44:22.000000000 +0200
@@ -1,4 +1,3 @@
-
/*
*/
@@ -12,6 +11,7 @@
bool forever = false;
bool badopts = false;
+ bool test_mode = false;
DBusModulesServer::NameSpaceList modules;
@@ -29,6 +29,10 @@
{
forever = true;
}
+ else if (!strcmp(argv[index], "--test"))
+ {
+ test_mode = true;
+ }
else
{
modules.push_back(argv[index]);
@@ -40,14 +44,16 @@
if (badopts)
{
- std::cerr << "Usage: " << argv[0] << " [--help] [--disable-timer] <namespace> <namespace>..." << std::endl;
+ std::cerr << "Usage: " << argv[0] << " [--help] [--disable-timer] [--session] <namespace> <namespace>..." << std::endl;
std::cerr << " --help Print this text\n";
std::cerr << " --disable-timer Disable automatic shutdown of the service, useful for debugging\n";
+ std::cerr << " --test Set the test mode - Connect to the session bus (system is the default),\n";
+ std::cerr << " disable PolicyKit checks. Useful for testing or debugging.\n";
std::cerr << " <namespace> Preload an yast namespace and export it on DBus\n";
return 1;
}
- DBusModulesServer server(modules);
+ DBusModulesServer server(modules, test_mode);
bool connected = server.connect();
if (connected)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.13/dbus/namespace_service/testsuite/Makefile.am new/yast2-core-2.18.14/dbus/namespace_service/testsuite/Makefile.am
--- old/yast2-core-2.18.13/dbus/namespace_service/testsuite/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.18.14/dbus/namespace_service/testsuite/Makefile.am 2009-06-18 19:24:31.000000000 +0200
@@ -0,0 +1,8 @@
+# adhoc testing, TODO use a decent framework (dejagnu does not qualify)
+TESTS = t1
+
+SUBDIRS = modules
+
+EXTRA_DIST = $(wildcard *.test) t1
+
+CLEANFILES = $(wildcard *.test.reply)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.13/dbus/namespace_service/testsuite/modules/Makefile.am new/yast2-core-2.18.14/dbus/namespace_service/testsuite/modules/Makefile.am
--- old/yast2-core-2.18.13/dbus/namespace_service/testsuite/modules/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.18.14/dbus/namespace_service/testsuite/modules/Makefile.am 2009-06-18 19:24:31.000000000 +0200
@@ -0,0 +1,13 @@
+
+yast_modules = TEST.ycp
+
+EXTRA_DIST = $(yast_modules)
+
+yast_modules_ybc = $(yast_modules:.ycp=.ybc)
+
+$(yast_modules_ybc): $(yast_modules)
+ ../../../../base/tools/ycpc/ycpc -c $<
+
+all: $(yast_modules_ybc)
+
+CLEANFILES = $(wildcard *.ybc)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.13/dbus/namespace_service/testsuite/modules/TEST.ycp new/yast2-core-2.18.14/dbus/namespace_service/testsuite/modules/TEST.ycp
--- old/yast2-core-2.18.13/dbus/namespace_service/testsuite/modules/TEST.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.18.14/dbus/namespace_service/testsuite/modules/TEST.ycp 2009-06-18 16:44:22.000000000 +0200
@@ -0,0 +1,81 @@
+
+// This is a testing module for the YaST DBuse service
+// Some methods are not called during tests, but the correct signature is checked in the introspection test
+
+{
+
+module "TEST";
+
+global define list List()
+{return [];}
+
+global define list<any> ListAny()
+{return [];}
+
+global define list ListAny1()
+{return [1, "string"];}
+
+global define list ListAny2()
+{return [["dssd", 123], ["zxcxczzx", 456]];}
+
+global define list<string> ListString()
+{return ["dssd", "sdfdfs"];}
+
+global define list<list<string> > ListListString()
+{return [["dssd", "sdfdfs"], ["zxcxczzx"]];}
+
+global define list<map> ListMap()
+{return [];}
+
+global define list<map<string, string> > ListMapStringString()
+{return [];}
+
+global define list<map<string, any> > ListMapStringAny()
+{return [ $["a" : "b"], $["c" : [10, 20, "haha", `Symbol]]];}
+
+global define map<string, any> MapStringAny()
+{return $[];}
+
+global define map<string, string> MapStringString()
+{return $[];}
+
+global define map<string, list<string> > MapStringListString()
+{return $[];}
+
+global define string String()
+{return "a";}
+
+global define any Any()
+{return "a";}
+
+global define any Any2()
+{return ["a"];}
+
+global define integer Integer()
+{return 10;}
+
+global define symbol Symbol()
+{return `s;}
+
+global define map MapAny()
+{return $[ ];}
+
+global define map MapAny2()
+{return $[ "3" : "l" ];}
+
+global define map MapAny3()
+{return $[ "3" : ["l", "3"] ];}
+
+global define map MapAny4()
+{return $[ "3" : $["l" : ["3", 10, $["a" : "b"]]]];}
+
+// Note: interger key is returned as string in map<any,X> type,
+// map<interger,X> must be used to return int,
+// Dbus requires a basic type as key, a variant cannot be sent
+global define map MapAny5()
+{return $[ 3 : 4, "4" : "5" ];}
+
+global define void Void()
+{return;}
+
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.13/dbus/namespace_service/testsuite/org.freedesktop.DBus.Introspectable.Introspect.test new/yast2-core-2.18.14/dbus/namespace_service/testsuite/org.freedesktop.DBus.Introspectable.Introspect.test
--- old/yast2-core-2.18.13/dbus/namespace_service/testsuite/org.freedesktop.DBus.Introspectable.Introspect.test 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.18.14/dbus/namespace_service/testsuite/org.freedesktop.DBus.Introspectable.Introspect.test 2009-06-18 15:25:17.000000000 +0200
@@ -0,0 +1,61 @@
+ string "<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+
+<node>
+ <interface name='org.freedesktop.DBus.Introspectable'>
+ <method name='Introspect'>
+ <arg name='xml_data' type='s' direction='out'/>
+ </method>
+ </interface>
+ <interface name='org.opensuse.YaST.Values'>
+ <method name='Any'><arg name='ret' type='v' direction='out'/></method>
+ <method name='Any2'><arg name='ret' type='v' direction='out'/></method>
+ <method name='Integer'><arg name='ret' type='x' direction='out'/></method>
+ <method name='List'><arg name='ret' type='av' direction='out'/></method>
+ <method name='ListAny'><arg name='ret' type='av' direction='out'/></method>
+ <method name='ListAny1'><arg name='ret' type='av' direction='out'/></method>
+ <method name='ListAny2'><arg name='ret' type='av' direction='out'/></method>
+ <method name='ListListString'><arg name='ret' type='aas' direction='out'/></method>
+ <method name='ListMap'><arg name='ret' type='aa{sv}' direction='out'/></method>
+ <method name='ListMapStringAny'><arg name='ret' type='aa{sv}' direction='out'/></method>
+ <method name='ListMapStringString'><arg name='ret' type='aa{ss}' direction='out'/></method>
+ <method name='ListString'><arg name='ret' type='as' direction='out'/></method>
+ <method name='MapAny'><arg name='ret' type='a{sv}' direction='out'/></method>
+ <method name='MapAny2'><arg name='ret' type='a{sv}' direction='out'/></method>
+ <method name='MapAny3'><arg name='ret' type='a{sv}' direction='out'/></method>
+ <method name='MapAny4'><arg name='ret' type='a{sv}' direction='out'/></method>
+ <method name='MapAny5'><arg name='ret' type='a{sv}' direction='out'/></method>
+ <method name='MapStringAny'><arg name='ret' type='a{sv}' direction='out'/></method>
+ <method name='MapStringListString'><arg name='ret' type='a{sas}' direction='out'/></method>
+ <method name='MapStringString'><arg name='ret' type='a{ss}' direction='out'/></method>
+ <method name='String'><arg name='ret' type='s' direction='out'/></method>
+ <method name='Symbol'><arg name='ret' type='s' direction='out'/></method>
+ <method name='Void'></method>
+ </interface>
+ <interface name='org.opensuse.YaST.YCPValues'>
+ <method name='Any'><arg name='ret' type='(bsv)' direction='out'/></method>
+ <method name='Any2'><arg name='ret' type='(bsv)' direction='out'/></method>
+ <method name='Integer'><arg name='ret' type='(bsv)' direction='out'/></method>
+ <method name='List'><arg name='ret' type='(bsv)' direction='out'/></method>
+ <method name='ListAny'><arg name='ret' type='(bsv)' direction='out'/></method>
+ <method name='ListAny1'><arg name='ret' type='(bsv)' direction='out'/></method>
+ <method name='ListAny2'><arg name='ret' type='(bsv)' direction='out'/></method>
+ <method name='ListListString'><arg name='ret' type='(bsv)' direction='out'/></method>
+ <method name='ListMap'><arg name='ret' type='(bsv)' direction='out'/></method>
+ <method name='ListMapStringAny'><arg name='ret' type='(bsv)' direction='out'/></method>
+ <method name='ListMapStringString'><arg name='ret' type='(bsv)' direction='out'/></method>
+ <method name='ListString'><arg name='ret' type='(bsv)' direction='out'/></method>
+ <method name='MapAny'><arg name='ret' type='(bsv)' direction='out'/></method>
+ <method name='MapAny2'><arg name='ret' type='(bsv)' direction='out'/></method>
+ <method name='MapAny3'><arg name='ret' type='(bsv)' direction='out'/></method>
+ <method name='MapAny4'><arg name='ret' type='(bsv)' direction='out'/></method>
+ <method name='MapAny5'><arg name='ret' type='(bsv)' direction='out'/></method>
+ <method name='MapStringAny'><arg name='ret' type='(bsv)' direction='out'/></method>
+ <method name='MapStringListString'><arg name='ret' type='(bsv)' direction='out'/></method>
+ <method name='MapStringString'><arg name='ret' type='(bsv)' direction='out'/></method>
+ <method name='String'><arg name='ret' type='(bsv)' direction='out'/></method>
+ <method name='Symbol'><arg name='ret' type='(bsv)' direction='out'/></method>
+ <method name='Void'></method>
+ </interface>
+</node>
+"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.13/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.Any2.test new/yast2-core-2.18.14/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.Any2.test
--- old/yast2-core-2.18.13/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.Any2.test 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.18.14/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.Any2.test 2009-06-18 15:25:17.000000000 +0200
@@ -0,0 +1,3 @@
+ variant array [
+ variant string "a"
+ ]
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.13/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.Any.test new/yast2-core-2.18.14/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.Any.test
--- old/yast2-core-2.18.13/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.Any.test 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.18.14/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.Any.test 2009-06-18 15:25:17.000000000 +0200
@@ -0,0 +1 @@
+ variant string "a"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.13/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.ListMapStringAny.test new/yast2-core-2.18.14/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.ListMapStringAny.test
--- old/yast2-core-2.18.13/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.ListMapStringAny.test 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.18.14/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.ListMapStringAny.test 2009-06-18 15:25:17.000000000 +0200
@@ -0,0 +1,19 @@
+ array [
+ array [
+ dict entry(
+ string "a"
+ variant string "b"
+ )
+ ]
+ array [
+ dict entry(
+ string "c"
+ variant array [
+ variant int64 10
+ variant int64 20
+ variant string "haha"
+ variant string "`Symbol"
+ ]
+ )
+ ]
+ ]
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.13/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.List.test new/yast2-core-2.18.14/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.List.test
--- old/yast2-core-2.18.13/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.List.test 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.18.14/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.List.test 2009-06-18 15:25:17.000000000 +0200
@@ -0,0 +1,2 @@
+ array [
+ ]
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.13/dbus/namespace_service/testsuite/t1 new/yast2-core-2.18.14/dbus/namespace_service/testsuite/t1
--- old/yast2-core-2.18.13/dbus/namespace_service/testsuite/t1 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.18.14/dbus/namespace_service/testsuite/t1 2009-06-18 16:44:22.000000000 +0200
@@ -0,0 +1,51 @@
+#! /bin/sh
+
+# A basic test: Does the server return the correct introspection data?
+# Do the return values match the signature?
+
+# It reads *.test files, calls the DBus method with the name of the file,
+# the result of the call must match the file content
+
+# Currently this test checks only return values of functions without parameters.
+
+# TODO: more tests, probably in python or whatever so that
+# the responses can be inspected better
+
+# This launches the bus daemon,
+# exports DBUS_SESSION_BUS_ADDRESS and sets DBUS_SESSION_BUS_PID
+eval $(dbus-launch --sh-syntax)
+# Clean up at exit. This will also kill the server.
+trap "kill $DBUS_SESSION_BUS_PID" EXIT TERM INT
+
+echo -n "Hey, server, get on da bus... "
+
+# load the modules from the current directory
+export Y2DIR=.
+
+# start the server, preload TEST.ycp module
+PRG="../src/yast_modules_dbus_server --disable-timer --test TEST"
+$PRG & sleep 3
+echo "off we go!"
+
+SEND0="dbus-send --session --dest=org.opensuse.YaST.modules"
+CALL="$SEND0 --type=method_call"
+
+# read al *.test files in the current directory
+find . -name '*.test' | while read TESTFILE; do
+ TESTCALL=`echo "$TESTFILE" | sed -e "s#./\(.*\).test#\1#"`
+ echo -n "Testing $TESTCALL ... "
+ # call the DBus method, ignore the first two lines (the header contains non-constant data)
+ REPLY=`$CALL --print-reply /org/opensuse/YaST/modules/TEST $TESTCALL | tail -n +2 > $TESTFILE.reply`
+
+ # the result with the expected value
+ if diff -u $TESTFILE $TESTFILE.reply > /dev/null; then
+ echo "OK"
+ else
+ echo "FAILED!"
+ echo "Diff: "
+ diff -u $TESTFILE $TESTFILE.reply
+ exit 1
+ fi
+done
+
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.13/liby2dbus/src/DBusConn.cc new/yast2-core-2.18.14/liby2dbus/src/DBusConn.cc
--- old/yast2-core-2.18.13/liby2dbus/src/DBusConn.cc 2009-04-10 09:49:56.000000000 +0200
+++ new/yast2-core-2.18.14/liby2dbus/src/DBusConn.cc 2009-06-18 16:44:22.000000000 +0200
@@ -32,14 +32,14 @@
return true;
}
- y2milestone("Connecting to DBus...");
+ y2milestone("Connecting to DBus (%s bus)...", type == DBUS_BUS_SYSTEM ? "system" : "session");
- // connect to the system bus
+ // connect to the bus
connection = dbus_bus_get(type, &dbus_error);
if (dbus_error_is_set(&dbus_error))
{
- y2error("Cannot connect to the system bus: %s", dbus_error.message);
+ y2error("Cannot connect to the bus: %s", dbus_error.message);
return false;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.13/liby2dbus/src/DBusConn.h new/yast2-core-2.18.14/liby2dbus/src/DBusConn.h
--- old/yast2-core-2.18.13/liby2dbus/src/DBusConn.h 2009-04-10 09:49:56.000000000 +0200
+++ new/yast2-core-2.18.14/liby2dbus/src/DBusConn.h 2009-06-17 13:53:46.000000000 +0200
@@ -32,6 +32,7 @@
bool send(const DBusMsg &msg);
DBusMsg call(const DBusMsg &msg);
void flush();
+ // it the msg is empty, there was a timeout
DBusMsg receive();
DBusConnection *getConnection() const;
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.13/liby2dbus/src/DBusMsg.cc new/yast2-core-2.18.14/liby2dbus/src/DBusMsg.cc
--- old/yast2-core-2.18.13/liby2dbus/src/DBusMsg.cc 2009-06-15 17:14:47.000000000 +0200
+++ new/yast2-core-2.18.14/liby2dbus/src/DBusMsg.cc 2009-06-18 15:25:17.000000000 +0200
@@ -224,30 +224,64 @@
return ret;
}
-bool DBusMsg::addValue(const YCPValue &val)
+bool DBusMsg::addValueAs(const YCPValue &val, constTypePtr rettype)
{
if (val.isNull())
{
- y2milestone("Ignoring YCPNull value");
+ y2error("Ignoring YCPNull value");
return false;
}
y2debug("Adding YCP value: %s", val->toString().c_str());
+ if (!rettype)
+ {
+ // return as the current type if not specified
+ rettype = Type::vt2type(val->valuetype());
+ }
+ else
+ {
+ // the required type does not match the value
+ if (rettype->matchvalue(val) < 0)
+ {
+ y2error("Value %s does not match requested type %s",
+ val->toString().c_str(), rettype->toString().c_str());
+ return false;
+ }
+ else
+ {
+ y2debug("Requested type matches the value");
+ }
+ }
+
+
// create insert iterator
DBusMessageIter it;
dbus_message_iter_init_append(msg, &it);
// add the value
- bool ret = addValueAt(val, &it, false);
+ bool ret = addValueAt(val, &it, rettype);
return ret;
}
-bool DBusMsg::addValueAt(const YCPValue &val, DBusMessageIter *i, bool bsv_encoding)
+bool DBusMsg::addValueAt(const YCPValue &val, DBusMessageIter *i, constTypePtr rtype)
{
+ y2milestone("Returning YCP value as type: %s", rtype->toString().c_str());
+
int type = typeInt(val);
+ DBusMessageIter variant_it;
+ DBusMessageIter *it_backup = i;
+ if (rtype && rtype->isAny())
+ {
+ // open variant container for "any" type
+ y2debug("Opening VARIANT container with type %s", typeStr(val, false).c_str());
+ dbus_message_iter_open_container(i, DBUS_TYPE_VARIANT, typeStr(val, false).c_str(), &variant_it);
+
+ i = &variant_it;
+ }
+
if (val->isInteger())
{
dbus_int64_t i64 = val->asInteger()->value();
@@ -279,11 +313,19 @@
else if (val->isList())
{
YCPList lst = val->asList();
- int sz = lst->size();
- int index = 0;
+ std::string list_type("v");
+ constTypePtr list_type_ptr = Type::Any;
+
+ if (rtype->isList())
+ {
+ list_type_ptr = ((constListTypePtr)rtype)->type();
+ y2debug("Found type list<%s>", list_type_ptr->toString().c_str());
- // use string as fallback for empty list
- std::string list_type(sz ? typeStr(lst->value(0), bsv_encoding) : DBUS_TYPE_STRING_AS_STRING);
+ if (!list_type_ptr->isAny())
+ {
+ list_type = YCPTypeSignature(list_type_ptr);
+ }
+ }
DBusMessageIter array_it;
@@ -291,24 +333,15 @@
y2debug("Opening array container with type: %s", list_type.c_str());
dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, list_type.c_str(), &array_it);
+
+ int sz = lst->size();
+ int index = 0;
while(index < sz)
{
y2debug("Adding YCP value at index %d", index);
- YCPValue list_item = lst->value(index);
-
- if (typeStr(list_item, bsv_encoding) != list_type)
- {
- y2error("Found different type in list: %s (expected %s) - ignoring item %s",
- typeStr(list_item, bsv_encoding).c_str(), list_type.c_str(),
- list_item->toString().c_str());
- return false;
- }
- else
- {
- // add the raw YCP value
- addValueAt(lst->value(index), &array_it, bsv_encoding);
- }
+ // add the raw YCP value
+ addValueAt(lst->value(index), &array_it, list_type_ptr);
index++;
}
@@ -321,24 +354,40 @@
{
YCPMap map = val->asMap();
- DBusMessageIter array_it;
+ std::string map_key_type("s");
+ std::string map_val_type("v");
- YCPMap::const_iterator mit = map.begin();
- // use string as fallback for empty map
- std::string key_type(mit == map.end() ? DBUS_TYPE_STRING_AS_STRING : typeStr(mit->first, bsv_encoding));
- std::string val_type(mit == map.end() ? DBUS_TYPE_STRING_AS_STRING : typeStr(mit->second, bsv_encoding));
+ // YCPMap can contain only YCPString, YCPInteger or YCPSymbol as the key
+ constTypePtr map_key_type_ptr = Type::String;
+ constTypePtr map_val_type_ptr = Type::Any;
+
+ if (rtype->isMap())
+ {
+ map_key_type_ptr = ((constMapTypePtr)rtype)->keytype();
- // dbus allows only basic types as key type in a map
- const std::string valid_key_types(DBUS_TYPE_INT64_AS_STRING DBUS_TYPE_DOUBLE_AS_STRING
- DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_BOOLEAN_AS_STRING);
+ if (map_key_type_ptr->isAny())
+ {
+ map_key_type_ptr = Type::String;
+ }
- if (valid_key_types.find(key_type) == std::string::npos)
- {
- y2error("Invalid type of key in map (non-basic type): %s, ignoring the map", key_type.c_str());
- return false;
+ map_val_type_ptr = ((constMapTypePtr)rtype)->valuetype();
+ y2debug("Found type map<%s,%s>", map_key_type_ptr->toString().c_str(), map_val_type_ptr->toString().c_str());
+
+ if (!map_key_type_ptr->isAny())
+ {
+ map_key_type = YCPTypeSignature(map_key_type_ptr);
+ }
+ if (!map_val_type_ptr->isAny())
+ {
+ map_val_type = YCPTypeSignature(map_val_type_ptr);
+ }
}
- std::string map_signature("{" + key_type + (bsv_encoding ? "v" : val_type) + "}");
+ DBusMessageIter array_it;
+
+ YCPMap::const_iterator mit = map.begin();
+
+ std::string map_signature("{" + map_key_type + map_val_type + "}");
// open array container
y2debug("Opening DICT container with signature: %s", map_signature.c_str());
@@ -349,41 +398,23 @@
YCPValue key = mit->first;
YCPValue val = mit->second;
- // error: this is a different key type than the announced type
- if (key_type != typeStr(key, bsv_encoding))
- {
- y2error("Found different key type %s (expected %s) - ignoring pair $[ %s : %s ]",
- typeStr(key, bsv_encoding).c_str(), key_type.c_str(),
- key->toString().c_str(), val->toString().c_str());
-
- continue;
- }
-
DBusMessageIter map_item_it;
y2debug("Opening map item container");
dbus_message_iter_open_container(&array_it, DBUS_TYPE_DICT_ENTRY, 0, &map_item_it);
- // add the key
- addValueAt(key, &map_item_it, bsv_encoding);
-
- if (bsv_encoding)
- {
- DBusMessageIter var_it2;
- // add VARIANT container
- y2debug("Opening VARIANT container with type %s", typeStr(val, bsv_encoding).c_str());
- dbus_message_iter_open_container(&map_item_it, DBUS_TYPE_VARIANT, typeStr(val, bsv_encoding).c_str(), &var_it2);
- // add the value
- addValueAt(val, &var_it2, bsv_encoding);
-
- y2debug("Closing VARIANT container");
- dbus_message_iter_close_container(&map_item_it, &var_it2);
- }
- else
+ // convert YCPInteger key to string for "any" type
+ if (key->isInteger() && map_key_type_ptr == Type::String)
{
- addValueAt(val, &map_item_it, bsv_encoding);
+ key = YCPString(key->toString());
}
+ // add the key
+ addValueAt(key, &map_item_it, map_key_type_ptr);
+
+ // add the value
+ addValueAt(val, &map_item_it, map_val_type_ptr);
+
// close map item
dbus_message_iter_close_container(&array_it, &map_item_it);
y2debug("Closing map item container");
@@ -401,6 +432,13 @@
// TODO add as string?
}
+ if (rtype && rtype->isAny())
+ {
+ // close variant container for "any" type
+ y2debug("Closing VARIANT container");
+ dbus_message_iter_close_container(it_backup, &variant_it);
+ }
+
return true;
}
@@ -1103,9 +1141,7 @@
}
else
{
- YCPList lst = val->asList();
- std::string val_type((lst->size() > 0) ? typeStr(lst->value(0)) : "s");
- return std::string("a") + val_type;
+ return "av";
}
}
else if (val->isCode())
@@ -1128,10 +1164,7 @@
}
else
{
- std::string val_type((map.size() > 0) ? typeStr(map.begin()->second) : "s");
-
- return std::string(DBUS_TYPE_ARRAY_AS_STRING) + DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING +
- + key_type.c_str() + val_type + DBUS_DICT_ENTRY_END_CHAR_AS_STRING;
+ return "a{sv}";
}
}
@@ -1170,3 +1203,76 @@
{
return "(bsv)";
}
+
+std::string DBusMsg::YCPTypeSignature(constTypePtr type)
+{
+ // handle any type specially
+ if (type->isAny())
+ {
+ return "v";
+ }
+
+ if (type->isList())
+ {
+ constTypePtr list_type = ((constListTypePtr)type)->type();
+ y2debug("type list<%s>", list_type->toString().c_str());
+
+ std::string list_type_str(YCPTypeSignature(list_type));
+
+ if (list_type_str.empty())
+ {
+ throw SignatureException();
+ }
+
+ return std::string("a") + list_type_str;
+ }
+
+ if (type->isMap())
+ {
+ constMapTypePtr mt = (constMapTypePtr)type;
+ constTypePtr key_type = mt->keytype();
+ constTypePtr val_type = mt->valuetype();
+
+ if (key_type->isAny())
+ {
+ key_type = Type::String;
+ }
+
+ y2debug("type map<%s,%s>", key_type->toString().c_str(), val_type->toString().c_str());
+
+ std::string key_type_str(YCPTypeSignature(key_type));
+ std::string val_type_str(YCPTypeSignature(val_type));
+
+ if (key_type_str.empty() || val_type_str.empty())
+ {
+ throw SignatureException();
+ }
+
+ return std::string("a{") + key_type_str + val_type_str + "}";
+ }
+
+ YCPValueType vt = type->valueType();
+ std::string ret;
+
+ switch (vt)
+ {
+ case(YT_VOID) : ret = ""; break;
+ case(YT_BOOLEAN) : ret = DBUS_TYPE_BOOLEAN_AS_STRING; break;
+ case(YT_INTEGER) : ret = DBUS_TYPE_INT64_AS_STRING; break;
+ case(YT_FLOAT) : ret = DBUS_TYPE_DOUBLE_AS_STRING; break;
+ case(YT_STRING) : ret = DBUS_TYPE_STRING_AS_STRING; break;
+ case(YT_PATH) : ret = DBUS_TYPE_STRING_AS_STRING; break;
+ case(YT_SYMBOL) : ret = DBUS_TYPE_STRING_AS_STRING; break;
+ case(YT_TERM) : ret = DBUS_TYPE_STRING_AS_STRING; break;
+// case(YT_CODE) : ret = DBUS_TYPE_STRING_AS_STRING; break;
+
+ default : y2error("Type '%s' is not supported", type->toString().c_str()); throw SignatureException();
+ }
+
+ return ret;
+}
+
+SignatureException::SignatureException()
+{
+ y2error("Signature exception");
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.13/liby2dbus/src/DBusMsg.h new/yast2-core-2.18.14/liby2dbus/src/DBusMsg.h
--- old/yast2-core-2.18.13/liby2dbus/src/DBusMsg.h 2009-06-15 15:53:06.000000000 +0200
+++ new/yast2-core-2.18.14/liby2dbus/src/DBusMsg.h 2009-06-18 15:25:17.000000000 +0200
@@ -9,6 +9,8 @@
#include <string>
#include <dbus/dbus.h>
+#include <ycp/TypePtr.h>
+
class YCPValue;
// DBusMessage wrapper
@@ -43,7 +45,7 @@
bool addDouble(double val);
bool addYCPValue(const YCPValue &val);
- bool addValue(const YCPValue &val);
+ bool addValueAs(const YCPValue &val, constTypePtr rettype = NULL);
YCPValue getYCPValue(int index) const;
@@ -61,12 +63,13 @@
std::string sender() const;
static const char *YCPValueSignature();
+ static std::string YCPTypeSignature(constTypePtr type);
private:
bool addValue(int type, void* data);
bool addValue(int type, void* data, DBusMessageIter *i);
- bool addValueAt(const YCPValue &val, DBusMessageIter *i, bool bsv_encoding = true);
+ bool addValueAt(const YCPValue &val, DBusMessageIter *i, constTypePtr rtype = NULL);
bool addYCPValue(const YCPValue &v, DBusMessageIter *i);
bool addYCPValueRaw(const YCPValue &val, DBusMessageIter *i);
void release();
@@ -79,5 +82,11 @@
YCPValue getYCPValueRaw(DBusMessageIter *it, const std::string &ycp_type = std::string()) const;
};
+class SignatureException : std::exception
+{
+ public:
+ SignatureException();
+};
+
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.13/liby2dbus/src/DBusServerBase.cc new/yast2-core-2.18.14/liby2dbus/src/DBusServerBase.cc
--- old/yast2-core-2.18.13/liby2dbus/src/DBusServerBase.cc 2009-05-04 18:52:52.000000000 +0200
+++ new/yast2-core-2.18.14/liby2dbus/src/DBusServerBase.cc 2009-06-18 16:44:22.000000000 +0200
@@ -21,8 +21,9 @@
int timeout_counter = YAST_DBUS_SHUTDOWN_TIMEOUT_COUNT;
-DBusServerBase::DBusServerBase()
+DBusServerBase::DBusServerBase(bool testmode)
{
+ test_mode = testmode;
dbus_threads_init_default();
}
@@ -124,6 +125,13 @@
// mainloop
while (true)
{
+ if (!dbus_connection_get_is_connected(connection.getConnection()))
+ {
+ y2debug ("Got disconnected");
+ // otherwise receiving would call exit (!)
+ break;
+ }
+
// try reading a message from DBus
DBusMsg request(connection.receive());
@@ -254,8 +262,8 @@
policykit.checkPolkitChanges();
#endif
- // check the policy using PolicyKit
- if (isActionAllowed(request, &dbus_error))
+ // check the policy using PolicyKit, the check is disabled in the test mode
+ if (test_mode || isActionAllowed(request, &dbus_error))
{
// find the registered object
std::string objname = request.path();
@@ -369,7 +377,7 @@
void DBusServerBase::register_method(const Object &obj, const Interface &intf, const Method &m, const DBusSignature &sig, methodHandler h)
{
- y2milestone("Registering DBus path: object %s interface %s method %s...", obj.c_str(), intf.c_str(), m.c_str());
+ y2milestone("Registering DBus path: object %s interface %s method %s signature %s...", obj.c_str(), intf.c_str(), m.c_str(), sig.asXML().c_str());
Objects::iterator i = registered_objects.find(obj);
// create a new data item
@@ -482,7 +490,7 @@
#endif
}
-DBusServerBase::actionList DBusServerBase::createActionId(const DBusMsg &msg)
+DBusServerBase::actionList DBusServerBase::createActionId(const DBusMsg &)
{
y2debug("Using default empty list of action IDs");
// default implementation is empty list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.13/liby2dbus/src/DBusServerBase.h new/yast2-core-2.18.14/liby2dbus/src/DBusServerBase.h
--- old/yast2-core-2.18.13/liby2dbus/src/DBusServerBase.h 2009-04-10 09:50:44.000000000 +0200
+++ new/yast2-core-2.18.14/liby2dbus/src/DBusServerBase.h 2009-06-18 16:44:22.000000000 +0200
@@ -23,7 +23,7 @@
{
public:
- DBusServerBase();
+ DBusServerBase(bool testmode = false);
virtual ~DBusServerBase();
virtual bool connect() = 0;
@@ -60,6 +60,7 @@
std::string service_name;
+ bool test_mode;
private:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.13/libycp/src/YCPBuiltinFloat.cc new/yast2-core-2.18.14/libycp/src/YCPBuiltinFloat.cc
--- old/yast2-core-2.18.13/libycp/src/YCPBuiltinFloat.cc 2009-06-11 17:45:07.000000000 +0200
+++ new/yast2-core-2.18.14/libycp/src/YCPBuiltinFloat.cc 2009-06-19 14:15:30.000000000 +0200
@@ -288,7 +288,7 @@
std::ostringstream ss;
ss.imbue (std::locale (""));
ss.precision (precision->value ());
- ss << f->value ();
+ ss << fixed<< f->value ();
YCPString ret (ss.str ());
return ret;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.13/libycp/testsuite/tests/builtin/Builtin_VIII.err new/yast2-core-2.18.14/libycp/testsuite/tests/builtin/Builtin_VIII.err
--- old/yast2-core-2.18.13/libycp/testsuite/tests/builtin/Builtin_VIII.err 2009-06-11 17:45:07.000000000 +0200
+++ new/yast2-core-2.18.14/libycp/testsuite/tests/builtin/Builtin_VIII.err 2009-06-19 14:15:30.000000000 +0200
@@ -73,6 +73,38 @@
----------------------------------------------------------------------
Parsed:
----------------------------------------------------------------------
+tostring (0., 2)
+----------------------------------------------------------------------
+Parsed:
+----------------------------------------------------------------------
+float::tolstring (0., 2)
+----------------------------------------------------------------------
+Parsed:
+----------------------------------------------------------------------
+tostring (1., 2)
+----------------------------------------------------------------------
+Parsed:
+----------------------------------------------------------------------
+float::tolstring (1., 2)
+----------------------------------------------------------------------
+Parsed:
+----------------------------------------------------------------------
+tostring ((1049. / /* const integer -> const float */1024), 2)
+----------------------------------------------------------------------
+Parsed:
+----------------------------------------------------------------------
+float::tolstring ((1049. / /* const integer -> const float */1024), 2)
+----------------------------------------------------------------------
+Parsed:
+----------------------------------------------------------------------
+tostring (((((1.126e+15 / /* const integer -> const float */1024) / /* const integer -> float */1024) / /* const integer -> float */1024) / /* const integer -> float */1024), 2)
+----------------------------------------------------------------------
+Parsed:
+----------------------------------------------------------------------
+float::tolstring (((((1.126e+15 / /* const integer -> const float */1024) / /* const integer -> float */1024) / /* const integer -> float */1024) / /* const integer -> float */1024), 2)
+----------------------------------------------------------------------
+Parsed:
+----------------------------------------------------------------------
(tohexstring (31) == "0x1f")
----------------------------------------------------------------------
Parsed:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.13/libycp/testsuite/tests/builtin/Builtin_VIII.out new/yast2-core-2.18.14/libycp/testsuite/tests/builtin/Builtin_VIII.out
--- old/yast2-core-2.18.13/libycp/testsuite/tests/builtin/Builtin_VIII.out 2009-06-11 17:45:07.000000000 +0200
+++ new/yast2-core-2.18.14/libycp/testsuite/tests/builtin/Builtin_VIII.out 2009-06-19 14:15:30.000000000 +0200
@@ -15,6 +15,14 @@
(true)
(true)
(true)
+("0.00")
+("0,00")
+("1.00")
+("1,00")
+("1.02")
+("1,02")
+("1024.09")
+("1�024,09")
(true)
(true)
(true)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.13/libycp/testsuite/tests/builtin/Builtin_VIII.ycp new/yast2-core-2.18.14/libycp/testsuite/tests/builtin/Builtin_VIII.ycp
--- old/yast2-core-2.18.13/libycp/testsuite/tests/builtin/Builtin_VIII.ycp 2009-06-11 17:45:07.000000000 +0200
+++ new/yast2-core-2.18.14/libycp/testsuite/tests/builtin/Builtin_VIII.ycp 2009-06-19 14:15:30.000000000 +0200
@@ -84,6 +84,14 @@
//
( tostring(0.12345, 4) == "0.1235" )
( float::tolstring(0.12345, 4) == "0,1235" )
+( tostring(0.0, 2) )
+( float::tolstring(0.0, 2) )
+( tostring(1.0, 2) )
+( float::tolstring(1.0, 2) )
+( tostring(1049.0/1024, 2) )
+( float::tolstring(1049.0/1024, 2) )
+( tostring(1126000000000000.0/1024/1024/1024/1024, 2) )
+( float::tolstring(1126000000000000.0/1024/1024/1024/1024, 2) )
//
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.18.13/VERSION new/yast2-core-2.18.14/VERSION
--- old/yast2-core-2.18.13/VERSION 2009-06-15 17:25:14.000000000 +0200
+++ new/yast2-core-2.18.14/VERSION 2009-06-19 14:55:10.000000000 +0200
@@ -1 +1 @@
-2.18.13
+2.18.14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package blocxx for openSUSE:Factory
checked in at Mon Jun 29 16:30:14 CEST 2009.
--------
--- blocxx/blocxx.changes 2009-03-02 23:06:47.000000000 +0100
+++ blocxx/blocxx.changes 2009-06-20 20:33:45.000000000 +0200
@@ -1,0 +2,5 @@
+Sat Jun 20 20:33:34 CEST 2009 - coolo(a)novell.com
+
+- fix link to pthread
+
+-------------------------------------------------------------------
--- blocxx/libblocxx4.changes 2009-02-17 16:39:32.000000000 +0100
+++ blocxx/libblocxx4.changes 2009-06-20 20:53:15.000000000 +0200
@@ -1,0 +2,5 @@
+Sat Jun 20 20:52:34 CEST 2009 - coolo(a)novell.com
+
+- fix build with -as-needed
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
blocxx-1.0.0-am111.dif
blocxx-2.1.0-asneeded.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ blocxx-doc.spec ++++++
--- /var/tmp/diff_new_pack.h30127/_old 2009-06-29 16:29:03.000000000 +0200
+++ /var/tmp/diff_new_pack.h30127/_new 2009-06-29 16:29:03.000000000 +0200
@@ -21,8 +21,8 @@
Name: blocxx-doc
%define blocxx_version 2.1.0
Version: 2.1.0.342
-Release: 124
-License: BSD 3-Clause
+Release: 125
+License: BSD 3-clause (or similar)
Group: Documentation/HTML
AutoReqProv: on
Summary: BloCXX - Documentation
@@ -121,16 +121,3 @@
%doc %blocxx_docdir/html
%changelog
-* Tue Nov 11 2008 ro(a)suse.de
-- SLE-11 uses PPC64 instead of PPC, adapt baselibs.conf
-* Fri Nov 09 2007 mt(a)suse.de
-- Updated to blocxx-2.1.0, svn-trunk revision 342 / merged from
- the blocxx:head project in opensuse build service.
-* Thu Jul 06 2006 mc(a)suse.de
-- add pcre-devel to BuildRequires to build doxygen documentation
- for PerlRegEx
-- add patch to create a blocxx.tag file
-* Tue Apr 11 2006 cthiel(a)suse.de
-- Reduce BuildRequires
-* Mon Mar 13 2006 mt(a)suse.de
-- New blocxx-doc noarch package extracted from blocxx.
++++++ blocxx.spec ++++++
--- /var/tmp/diff_new_pack.h30127/_old 2009-06-29 16:29:03.000000000 +0200
+++ /var/tmp/diff_new_pack.h30127/_new 2009-06-29 16:29:03.000000000 +0200
@@ -21,8 +21,8 @@
Name: blocxx
%define blocxx_version 2.1.0
Version: 2.1.0.342
-Release: 16
-License: BSD 3-Clause
+Release: 17
+License: BSD 3-clause (or similar)
Group: Development/Libraries/C and C++
AutoReqProv: on
Summary: BloCXX--C++ Framework for Application Development
@@ -34,6 +34,7 @@
Patch2: %{name}-no-condition-test.dif
Patch3: %{name}-pkgconfig.diff
Patch4: %{name}-2.1.0-gcc44.dif
+Patch5: %{name}-2.1.0-asneeded.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++ pcre-devel
%if 0%{?suse_version} >= 1030
@@ -102,7 +103,7 @@
and others
%package -n libblocxx-devel
-License: BSD 3-Clause
+License: BSD 3-clause (or similar)
Summary: BloCXX--C++ Framework for Application Development
Group: Development/Libraries/C and C++
Requires: libblocxx6 = %{version}
@@ -176,7 +177,7 @@
and others
%package -n libblocxx6
-License: BSD 3-Clause
+License: BSD 3-clause (or similar)
Summary: BloCXX--C++ Framework for Application Development
Group: Development/Libraries/C and C++
# bug437293
@@ -250,6 +251,7 @@
%patch2 -p0
%patch3 -p0
%patch4 -p1
+%patch5 -p1
if test -f ./bootstrap.sh ; then
./bootstrap.sh
else
@@ -346,143 +348,3 @@
%_libdir/libblocxx.so.6.%{blocxx_version}
%changelog
-* Mon Mar 02 2009 crrodriguez(a)suse.de
-- remove static libraries (and save 13.9MB space)
-* Tue Feb 17 2009 mt(a)suse.de
-- fixed to include cstdio instead of stdio.h in gcc 4.4 fix
-* Tue Feb 17 2009 coolo(a)suse.de
-- fix compilation with gcc 4.4
-* Thu Jan 29 2009 olh(a)suse.de
-- obsolete libblocxx-XXbit in the library subpackage
-* Wed Dec 10 2008 olh(a)suse.de
-- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade
- (bnc#437293)
-* Tue Nov 11 2008 ro(a)suse.de
-- SLE-11 uses PPC64 instead of PPC, adapt baselibs.conf
-* Thu Oct 30 2008 olh(a)suse.de
-- obsolete old -XXbit packages (bnc#437293)
-* Tue Jun 03 2008 coolo(a)suse.de
-- obsolete blocxx for rename
-* Wed May 28 2008 ro(a)suse.de
-- fix baselibs.conf file
-* Sat May 17 2008 schwab(a)suse.de
-- Fix pkgconfig file.
-* Thu Apr 10 2008 ro(a)suse.de
-- added baselibs.conf file to build xxbit packages
- for multilib support
-* Thu Nov 22 2007 bg(a)suse.de
-- use --target=hppa2.0-suse-linux-gnu to make this build on hppa.
- We don't have older machines, and they would be too slow anyways.
-* Wed Nov 21 2007 ro(a)suse.de
-- provide main package name in libblocxx6 for debuginfo
-* Fri Nov 09 2007 mt(a)suse.de
-- Updated to blocxx-2.1.0, svn-trunk revision 342 / merged from
- the blocxx:head project in opensuse build service.
-- Changed to use libblocxx6 package to provide the shared library
- and libblocxx-devel for the development files according to the
- opensuse library packaging policy.
-- Moved blocxx-1.0 compatibility build into libblocxx4.spec file.
-- Disabled Condition testsuite (solaris test fails on x86_64).
-- Corrected broken entries in the blocxx.changes file
-* Tue Apr 11 2006 cthiel(a)suse.de
-- Reduce BuildRequires
-* Mon Mar 27 2006 mt(a)suse.de
-- Fix/Workaround in RWLocker testcase: hold the lock longer
- and get another thread a chance to run into the exception
-- Fix/Workaround in IPCMutex testcase: sync the client start
- and let the other process more time to set its own lock
-- New patch file: blocxx-testsuite01.dif
-* Fri Mar 17 2006 mt(a)suse.de
-- Readded run_ldconfig macro run in post, unintentionally
- removed while blocxx-doc split
-* Mon Mar 13 2006 mt(a)suse.de
-- Moved blocxx-doc subpackage into a separate noarch package
-* Fri Feb 10 2006 mt(a)suse.de
-- Fix for String::indexOf() - a int variable was used instead of
- size_t, that may cause a potential overflow.
-- Resource leak in Mutex implementations: the pthread_mutexattr_t
- variable was not destroyed after it is not needed any more.
-- Fix for COWReferenceBase/COWReference -- if somebody used the
- COWReference::cast_to() function, compilation fails because
- of missed implementation of useRefCountOf function.
-- Fix for COWReference::cast_to() to not to increment ref counter.
-- Added String::String(const std::string &str) constructor.
-- Removed blocxx::off_t from blocxx/Types.hpp
-- Minor portability fixes to build on Mac OS X.
-- Makefile.am fixes causing failures on "make distcheck"
-- Documentation and ChangeLog cleanups
-- Enabled testsuite run (make check) in spec file, cleaned up
-- Bug #149127, increased version number to 1.0.0
-* Wed Jan 25 2006 mls(a)suse.de
-- converted neededforbuild to BuildRequires
-* Wed Jan 04 2006 mc(a)suse.de
-- Updated to cvs snapshot 20060104 adding fixes synced from OpenWBEM
-* Wed Oct 19 2005 mt(a)suse.de
-- Updated to cvs snapshot 20051019 fixing the BLOCXX_THROW_ERRNO
- and BLOCXX_THROW_ERRNO_MSG macros to be useable outside of the
- blocxx namespace as well.
-* Mon Oct 10 2005 mt(a)suse.de
-- Updated to cvs snapshot 20051010 adding fixes synced from OpenWBEM,
- like avoiding to escape of an exec exception from initRandomnes()
- in CryptographicRandomNumber, fixes/improvements to event handling
- in Select functions, missed initialization in DateTime::set().
-* Fri Aug 12 2005 mt(a)suse.de
-- Updated to cvs snapshot 20050812 fixing handling of quoted
- capture references in Perl/PosixRegEx replace() methods
-* Wed Aug 10 2005 mt(a)suse.de
-- Updated to cvs snapshot 20050810 adding identity and facility
- arguments to the SyslogAppender.
-* Mon Jul 25 2005 mt(a)suse.de
-- Updated to cvs snapshot 20050725 improving large file support.
-* Thu Jul 21 2005 mt(a)suse.de
-- Updated to cvs snapshot 20050721 enabling large file support.
-* Thu Jul 14 2005 mt(a)suse.de
-- Updated to cvs snapshot 0.9.20050714 providing minor
- cleanups only
-* Mon Jul 11 2005 mt(a)suse.de
-- Updated to cvs snapshot 0.9.20050711 providing blocxx.pc
- pkg-config file, removeing -R flag from blocxx.m4 file
- and fixing a bug in EnvVars::getenvp()
-- Added libstdc++-devel pcre-devel requirements to spec file
-* Fri Jul 08 2005 mt(a)suse.de
-- Updated to cvs snapshot 0.9.20050708 adding shared locks
- to File class, fixing Exec/EnvVars to allow to execute
- with empty environmens and other minor improvements
-* Tue Jun 21 2005 mt(a)suse.de
-- Updated to cvs snapshot 0.9.20050621;
- provides new pcre based PerlRegEx class and
- improved RegEx class renamed to PosixRegEx
-* Thu Jun 16 2005 mt(a)suse.de
-- Updated to cvs snapshot 0.9.20050616;
- improvements in RegEx class, regex examples
-* Tue Jun 14 2005 mt(a)suse.de
-- Updated to cvs snapshot 0.9.20050614;
- small enable_ssl dependency fix in configure.in
-* Mon Jun 13 2005 mt(a)suse.de
-- Disabled SSL support, since it conflicts with SSL code in
- openwbem, e.g. if blocxx is used to implement a provider.
-* Thu Jun 09 2005 mt(a)suse.de
-- Updated to cvs snapshot 0.9.20050609;
- contains errno fix in Select.cpp
-* Fri May 20 2005 mt(a)suse.de
-- Updated to cvs snapshot from 20050520
-* Tue May 10 2005 uli(a)suse.de
-- don't use dot on ARM (hangs on some source files)
-* Tue Apr 26 2005 mt(a)suse.de
-- Updated to cvs snapshot from 20050426 including fix
- for blocxx.m4 (lib64) and obsoleting configure.in dif.
-- Fixed last changelog entry (date)
-* Tue Apr 26 2005 mt(a)suse.de
-- Updated to cvs snapshot from 20050425
-* Fri Apr 15 2005 mt(a)suse.de
-- Updated to cvs snapshot from 20050425
-- Updated to cvs snapshot from 20050415 providing additional
- Logger interfaces and diverse error checking improvements.
-- Changed to use --without-docs rpmbuild option in spec file
- to allow to skip the generation of documentation and use a
- pre-build archive instead. Default is to build documentation
- since it contains architecture/feature depending references.
-* Sun Apr 10 2005 bwhiteley(a)suse.de
-- fixed 64bit pointer issue in IPCMutexTestCases
-* Thu Apr 07 2005 mt(a)suse.de
-- initial package checkin, cvs snapshot 20050407
++++++ libblocxx4.spec ++++++
--- /var/tmp/diff_new_pack.h30127/_old 2009-06-29 16:29:03.000000000 +0200
+++ /var/tmp/diff_new_pack.h30127/_new 2009-06-29 16:29:03.000000000 +0200
@@ -19,8 +19,8 @@
Name: libblocxx4
Version: 1.0.0
-Release: 80
-License: BSD 3-Clause
+Release: 81
+License: BSD 3-clause (or similar)
Group: Development/Libraries/C and C++
AutoReqProv: on
Summary: BloCXX--C++ Framework for Application Development
@@ -32,6 +32,7 @@
Patch3: blocxx-%{version}-gcc43.dif
Patch4: blocxx-%{version}-no-fqdn-dot-check.dif
Patch5: blocxx-%{version}-gcc44.dif
+Patch6: blocxx-%{version}-am111.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++ pcre-devel pkgconfig
%if 0%{?suse_version} >= 1030
@@ -109,6 +110,7 @@
%patch3 -p1
%patch4 -p0
%patch5 -p1
+%patch6 -p1
if test -f ./cvsbootstrap.sh ; then
./cvsbootstrap.sh
else
@@ -169,19 +171,3 @@
#%_datadir/aclocal/blocxx.m4
%changelog
-* Tue Feb 17 2009 mt(a)suse.de
-- fixed to include cstdio instead of stdio.h in gcc 4.4 fix
-* Tue Feb 17 2009 coolo(a)suse.de
-- fix compilation with gcc 4.4
-* Thu Jan 29 2009 olh(a)suse.de
-- obsolete libblocxx-XXbit in the library subpackage (bnc#437293)
-* Tue Nov 11 2008 ro(a)suse.de
-- SLE-11 uses PPC64 instead of PPC, adapt baselibs.conf
-* Fri Nov 09 2007 mt(a)suse.de
-- Splitted out blocxx-1.0.0 compatibility library build
- into a separate spec file.
-- Added blocxx-1.0.0 fix for GCC4.3 (missed c++ includes).
- New patch file: blocxx-1.0.0-gcc43.dif
-- Added blocxx-1.0.0 fix adding BLOCXX_VERSION_NUMBER with
- a numeric blocxx version to avoid conflict with VERSION.
- New patch file: blocxx-1.0.0-version.dif
++++++ blocxx-1.0.0-am111.dif ++++++
Index: blocxx-1.0.0/configure.in
===================================================================
--- blocxx-1.0.0.orig/configure.in
+++ blocxx-1.0.0/configure.in
@@ -254,9 +254,9 @@ case "$host" in
PLAT_CFLAGS="-fPIC -D_REENTRANT -D_GNU_SOURCE -pipe"
PLAT_CXXFLAGS="-fPIC -D_REENTRANT -D_GNU_SOURCE -pipe"
CXXCOMMONLINKFLAGS=""
- CXXBINLINKFLAGS="-Wl,-Bdynamic -lpthread $LDFLAGS"
+ CXXBINLINKFLAGS="-Wl,-Bdynamic -pthread $LDFLAGS"
CBINLINKFLAGS="-Wl,-Bdynamic -lpthread $LDFLAGS"
- CXXSHAREDLIBLINKFLAGS='-shared -fPIC -Wl,-soname -Wl,$@.$(LIBRARY_BINARY_VERSION) -lpthread'
+ CXXSHAREDLIBLINKFLAGS='-shared -fPIC -Wl,-soname -Wl,$@.$(LIBRARY_BINARY_VERSION) -pthread'
PLAT_OPTFLAGS="-O3"
LIB_EXT="so"
STATIC_LINK_FLAGS="-Wl,-Bstatic"
++++++ blocxx-2.1.0-asneeded.patch ++++++
Index: blocxx-2.1.0/configure.in
===================================================================
--- blocxx-2.1.0.orig/configure.in
+++ blocxx-2.1.0/configure.in
@@ -368,8 +368,8 @@ case "$target" in
PLAT_CFLAGS="-fPIC -D_REENTRANT -D_GNU_SOURCE -pipe"
PLAT_CXXFLAGS="-fPIC -D_REENTRANT -D_GNU_SOURCE -pipe"
CXXCOMMONLINKFLAGS=""
- CXXBINLINKFLAGS="-Wl,-Bdynamic -lpthread -Wl,-E $LDFLAGS"
- CBINLINKFLAGS="-Wl,-Bdynamic -lpthread $LDFLAGS"
+ CXXBINLINKFLAGS="-Wl,-Bdynamic -pthread -Wl,-E $LDFLAGS"
+ CBINLINKFLAGS="-Wl,-Bdynamic -pthread $LDFLAGS"
CXXSHAREDLIBLINKFLAGS='-shared -fPIC -Wl,-soname -Wl,$@.$(LIBRARY_BINARY_VERSION) -lpthread'
PLAT_OPTFLAGS="-O3"
LIB_EXT="so"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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