commit sysconfig for openSUSE:Factory
Hello community, here is the log from the commit of package sysconfig for openSUSE:Factory checked in at Fri Aug 26 09:21:12 CEST 2011. --- sysconfig/sysconfig.changes 2011-08-10 05:05:51.0 +0200 +++ /mounts/work_src_done/STABLE/sysconfig/sysconfig.changes2011-08-25 14:44:40.0 +0200 @@ -1,0 +2,12 @@ +Thu Aug 25 09:32:55 UTC 2011 - fcro...@suse.com + +- Add disable-NM-under-systemd.patch: don't handle NM startup with + network initscript when running under systemd. + +--- +Wed Aug 11 20:29:55 UTC 2011 - m...@suse.de + +- Fixed to apply wireless power settings and allow any setting as + defined in the iwconfig(8) manual page. + +--- calling whatdependson for head-i586 New: disable-NM-under-systemd.patch wireless-power-settings.patch Other differences: -- ++ sysconfig.spec ++ --- /var/tmp/diff_new_pack.MQdAfq/_old 2011-08-26 09:20:41.0 +0200 +++ /var/tmp/diff_new_pack.MQdAfq/_new 2011-08-26 09:20:41.0 +0200 @@ -20,7 +20,7 @@ Name: sysconfig Version:0.75.0 -Release:5 +Release:7 Summary:The system configuration scheme Url:http://gitorious.org/opensuse/sysconfig Group: System/Base @@ -32,6 +32,8 @@ Requires: iproute2 dbus-1 procps BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %name-%version.tar.bz2 +Patch0: disable-NM-under-systemd.patch +Patch1: wireless-power-settings.patch %description This package provides the SuSE system configuration scheme and @@ -51,6 +53,8 @@ %prep %setup -n sysconfig-%{version} +%patch0 -p1 +%patch1 -p1 %build autoreconf --force --install ++ disable-NM-under-systemd.patch ++ From b53cab083de6baafb6fd61186d164dc2a71cfcf7 Mon Sep 17 00:00:00 2001 From: Frederic Crozat fcro...@suse.com Date: Fri, 12 Aug 2011 16:03:48 +0200 Subject: [PATCH] Do not handle NetworkManager if running under systemd. NetworkManager should be using its own .service when used under systemd. --- scripts/network | 11 ++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/scripts/network b/scripts/network index 5d8dc52..434dd66 100755 --- a/scripts/network +++ b/scripts/network @@ -102,6 +102,13 @@ test -f scripts/functions.common \ || exit $R_INTERNAL +systemd_running () { +# We simply test whether systemd cgroup hierarchy is mounted + /bin/mountpoint -q /sys/fs/cgroup/systemd + return $? +} + + ## # Start NetworkManager if wanted # @@ -110,9 +117,11 @@ test -f scripts/functions.common \ # because they are also used in ifup # if [ $NETWORKMANAGER = yes ] ; then - if [ $FS_FILTER = localfs ] ; then + if [ $FS_FILTER = localfs -o systemd_running ] ; then # NetworkManager is not supported without remotefs # and will be started later via network-remotefs. + # NetworkManager should be started with its own .service + # under systemd case $ACTION in (status) exit 3 ;; (start) exit 0 ;; -- 1.7.3.4 ++ wireless-power-settings.patch ++ From 1ed12797eab1b75fcc01bf97081b71a4fa8e7090 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski m...@suse.de Date: Wed, 11 May 2011 22:16:56 +0200 Subject: [PATCH] Apply wireless power settings when requested Fixed to apply wireless power settings and allow any setting as defined in the iwconfig(8) manual page. Signed-off-by: Marius Tomaschewski m...@suse.de --- config/ifcfg.template |6 -- scripts/ifup-wireless |8 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/config/ifcfg.template b/config/ifcfg.template index d0e1b6d..d7f0f75 100644 --- a/config/ifcfg.template +++ b/config/ifcfg.template @@ -612,10 +612,12 @@ PREFER_WPA_SUPPLICANT='' # Ad-Hoc modes when the variable is empty. WIRELESS_AP='' -## Type: string(yes,no,none) +## Type: string(yes,no,off,none,) ## Default:none # -# Can be set to yes, no, none (default). +# Used to manipulate power management scheme parameters and mode. +# Can be set to 'yes', 'no' or 'off', 'none' (default) or to a setting +# defined in iwconfig(8) manual page. # If set to none, ifup will not manipulate power saving for this device. # If set to no, ifup tries to disable power saving for this device. # If set to yes, ifup tries to enable power saving for this device. This diff --git a/scripts/ifup-wireless b/scripts/ifup-wireless index 105ebe9..3f83f50 100755 --- a/scripts/ifup-wireless +++ b/scripts/ifup-wireless @@ -776,6 +776,14 @@ case $ACTION in PREFER_WPA_SUPPLICANT=no ;;
commit NetworkManager for openSUSE:Factory
Hello community, here is the log from the commit of package NetworkManager for openSUSE:Factory checked in at Fri Aug 26 09:24:24 CEST 2011. --- NetworkManager/NetworkManager.changes 2011-08-24 18:29:27.0 +0200 +++ /mounts/work_src_done/STABLE/NetworkManager/NetworkManager.changes 2011-08-25 13:33:02.0 +0200 @@ -1,0 +2,17 @@ +Tue Aug 24 16:24:52 CEST 2011 - dims...@opensuse.org + +- Update to version 0.9.0: + + fdo#39463: Ensure NM can talk to newly installed VPN plugins + + Don't autoconnect disabled modems. + + Preserve agent secrets the right way. + + Preserve agent secrets over Update operation. + + Add libnl-3 API compatibility. + + Add libnl-2 support with libnl-1 compatibility. + + Fix DBus signal signatures in supplicant. + + Handle a few more possible D-Bus activation errors. + + Fix integer list SSID parsing. + + bgo#652512: Fix crash for AddAndActivateConnection() D-Bus call + + Add missing U2600 GSM band enumeration. +- Drop f15-branch.patch: No longer required. + +--- calling whatdependson for head-i586 Old: NetworkManager-0.8.9997.tar.bz2 f15-branch.patch New: NetworkManager-0.9.0.tar.bz2 Other differences: -- ++ NetworkManager.spec ++ --- /var/tmp/diff_new_pack.VwRl5V/_old 2011-08-26 09:21:23.0 +0200 +++ /var/tmp/diff_new_pack.VwRl5V/_new 2011-08-26 09:21:23.0 +0200 @@ -19,19 +19,17 @@ Name: NetworkManager Url:http://www.gnome.org/projects/NetworkManager/ -Version:0.8.9997 -Release:2 +Version:0.9.0 +Release:1 License:GPLv2+ Group: Productivity/Networking/System Summary:Network Link Manager and User Applications -Source0:NetworkManager-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/NetworkManager/0.9/%{name}-%{version}.tar.bz2 Source1:nfs Source2:nm-system-settings.conf Source99: NetworkManager-rpmlintrc -# PATCH-FIX-UPSTREAM f15-branch.patch fcro...@novell.com -- all patches from f15 branch (mostly KDE compat) : git diff 0.9.0-rc3..f15 (latest f15 commit : de32d1b87174e33626cb30ac2567d4ae964879f4) -Patch0: f15-branch.patch # PATCH-FEATURE-OPENSUSE systemd-network-config.patch -- don't try to start NM under systemd if it is disabled in system configuration -Patch1: systemd-network-config.patch +Patch0: systemd-network-config.patch BuildRequires: fdupes BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc @@ -119,7 +117,6 @@ %setup -n %{name}-%{version} -q translation-update-upstream %patch0 -p1 -%patch1 -p1 %build #needed by patch0 ++ NetworkManager-0.8.9997.tar.bz2 - NetworkManager-0.9.0.tar.bz2 ++ 36082 lines of diff (skipped) Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit NetworkManager-pptp for openSUSE:Factory
Hello community, here is the log from the commit of package NetworkManager-pptp for openSUSE:Factory checked in at Fri Aug 26 09:28:50 CEST 2011. --- NetworkManager-pptp/NetworkManager-pptp.changes 2011-06-21 11:15:14.0 +0200 +++ /mounts/work_src_done/STABLE/NetworkManager-pptp/NetworkManager-pptp.changes 2011-08-25 14:32:05.0 +0200 @@ -1,0 +2,10 @@ +Tue Aug 23 09:16:25 CEST 2011 - dims...@opensuse.org + +- Update to version 0.9.0: + + Preserve secret flags. + + Simplify keyring access and don't save secrets. + + Use a simplified password request dialog. + + Use gtk_box_new() instead of gtk_(h/v)box_new() (bgo#652801) +- Drop NetworkManager-pptp-gtk_box_new.patch: fixed upstream. + +--- calling whatdependson for head-i586 Old: NetworkManager-pptp-0.8.999.tar.bz2 NetworkManager-pptp-gtk_box_new.patch New: NetworkManager-pptp-0.9.0.tar.bz2 Other differences: -- ++ NetworkManager-pptp.spec ++ --- /var/tmp/diff_new_pack.6pQ2Lu/_old 2011-08-26 09:28:18.0 +0200 +++ /var/tmp/diff_new_pack.6pQ2Lu/_new 2011-08-26 09:28:18.0 +0200 @@ -21,17 +21,15 @@ Name: NetworkManager-pptp %define pppd_plugin_dir %(rpm -ql ppp | grep -m1 pppd/[0-9]*) Summary:NetworkManager VPN support for PPTP -Version:0.8.999 -Release:2 +Version:0.9.0 +Release:1 # FIXME .desktop icons are currently disabled (on purpose) in the NM tarballs. They will re-appear later on (when nmce supports --import) License:GPLv2+ Group: Productivity/Networking/System Url:http://www.gnome.org/projects/NetworkManager -Source0:%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/NetworkManager-pptp/0.9/%{name}-%{version}.tar.bz2 Source1:gnome-mime-application-x-pptp-settings.png Patch0: nm-pptp-desktop.patch -# PATCH-FIX-UPSTREAM NetworkManager-pptp-gtk_box_new.patch bgo#652801 dims...@opensuse.org -- Fix build with GTK+ 3.1.6. Patch taken from upstream git, commit id 81b8afb2. -Patch1: NetworkManager-pptp-gtk_box_new.patch BuildRequires: grep BuildRequires: intltool BuildRequires: ppp-devel @@ -65,7 +63,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 cp -a %{S:1} nm-pptp-settings.png %build ++ NetworkManager-pptp-0.8.999.tar.bz2 - NetworkManager-pptp-0.9.0.tar.bz2 ++ 5277 lines of diff (skipped) Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rfc for openSUSE:Factory
Hello community, here is the log from the commit of package rfc for openSUSE:Factory checked in at Fri Aug 26 09:29:13 CEST 2011. --- AUTO/all/rfc/rfc.changes2011-08-19 05:42:47.0 +0200 +++ /mounts/work_src_done/STABLE/rfc/rfc.changes2011-08-26 06:42:59.0 +0200 @@ -2 +2 @@ -Fri Aug 19 05:42:47 CEST 2011 - autobu...@suse.de +Fri Aug 26 06:42:58 CEST 2011 - autobu...@suse.de @@ -4 +4 @@ -- automated update on 2011-08-19 +- automated update on 2011-08-26 calling whatdependson for head-i586 Other differences: -- ++ rfc.spec ++ --- /var/tmp/diff_new_pack.SC3KWT/_old 2011-08-26 09:28:57.0 +0200 +++ /var/tmp/diff_new_pack.SC3KWT/_new 2011-08-26 09:28:57.0 +0200 @@ -25,7 +25,7 @@ Summary:The RFCs (Request For Comments) Source: rfc.tgz BuildArch: noarch -Version:2011.8.19 +Version:2011.8.26 Release:1 Url:ftp://ftp.isi.edu/in-notes BuildRoot: %{_tmppath}/%{name}-%{version}-build ++ rfc.tgz ++ AUTO/all/rfc/rfc.tgz /mounts/work_src_done/STABLE/rfc/rfc.tgz differ: char 5, line 1 Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit python-mpservlets for openSUSE:Factory
Hello community, here is the log from the commit of package python-mpservlets for openSUSE:Factory checked in at Fri Aug 26 09:35:40 CEST 2011. --- python-mpservlets/python-mpservlets.changes 2011-03-15 14:00:01.0 +0100 +++ /mounts/work_src_done/STABLE/python-mpservlets/python-mpservlets.changes 2011-08-26 00:56:35.0 +0200 @@ -1,0 +2,6 @@ +Thu Aug 25 22:55:34 UTC 2011 - l...@linux-schulserver.de + +- fix Url +- cleanup using spec-cleaner + +--- calling whatdependson for head-i586 Other differences: -- ++ python-mpservlets.spec ++ --- /var/tmp/diff_new_pack.fVMvXH/_old 2011-08-26 09:29:25.0 +0200 +++ /var/tmp/diff_new_pack.fVMvXH/_new 2011-08-26 09:29:25.0 +0200 @@ -15,29 +15,28 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -%{!?python_sitelib: %global python_sitelib %(%{__python} -c from distutils.sysconfig import get_python_lib; print get_python_lib())} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c from distutils.sysconfig import get_python_lib; print get_python_lib(1))} +%{!?python_sitelib: %global python_sitelib %(python -c from distutils.sysconfig import get_python_lib; print get_python_lib())} +%{!?python_sitearch: %global python_sitearch %(python -c from distutils.sysconfig import get_python_lib; print get_python_lib(1))} %define mod_name mpservlets Name: python-%{mod_name} Version:1.1.6 -Release:23 -Url:http://www.astro.umass.edu/~dpopowich/python/mpservlets -Summary:Mod_python Servlets - a mod_python handler +Release:28 License:APLv2 +Summary:Mod_python Servlets - a mod_python handler +Url:http://pypi.python.org/pypi/mpservlets Group: Development/Languages/Python Source: %{mod_name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} BuildRequires: apache2-devel %py_requires %if 0%{?suse_version} 1110 -BuildArch: noarch BuildRequires: fdupes +BuildArch: noarch %endif %else BuildRequires: apache-devel @@ -55,10 +54,10 @@ License:APLv2 Summary:API Reference in HTML and PDF Group: Documentation/Other -Requires: %name = %version +Requires: %{name} = %{version} %description doc -This package contains the API Reference in HTML and PDF for %name. +This package contains the API Reference in HTML and PDF for %{name}. This documentation is generated using epydoc (http://epydoc.sourceforge.net) which uses simple, special markup in python doc strings, so the source code is @@ -68,10 +67,10 @@ License:APLv2 Summary:A tutorial on developing web applications using servlets Group: Documentation/Other -Requires: %name = %version +Requires: %{name} = %{version} %description tutorial -This package contains a tutorial on developing web applications using %name. +This package contains a tutorial on developing web applications using %{name}. %prep %setup -q -n %{mod_name}-%{version} Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kvm for openSUSE:Factory
Hello community, here is the log from the commit of package kvm for openSUSE:Factory checked in at Fri Aug 26 09:40:22 CEST 2011. --- kvm/kvm.changes 2011-08-05 15:17:20.0 +0200 +++ /mounts/work_src_done/STABLE/kvm/kvm.changes2011-08-26 00:25:05.0 +0200 @@ -1,0 +2,15 @@ +Thu Aug 25 22:12:00 UTC 2011 - brog...@novell.com + +- update to v0.15.0 + for details, see: http://wiki.qemu.org/ChangeLog/0.15 +- update to latest seabios (ahci is enabled there now) +- fix failures migrating or saving large memory vms when remaining + host memory is insuffienct (bnc#705095) +- fix for creating 1MB vm + +--- +Thu Aug 25 20:57:01 UTC 2011 - brog...@novell.com + +- fix build: don't use deprecated functions + +--- calling whatdependson for head-i586 Old: kvm-seabios-enable-ahci.patch qemu-kvm-0.15.rc1.tar.bz2 seabios-git-e0f87ce.tar.bz2 New: kvm-qemu-fix-1mb-memory-assert.patch kvm-qemu-madvise-DONTFORK-for-tight-memory-migration.patch kvm-qemu-preXX-ui-avoid-deprecated-gnutls_-_set_priority-functions.patch qemu-kvm-0.15.0.tar.bz2 seabios-git-8e30147.tar.bz2 Other differences: -- ++ kvm.spec ++ --- /var/tmp/diff_new_pack.WFAvFp/_old 2011-08-26 09:35:51.0 +0200 +++ /var/tmp/diff_new_pack.WFAvFp/_new 2011-08-26 09:35:51.0 +0200 @@ -20,9 +20,9 @@ %bcond_with spice -%define package_true_version 0.15.rc1 +%define package_true_version 0.15.0 %define package_base_version 0.15.0 -%define bios_id seabios-git-e0f87ce +%define bios_id seabios-git-8e30147 %define pxe_rom_id ipxe-git-149b502 %define vgabios_id vgabios-0.6c @@ -73,6 +73,8 @@ %endif %endif %endif +BuildRequires: pwdutils +Requires: pwdutils Requires: virt-utils Requires: python-curses %if 0%{?suse_version} 1110 @@ -101,14 +103,16 @@ Patch04:qemu-datadir.diff Patch05:kvm-qemu-default-memsize.patch Patch06:kvm-qemu-user-space-tool-name.patch -Patch07:kvm-seabios-enable-ahci.patch -Patch08:kvm-qemu-fix-unused-but-set.patch +Patch07:kvm-qemu-fix-unused-but-set.patch +Patch08:kvm-qemu-madvise-DONTFORK-for-tight-memory-migration.patch +Patch09:kvm-qemu-fix-1mb-memory-assert.patch # Post-release upstream patches Patch100: kvm-qemu-preXX-dictzip1.patch Patch101: kvm-qemu-preXX-dictzip2.patch Patch102: kvm-qemu-preXX-report-default-mac-used.patch Patch103: kvm-qemu-preXX-console.patch +Patch104: kvm-qemu-preXX-ui-avoid-deprecated-gnutls_-_set_priority-functions.patch Patch155: qemu-kvm-common-code-fixes-for-s390-build.patch @@ -190,11 +194,13 @@ %patch06 -p1 %patch07 -p1 %patch08 -p1 +%patch09 -p1 # Post-release patches %patch100 -p1 %patch101 -p1 %patch102 -p1 %patch103 -p1 +%patch104 -p1 %patch155 -p1 @@ -225,7 +231,7 @@ echo kvm-%{version}-%{release} KVM_VERSION ./configure \ --prefix=%{_prefix} \ ---sysconfdir=/etc \ +--sysconfdir=%{_sysconfdir} \ --extra-cflags=%{optflags} \ --disable-debug-tcg \ --disable-sparse \ @@ -285,7 +291,8 @@ sed -i 's/CFLAGS =/CFLAGS +=/' roms/vgabios/Makefile # userspace: -make %{?jobs:-j%jobs} +make +#make %{?jobs:-j%jobs} # Firmware %ifarch %ix86 x86_64 @@ -370,7 +377,7 @@ %attr(755,root,kvm) %{_bindir}/qemu-ga %attr(755,root,kvm) %{_bindir}/kvm_stat %{_datadir}/qemu-kvm -%dir %attr(0700, root, kvm) %{_sysconfdir}/qemu-kvm/ +%dir %attr(0755, root, kvm) %{_sysconfdir}/qemu-kvm/ %config %attr(644,root,kvm) %{_sysconfdir}/qemu-kvm/target-x86_64.conf %config %{_sysconfdir}/udev/rules.d/60-kvm.rules %_mandir/man1/qemu-kvm.1.gz ++ kvm-qemu-fix-1mb-memory-assert.patch ++ diff --git a/hw/pc.c b/hw/pc.c index c0a88e1..3412bfa 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -978,9 +978,10 @@ void pc_memory_init(const char *kernel_filename, ram_addr = qemu_ram_alloc(NULL, pc.ram, below_4g_mem_size + above_4g_mem_size); cpu_register_physical_memory(0, 0xa, ram_addr); -cpu_register_physical_memory(0x10, - below_4g_mem_size - 0x10, - ram_addr + 0x10); +if (below_4g_mem_size 0x10) { +cpu_register_physical_memory(0x10, below_4g_mem_size - 0x10, + ram_addr + 0x10); +} if (above_4g_mem_size 0) { cpu_register_physical_memory(0x1ULL, above_4g_mem_size, ram_addr + below_4g_mem_size); ++ kvm-qemu-madvise-DONTFORK-for-tight-memory-migration.patch ++ Index: qemu-kvm-0.15.0/exec.c === --- qemu-kvm-0.15.0.orig/exec.c +++
commit gupnp-ui for openSUSE:Factory
Hello community, here is the log from the commit of package gupnp-ui for openSUSE:Factory checked in at Fri Aug 26 09:42:50 CEST 2011. --- GNOME/gupnp-ui/gupnp-ui.changes 2009-06-13 23:12:56.0 +0200 +++ /mounts/work_src_done/STABLE/gupnp-ui/gupnp-ui.changes 2011-08-25 20:15:29.0 +0200 @@ -1,0 +2,8 @@ +Thu Aug 25 18:13:48 UTC 2011 - dims...@opensuse.org + +- Add gupnp-linking.patch: Fix linking on Factory with + --no-copy-dt-needed-entries enabled. +- Add gnome-common BuildRequires and call to gnome-autogen.sh, as + the patch touches the build system. + +--- calling whatdependson for head-i586 New: gupnp-linking.patch Other differences: -- ++ gupnp-ui.spec ++ --- /var/tmp/diff_new_pack.Lna7fL/_old 2011-08-26 09:40:30.0 +0200 +++ /var/tmp/diff_new_pack.Lna7fL/_new 2011-08-26 09:40:30.0 +0200 @@ -1,7 +1,7 @@ # -# spec file for package gupnp-ui (Version 0.1.1) +# spec file for package gupnp-ui # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,12 +19,15 @@ Name: gupnp-ui Version:0.1.1 -Release:2 +Release:12 Summary:Collection of GTK+ widgets on top of GUPnP License:LGPL v2 or later Group: Development/Libraries/GNOME Url:http://www.gupnp.org/ Source: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM gupnp-linking.patch dims...@opensuse.org -- Fix build on Factory with --no-copy-dt-needed-entries. Patch sent upstream. +Patch0: gupnp-linking.patch +BuildRequires: gnome-common BuildRequires: gtk2-devel BuildRequires: libgupnp-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -53,8 +56,10 @@ %prep %setup -q +%patch0 -p1 %build +NOCONFIGURE=1 gnome-autogen.sh %configure --disable-static %__make %{?jobs:-j%jobs} ++ gupnp-linking.patch ++ From d428768f8054a68d2c19388454f4427ad2720910 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger dims...@opensuse.org Date: Thu, 25 Aug 2011 20:05:02 +0200 Subject: [PATCH] Tests: make sure to link the source against libgupnp-1.0 and other dependencies. --- tests/Makefile.am |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 09c37fd..125c8e9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -3,7 +3,7 @@ AM_CFLAGS = $(LIBGUPNP_UI_CFLAGS) $(GTHREAD_CFLAGS) -I$(top_srcdir) noinst_PROGRAMS = test-view test_view_SOURCES = test-view.c -test_view_LDADD = $(top_builddir)/libgupnp-ui/libgupnp-ui-1.0.la $(GTHREAD_LIBS) +test_view_LDADD = $(top_builddir)/libgupnp-ui/libgupnp-ui-1.0.la $(GTHREAD_LIBS) $(LIBGUPNP_UI_LIBS) CLEANFILES = $(BUILT_SOURCES) DISTCLEANFILES = $(BUILT_SOURCES) -- 1.7.6 Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit grub2 for openSUSE:Factory
Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at Fri Aug 26 10:01:48 CEST 2011. --- grub2/grub2.changes 2011-08-02 14:12:32.0 +0200 +++ /mounts/work_src_done/STABLE/grub2/grub2.changes2011-08-25 16:50:29.0 +0200 @@ -1,0 +2,10 @@ +Thu Aug 25 14:46:04 UTC 2011 - a...@suse.de + +- Fix directory ownership. + +--- +Tue Aug 23 12:46:43 UTC 2011 - a...@suse.de + +- Build an efi subpackage [bnc#713595]. + +--- calling whatdependson for head-i586 Other differences: -- ++ grub2.spec ++ --- /var/tmp/diff_new_pack.2tbO3E/_old 2011-08-26 09:59:27.0 +0200 +++ /var/tmp/diff_new_pack.2tbO3E/_new 2011-08-26 09:59:27.0 +0200 @@ -40,8 +40,13 @@ %else %define platform pc %endif +# build efi bootloader on some platforms only: +%if ! 0%{?efi} +%global efi %{ix86} x86_64 ia64 +%endif + Version:1.99 -Release:4 +Release:6 Summary:Bootloader with support for Linux, Multiboot and more Group: System/Boot License:GPLv3+ @@ -65,7 +70,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build -# TODO: ppc ExclusiveArch: %{ix86} x86_64 ppc ppc64 %description @@ -80,21 +84,67 @@ with it unless you know what are you doing. Refer to README.openSUSE file that is part of this package's documentation for more information. +%ifarch %{efi} + +%package efi + +Summary:GRUB2 for EFI systems +Group: System/Boot + +%description efi +The GRand Unified Bootloader (GRUB) is a highly configurable and customizable +bootloader with modular architecture. It support rich variety of kernel formats, +file systems, computer architectures and hardware devices. This subpackage +provides support for EFI systems. +%endif + %prep -%setup -q -n grub-%{version} -a 5 -(cd po ls *.po | cut -d. -f1 | xargs) po/LINGUAS -sed 's,@setfilename grub.info,@setfilename grub2.info,' docs/grub.texi docs/grub2.texi -sed -i 's,grub.texi,grub2.texi,' docs/Makefile.am +# We create (if we build for efi) two copies of the sources +# in the Builddir +%setup -T -c -n grub-%{version} +%setup -D -T -q -n grub-%{version} -a 0 +(cd grub-%{version};tar xaf %{SOURCE5}) +(cd grub-%{version}/po ls *.po | cut -d. -f1 | xargs) grub-%{version}/po/LINGUAS +sed 's,@setfilename grub.info,@setfilename grub2.info,' grub-%{version}/docs/grub.texi grub-%{version}/docs/grub2.texi +sed -i 's,grub.texi,grub2.texi,' grub-%{version}/docs/Makefile.am +cd grub-%{version} %patch0 -p1 %patch2 -p0 %patch3 -p1 %patch4 -p1 %patch5 -p1 +cd .. # README.openSUSE -cp %{SOURCE3} . +cp %{SOURCE3} grub-%{version}/ +%ifarch %{efi} +cp -a grub-%{version} grub-efi-%{version} +%endif %build +%ifarch %{efi} +cd grub-efi-%{version} +# we don't want to let rpm to override *FLAGS by bogus ones +CFLAGS= +CXXFLAGS= +FFLAGS= +export CFLAGS CXXFLAGS FFLAGS +%configure \ +TARGET_LDFLAGS=-static \ +--with-platform=efi \ +--program-transform-name=s,grub,%{name}-efi, +make %{?_smp_mflags} +%ifarch %{ix86} +%define grubefiarch i386-efi +%else +%define grubefiarch %{_arch}-efi +%endif +./grub-mkimage -O %{grubefiarch} -o grub.efi -d grub-core part_gpt hfsplus fat \ +ext2 btrfs normal chain boot configfile linux appleldr minicmd \ +loadbios reboot halt search font gfxterm +cd .. +%endif +cd grub-%{version} #./autogen.sh # we don't want to let rpm to override *FLAGS by bogus ones @@ -113,6 +163,24 @@ make %{?_smp_mflags} %install +%ifarch %{efi} +cd grub-efi-%{version} +make DESTDIR=$RPM_BUILD_ROOT install + +# Ghost config file +install -d $RPM_BUILD_ROOT/boot/%{name}-efi +touch $RPM_BUILD_ROOT/boot/%{name}-efi/grub.cfg +ln -s ../boot/%{name}-efi/grub.cfg $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-efi.cfg + +install -m 755 -d $RPM_BUILD_ROOT/boot/efi/EFI/opensuse/ +install -m 755 grub.efi $RPM_BUILD_ROOT/boot/efi/EFI/opensuse/grub.efi +# Remove devel files +rm $RPM_BUILD_ROOT/%{_libdir}/%{name}-efi/*/*.h + +cd .. +%endif + +cd grub-%{version} make DESTDIR=$RPM_BUILD_ROOT install # Script that makes part of grub.cfg persist across updates @@ -153,6 +221,10 @@ /sbin/update-bootloader --refresh || true fi +%post efi +/sbin/install-info %{_infodir}/grub-dev.info %{_infodir}/dir || : +/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : + %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/grub-dev.info %{_infodir}/dir || : @@ -169,7 +241,13 @@ rm -f /boot/%{name}/device.map fi -%files -f grub.lang +%preun efi +if [ $1 = 0 ]; then +/sbin/install-info --delete %{_infodir}/grub-dev.info %{_infodir}/dir || : +
commit ignuit for openSUSE:Factory
Hello community, here is the log from the commit of package ignuit for openSUSE:Factory checked in at Fri Aug 26 10:07:29 CEST 2011. New Changes file: --- /dev/null 2010-08-26 16:28:41.0 +0200 +++ /mounts/work_src_done/STABLE/ignuit/ignuit.changes 2011-08-25 01:02:41.0 +0200 @@ -0,0 +1,109 @@ +--- +Wed Aug 24 22:54:57 UTC 2011 - kirill.kiril...@gmail.com + +- fixed license tag +- improved desktop file + +--- +Sun Nov 29 20:52:43 UTC 2009 - kirill.kiril...@gmail.com + +- update to 0.0.16: + + Added a drop-down list of common licenses + + Added a text entry box for license URI + + Added a Revert button to undo accidental changes + + Added an optional answer entry box to the quiz dialog + + Added an option to make a backup before saving + + DPI of LaTeX output can now be set via the preferences dialog + + Initial support for tagging with strings, and for searching those tags + + Several minor bugs have been fixed + +--- +Fri Sep 25 23:19:11 CEST 2009 - kirill.kiril...@gmail.com + +- update to 0.0.15: + + Saving changes on computer shut down + + Added US English and German language translations + + Several minor bugs have been fixed + +--- +Mon Apr 20 23:40:27 MSD 2009 - kirill.kiril...@gmail.com + +- update to 0.0.14: + + The package now uses the latest GNU build files + + LaTeX support has been improved (transparent background and +using user-supplied pre and postamble files if present) + + Several minor bugs have been fixed + +--- +Mon Apr 6 22:10:12 MSD 2009 - kirill.kiril...@gmail.com + +- update to 0.0.13: + + Several new audio and search features were added + + Initial support for LaTeX was also added + + File properties can now include an optional homepage address + + jMemorize and Mnemosyne compatibility have been improved + + Icons and buttons now follow GNOME theme guidelines + + Many other small changes were made + +--- +Wed Mar 4 03:16:13 MSK 2009 - kirill.kiril...@gmail.com + +- update to 0.0.12: + + Various UI elements can now be optionally hidden or shown. + + Cards can now be tagged, and there's a new search option for tagged cards. + + Bugfix: Update the main window's status bar after resetting statistics. + +--- +Sun Nov 9 20:59:03 MSK 2008 - kirill.kiril...@gmail.com + +- update to 0.0.11: + + Images and audio files can now be embedded in cards. + + New formatting tags were added. + + A memory leak was fixed. + +--- +Mon Oct 27 02:26:42 MSK 2008 - kirill.kiril...@gmail.com + +- update to 0.0.10: + + Poll cards for expiry at the turn of each hour, and +update the display accordingly. + + Use colour to indicate categories containing expired cards. + + Bugfixes +- release notes for 0.0.9 + + Set card expiry times according to the hour of testing. + + Use separate textview widgets for the front, back, and details +of the card. +- release notes for 0.0.8 + + Implemented Undo and Redo. + + Implemented Cut, Copy, Paste and Delete. + + New option to quiz using random card faces. + + Add left and right tags for text alignment. +- release notes for 0.0.7 + + dialog-quiz.c: Implement simple HTML-like markup. + + Allow a license to be specified for card files. +- release notes for 0.0.6 + + Allow regular expression searches + + Allow hidden comments or search keywords in card text, introduced by +double hash signs - e.g.: ## Checkme + + Implement right-click menus in the Category and Card panes. + + Cut/Copy/Paste for cards. + + New filter to import KVocTrain files. + +--- +Thu Sep 25 13:11:40 CEST 2008 - l...@linux-schulserver.de + +- moved to Education base repository + +--- +Mon May 19 17:54:53 CEST 2008 - l...@linux-schulserver.de + +- fix rpm group +- use suse_update_desktop_file +- own %{_datadir}/omf/ignuit +- INSTALL is already done by rpm ;-) +- mark the help files as documentation + +--- +Tue Mar 11 23:19:54 MSK 2008 - kirill.kiril...@gmail.com + +- Initial build of version 0.0.5 calling whatdependson for head-i586 New: ignuit-0.0.16.tar.bz2 ignuit.changes ignuit.desktop ignuit.spec Other differences: -- ++ ignuit.spec ++ # # spec file for package ignuit # # Copyright (c) 2011 SUSE LINUX
commit libnjb for openSUSE:Factory
Hello community, here is the log from the commit of package libnjb for openSUSE:Factory checked in at Fri Aug 26 10:10:52 CEST 2011. New Changes file: --- /dev/null 2010-08-26 16:28:41.0 +0200 +++ /mounts/work_src_done/STABLE/libnjb/libnjb.changes 2011-08-26 05:45:22.0 +0200 @@ -0,0 +1,7 @@ +--- +Fri Aug 26 03:42:34 UTC 2011 - an...@opensuse.org + +- update version to 2.2.7 +- remove dependency on HAL + +--- calling whatdependson for head-i586 New: libnjb-2.2.7.tar.gz libnjb.changes libnjb.spec Other differences: -- ++ libnjb.spec ++ # # spec file for package libnjb # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An Open Source License is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: libnjb BuildRequires: libusb-devel zlib-devel Url:http://libnjb.sourceforge.net License:BSD 3-Clause Group: Development/Libraries/Other AutoReqProv:on Version:2.2.7 Release:1 Summary:Nomad Jukebox API Source: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: dbus-1 %description Nomad Jukebox API Authors: Linus Walleij tr...@df.lth.se (Much code, Windows port) C351sar Talon (NJB 3 initial code) David A. Knight da...@ritter.demon.co.uk (Code, especially for NJB1) Dwight Engen denge...@yahoo.com (NJB Zen stuff) Bernie ber...@knup.de (NJB 2 stuff) Paul Lalonde plalo...@telus.net (NJB Zen USB 2.0 stuff) Tom LeRoux t...@harborcoat.com (Dell Digital Jukebox stuff) Friso Brugmans njb...@brugmans.nu (NJB Zen NX stuff) Ryan Marsh ryan_ma...@yahoo.com (MacOS X porting, fixing and testing) Richard Low rich...@wentnet.com (MacOS X porting, fixing and testing) Michael a.k.a. LuNaTiC (NJB Zen Touch testing) Shaun Jackman sjack...@gmail.com (Debian packaging, automakification) Kevin Williams zak...@gmail.com (MSVC++ 8 port) Polar Humenn po...@adiron.com (playback hacks) %package -n libnjb5 License:BSD 3-Clause Summary:Nomad Jukebox API Group: Development/Libraries/Other Requires: %{name} = %{version} %description -n libnjb5 Nomad Jukebox API Authors: Linus Walleij tr...@df.lth.se (Much code, Windows port) C351sar Talon (NJB 3 initial code) David A. Knight da...@ritter.demon.co.uk (Code, especially for NJB1) Dwight Engen denge...@yahoo.com (NJB Zen stuff) Bernie ber...@knup.de (NJB 2 stuff) Paul Lalonde plalo...@telus.net (NJB Zen USB 2.0 stuff) Tom LeRoux t...@harborcoat.com (Dell Digital Jukebox stuff) Friso Brugmans njb...@brugmans.nu (NJB Zen NX stuff) Ryan Marsh ryan_ma...@yahoo.com (MacOS X porting, fixing and testing) Richard Low rich...@wentnet.com (MacOS X porting, fixing and testing) Michael a.k.a. LuNaTiC (NJB Zen Touch testing) Shaun Jackman sjack...@gmail.com (Debian packaging, automakification) Kevin Williams zak...@gmail.com (MSVC++ 8 port) Polar Humenn po...@adiron.com (playback hacks) %package devel License:BSD 3-Clause Group: Development/Libraries/Other AutoReqProv:on Summary:Nomad Jukebox API Requires: %{name} = %{version} Requires: libusb-devel %description devel Nomad Jukebox API Authors: Linus Walleij tr...@df.lth.se (Much code, Windows port) C351sar Talon (NJB 3 initial code) David A. Knight da...@ritter.demon.co.uk (Code, especially for NJB1) Dwight Engen denge...@yahoo.com (NJB Zen stuff) Bernie ber...@knup.de (NJB 2 stuff) Paul Lalonde plalo...@telus.net (NJB Zen USB 2.0 stuff) Tom LeRoux t...@harborcoat.com (Dell Digital Jukebox stuff) Friso Brugmans njb...@brugmans.nu (NJB Zen NX stuff) Ryan Marsh ryan_ma...@yahoo.com (MacOS X porting, fixing and testing) Richard Low rich...@wentnet.com (MacOS X porting, fixing and testing) Michael a.k.a. LuNaTiC (NJB Zen Touch testing) Shaun Jackman sjack...@gmail.com (Debian packaging, automakification) Kevin Williams zak...@gmail.com (MSVC++ 8 port) Polar Humenn po...@adiron.com (playback hacks) %prep %setup -q %build
commit MozillaThunderbird for openSUSE:11.3
Hello community, here is the log from the commit of package MozillaThunderbird for openSUSE:11.3 checked in at Fri Aug 26 10:32:23 CEST 2011. --- old-versions/11.3/UPDATES/all/MozillaThunderbird/MozillaThunderbird.changes 2011-08-17 22:46:53.0 +0200 +++ /mounts/work_src_done/11.3/MozillaThunderbird/MozillaThunderbird.changes 2011-08-25 16:10:00.0 +0200 @@ -1,0 +2,6 @@ +Thu Aug 25 16:08:46 CEST 2011 - dmuel...@suse.de + +- make enigmail a subversion of Thunderbird to fix %release + number tracking issues with the Open Build Service + +--- calling whatdependson for 11.3-i586 Other differences: -- ++ MozillaThunderbird.spec ++ --- /var/tmp/diff_new_pack.DY7blB/_old 2011-08-26 10:32:07.0 +0200 +++ /var/tmp/diff_new_pack.DY7blB/_new 2011-08-26 10:32:07.0 +0200 @@ -141,8 +141,8 @@ %if %build_enigmail %package -n enigmail -Version:1.1.2 -Release:9.RELEASE13 +Version:1.1.2+%{mainversion} +Release:0.RELEASE2 License:MPLv1.1 or GPLv2+ Summary:OpenPGP addon for Thunderbird and SeaMonkey Group: Productivity/Networking/Email/Clients Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit MozillaThunderbird for openSUSE:11.4
Hello community, here is the log from the commit of package MozillaThunderbird for openSUSE:11.4 checked in at Fri Aug 26 10:33:11 CEST 2011. --- old-versions/11.4/UPDATES/all/MozillaThunderbird/MozillaThunderbird.changes 2011-08-17 22:46:53.0 +0200 +++ /mounts/work_src_done/11.4/MozillaThunderbird/MozillaThunderbird.changes 2011-08-25 16:10:00.0 +0200 @@ -1,0 +2,6 @@ +Thu Aug 25 16:08:46 CEST 2011 - dmuel...@suse.de + +- make enigmail a subversion of Thunderbird to fix %release + number tracking issues with the Open Build Service + +--- calling whatdependson for 11.4-i586 Other differences: -- ++ MozillaThunderbird.spec ++ --- /var/tmp/diff_new_pack.WZRVCz/_old 2011-08-26 10:32:43.0 +0200 +++ /var/tmp/diff_new_pack.WZRVCz/_new 2011-08-26 10:32:43.0 +0200 @@ -141,8 +141,8 @@ %if %build_enigmail %package -n enigmail -Version:1.1.2 -Release:9.RELEASE9 +Version:1.1.2+%{mainversion} +Release:0.RELEASE2 License:MPLv1.1 or GPLv2+ Summary:OpenPGP addon for Thunderbird and SeaMonkey Group: Productivity/Networking/Email/Clients Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit util-linux for openSUSE:Factory
Hello community, here is the log from the commit of package util-linux for openSUSE:Factory checked in at Fri Aug 26 10:33:31 CEST 2011. --- util-linux/util-linux.changes 2011-08-17 12:46:34.0 +0200 +++ /mounts/work_src_done/STABLE/util-linux/util-linux.changes 2011-08-25 16:12:30.0 +0200 @@ -1,0 +2,5 @@ +Thu Aug 25 14:12:15 UTC 2011 - rguent...@novell.com + +- BuildIgnore pwdutils. + +--- calling whatdependson for head-i586 Other differences: -- ++ util-linux.spec ++ --- /var/tmp/diff_new_pack.ScMucz/_old 2011-08-26 10:24:28.0 +0200 +++ /var/tmp/diff_new_pack.ScMucz/_new 2011-08-26 10:24:28.0 +0200 @@ -31,8 +31,14 @@ BuildRequires: pkg-config BuildRequires: readline-devel BuildRequires: zlib-devel +# util-linux is a base package and uuidd pre-requiring pwdutils pulls +# that into the core build cycle. pwdutils also pulls in the whole +# ldap stack into it. Avoid this whole mess which is done only to +# make the rpm install check of uuidd happy which has support to work without +# these tools as well +#!BuildIgnore: pwdutils Version:2.19.91 -Release:4 +Release:6 Url:http://kernel.org/~kzak/util-linux/ Supplements:filesystem(minix) Provides: fsck-with-dev-lock = %{version} Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit json-c for openSUSE:Factory
Hello community, here is the log from the commit of package json-c for openSUSE:Factory checked in at Fri Aug 26 12:21:21 CEST 2011. New Changes file: --- /dev/null 2010-08-26 16:28:41.0 +0200 +++ /mounts/work_src_done/STABLE/json-c/json-c.changes 2010-11-04 18:22:35.0 +0100 @@ -0,0 +1,5 @@ +--- +Thu Nov 4 17:22:27 UTC 2010 - ch...@computersalat.de + +- initial pkg 0.9 + calling whatdependson for head-i586 New: json-c-0.9-base.patch json-c-0.9-json_object_from_file.patch json-c-0.9-json_tokener.patch json-c-0.9-linkhash.patch json-c-0.9.tar.bz2 json-c.changes json-c.spec Other differences: -- ++ json-c.spec ++ # # spec file for package json-c # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An Open Source License is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild %define libname libjson %define libsoname %{libname}0 Name: json-c Summary:JSON implementation in C Version:0.9 Release:1 License:MIT Group: System/Libraries Url:http://oss.metaparadigm.com/%{name} #Source0: http://oss.metaparadigm.com/json-c/json-c-0.9.tar.gz Source0:%{name}-%{version}.tar.bz2 Patch0: %{name}-0.9-base.patch Patch1: %{name}-0.9-json_object_from_file.patch Patch2: %{name}-0.9-json_tokener.patch Patch3: %{name}-0.9-linkhash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkg-config %description JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects. %package -n %{libsoname} Summary:JSON shared lib Group: System/Libraries %description -n %{libsoname} This package includes the JSON library. %package -n %{libname}-devel Summary:Development headers and libraries for json-c Group: Development/Libraries/C and C++ Requires: %{libsoname} = %{version} %description -n %{libname}-devel This package includes header files and scripts needed for developers using the json-c library %package -n %{libname}-doc Summary:Dokumentation files Group: Documentation/Other %if 0%{suse_version} = 1120 BuildArch: noarch %endif %description -n %{libname}-doc This package includes alls docs %prep %setup -q -n %{name}-%{version} %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %build autoreconf -fi %configure --disable-static --with-pic %{__make} %{?_smp_mflags} %check %{__make} %{?_smp_mflags} check %install make DESTDIR=$RPM_BUILD_ROOT install libdir=%{_libdir} mandir=%{_mandir} %post -n %{libsoname} -p /sbin/ldconfig %postun -n %{libsoname} -p /sbin/ldconfig %clean %{__rm} -rf $RPM_BUILD_ROOT %files -n %{libsoname} %defattr(-,root,root) %{_libdir}/%{libname}.so.* %files -n %{libname}-devel %defattr(-,root,root) %{_libdir}/%{libname}.so %{_libdir}/%{libname}.*a %{_includedir}/json %{_libdir}/pkgconfig/*.pc %files -n %{libname}-doc %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README README.html doc %changelog ++ json-c-0.9-base.patch ++ diff -Naur json-c-0.9.old//configure.in json-c-0.9//configure.in --- json-c-0.9.old//configure.in2009-12-15 23:53:18.0 + +++ json-c-0.9//configure.in2009-12-16 00:23:24.0 + @@ -1,7 +1,7 @@ AC_PREREQ(2.52) # Process this file with autoconf to produce a configure script. -AC_INIT([json-c], 0.9, [mich...@metaparadigm.com]) +AC_INIT([json-c], [0.9], [mich...@metaparadigm.com]) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) ++ json-c-0.9-json_object_from_file.patch ++ diff -Naur json-c-0.9.old//json_util.c json-c-0.9//json_util.c --- json-c-0.9.old//json_util.c 2009-12-15 23:53:18.0 + +++ json-c-0.9//json_util.c 2009-12-16 00:37:37.0 + @@ -52,7 +52,7 @@ #include json_tokener.h #include json_util.h -struct json_object* json_object_from_file(char *filename) +struct json_object* json_object_from_file(const char *filename) { struct printbuf *pb; struct json_object *obj; diff -Naur json-c-0.9.old//json_util.h json-c-0.9//json_util.h ---
commit system-config-printer for openSUSE:Factory
Hello community, here is the log from the commit of package system-config-printer for openSUSE:Factory checked in at Fri Aug 26 12:34:16 CEST 2011. --- GNOME/system-config-printer/system-config-printer.changes 2011-08-25 11:24:47.0 +0200 +++ /mounts/work_src_done/STABLE/system-config-printer/system-config-printer.changes 2011-08-25 13:35:40.0 +0200 @@ -1,0 +2,7 @@ +Thu Aug 25 20:55:20 CEST 2011 - dims...@opensuse.org + +- Update to version 1.3.6: + + Bugs fixed: rh#726682, rh#726996, rh#726938, lp#826958, +lp#444280, lp#828030, lp#819000. + +--- calling whatdependson for head-i586 Old: system-config-printer-1.3.5.tar.xz New: system-config-printer-1.3.6.tar.xz Other differences: -- ++ system-config-printer.spec ++ --- /var/tmp/diff_new_pack.7nkkTI/_old 2011-08-26 12:29:54.0 +0200 +++ /var/tmp/diff_new_pack.7nkkTI/_new 2011-08-26 12:29:54.0 +0200 @@ -21,8 +21,8 @@ Name: system-config-printer License:GPLv2+ Group: Hardware/Printing -Version:1.3.5 -Release:2 +Version:1.3.6 +Release:1 Summary:A printer administration tool Url:http://cyberelk.net/tim/software/system-config-printer/ Source0: http://cyberelk.net/tim/data/system-config-printer/1.3/%{name}-%{version}.tar.xz Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit v8 for openSUSE:Factory
Hello community, here is the log from the commit of package v8 for openSUSE:Factory checked in at Fri Aug 26 12:44:11 CEST 2011. New Changes file: --- /dev/null 2010-08-26 16:28:41.0 +0200 +++ /mounts/work_src_done/STABLE/v8/v8.changes 2011-08-24 19:46:21.0 +0200 @@ -0,0 +1,217 @@ +--- +Wed Aug 24 17:44:44 UTC 2011 - tittiatc...@gmail.com + +- update to 3.5.7.0 + +--- +Mon Aug 22 09:26:18 UTC 2011 - tittiatc...@gmail.com + +- Stop building libv8 in debug mode. Chromium doesn't like this + and starts cpu hogging. + +--- +Fri Aug 19 05:03:37 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.5.6.0 + +--- +Tue Aug 16 08:09:45 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.5.5.0 + +--- +Sat Aug 6 07:29:15 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.5.2.0 + +--- +Sat Jul 30 08:11:13 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.5.1.0 + +--- +Thu Jul 21 17:05:02 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.4.13 + +--- +Sun Jul 17 08:27:03 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.4.12.1 + +--- +Mon Jun 20 20:28:42 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.4.4.0 + +--- +Mon Jun 13 11:16:26 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.4.3.0 + +--- +Tue May 31 16:17:22 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.4.0.1 + +--- +Sat May 28 19:40:54 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.3.10.1 + +--- +Wed May 25 12:23:08 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.3.10.0 + +--- +Wed May 25 05:07:26 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.3.9.3 + +--- +Fri May 6 16:50:25 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.3.4.0 + +--- +Thu Apr 28 16:56:16 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.3.2.0 + +--- +Fri Apr 22 05:35:14 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.3.1.0 + +--- +Mon Apr 18 16:53:28 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.2.10.0 + +--- +Tue Apr 12 15:55:45 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.2.9.1 + +--- +Fri Apr 8 14:51:37 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.2.8.3 + +--- +Thu Mar 31 17:45:52 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.2.6.0 + +--- +Mon Mar 28 16:40:41 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.2.5.0 + +--- +Fri Mar 18 17:52:14 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.2.3.1 + +--- +Wed Mar 16 05:05:52 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.2.2.1 + +--- +Fri Mar 11 08:07:26 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.2.1.1 + +--- +Wed Mar 9 18:45:44 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.2.0.2 + +--- +Fri Mar 4 08:10:13 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.1.8.0 + +--- +Wed Mar 2 13:01:45 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.1.7.0 + +--- +Sun Feb 27 09:02:12 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.1.6.1 + +--- +Sun Feb 27 08:51:15 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.1.6.0 + +--- +Wed Feb 16 23:05:36 UTC 2011 - tittiatc...@gmail.com + +- Update to 3.1.5.0 +
commit ntp for openSUSE:Factory
Hello community, here is the log from the commit of package ntp for openSUSE:Factory checked in at Fri Aug 26 12:48:52 CEST 2011. --- ntp/ntp.changes 2011-06-01 11:18:25.0 +0200 +++ /mounts/work_src_done/STABLE/ntp/ntp.changes2011-08-26 10:12:02.0 +0200 @@ -1,0 +2,5 @@ +Fri Aug 26 08:11:33 UTC 2011 - vark...@suse.com + +- bnc#699724 - ntpdate was replaced with a dud script + +--- calling whatdependson for head-i586 Old: ntpdate Other differences: -- ++ ntp.spec ++ --- /var/tmp/diff_new_pack.ruVnbp/_old 2011-08-26 12:45:54.0 +0200 +++ /var/tmp/diff_new_pack.ruVnbp/_new 2011-08-26 12:45:54.0 +0200 @@ -27,7 +27,7 @@ License:BSD3c(or similar) Group: Productivity/Networking/Other Version:4.2.6p3 -Release:12 +Release:14 Summary:Network Time Protocol daemon (version 4) # main source Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.bz2 @@ -45,7 +45,6 @@ Source12: README.SUSE Source13: ntp-4.2.0-rh-manpages.tar.gz Source14: ntp.xml -Source15: ntpdate Source16: ntp-wait Patch1: ntp-segfault_on_invalid_device.patch Patch4: ntpd-maxmonmen.patch @@ -193,9 +192,6 @@ %patch16 %patch18 -# don't build ntpdate (replaced with %{SOURCE15} script) -sed -i '/\tntpdate/d -s/ntpdate //g' Makefile.in Makefile.am # fix DOS line breaks sed -i 's/\r//g' html/scripts/{footer.txt,style.css} @@ -274,7 +270,6 @@ # install -d %{buildroot}/usr/share/omc/svcinfo.d/ install -m 644 %{S:14} %{buildroot}/usr/share/omc/svcinfo.d/ -install -m 755 %{S:15} %{buildroot}/usr/sbin/ install -m 755 %{S:16} %{buildroot}/usr/sbin/ %clean @@ -319,7 +314,10 @@ fi # update from previous permissions if [ -f /etc/ntp.conf ]; then - chown --from=ntp:root root:ntp /etc/ntp.conf + chown root:ntp /etc/ntp.conf +fi +if [ -f /etc/ntp.keys ]; then + chown root:ntp /etc/ntp.keys fi if [ -f /var/lib/ntp/etc/ntp.conf.iburst ]; then chown --from=ntp:root root:ntp /var/lib/ntp/etc/ntp.conf.iburst Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit openconnect for openSUSE:Factory
Hello community, here is the log from the commit of package openconnect for openSUSE:Factory checked in at Fri Aug 26 13:54:07 CEST 2011. New Changes file: --- /dev/null 2010-08-26 16:28:41.0 +0200 +++ /mounts/work_src_done/STABLE/openconnect/openconnect.changes 2011-08-25 10:24:39.0 +0200 @@ -0,0 +1,89 @@ +--- +Thu Aug 25 10:24:05 UTC 2011 - toddrme2...@gmail.com + +- Simplified man file installation +- Cleaned up spec file formatting + +--- +Mon Aug 8 14:28:45 UTC 2011 - toddrme2...@gmail.com + +- Changed manuals to man1 + +--- +Sun Aug 7 23:05:10 UTC 2011 - toddrme2...@gmail.com + +- Removed %{?_smp_mflags} + +--- +Sun Aug 7 18:40:53 UTC 2011 - toddrme2...@gmail.com + +- Removed unneeded libopenconnect.la file. +- Minor formatting changes to several spec file macros + +--- +Sun Aug 7 16:11:47 UTC 2011 - toddrme2...@gmail.com + +- Added upstream url to Source0: tag +- Switched back to original tar.gz file + +--- +Sun Aug 7 13:50:57 UTC 2011 - toddrme2...@gmail.com + +- Fixed license name +- Fixed spec file header +- Switched to %make_install macro +- Added %doc macro for manual files +- Removed norootforbuild + + +--- +Sun Aug 7 09:20:18 UTC 2011 - toddrme2...@gmail.com + +- Moved .so file to devel package + + +--- +Thu Aug 4 09:35:34 UTC 2011 - toddrme2...@gmail.com + +- Update to version 3.11 + * Add Android.mk file for Android build support + * Add logging support for Android, in place of standard syslog(). + * Switch back to using TLSv1, but without extensions. + * Make TPM support optional, dependent on OpenSSL ENGINE support. +- Update to version 3.10 + * Switch to using GNU autoconf/automake/libtool. + * Produce shared library for authentication. + * Improve library API to make life easier for C++ users. + * Be more explicit about requiring pkg-config. + * Invoke script with reason=reconnect on CSTP reconnect. + * Add --non-inter option to avoid all user input. +- Update to version .02 + * Install man page in make install target. + * Add openconnect_vpninfo_free() to libopenconnect. + * Clear cached peer_addr to avoid reconnecting to wrong host. +- Update to version 3.01 + * Add libxml2 to pkg-config requirements. +- Update to version 3.00 + * Create libopenconnect.a for GUI authentication dialog to use. + * Remove auth-dialog, which now lives in the network-manager-openconnect package. + * Cope with more entries in authentication forms. + * Add --csd-wrapper option to wrap CSD trojan. + * Report error and abort if CA file cannot be opened. +- Update to version 2.26 + * Fix potential crash on relative HTTP redirect. + * Use correct TUN/TAP device node on Android. + * Check client certificate expiry date. + * Implement CSTP and DTLS rekeying (both by reconnecting CSTP). + * Add --force-dpd option to set minimum DPD interval. + * Don't print webvpn cookie in debug output. + * Fix host selection in NetworkManager auth dialog. + * Use SSLv3 instead of TLSv1; some servers (or their firewalls) don't accept any ClientHello options. + * Never include address family prefix on script-tun connections. +- Fix build errors and rpmlint errors + + +--- +Fri Aug 6 16:04:13 UTC 2010 - and...@opensuse.org + +- New pacakge + calling whatdependson for head-i586 New: openconnect-3.11.tar.gz openconnect.changes openconnect.spec Other differences: -- ++ openconnect.spec ++ # # spec file for package openconnect # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An Open Source License is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: openconnect Version:3.11 Release:1 License:LGPL-2.1 Summary:Open client for Cisco AnyConnect VPN Url:
commit kbuild for openSUSE:Factory
Hello community, here is the log from the commit of package kbuild for openSUSE:Factory checked in at Fri Aug 26 15:13:50 CEST 2011. --- kbuild/kbuild.changes 2009-11-03 20:19:02.0 +0100 +++ /mounts/work_src_done/STABLE/kbuild/kbuild.changes 2011-08-24 16:05:28.0 +0200 @@ -1,0 +2,6 @@ +Tue Aug 23 08:35:11 UTC 2011 - mse...@gmail.com + +- updated to 0.1.9998 (svn revision 2538) in order to build + virtualbox 4.1.2, for changes check http://svn.netlabs.org/kbuild/timeline + +--- calling whatdependson for head-i586 Old: kbuild-0.1.5svn2336.tar.bz2 New: kbuild-0.1.9998svn2543.tar.bz2 kbuild-pthread.diff kbuild-timestamps.diff Other differences: -- ++ kbuild.spec ++ --- /var/tmp/diff_new_pack.Np8mGb/_old 2011-08-26 15:12:31.0 +0200 +++ /var/tmp/diff_new_pack.Np8mGb/_new 2011-08-26 15:12:31.0 +0200 @@ -1,7 +1,7 @@ # -# spec file for package kbuild (Version 0.1.5svn2336) +# spec file for package kbuild # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,38 +23,32 @@ BuildRequires: bison flex libacl-devel License:GPL v2 or later Group: Development/Tools/Building -Summary:framework for writing simple makefiles for complex tasks -Version:0.1.5svn2336 -Release:3 -%define _svnrev 2336 +Summary:Framework for writing simple makefiles for complex tasks +Version:0.1.9998svn2543 +Release:1 +%define _svnrev 2543 Source0:%{name}-%{version}.tar.bz2 Patch0: kbuild-man.diff Patch1: warnings.diff Patch2: kbuild-dummy_noreturn.diff Patch3: kbuild-func_missing_args.diff Patch4: glibc-2.10.diff +Patch5: kbuild-pthread.diff +Patch6: kbuild-timestamps.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The goals of the kBuild framework: - Similar behavior across all supported platforms - - Flexibility, don't create unnecessary restrictions preventing ad-hoc solutions - - Makefiles can be simple to write and maintain - - One configuration file for a subtree automatically included - - Target configuration templates as the primary mechanism for makefile simplification - - Tools and SDKs for helping out the templates with flexibility - - Non-recursive makefile method by using sub-makefiles - - Authors: Knut St. Osmundsen bird-kbuild-s...@anduin.net @@ -66,6 +60,8 @@ %patch2 %patch3 %patch4 +%patch5 -p1 +%patch6 -p1 %build export CFLAGS=$RPM_OPT_FLAGS @@ -78,19 +74,22 @@ pod2man -c 'kBuild for SUSE Linux' -r kBuild-%version kmk.pod kmk.1 %install -kBuild/env.sh kmk NIX_INSTALL_DIR=/usr BUILD_TYPE=release PATH_INS=%{buildroot} LDFLAGS=-Wl,--as-needed +kBuild/env.sh kmk NIX_INSTALL_DIR=/usr BUILD_TYPE=release PATH_INS=%{buildroot} LDFLAGS=-Wl,--as-needed install %__install -m 644 -D kmk.1 %buildroot/%_mandir/man1/kmk.1 -%__chmod a-x %buildroot/usr/share/kBuild/*/*kmk -%__rm -r %{buildroot}%{_datadir}/doc/kBuild-0.1.5 +#remove execute flag, if occurs +%__chmod a-x %{buildroot}/%{_datadir}/kBuild/*/*kmk +%__rm -r %{buildroot}%{_datadir}/doc/kBuild-0.1.9998 %clean %__rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) +%doc COPYING ChangeLog +%doc kBuild/doc/COPYING-FDL-1.3 %doc kBuild/doc/QuickReference-kmk.* +%{_mandir}/man1/kmk.1.gz %{_bindir}/* -%{_mandir}/*/* %{_datadir}/kBuild %changelog ++ kbuild-0.1.5svn2336.tar.bz2 - kbuild-0.1.9998svn2543.tar.bz2 ++ 33385 lines of diff (skipped) ++ kbuild-pthread.diff ++ Index: kbuild-0.1.9998svn2538/Config.kmk === --- kbuild-0.1.9998svn2538.orig/Config.kmk +++ kbuild-0.1.9998svn2538/Config.kmk @@ -305,7 +305,7 @@ ifndef TEMPLATE_BIN_TOOL TEMPLATE_BIN_INCS+= $(PATH_GNUMAKE_SRC)/glob /usr/local/include endif ifeq ($(KBUILD_TARGET),linux) - TEMPLATE_BIN_LIBS+= rt + TEMPLATE_BIN_LIBS+= rt pthread endif TEMPLATE_BIN_CFLAGS.x86 += -m32 TEMPLATE_BIN_CFLAGS.sparc32 += -m32 ++ kbuild-timestamps.diff ++ Index: kbuild-0.1.9998svn2538/src/kmk/main.c === --- kbuild-0.1.9998svn2538.orig/src/kmk/main.c +++ kbuild-0.1.9998svn2538/src/kmk/main.c @@ -2996,10 +2996,10 @@ print_usage (int bad) #ifdef KMK if (!remote_description || *remote_description == '\0') -fprintf (usageto, _(\nThis program is built for %s/%s/%s [ __DATE__ __TIME__ ]\n), +fprintf (usageto, _(\nThis program is
commit desktop-translations for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-translations for openSUSE:Factory checked in at Fri Aug 26 15:15:06 CEST 2011. --- desktop-translations/desktop-translations.changes 2011-05-27 10:58:25.0 +0200 +++ /mounts/work_src_done/STABLE/desktop-translations/desktop-translations.changes 2011-08-26 14:43:16.0 +0200 @@ -1,0 +2,16 @@ +Fri Aug 26 14:42:40 CEST 2011 - k...@suse.de + +- Update translations. + +--- +Fri Aug 5 12:30:50 CEST 2011 - k...@suse.de + +- Update translations. + +--- +Fri Jun 17 15:29:55 CEST 2011 - k...@suse.de + +- set version to 12.1. +- update translations. + +--- calling whatdependson for head-i586 Other differences: -- ++ desktop-translations.spec ++ --- /var/tmp/diff_new_pack.3RWcUI/_old 2011-08-26 15:14:54.0 +0200 +++ /var/tmp/diff_new_pack.3RWcUI/_new 2011-08-26 15:14:54.0 +0200 @@ -19,8 +19,8 @@ Name: desktop-translations -Version:11.4 -Release:12 +Version:12.1 +Release:1 Summary:Desktop Files Translation updates License:BSD3c(or similar) Group: System/GUI/Other ++ desktop-translations.tar.bz2 ++ desktop-translations/desktop-translations.tar.bz2 /mounts/work_src_done/STABLE/desktop-translations/desktop-translations.tar.bz2 differ: char 11, line 1 Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit minicom for openSUSE:11.4
Hello community, here is the log from the commit of package minicom for openSUSE:11.4 checked in at Fri Aug 26 22:47:47 CEST 2011. --- old-versions/11.4/UPDATES/all/minicom/minicom.changes 2011-07-26 11:27:09.0 +0200 +++ 11.4/minicom/minicom.changes2011-08-24 11:48:56.0 +0200 @@ -1,0 +2,5 @@ +Wed Aug 24 09:44:30 UTC 2011 - lnus...@suse.de + +- fix lockdev suppport (bnc#713330) + +--- calling whatdependson for 11.4-i586 Other differences: -- ++ minicom.spec ++ --- /var/tmp/diff_new_pack.8dGb9P/_old 2011-08-26 22:29:09.0 +0200 +++ /var/tmp/diff_new_pack.8dGb9P/_new 2011-08-26 22:29:09.0 +0200 @@ -26,7 +26,7 @@ Group: Hardware/Modem Requires: rzsz Version:2.5 -Release:5.RELEASE6 +Release:5.RELEASE8 Summary:A Terminal Program Source: %{name}-%{version}.tar.bz2 Patch0: minicom-2.2-defaults.diff @@ -35,6 +35,7 @@ Patch3: minicom-2.4-lockdev.diff Patch4: minicom-2.3-no-build-date.patch Patch5: minicom-2.4-norootsetup.diff +# PATCH-FIX-UPSTREAM increased size of parameter buffers (bnc#707860) Patch6: minicom-2.5-increase-parameter-buffers.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -46,13 +47,6 @@ of the uucp group. - -Authors: - -Miquel van Smoorenburg miqu...@cistron.nl -Jukka Lahtinen wal...@netsonic.fi -Adam Lackorzynski a...@os.inf.tu-dresden.de - %prep %setup -q %patch0 ++ minicom-2.4-lockdev.diff ++ --- /var/tmp/diff_new_pack.8dGb9P/_old 2011-08-26 22:29:10.0 +0200 +++ /var/tmp/diff_new_pack.8dGb9P/_new 2011-08-26 22:29:10.0 +0200 @@ -2,7 +2,7 @@ === --- minicom-2.5.orig/src/main.c +++ minicom-2.5/src/main.c -@@ -164,6 +164,20 @@ int open_term(int doinit, int show_win_o +@@ -164,6 +164,18 @@ int open_term(int doinit, int show_win_o int s_errno; #endif @@ -14,29 +14,29 @@ +} +#endif + -+ lockfile[0] = 0; + if (portfd_is_socket) +goto nolock; + +#if !HAVE_LOCKDEV -+ /* First see if the lock file directory is present. */ if (P_LOCK[0] stat(P_LOCK, stt) == 0) { -@@ -211,10 +225,12 @@ int open_term(int doinit, int show_win_o +@@ -211,10 +223,12 @@ int open_term(int doinit, int show_win_o return -1; } } +#endif - if (doinit 0) - lockfile_create(); +- if (doinit 0) +-lockfile_create(); ++ if (doinit 0 lockfile_create() != 0) ++return -1; +nolock: /* Run a special program to disable callin if needed. */ if (doinit 0 P_CALLOUT[0]) { if (fastsystem(P_CALLOUT, NULL, NULL, NULL) 0) { -@@ -232,11 +248,7 @@ int open_term(int doinit, int show_win_o +@@ -232,11 +246,7 @@ int open_term(int doinit, int show_win_o signal(SIGALRM, get_alrm); alarm(4); #ifdef USE_SOCKET @@ -53,12 +53,13 @@ === --- minicom-2.5.orig/src/minicom.c +++ minicom-2.5/src/minicom.c -@@ -1570,7 +1570,7 @@ dirty_goto: +@@ -1569,8 +1569,7 @@ dirty_goto: + mc_wclose(st, 0); mc_wclose(stdwin, 1); keyboard(KUNINSTALL, 0); - if (lockfile[0]) +- if (lockfile[0]) -unlink(lockfile); -+ttyunlock(lockfile); ++ lockfile_remove(); close(portfd); if (quit != NORESET P_CALLIN[0]) @@ -66,45 +67,56 @@ === --- minicom-2.5.orig/src/minicom.h +++ minicom-2.5/src/minicom.h -@@ -35,6 +35,12 @@ +@@ -35,6 +35,10 @@ #include time.h +#if HAVE_LOCKDEV +#include ttylock.h -+#else -+#define ttyunlock(x) unlink(x) +#endif + #ifdef USE_SOCKET #include sys/socket.h #include sys/un.h -@@ -82,7 +88,7 @@ EXTERN int tempst; /* Status line is tem - EXTERN int escape;/* Escape code. */ - EXTERN int disable_online_time; /* disable online time display */ - --EXTERN char lockfile[128]; /* UUCP lock file of terminal */ -+EXTERN char lockfile[1024]; /* UUCP lock file of terminal */ - EXTERN char homedir[256]; /* Home directory of user */ - EXTERN char logfname[PARS_VAL_LEN]; /* Name of the logfile */ - EXTERN char username[16]; /* Who is using minicom? */ +@@ -294,7 +298,7 @@ extern int io_pending, pendingkeys; + void domacros(void); + + +-void lockfile_create(void); ++int lockfile_create(void); + void lockfile_remove(void); + + Index: minicom-2.5/src/updown.c === --- minicom-2.5.orig/src/updown.c +++ minicom-2.5/src/updown.c -@@ -457,17 +457,28 @@ void updown(int what, int nr) +@@ -29,6 +29,8 @@ + #include config.h + #endif + ++#include wchar.h ++ + #include port.h + #include minicom.h + #include intl.h +@@ -457,16 +459,31 @@ void