June 2012 - openSUSE Commits - openSUSE Mailing Lists

commit libvirt for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '12

01 Jun '12

Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2012-06-01 07:20:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libvirt", Maintainer is "JFEHLIG(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2012-05-08 11:15:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2012-06-01 07:21:03.000000000 +0200 @@ -1,0 +2,8 @@ +Wed May 30 16:00:38 MDT 2012 - jfehlig(a)suse.com + +- Add capability 'audit_write' to libvirtd apparmor profile + update install-apparmor-profiles.patch + bnc#764388 +- Update to libvirt 0.9.11.3 stable release + +------------------------------------------------------------------- Old: ---- 4eb1c256-viruri-user.patch libvirt-0.9.11.tar.bz2 New: ---- libvirt-0.9.11.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.9tY971/_old 2012-06-01 07:21:07.000000000 +0200 +++ /var/tmp/diff_new_pack.9tY971/_new 2012-06-01 07:21:07.000000000 +0200 @@ -327,7 +327,7 @@ Name: libvirt Url: http://libvirt.org/ -Version: 0.9.11 +Version: 0.9.11.3 Release: 0 Summary: A C toolkit to interact with the virtualization capabilities of Linux License: LGPL-2.1+ @@ -410,7 +410,6 @@ Source2: libvirtd-relocation-server.fw Source99: baselibs.conf # Upstream patches -Patch0: 4eb1c256-viruri-user.patch # Need to go upstream Patch100: xen-name-for-devid.patch Patch101: clone.patch @@ -546,7 +545,6 @@ %prep %setup -q -%patch0 -p1 %patch100 -p1 %patch101 %patch102 -p1 ++++++ AF_PACKET.patch ++++++ --- /var/tmp/diff_new_pack.9tY971/_old 2012-06-01 07:21:07.000000000 +0200 +++ /var/tmp/diff_new_pack.9tY971/_new 2012-06-01 07:21:07.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-0.9.11/src/util/virnetdev.c +Index: libvirt-0.9.11.3/src/util/virnetdev.c =================================================================== ---- libvirt-0.9.11.orig/src/util/virnetdev.c -+++ libvirt-0.9.11/src/util/virnetdev.c +--- libvirt-0.9.11.3.orig/src/util/virnetdev.c ++++ libvirt-0.9.11.3/src/util/virnetdev.c @@ -85,7 +85,7 @@ static int virNetDevSetupControlFull(con static int virNetDevSetupControl(const char *ifname, struct ifreq *ifr) @@ -11,10 +11,10 @@ } #endif -Index: libvirt-0.9.11/src/util/virnetdevbridge.c +Index: libvirt-0.9.11.3/src/util/virnetdevbridge.c =================================================================== ---- libvirt-0.9.11.orig/src/util/virnetdevbridge.c -+++ libvirt-0.9.11/src/util/virnetdevbridge.c +--- libvirt-0.9.11.3.orig/src/util/virnetdevbridge.c ++++ libvirt-0.9.11.3/src/util/virnetdevbridge.c @@ -84,7 +84,7 @@ static int virNetDevSetupControlFull(con static int virNetDevSetupControl(const char *ifname, struct ifreq *ifr) ++++++ install-apparmor-profiles.patch ++++++ --- /var/tmp/diff_new_pack.9tY971/_old 2012-06-01 07:21:07.000000000 +0200 +++ /var/tmp/diff_new_pack.9tY971/_new 2012-06-01 07:21:07.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-0.9.11/examples/apparmor/Makefile.am +Index: libvirt-0.9.11.3/examples/apparmor/Makefile.am =================================================================== ---- libvirt-0.9.11.orig/examples/apparmor/Makefile.am -+++ libvirt-0.9.11/examples/apparmor/Makefile.am +--- libvirt-0.9.11.3.orig/examples/apparmor/Makefile.am ++++ libvirt-0.9.11.3/examples/apparmor/Makefile.am @@ -1,8 +1,39 @@ ## Copyright (C) 2005-2011 Red Hat, Inc. ## See COPYING.LIB for the License of this software @@ -47,10 +47,10 @@ + rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/libvirt/TEMPLATE + +endif -Index: libvirt-0.9.11/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in +Index: libvirt-0.9.11.3/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in =================================================================== --- /dev/null -+++ libvirt-0.9.11/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in ++++ libvirt-0.9.11.3/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in @@ -0,0 +1,40 @@ +# Last Modified: Fri Aug 19 11:21:48 2011 +#include <tunables/global> @@ -92,9 +92,9 @@ + /var/lib/kvm/images/ r, + /var/lib/kvm/images/** r, +} -Index: libvirt-0.9.11/examples/apparmor/usr.lib.libvirt.virt-aa-helper +Index: libvirt-0.9.11.3/examples/apparmor/usr.lib.libvirt.virt-aa-helper =================================================================== ---- libvirt-0.9.11.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper +--- libvirt-0.9.11.3.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper +++ /dev/null @@ -1,38 +0,0 @@ -# Last Modified: Mon Apr 5 15:10:27 2010 @@ -135,9 +135,9 @@ - /var/lib/libvirt/images/ r, - /var/lib/libvirt/images/** r, -} -Index: libvirt-0.9.11/examples/apparmor/usr.sbin.libvirtd +Index: libvirt-0.9.11.3/examples/apparmor/usr.sbin.libvirtd =================================================================== ---- libvirt-0.9.11.orig/examples/apparmor/usr.sbin.libvirtd +--- libvirt-0.9.11.3.orig/examples/apparmor/usr.sbin.libvirtd +++ /dev/null @@ -1,52 +0,0 @@ -# Last Modified: Mon Apr 5 15:03:58 2010 @@ -192,11 +192,11 @@ - change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*, - -} -Index: libvirt-0.9.11/examples/apparmor/usr.sbin.libvirtd.in +Index: libvirt-0.9.11.3/examples/apparmor/usr.sbin.libvirtd.in =================================================================== --- /dev/null -+++ libvirt-0.9.11/examples/apparmor/usr.sbin.libvirtd.in -@@ -0,0 +1,57 @@ ++++ libvirt-0.9.11.3/examples/apparmor/usr.sbin.libvirtd.in +@@ -0,0 +1,58 @@ +# Last Modified: Fri Aug 19 11:20:36 2011 +#include <tunables/global> +@{LIBVIRT}="libvirt" @@ -222,6 +222,7 @@ + capability mknod, + capability fsetid, + capability ipc_lock, ++ capability audit_write, + + network inet stream, + network inet dgram, @@ -254,10 +255,10 @@ + change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*, + +} -Index: libvirt-0.9.11/examples/apparmor/libvirt-qemu +Index: libvirt-0.9.11.3/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-0.9.11.orig/examples/apparmor/libvirt-qemu -+++ libvirt-0.9.11/examples/apparmor/libvirt-qemu +--- libvirt-0.9.11.3.orig/examples/apparmor/libvirt-qemu ++++ libvirt-0.9.11.3/examples/apparmor/libvirt-qemu @@ -52,6 +52,7 @@ # access to firmware's etc /usr/share/kvm/** r, ++++++ libvirt-0.9.11.tar.bz2 -> libvirt-0.9.11.3.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/libvirt/libvirt-0.9.11.tar.bz2 /work/SRC/openSUSE:Factory/.libvirt.new/libvirt-0.9.11.3.tar.bz2 differ: char 11, line 1 ++++++ libvirt-suse-netcontrol.patch ++++++ --- /var/tmp/diff_new_pack.9tY971/_old 2012-06-01 07:21:07.000000000 +0200 +++ /var/tmp/diff_new_pack.9tY971/_new 2012-06-01 07:21:07.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-0.9.11/configure.ac +Index: libvirt-0.9.11.3/configure.ac =================================================================== ---- libvirt-0.9.11.orig/configure.ac -+++ libvirt-0.9.11/configure.ac +--- libvirt-0.9.11.3.orig/configure.ac ++++ libvirt-0.9.11.3/configure.ac @@ -63,6 +63,7 @@ AVAHI_REQUIRED="0.6.0" POLKIT_REQUIRED="0.6" PARTED_REQUIRED="1.8.0" @@ -10,7 +10,7 @@ UDEV_REQUIRED=145 PCIACCESS_REQUIRED=0.10.0 XMLRPC_REQUIRED=1.14.0 -@@ -1716,6 +1717,38 @@ AM_CONDITIONAL([WITH_NETCF], [test "$wit +@@ -1741,6 +1742,38 @@ AM_CONDITIONAL([WITH_NETCF], [test "$wit AC_SUBST([NETCF_CFLAGS]) AC_SUBST([NETCF_LIBS]) @@ -49,7 +49,7 @@ AC_ARG_WITH([secrets], AC_HELP_STRING([--with-secrets], [with local secrets management driver @<:@default=yes@:>@]),[],[with_secrets=yes]) -@@ -2660,6 +2693,7 @@ AC_MSG_NOTICE([ Remote: $with_remote]) +@@ -2686,6 +2719,7 @@ AC_MSG_NOTICE([ Remote: $with_remote]) AC_MSG_NOTICE([ Network: $with_network]) AC_MSG_NOTICE([Libvirtd: $with_libvirtd]) AC_MSG_NOTICE([ netcf: $with_netcf]) @@ -57,7 +57,7 @@ AC_MSG_NOTICE([ macvtap: $with_macvtap]) AC_MSG_NOTICE([virtport: $with_virtualport]) AC_MSG_NOTICE([]) -@@ -2791,6 +2825,11 @@ AC_MSG_NOTICE([ netcf: $NETCF_CFLAGS $ +@@ -2817,6 +2851,11 @@ AC_MSG_NOTICE([ netcf: $NETCF_CFLAGS $ else AC_MSG_NOTICE([ netcf: no]) fi @@ -69,10 +69,10 @@ if test "$with_qemu" = "yes" && test "$LIBPCAP_FOUND" != "no"; then AC_MSG_NOTICE([ pcap: $LIBPCAP_CFLAGS $LIBPCAP_LIBS]) else -Index: libvirt-0.9.11/daemon/Makefile.am +Index: libvirt-0.9.11.3/daemon/Makefile.am =================================================================== ---- libvirt-0.9.11.orig/daemon/Makefile.am -+++ libvirt-0.9.11/daemon/Makefile.am +--- libvirt-0.9.11.3.orig/daemon/Makefile.am ++++ libvirt-0.9.11.3/daemon/Makefile.am @@ -143,6 +143,10 @@ endif if WITH_NETCF @@ -84,10 +84,10 @@ endif if WITH_NODE_DEVICES -Index: libvirt-0.9.11/daemon/libvirtd.c +Index: libvirt-0.9.11.3/daemon/libvirtd.c =================================================================== ---- libvirt-0.9.11.orig/daemon/libvirtd.c -+++ libvirt-0.9.11/daemon/libvirtd.c +--- libvirt-0.9.11.3.orig/daemon/libvirtd.c ++++ libvirt-0.9.11.3/daemon/libvirtd.c @@ -76,6 +76,10 @@ # endif # ifdef WITH_NETCF @@ -110,10 +110,10 @@ # endif # ifdef WITH_STORAGE_DIR storageRegister(); -Index: libvirt-0.9.11/src/Makefile.am +Index: libvirt-0.9.11.3/src/Makefile.am =================================================================== ---- libvirt-0.9.11.orig/src/Makefile.am -+++ libvirt-0.9.11/src/Makefile.am +--- libvirt-0.9.11.3.orig/src/Makefile.am ++++ libvirt-0.9.11.3/src/Makefile.am @@ -967,6 +967,24 @@ libvirt_driver_interface_la_LIBADD += .. libvirt_driver_interface_la_LDFLAGS += -module -avoid-version endif @@ -139,10 +139,10 @@ endif if WITH_SECRETS -Index: libvirt-0.9.11/src/interface/netcf_driver.c +Index: libvirt-0.9.11.3/src/interface/netcf_driver.c =================================================================== ---- libvirt-0.9.11.orig/src/interface/netcf_driver.c -+++ libvirt-0.9.11/src/interface/netcf_driver.c +--- libvirt-0.9.11.3.orig/src/interface/netcf_driver.c ++++ libvirt-0.9.11.3/src/interface/netcf_driver.c @@ -23,7 +23,13 @@ #include <config.h> @@ -208,10 +208,10 @@ /* open netcf */ if (ncf_init(&driverState->netcf, NULL) != 0) { -Index: libvirt-0.9.11/tools/virsh.c +Index: libvirt-0.9.11.3/tools/virsh.c =================================================================== ---- libvirt-0.9.11.orig/tools/virsh.c -+++ libvirt-0.9.11/tools/virsh.c +--- libvirt-0.9.11.3.orig/tools/virsh.c ++++ libvirt-0.9.11.3/tools/virsh.c @@ -19821,6 +19821,10 @@ vshShowVersion(vshControl *ctl ATTRIBUTE #endif #ifdef WITH_NETCF ++++++ libvirtd-defaults.patch ++++++ --- /var/tmp/diff_new_pack.9tY971/_old 2012-06-01 07:21:07.000000000 +0200 +++ /var/tmp/diff_new_pack.9tY971/_new 2012-06-01 07:21:07.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-0.9.11/daemon/libvirtd.conf +Index: libvirt-0.9.11.3/daemon/libvirtd.conf =================================================================== ---- libvirt-0.9.11.orig/daemon/libvirtd.conf -+++ libvirt-0.9.11/daemon/libvirtd.conf +--- libvirt-0.9.11.3.orig/daemon/libvirtd.conf ++++ libvirt-0.9.11.3/daemon/libvirtd.conf @@ -18,8 +18,8 @@ # It is necessary to setup a CA and issue server certificates before # using this capability. @@ -13,10 +13,10 @@ # Listen for unencrypted TCP connections on the public TCP/IP port. # NB, must pass the --listen flag to the libvirtd process for this to -Index: libvirt-0.9.11/daemon/libvirtd.c +Index: libvirt-0.9.11.3/daemon/libvirtd.c =================================================================== ---- libvirt-0.9.11.orig/daemon/libvirtd.c -+++ libvirt-0.9.11/daemon/libvirtd.c +--- libvirt-0.9.11.3.orig/daemon/libvirtd.c ++++ libvirt-0.9.11.3/daemon/libvirtd.c @@ -872,7 +872,7 @@ daemonConfigNew(bool privileged ATTRIBUT return NULL; } ++++++ relax-qemu-usergroup-check.patch ++++++ --- /var/tmp/diff_new_pack.9tY971/_old 2012-06-01 07:21:07.000000000 +0200 +++ /var/tmp/diff_new_pack.9tY971/_new 2012-06-01 07:21:07.000000000 +0200 @@ -7,10 +7,10 @@ daemon. Then the qemu driver would only be loaded when needed, which would never be the case on a xen-only configuration. -Index: libvirt-0.9.11/src/qemu/qemu_conf.c +Index: libvirt-0.9.11.3/src/qemu/qemu_conf.c =================================================================== ---- libvirt-0.9.11.orig/src/qemu/qemu_conf.c -+++ libvirt-0.9.11/src/qemu/qemu_conf.c +--- libvirt-0.9.11.3.orig/src/qemu/qemu_conf.c ++++ libvirt-0.9.11.3/src/qemu/qemu_conf.c @@ -271,9 +271,7 @@ int qemudLoadDriverConfig(struct qemud_d return -1; } ++++++ suse-qemu-conf.patch ++++++ --- /var/tmp/diff_new_pack.9tY971/_old 2012-06-01 07:21:07.000000000 +0200 +++ /var/tmp/diff_new_pack.9tY971/_new 2012-06-01 07:21:07.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-0.9.11/src/qemu/qemu.conf +Index: libvirt-0.9.11.3/src/qemu/qemu.conf =================================================================== ---- libvirt-0.9.11.orig/src/qemu/qemu.conf -+++ libvirt-0.9.11/src/qemu/qemu.conf +--- libvirt-0.9.11.3.orig/src/qemu/qemu.conf ++++ libvirt-0.9.11.3/src/qemu/qemu.conf @@ -136,7 +136,16 @@ # leaving SELinux enabled for the host in general, then set this # to 'none' instead. ++++++ use-init-script-redhat.patch ++++++ --- /var/tmp/diff_new_pack.9tY971/_old 2012-06-01 07:21:07.000000000 +0200 +++ /var/tmp/diff_new_pack.9tY971/_new 2012-06-01 07:21:07.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-0.9.11/tools/Makefile.am +Index: libvirt-0.9.11.3/tools/Makefile.am =================================================================== ---- libvirt-0.9.11.orig/tools/Makefile.am -+++ libvirt-0.9.11/tools/Makefile.am +--- libvirt-0.9.11.3.orig/tools/Makefile.am ++++ libvirt-0.9.11.3/tools/Makefile.am @@ -182,24 +182,22 @@ install-data-local: install-init install uninstall-local: uninstall-init uninstall-systemd @@ -33,10 +33,10 @@ if LIBVIRT_INIT_SCRIPT_RED_HAT -Index: libvirt-0.9.11/tools/libvirt-guests.sysconf +Index: libvirt-0.9.11.3/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-0.9.11.orig/tools/libvirt-guests.sysconf -+++ libvirt-0.9.11/tools/libvirt-guests.sysconf +--- libvirt-0.9.11.3.orig/tools/libvirt-guests.sysconf ++++ libvirt-0.9.11.3/tools/libvirt-guests.sysconf @@ -1,19 +1,29 @@ +## Path: System/Virtualization/libvirt + @@ -101,10 +101,10 @@ # some file systems. -#BYPASS_CACHE=0 +BYPASS_CACHE=0 -Index: libvirt-0.9.11/tools/libvirt-guests.init.sh +Index: libvirt-0.9.11.3/tools/libvirt-guests.init.sh =================================================================== ---- libvirt-0.9.11.orig/tools/libvirt-guests.init.sh -+++ libvirt-0.9.11/tools/libvirt-guests.init.sh +--- libvirt-0.9.11.3.orig/tools/libvirt-guests.init.sh ++++ libvirt-0.9.11.3/tools/libvirt-guests.init.sh @@ -4,10 +4,10 @@ # ### BEGIN INIT INFO @@ -252,11 +252,11 @@ esac -exit $RETVAL +rc_exit -Index: libvirt-0.9.11/daemon/Makefile.am +Index: libvirt-0.9.11.3/daemon/Makefile.am =================================================================== ---- libvirt-0.9.11.orig/daemon/Makefile.am -+++ libvirt-0.9.11/daemon/Makefile.am -@@ -249,34 +249,23 @@ uninstall-logrotate: +--- libvirt-0.9.11.3.orig/daemon/Makefile.am ++++ libvirt-0.9.11.3/daemon/Makefile.am +@@ -249,22 +249,16 @@ uninstall-logrotate: rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || : install-sysconfig: @@ -265,39 +265,42 @@ $(INSTALL_DATA) $(srcdir)/libvirtd.sysconf \ - $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd + $(DESTDIR)$(localstatedir)/adm/fillup-templates/sysconfig.libvirtd ++ uninstall-sysconfig: - rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd - rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : + rm -f $(DESTDIR)$(localstatedir)/adm/fillup-templates/sysconfig.libvirtd + if WITH_SYSCTL install-sysctl: - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysctl.d - $(INSTALL_DATA) $(srcdir)/libvirtd.sysctl \ - $(DESTDIR)$(sysconfdir)/sysctl.d/libvirtd - +- uninstall-sysctl: - rm -f $(DESTDIR)$(sysconfdir)/sysctl.d/libvirtd - rmdir $(DESTDIR)$(sysconfdir)/sysctl.d || : - - if LIBVIRT_INIT_SCRIPT_RED_HAT - + else + install-sysctl: + uninstall-sysctl: +@@ -275,13 +269,7 @@ if LIBVIRT_INIT_SCRIPT_RED_HAT BUILT_SOURCES += libvirtd.init install-init-redhat: install-sysconfig libvirtd.init - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d - $(INSTALL_SCRIPT) libvirtd.init \ - $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd - +- uninstall-init-redhat: uninstall-sysconfig - rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd - rmdir $(DESTDIR)$(sysconfdir)/rc.d/init.d || : else install-init-redhat: uninstall-init-redhat: -Index: libvirt-0.9.11/daemon/libvirtd.sysconf +Index: libvirt-0.9.11.3/daemon/libvirtd.sysconf =================================================================== ---- libvirt-0.9.11.orig/daemon/libvirtd.sysconf -+++ libvirt-0.9.11/daemon/libvirtd.sysconf +--- libvirt-0.9.11.3.orig/daemon/libvirtd.sysconf ++++ libvirt-0.9.11.3/daemon/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + ++++++ xen-name-for-devid.patch ++++++ --- /var/tmp/diff_new_pack.9tY971/_old 2012-06-01 07:21:07.000000000 +0200 +++ /var/tmp/diff_new_pack.9tY971/_new 2012-06-01 07:21:07.000000000 +0200 @@ -13,10 +13,10 @@ This approach allows removing a disk when domain is inactive. We obviously can't search xenstore when the domain is inactive. -Index: libvirt-0.9.11/src/xen/xend_internal.c +Index: libvirt-0.9.11.3/src/xen/xend_internal.c =================================================================== ---- libvirt-0.9.11.orig/src/xen/xend_internal.c -+++ libvirt-0.9.11/src/xen/xend_internal.c +--- libvirt-0.9.11.3.orig/src/xen/xend_internal.c ++++ libvirt-0.9.11.3/src/xen/xend_internal.c @@ -60,6 +60,7 @@ static int @@ -25,7 +25,7 @@ virDomainDeviceDefPtr dev, char *class, char *ref, -@@ -2752,7 +2753,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr +@@ -2757,7 +2758,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr sexpr = virBufferContentAndReset(&buf); @@ -34,7 +34,7 @@ /* device doesn't exist, define it */ ret = xend_op(domain->conn, domain->name, "op", "device_create", "config", sexpr, NULL); -@@ -2873,7 +2874,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr +@@ -2878,7 +2879,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr sexpr = virBufferContentAndReset(&buf); @@ -43,7 +43,7 @@ virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("requested device does not exist")); goto cleanup; -@@ -2968,7 +2969,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr +@@ -2973,7 +2974,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr def, xml, VIR_DOMAIN_XML_INACTIVE))) goto cleanup; @@ -52,7 +52,7 @@ goto cleanup; if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) { -@@ -3914,6 +3915,7 @@ struct xenUnifiedDriver xenDaemonDriver +@@ -3919,6 +3920,7 @@ struct xenUnifiedDriver xenDaemonDriver */ static int virDomainXMLDevID(virDomainPtr domain, @@ -60,7 +60,7 @@ virDomainDeviceDefPtr dev, char *class, char *ref, -@@ -3922,8 +3924,12 @@ virDomainXMLDevID(virDomainPtr domain, +@@ -3927,8 +3929,12 @@ virDomainXMLDevID(virDomainPtr domain, xenUnifiedPrivatePtr priv = domain->conn->privateData; char *xref; char *tmp; @@ -73,7 +73,7 @@ if (dev->data.disk->driverName && STREQ(dev->data.disk->driverName, "tap")) strcpy(class, "tap"); -@@ -3933,19 +3939,21 @@ virDomainXMLDevID(virDomainPtr domain, +@@ -3938,19 +3944,21 @@ virDomainXMLDevID(virDomainPtr domain, else strcpy(class, "vbd"); ++++++ xen-pv-cdrom.patch ++++++ --- /var/tmp/diff_new_pack.9tY971/_old 2012-06-01 07:21:07.000000000 +0200 +++ /var/tmp/diff_new_pack.9tY971/_new 2012-06-01 07:21:07.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-0.9.11/src/xenxs/xen_sxpr.c +Index: libvirt-0.9.11.3/src/xenxs/xen_sxpr.c =================================================================== ---- libvirt-0.9.11.orig/src/xenxs/xen_sxpr.c -+++ libvirt-0.9.11/src/xenxs/xen_sxpr.c +--- libvirt-0.9.11.3.orig/src/xenxs/xen_sxpr.c ++++ libvirt-0.9.11.3/src/xenxs/xen_sxpr.c @@ -340,7 +340,7 @@ error: static int xenParseSxprDisks(virDomainDefPtr def, -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libsolv for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '12

01 Jun '12

Hello community, here is the log from the commit of package libsolv for openSUSE:Factory checked in at 2012-06-01 07:20:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsolv (Old) and /work/SRC/openSUSE:Factory/.libsolv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libsolv", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libsolv/libsolv.changes 2012-05-08 11:51:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libsolv.new/libsolv.changes 2012-06-01 07:21:01.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 30 14:46:48 CEST 2012 - mls(a)suse.de + +- fix build for older suse versions +- fix memory corruption in unneeded calculation when there are + product buddies + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsolv-0.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.1.0/bindings/ruby/CMakeLists.txt new/libsolv-0.1.0/bindings/ruby/CMakeLists.txt --- old/libsolv-0.1.0/bindings/ruby/CMakeLists.txt 2012-05-08 11:14:22.000000000 +0200 +++ new/libsolv-0.1.0/bindings/ruby/CMakeLists.txt 2012-05-31 12:11:34.000000000 +0200 @@ -1,10 +1,10 @@ FIND_PACKAGE (Ruby) -IF (USE_VENDORDIRS) +IF (USE_VENDORDIRS AND RUBY_VENDORARCH_DIR) SET (RUBY_INSTALL_DIR ${RUBY_VENDORARCH_DIR}) -ELSE (USE_VENDORDIRS) +ELSE (USE_VENDORDIRS AND RUBY_VENDORARCH_DIR) SET (RUBY_INSTALL_DIR ${RUBY_SITEARCH_DIR}) -ENDIF (USE_VENDORDIRS) +ENDIF (USE_VENDORDIRS AND RUBY_VENDORARCH_DIR) MESSAGE (STATUS "Ruby executable: ${RUBY_EXECUTABLE}") MESSAGE (STATUS "Ruby installation dir: ${RUBY_INSTALL_DIR}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.1.0/bindings/solv.i new/libsolv-0.1.0/bindings/solv.i --- old/libsolv-0.1.0/bindings/solv.i 2012-05-08 11:14:23.000000000 +0200 +++ new/libsolv-0.1.0/bindings/solv.i 2012-05-31 12:11:34.000000000 +0200 @@ -143,9 +143,9 @@ int size, i; VALUE *o; queue_init(&$1); - size = RARRAY($input)->len; + size = RARRAY_LEN($input); i = 0; - o = RARRAY($input)->ptr; + o = RARRAY_PTR($input); for (i = 0; i < size; i++, o++) { int v; int e = SWIG_AsVal_int(*o, &v); @@ -370,6 +370,14 @@ #endif #include "solv_xfopen.h" +/* for old ruby versions */ +#ifndef RARRAY_PTR +#define RARRAY_PTR(ary) (RARRAY(ary)->ptr) +#endif +#ifndef RARRAY_LEN +#define RARRAY_LEN(ary) (RARRAY(ary)->len) +#endif + #define true 1 #define false 1 @@ -835,7 +843,8 @@ %} void set_loadcallback(PyObject *callable) { if ($self->loadcallback == loadcallback) { - Py_DECREF($self->loadcallbackdata); + PyObject *obj = $self->loadcallbackdata; + Py_DECREF(obj); } if (callable) { Py_INCREF(callable); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.1.0/cmake/modules/FindPackageHandleStandardArgs.cmake new/libsolv-0.1.0/cmake/modules/FindPackageHandleStandardArgs.cmake --- old/libsolv-0.1.0/cmake/modules/FindPackageHandleStandardArgs.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/libsolv-0.1.0/cmake/modules/FindPackageHandleStandardArgs.cmake 2012-05-31 12:11:34.000000000 +0200 @@ -0,0 +1,296 @@ +# FIND_PACKAGE_HANDLE_STANDARD_ARGS(<name> ... ) +# +# This function is intended to be used in FindXXX.cmake modules files. +# It handles the REQUIRED, QUIET and version-related arguments to FIND_PACKAGE(). +# It also sets the <UPPERCASED_NAME>_FOUND variable. +# The package is considered found if all variables <var1>... listed contain +# valid results, e.g. valid filepaths. +# +# There are two modes of this function. The first argument in both modes is +# the name of the Find-module where it is called (in original casing). +# +# The first simple mode looks like this: +# FIND_PACKAGE_HANDLE_STANDARD_ARGS(<name> (DEFAULT_MSG|"Custom failure message") <var1>...<varN> ) +# If the variables <var1> to <varN> are all valid, then <UPPERCASED_NAME>_FOUND +# will be set to TRUE. +# If DEFAULT_MSG is given as second argument, then the function will generate +# itself useful success and error messages. You can also supply a custom error message +# for the failure case. This is not recommended. +# +# The second mode is more powerful and also supports version checking: +# FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME [REQUIRED_VARS <var1>...<varN>] +# [VERSION_VAR <versionvar>] +# [HANDLE_COMPONENTS] +# [CONFIG_MODE] +# [FAIL_MESSAGE "Custom failure message"] ) +# +# As above, if <var1> through <varN> are all valid, <UPPERCASED_NAME>_FOUND +# will be set to TRUE. +# After REQUIRED_VARS the variables which are required for this package are listed. +# Following VERSION_VAR the name of the variable can be specified which holds +# the version of the package which has been found. If this is done, this version +# will be checked against the (potentially) specified required version used +# in the find_package() call. The EXACT keyword is also handled. The default +# messages include information about the required version and the version +# which has been actually found, both if the version is ok or not. +# If the package supports components, use the HANDLE_COMPONENTS option to enable +# handling them. In this case, find_package_handle_standard_args() will report +# which components have been found and which are missing, and the <NAME>_FOUND +# variable will be set to FALSE if any of the required components (i.e. not the +# ones listed after OPTIONAL_COMPONENTS) are missing. +# Use the option CONFIG_MODE if your FindXXX.cmake module is a wrapper for +# a find_package(... NO_MODULE) call. In this case VERSION_VAR will be set +# to <NAME>_VERSION and the macro will automatically check whether the +# Config module was found. +# Via FAIL_MESSAGE a custom failure message can be specified, if this is not +# used, the default message will be displayed. +# +# Example for mode 1: +# +# FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 DEFAULT_MSG LIBXML2_LIBRARY LIBXML2_INCLUDE_DIR) +# +# LibXml2 is considered to be found, if both LIBXML2_LIBRARY and +# LIBXML2_INCLUDE_DIR are valid. Then also LIBXML2_FOUND is set to TRUE. +# If it is not found and REQUIRED was used, it fails with FATAL_ERROR, +# independent whether QUIET was used or not. +# If it is found, success will be reported, including the content of <var1>. +# On repeated Cmake runs, the same message won't be printed again. +# +# Example for mode 2: +# +# FIND_PACKAGE_HANDLE_STANDARD_ARGS(BISON REQUIRED_VARS BISON_EXECUTABLE +# VERSION_VAR BISON_VERSION) +# In this case, BISON is considered to be found if the variable(s) listed +# after REQUIRED_VAR are all valid, i.e. BISON_EXECUTABLE in this case. +# Also the version of BISON will be checked by using the version contained +# in BISON_VERSION. +# Since no FAIL_MESSAGE is given, the default messages will be printed. +# +# Another example for mode 2: +# +# FIND_PACKAGE(Automoc4 QUIET NO_MODULE HINTS /opt/automoc4) +# FIND_PACKAGE_HANDLE_STANDARD_ARGS(Automoc4 CONFIG_MODE) +# In this case, FindAutmoc4.cmake wraps a call to FIND_PACKAGE(Automoc4 NO_MODULE) +# and adds an additional search directory for automoc4. +# The following FIND_PACKAGE_HANDLE_STANDARD_ARGS() call produces a proper +# success/error message. + +#============================================================================= +# Copyright 2007-2009 Kitware, Inc. +# +# Distributed under the OSI-approved BSD License (the "License"); +# see accompanying file Copyright.txt for details. +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +#============================================================================= +# (To distribute this file outside of CMake, substitute the full +# License text for the above reference.) + +INCLUDE(FindPackageMessage) +INCLUDE(CMakeParseArguments) + +# internal helper macro +MACRO(_FPHSA_FAILURE_MESSAGE _msg) + IF (${_NAME}_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "${_msg}") + ELSE (${_NAME}_FIND_REQUIRED) + IF (NOT ${_NAME}_FIND_QUIETLY) + MESSAGE(STATUS "${_msg}") + ENDIF (NOT ${_NAME}_FIND_QUIETLY) + ENDIF (${_NAME}_FIND_REQUIRED) +ENDMACRO(_FPHSA_FAILURE_MESSAGE _msg) + + +# internal helper macro to generate the failure message when used in CONFIG_MODE: +MACRO(_FPHSA_HANDLE_FAILURE_CONFIG_MODE) + # <name>_CONFIG is set, but FOUND is false, this means that some other of the REQUIRED_VARS was not found: + IF(${_NAME}_CONFIG) + _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: missing: ${MISSING_VARS} (found ${${_NAME}_CONFIG} ${VERSION_MSG})") + ELSE(${_NAME}_CONFIG) + # If _CONSIDERED_CONFIGS is set, the config-file has been found, but no suitable version. + # List them all in the error message: + IF(${_NAME}_CONSIDERED_CONFIGS) + SET(configsText "") + LIST(LENGTH ${_NAME}_CONSIDERED_CONFIGS configsCount) + MATH(EXPR configsCount "${configsCount} - 1") + FOREACH(currentConfigIndex RANGE ${configsCount}) + LIST(GET ${_NAME}_CONSIDERED_CONFIGS ${currentConfigIndex} filename) + LIST(GET ${_NAME}_CONSIDERED_VERSIONS ${currentConfigIndex} version) + SET(configsText "${configsText} ${filename} (version ${version})\n") + ENDFOREACH(currentConfigIndex) + _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} ${VERSION_MSG}, checked the following files:\n${configsText}") + + ELSE(${_NAME}_CONSIDERED_CONFIGS) + # Simple case: No Config-file was found at all: + _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: found neither ${_NAME}Config.cmake nor ${_NAME_LOWER}-config.cmake ${VERSION_MSG}") + ENDIF(${_NAME}_CONSIDERED_CONFIGS) + ENDIF(${_NAME}_CONFIG) +ENDMACRO(_FPHSA_HANDLE_FAILURE_CONFIG_MODE) + + +FUNCTION(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG) + +# set up the arguments for CMAKE_PARSE_ARGUMENTS and check whether we are in +# new extended or in the "old" mode: + SET(options CONFIG_MODE HANDLE_COMPONENTS) + SET(oneValueArgs FAIL_MESSAGE VERSION_VAR) + SET(multiValueArgs REQUIRED_VARS) + SET(_KEYWORDS_FOR_EXTENDED_MODE ${options} ${oneValueArgs} ${multiValueArgs} ) + LIST(FIND _KEYWORDS_FOR_EXTENDED_MODE "${_FIRST_ARG}" INDEX) + + IF(${INDEX} EQUAL -1) + SET(FPHSA_FAIL_MESSAGE ${_FIRST_ARG}) + SET(FPHSA_REQUIRED_VARS ${ARGN}) + SET(FPHSA_VERSION_VAR) + ELSE(${INDEX} EQUAL -1) + + CMAKE_PARSE_ARGUMENTS(FPHSA "${options}" "${oneValueArgs}" "${multiValueArgs}" ${_FIRST_ARG} ${ARGN}) + + IF(FPHSA_UNPARSED_ARGUMENTS) + MESSAGE(FATAL_ERROR "Unknown keywords given to FIND_PACKAGE_HANDLE_STANDARD_ARGS(): \"${FPHSA_UNPARSED_ARGUMENTS}\"") + ENDIF(FPHSA_UNPARSED_ARGUMENTS) + + IF(NOT FPHSA_FAIL_MESSAGE) + SET(FPHSA_FAIL_MESSAGE "DEFAULT_MSG") + ENDIF(NOT FPHSA_FAIL_MESSAGE) + ENDIF(${INDEX} EQUAL -1) + +# now that we collected all arguments, process them + + IF("${FPHSA_FAIL_MESSAGE}" STREQUAL "DEFAULT_MSG") + SET(FPHSA_FAIL_MESSAGE "Could NOT find ${_NAME}") + ENDIF("${FPHSA_FAIL_MESSAGE}" STREQUAL "DEFAULT_MSG") + + # In config-mode, we rely on the variable <package>_CONFIG, which is set by find_package() + # when it successfully found the config-file, including version checking: + IF(FPHSA_CONFIG_MODE) + LIST(INSERT FPHSA_REQUIRED_VARS 0 ${_NAME}_CONFIG) + LIST(REMOVE_DUPLICATES FPHSA_REQUIRED_VARS) + SET(FPHSA_VERSION_VAR ${_NAME}_VERSION) + ENDIF(FPHSA_CONFIG_MODE) + + IF(NOT FPHSA_REQUIRED_VARS) + MESSAGE(FATAL_ERROR "No REQUIRED_VARS specified for FIND_PACKAGE_HANDLE_STANDARD_ARGS()") + ENDIF(NOT FPHSA_REQUIRED_VARS) + + LIST(GET FPHSA_REQUIRED_VARS 0 _FIRST_REQUIRED_VAR) + + STRING(TOUPPER ${_NAME} _NAME_UPPER) + STRING(TOLOWER ${_NAME} _NAME_LOWER) + + # collect all variables which were not found, so they can be printed, so the + # user knows better what went wrong (#6375) + SET(MISSING_VARS "") + SET(DETAILS "") + SET(${_NAME_UPPER}_FOUND TRUE) + # check if all passed variables are valid + FOREACH(_CURRENT_VAR ${FPHSA_REQUIRED_VARS}) + IF(NOT ${_CURRENT_VAR}) + SET(${_NAME_UPPER}_FOUND FALSE) + SET(MISSING_VARS "${MISSING_VARS} ${_CURRENT_VAR}") + ELSE(NOT ${_CURRENT_VAR}) + SET(DETAILS "${DETAILS}[${${_CURRENT_VAR}}]") + ENDIF(NOT ${_CURRENT_VAR}) + ENDFOREACH(_CURRENT_VAR) + + # component handling + UNSET(FOUND_COMPONENTS_MSG) + UNSET(MISSING_COMPONENTS_MSG) + + IF(FPHSA_HANDLE_COMPONENTS) + FOREACH(comp ${${_NAME}_FIND_COMPONENTS}) + IF(${_NAME}_${comp}_FOUND) + + IF(NOT DEFINED FOUND_COMPONENTS_MSG) + SET(FOUND_COMPONENTS_MSG "found components: ") + ENDIF() + SET(FOUND_COMPONENTS_MSG "${FOUND_COMPONENTS_MSG} ${comp}") + + ELSE() + + IF(NOT DEFINED MISSING_COMPONENTS_MSG) + SET(MISSING_COMPONENTS_MSG "missing components: ") + ENDIF() + SET(MISSING_COMPONENTS_MSG "${MISSING_COMPONENTS_MSG} ${comp}") + + IF(${_NAME}_FIND_REQUIRED_${comp}) + SET(${_NAME_UPPER}_FOUND FALSE) + SET(MISSING_VARS "${MISSING_VARS} ${comp}") + ENDIF() + + ENDIF() + ENDFOREACH(comp) + SET(COMPONENT_MSG "${FOUND_COMPONENTS_MSG} ${MISSING_COMPONENTS_MSG}") + SET(DETAILS "${DETAILS}[c${COMPONENT_MSG}]") + ENDIF(FPHSA_HANDLE_COMPONENTS) + + # version handling: + SET(VERSION_MSG "") + SET(VERSION_OK TRUE) + SET(VERSION ${${FPHSA_VERSION_VAR}} ) + IF (${_NAME}_FIND_VERSION) + + IF(VERSION) + + IF(${_NAME}_FIND_VERSION_EXACT) # exact version required + IF (NOT "${${_NAME}_FIND_VERSION}" VERSION_EQUAL "${VERSION}") + SET(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"") + SET(VERSION_OK FALSE) + ELSE (NOT "${${_NAME}_FIND_VERSION}" VERSION_EQUAL "${VERSION}") + SET(VERSION_MSG "(found suitable exact version \"${VERSION}\")") + ENDIF (NOT "${${_NAME}_FIND_VERSION}" VERSION_EQUAL "${VERSION}") + + ELSE(${_NAME}_FIND_VERSION_EXACT) # minimum version specified: + IF ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}") + SET(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is at least \"${${_NAME}_FIND_VERSION}\"") + SET(VERSION_OK FALSE) + ELSE ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}") + SET(VERSION_MSG "(found suitable version \"${VERSION}\", required is \"${${_NAME}_FIND_VERSION}\")") + ENDIF ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}") + ENDIF(${_NAME}_FIND_VERSION_EXACT) + + ELSE(VERSION) + + # if the package was not found, but a version was given, add that to the output: + IF(${_NAME}_FIND_VERSION_EXACT) + SET(VERSION_MSG "(Required is exact version \"${${_NAME}_FIND_VERSION}\")") + ELSE(${_NAME}_FIND_VERSION_EXACT) + SET(VERSION_MSG "(Required is at least version \"${${_NAME}_FIND_VERSION}\")") + ENDIF(${_NAME}_FIND_VERSION_EXACT) + + ENDIF(VERSION) + ELSE (${_NAME}_FIND_VERSION) + IF(VERSION) + SET(VERSION_MSG "(found version \"${VERSION}\")") + ENDIF(VERSION) + ENDIF (${_NAME}_FIND_VERSION) + + IF(VERSION_OK) + SET(DETAILS "${DETAILS}[v${VERSION}(${${_NAME}_FIND_VERSION})]") + ELSE(VERSION_OK) + SET(${_NAME_UPPER}_FOUND FALSE) + ENDIF(VERSION_OK) + + + # print the result: + IF (${_NAME_UPPER}_FOUND) + FIND_PACKAGE_MESSAGE(${_NAME} "Found ${_NAME}: ${${_FIRST_REQUIRED_VAR}} ${VERSION_MSG} ${COMPONENT_MSG}" "${DETAILS}") + ELSE (${_NAME_UPPER}_FOUND) + + IF(FPHSA_CONFIG_MODE) + _FPHSA_HANDLE_FAILURE_CONFIG_MODE() + ELSE(FPHSA_CONFIG_MODE) + IF(NOT VERSION_OK) + _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: ${VERSION_MSG} (found ${${_FIRST_REQUIRED_VAR}})") + ELSE(NOT VERSION_OK) + _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} (missing: ${MISSING_VARS}) ${VERSION_MSG}") + ENDIF(NOT VERSION_OK) + ENDIF(FPHSA_CONFIG_MODE) + + ENDIF (${_NAME_UPPER}_FOUND) + + SET(${_NAME_UPPER}_FOUND ${${_NAME_UPPER}_FOUND} PARENT_SCOPE) + +ENDFUNCTION(FIND_PACKAGE_HANDLE_STANDARD_ARGS _FIRST_ARG) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.1.0/cmake/modules/FindRuby.cmake new/libsolv-0.1.0/cmake/modules/FindRuby.cmake --- old/libsolv-0.1.0/cmake/modules/FindRuby.cmake 2012-05-08 11:14:23.000000000 +0200 +++ new/libsolv-0.1.0/cmake/modules/FindRuby.cmake 2012-05-31 12:11:34.000000000 +0200 @@ -1,19 +1,34 @@ # - Find Ruby # This module finds if Ruby is installed and determines where the include files -# and libraries are. It also determines what the name of the library is. This +# and libraries are. Ruby 1.8 and 1.9 are supported. +# +# The minimum required version of Ruby can be specified using the +# standard syntax, e.g. FIND_PACKAGE(Ruby 1.8) +# +# It also determines what the name of the library is. This # code sets the following variables: # -# RUBY_INCLUDE_PATH = path to where ruby.h can be found # RUBY_EXECUTABLE = full path to the ruby binary +# RUBY_INCLUDE_DIRS = include dirs to be used when using the ruby library +# RUBY_LIBRARY = full path to the ruby library +# RUBY_VERSION = the version of ruby which was found, e.g. "1.8.7" +# RUBY_FOUND = set to true if ruby ws found successfully +# +# RUBY_INCLUDE_PATH = same as RUBY_INCLUDE_DIRS, only provided for compatibility reasons, don't use it -# Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. -# See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. - - -if(RUBY_LIBRARY AND RUBY_INCLUDE_PATH) - # Already in cache, be silent - set(RUBY_FIND_QUIETLY TRUE) -endif (RUBY_LIBRARY AND RUBY_INCLUDE_PATH) +#============================================================================= +# Copyright 2004-2009 Kitware, Inc. +# Copyright 2008-2009 Alexander Neundorf <neundorf(a)kde.org> +# +# Distributed under the OSI-approved BSD License (the "License"); +# see accompanying file Copyright.txt for details. +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +#============================================================================= +# (To distribute this file outside of CMake, substitute the full +# License text for the above reference.) # RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'` # RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'` @@ -21,64 +36,208 @@ # RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'` # RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'` -FIND_PROGRAM(RUBY_EXECUTABLE NAMES ruby ruby1.8 ruby18 ) - -EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['archdir']" - OUTPUT_VARIABLE RUBY_ARCH_DIR) - -EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['libdir']" - OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH) - -EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['rubylibdir']" - OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH) - -# site_ruby -EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['sitearchdir']" - OUTPUT_VARIABLE RUBY_SITEARCH_DIR) +# uncomment the following line to get debug output for this file +# SET(_RUBY_DEBUG_OUTPUT TRUE) -EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['sitelibdir']" - OUTPUT_VARIABLE RUBY_SITELIB_DIR) +# Determine the list of possible names of the ruby executable depending +# on which version of ruby is required +SET(_RUBY_POSSIBLE_EXECUTABLE_NAMES ruby) + +# if 1.9 is required, don't look for ruby18 and ruby1.8, default to version 1.8 +IF(Ruby_FIND_VERSION_MAJOR AND Ruby_FIND_VERSION_MINOR) + SET(Ruby_FIND_VERSION_SHORT_NODOT "${Ruby_FIND_VERSION_MAJOR}${RUBY_FIND_VERSION_MINOR}") +ELSE(Ruby_FIND_VERSION_MAJOR AND Ruby_FIND_VERSION_MINOR) + SET(Ruby_FIND_VERSION_SHORT_NODOT "18") +ENDIF(Ruby_FIND_VERSION_MAJOR AND Ruby_FIND_VERSION_MINOR) + +SET(_RUBY_POSSIBLE_EXECUTABLE_NAMES ${_RUBY_POSSIBLE_EXECUTABLE_NAMES} ruby1.9 ruby19) + +# if we want a version below 1.9, also look for ruby 1.8 +IF("${Ruby_FIND_VERSION_SHORT_NODOT}" VERSION_LESS "19") + SET(_RUBY_POSSIBLE_EXECUTABLE_NAMES ${_RUBY_POSSIBLE_EXECUTABLE_NAMES} ruby1.8 ruby18) +ENDIF("${Ruby_FIND_VERSION_SHORT_NODOT}" VERSION_LESS "19") + +FIND_PROGRAM(RUBY_EXECUTABLE NAMES ${_RUBY_POSSIBLE_EXECUTABLE_NAMES}) + + +IF(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR) + FUNCTION(_RUBY_CONFIG_VAR RBVAR OUTVAR) + EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['${RBVAR}']" + RESULT_VARIABLE _RUBY_SUCCESS + OUTPUT_VARIABLE _RUBY_OUTPUT + ERROR_QUIET) + IF(_RUBY_SUCCESS OR NOT _RUBY_OUTPUT) + EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['${RBVAR}']" + RESULT_VARIABLE _RUBY_SUCCESS + OUTPUT_VARIABLE _RUBY_OUTPUT + ERROR_QUIET) + ENDIF(_RUBY_SUCCESS OR NOT _RUBY_OUTPUT) + SET(${OUTVAR} "${_RUBY_OUTPUT}" PARENT_SCOPE) + ENDFUNCTION(_RUBY_CONFIG_VAR) + + + # query the ruby version + _RUBY_CONFIG_VAR("MAJOR" RUBY_VERSION_MAJOR) + _RUBY_CONFIG_VAR("MINOR" RUBY_VERSION_MINOR) + _RUBY_CONFIG_VAR("TEENY" RUBY_VERSION_PATCH) + + # query the different directories + _RUBY_CONFIG_VAR("archdir" RUBY_ARCH_DIR) + _RUBY_CONFIG_VAR("arch" RUBY_ARCH) + _RUBY_CONFIG_VAR("rubyhdrdir" RUBY_HDR_DIR) + _RUBY_CONFIG_VAR("libdir" RUBY_POSSIBLE_LIB_DIR) + _RUBY_CONFIG_VAR("rubylibdir" RUBY_RUBY_LIB_DIR) + + # site_ruby + _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR) + _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR) + + # vendor_ruby available ? + EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print 'true' unless Config::CONFIG['vendorarchdir'].nil?" + OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET) + + IF(RUBY_HAS_VENDOR_RUBY) + _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR) + _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR) + ENDIF(RUBY_HAS_VENDOR_RUBY) + + # save the results in the cache so we don't have to run ruby the next time again + SET(RUBY_VERSION_MAJOR ${RUBY_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE) + SET(RUBY_VERSION_MINOR ${RUBY_VERSION_MINOR} CACHE PATH "The Ruby minor version" FORCE) + SET(RUBY_VERSION_PATCH ${RUBY_VERSION_PATCH} CACHE PATH "The Ruby patch version" FORCE) + SET(RUBY_ARCH_DIR ${RUBY_ARCH_DIR} CACHE PATH "The Ruby arch dir" FORCE) + SET(RUBY_HDR_DIR ${RUBY_HDR_DIR} CACHE PATH "The Ruby header dir (1.9)" FORCE) + SET(RUBY_POSSIBLE_LIB_DIR ${RUBY_POSSIBLE_LIB_DIR} CACHE PATH "The Ruby lib dir" FORCE) + SET(RUBY_RUBY_LIB_DIR ${RUBY_RUBY_LIB_DIR} CACHE PATH "The Ruby ruby-lib dir" FORCE) + SET(RUBY_SITEARCH_DIR ${RUBY_SITEARCH_DIR} CACHE PATH "The Ruby site arch dir" FORCE) + SET(RUBY_SITELIB_DIR ${RUBY_SITELIB_DIR} CACHE PATH "The Ruby site lib dir" FORCE) + SET(RUBY_HAS_VENDOR_RUBY ${RUBY_HAS_VENDOR_RUBY} CACHE BOOL "Vendor Ruby is available" FORCE) + SET(RUBY_VENDORARCH_DIR ${RUBY_VENDORARCH_DIR} CACHE PATH "The Ruby vendor arch dir" FORCE) + SET(RUBY_VENDORLIB_DIR ${RUBY_VENDORLIB_DIR} CACHE PATH "The Ruby vendor lib dir" FORCE) + + MARK_AS_ADVANCED( + RUBY_ARCH_DIR + RUBY_ARCH + RUBY_HDR_DIR + RUBY_POSSIBLE_LIB_DIR + RUBY_RUBY_LIB_DIR + RUBY_SITEARCH_DIR + RUBY_SITELIB_DIR + RUBY_HAS_VENDOR_RUBY + RUBY_VENDORARCH_DIR + RUBY_VENDORLIB_DIR + RUBY_VERSION_MAJOR + RUBY_VERSION_MINOR + RUBY_VERSION_PATCH + ) +ENDIF(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR) + +# In case RUBY_EXECUTABLE could not be executed (e.g. cross compiling) +# try to detect which version we found. This is not too good. +IF(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR) + # by default assume 1.8.0 + SET(RUBY_VERSION_MAJOR 1) + SET(RUBY_VERSION_MINOR 8) + SET(RUBY_VERSION_PATCH 0) + # check whether we found 1.9.x + IF(${RUBY_EXECUTABLE} MATCHES "ruby1.?9" OR RUBY_HDR_DIR) + SET(RUBY_VERSION_MAJOR 1) + SET(RUBY_VERSION_MINOR 9) + ENDIF(${RUBY_EXECUTABLE} MATCHES "ruby1.?9" OR RUBY_HDR_DIR) +ENDIF(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR) + +IF(RUBY_VERSION_MAJOR) + SET(RUBY_VERSION "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_PATCH}") + SET(_RUBY_VERSION_SHORT "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}") + SET(_RUBY_VERSION_SHORT_NODOT "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}") + SET(_RUBY_NODOT_VERSION "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}${RUBY_VERSION_PATCH}") +ENDIF(RUBY_VERSION_MAJOR) - -# vendor_ruby -EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print '-rvendor-specific'" - OUTPUT_VARIABLE RUBY_VENDOR_ARG) - -IF(RUBY_VENDOR_ARG) - EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorarchdir']" - OUTPUT_VARIABLE RUBY_VENDORARCH_DIR) - - EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorlibdir']" - OUTPUT_VARIABLE RUBY_VENDORLIB_DIR) -ELSE(RUBY_VENDOR_ARG) - # fall back to site*dir - EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['sitearchdir']" - OUTPUT_VARIABLE RUBY_VENDORARCH_DIR) - - EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['sitelibdir']" - OUTPUT_VARIABLE RUBY_VENDORLIB_DIR) -ENDIF(RUBY_VENDOR_ARG) - -# this is not needed if you use "print" inside the ruby statements -# remove the new lines from the output by replacing them with empty strings -#STRING(REPLACE "\n" "" RUBY_ARCH_DIR "${RUBY_ARCH_DIR}") -#STRING(REPLACE "\n" "" RUBY_POSSIBLE_LIB_PATH "${RUBY_POSSIBLE_LIB_PATH}") -#STRING(REPLACE "\n" "" RUBY_RUBY_LIB_PATH "${RUBY_RUBY_LIB_PATH}") - - -FIND_PATH(RUBY_INCLUDE_PATH +FIND_PATH(RUBY_INCLUDE_DIR NAMES ruby.h - PATHS + HINTS + ${RUBY_HDR_DIR} ${RUBY_ARCH_DIR} - /usr/lib/ruby/1.8/i586-linux-gnu/ ) + /usr/lib/ruby/${_RUBY_VERSION_SHORT}/i586-linux-gnu/ ) -FIND_LIBRARY(RUBY_LIBRARY - NAMES ruby ruby1.8 - PATHS ${RUBY_POSSIBLE_LIB_PATH} - ) +SET(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIR} ) + +# if ruby > 1.8 is required or if ruby > 1.8 was found, search for the config.h dir +IF( "${Ruby_FIND_VERSION_SHORT_NODOT}" GREATER 18 OR "${_RUBY_VERSION_SHORT_NODOT}" GREATER 18 OR RUBY_HDR_DIR) + FIND_PATH(RUBY_CONFIG_INCLUDE_DIR + NAMES ruby/config.h config.h + HINTS + ${RUBY_HDR_DIR}/${RUBY_ARCH} + ${RUBY_ARCH_DIR} + ) + + SET(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIRS} ${RUBY_CONFIG_INCLUDE_DIR} ) +ENDIF( "${Ruby_FIND_VERSION_SHORT_NODOT}" GREATER 18 OR "${_RUBY_VERSION_SHORT_NODOT}" GREATER 18 OR RUBY_HDR_DIR) + + +# Determine the list of possible names for the ruby library +SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT} ruby-${_RUBY_VERSION_SHORT} ruby-${RUBY_VERSION}) + +IF(WIN32) + SET( _RUBY_MSVC_RUNTIME "" ) + IF( MSVC60 ) + SET( _RUBY_MSVC_RUNTIME "60" ) + ENDIF( MSVC60 ) + IF( MSVC70 ) + SET( _RUBY_MSVC_RUNTIME "70" ) + ENDIF( MSVC70 ) + IF( MSVC71 ) + SET( _RUBY_MSVC_RUNTIME "71" ) + ENDIF( MSVC71 ) + IF( MSVC80 ) + SET( _RUBY_MSVC_RUNTIME "80" ) + ENDIF( MSVC80 ) + IF( MSVC90 ) + SET( _RUBY_MSVC_RUNTIME "90" ) + ENDIF( MSVC90 ) + + LIST(APPEND _RUBY_POSSIBLE_LIB_NAMES + "msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}" + "msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}-static" + "msvcrt-ruby${_RUBY_NODOT_VERSION}" + "msvcrt-ruby${_RUBY_NODOT_VERSION}-static" ) +ENDIF(WIN32) + +FIND_LIBRARY(RUBY_LIBRARY NAMES ${_RUBY_POSSIBLE_LIB_NAMES} HINTS ${RUBY_POSSIBLE_LIB_DIR} ) + +INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +SET(_RUBY_REQUIRED_VARS RUBY_EXECUTABLE RUBY_INCLUDE_DIR RUBY_LIBRARY) +IF(_RUBY_VERSION_SHORT_NODOT GREATER 18) + LIST(APPEND _RUBY_REQUIRED_VARS RUBY_CONFIG_INCLUDE_DIR) +ENDIF(_RUBY_VERSION_SHORT_NODOT GREATER 18) + +IF(_RUBY_DEBUG_OUTPUT) + MESSAGE(STATUS "--------FindRuby.cmake debug------------") + MESSAGE(STATUS "_RUBY_POSSIBLE_EXECUTABLE_NAMES: ${_RUBY_POSSIBLE_EXECUTABLE_NAMES}") + MESSAGE(STATUS "_RUBY_POSSIBLE_LIB_NAMES: ${_RUBY_POSSIBLE_LIB_NAMES}") + MESSAGE(STATUS "RUBY_ARCH_DIR: ${RUBY_ARCH_DIR}") + MESSAGE(STATUS "RUBY_HDR_DIR: ${RUBY_HDR_DIR}") + MESSAGE(STATUS "RUBY_POSSIBLE_LIB_DIR: ${RUBY_POSSIBLE_LIB_DIR}") + MESSAGE(STATUS "Found RUBY_VERSION: \"${RUBY_VERSION}\" , short: \"${_RUBY_VERSION_SHORT}\", nodot: \"${_RUBY_VERSION_SHORT_NODOT}\"") + MESSAGE(STATUS "_RUBY_REQUIRED_VARS: ${_RUBY_REQUIRED_VARS}") + MESSAGE(STATUS "RUBY_EXECUTABLE: ${RUBY_EXECUTABLE}") + MESSAGE(STATUS "RUBY_LIBRARY: ${RUBY_LIBRARY}") + MESSAGE(STATUS "RUBY_INCLUDE_DIR: ${RUBY_INCLUDE_DIR}") + MESSAGE(STATUS "RUBY_CONFIG_INCLUDE_DIR: ${RUBY_CONFIG_INCLUDE_DIR}") + MESSAGE(STATUS "--------------------") +ENDIF(_RUBY_DEBUG_OUTPUT) + +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ruby REQUIRED_VARS ${_RUBY_REQUIRED_VARS} + VERSION_VAR RUBY_VERSION ) MARK_AS_ADVANCED( RUBY_EXECUTABLE RUBY_LIBRARY - RUBY_INCLUDE_PATH + RUBY_INCLUDE_DIR + RUBY_CONFIG_INCLUDE_DIR ) + +# Set some variables for compatibility with previous version of this file +SET(RUBY_POSSIBLE_LIB_PATH ${RUBY_POSSIBLE_LIB_DIR}) +SET(RUBY_RUBY_LIB_PATH ${RUBY_RUBY_LIB_DIR}) +SET(RUBY_INCLUDE_PATH ${RUBY_INCLUDE_DIRS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.1.0/package/libsolv.changes new/libsolv-0.1.0/package/libsolv.changes --- old/libsolv-0.1.0/package/libsolv.changes 2012-05-08 11:14:23.000000000 +0200 +++ new/libsolv-0.1.0/package/libsolv.changes 2012-05-31 12:11:34.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed May 30 14:46:48 CEST 2012 - mls(a)suse.de + +- fix build for older suse versions +- fix memory corruption in unneeded calculation when there are + product buddies + +------------------------------------------------------------------- Tue May 8 10:59:39 CEST 2012 - ma(a)suse.de - build with swig-2.0.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.1.0/src/rules.c new/libsolv-0.1.0/src/rules.c --- old/libsolv-0.1.0/src/rules.c 2012-05-08 11:14:22.000000000 +0200 +++ new/libsolv-0.1.0/src/rules.c 2012-05-31 12:11:34.000000000 +0200 @@ -2448,7 +2448,7 @@ { Id buddy = pool->nscallback(pool, pool->nscallbackdata, NAMESPACE_PRODUCTBUDDY, p); if (buddy >= installed->start && buddy < installed->end && pool->solvables[buddy].repo == installed) - MAPSET(&userinstalled, buddy); + MAPSET(&userinstalled, buddy - installed->start); } } } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libsatsolver for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '12

01 Jun '12

Hello community, here is the log from the commit of package libsatsolver for openSUSE:Factory checked in at 2012-06-01 07:20:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsatsolver (Old) and /work/SRC/openSUSE:Factory/.libsatsolver.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libsatsolver", Maintainer is "mls(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libsatsolver/libsatsolver.changes 2012-03-22 12:35:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libsatsolver.new/libsatsolver.changes 2012-06-01 07:20:51.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 31 14:43:27 CEST 2012 - mls(a)suse.de + +- fix gzfile usage to make it compile again + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ satsolver-0.17.2.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/libsatsolver/satsolver-0.17.2.tar.bz2 /work/SRC/openSUSE:Factory/.libsatsolver.new/satsolver-0.17.2.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libreiserfs for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '12

01 Jun '12

Hello community, here is the log from the commit of package libreiserfs for openSUSE:Factory checked in at 2012-06-01 07:20:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreiserfs (Old) and /work/SRC/openSUSE:Factory/.libreiserfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libreiserfs", Maintainer is "jeffm(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libreiserfs/libreiserfs.changes 2011-11-22 17:48:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libreiserfs.new/libreiserfs.changes 2012-06-01 07:20:46.000000000 +0200 @@ -1,0 +2,8 @@ +Thu May 24 10:37:38 UTC 2012 - jengelh(a)inai.de + +- Remove redundant tags/sections from specfile +- Parallel build with %_smp_mflags +- Follow shlib naming policy, simplify file list +- Trim description, remove visions and deep implementation details + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreiserfs.spec ++++++ --- /var/tmp/diff_new_pack.pvyUks/_old 2012-06-01 07:20:47.000000000 +0200 +++ /var/tmp/diff_new_pack.pvyUks/_new 2012-06-01 07:20:47.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libreiserfs # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,16 +16,14 @@ # - Name: libreiserfs +%define lname libreiserfs-0_3-0 Url: http://reiserfs.linux.kiev.ua Version: 0.3.0.5 -Release: 145 -License: GPL-2.0+ -Group: System/Libraries -PreReq: %install_info_prereq -BuildRequires: libtool +Release: 0 Summary: ReiserFS File System Access Library +License: GPL-2.0+ +Group: Development/Libraries/C and C++ Source: http://ftp.roedu.net/pub/mirrors/ftp.namesys.com/pub/libreiserfs/progsreise… Source1: series Source2: baselibs.conf @@ -35,6 +33,8 @@ Patch4: libreiserfs-autoconf-fixups Patch5: libreiserfs-devel-fix BuildRoot: %{_tmppath}/%{name}-%{version}-build +PreReq: %install_info_prereq +BuildRequires: libtool %description This is a library for reiserfs file system access and manipulation. The @@ -42,69 +42,62 @@ can be linked to any projects that needed reiserfs file system access. These include GNU Parted, GNU GRUB, Yaboot, Partimage, and EVMS. -The second goal is high maintainability source code. - -The third goal is to develop an alternative set of the reiserfs -programs as small and nice front-ends to this library. - -libreiserfs has a number of high level APIs for accessing reiserfs file -systems. There are main file system code (reiserfs_fs_open, -reiserfs_fs_close, reiserfs_fs_create, reiserfs_fs_resize, -reiserfs_fs_journal_tune, etc), journal code, bitmap code, directories -and files access code, and device abstraction layer. - -progsreiserfs supports versions 3.5 and 3.6 with standard and relocated -journal. It also supports all possible block sizes supported by the -kernel (2.4.18 with patches or 2.4.19). - -The project home page is http://reiserfs.linux.kiev.ua/. - - +libreiserfs has a number of high level APIs for accessing reiserfs +file systems. There are main file system code, journal code, bitmap +code, directories and files access code, and device abstraction +layer. + +progsreiserfs supports versions reiserfs versions 3.5 and 3.6 with +standard and relocated journal. It also supports all possible block +sizes supported by the kernel (2.4.18 with patches or 2.4.19). Authors: -------- Yury Umanets <torque(a)ukrpost.net> Andrew Clausen <clausen(a)gnu.org> +%package -n %lname +Summary: ReiserFS File System Access Library +Group: System/Libraries +# added on 2012-05-24 +Obsoletes: libreiserfs < %version-%release +Provides: libreiserfs = %version-%release + +%description -n %lname +This is a library for reiserfs file system access and manipulation. The +primary goal is to develop the nice, full functionality library that +can be linked to any projects that needed reiserfs file system access. +These include GNU Parted, GNU GRUB, Yaboot, Partimage, and EVMS. + +libreiserfs has a number of high level APIs for accessing reiserfs +file systems. There are main file system code, journal code, bitmap +code, directories and files access code, and device abstraction +layer. + %package progs -License: GPL-2.0+ Summary: ReiserFS Filesystem Access Tools Group: System/Filesystems Conflicts: reiserfs %description progs -This is a library for reiserfs filesystem access and manipulation. The -primary goal is to develop the nice, full functionality library wich -might be linked against any projects which needed reiserfs filesystem -access. There are GNU Parted, GNU GRUB, Yaboot, Partimage, EVMS, etc. - -The second goal is high maintainability source code. - -The third goal is to develop an alternative set of the reiserfsprogs as -small and nice frontends to this library. +progsreiserfs supports reiserfs versions 3.5, 3.6 with standard and +relocated journal. Also all possible blocksizes which supported by +kernel (2.4.18 with patches or 2.4.19) This package contains four programs that are simple frontends to libreiserfs. There are: mkfs.reiserfs, resizefs.reiserfs, cpfs.reiserfs, tunefs.reiserfs -progsreiserfs supports versions 3.5, 3.6 with standard and relocated -journal. Also all possible blocksizes which supported by kernel (2.4.18 -with patches or 2.4.19) - -The project homepage is http://reiserfs.linux.kiev.ua - - - Authors: -------- Yury Umanets <torque(a)ukrpost.net> Andrew Clausen <clausen(a)gnu.org> %package devel -License: GPL-2.0+ Summary: ReiserFS Filesystem Access Tools Group: Development/Libraries/C and C++ -Requires: %name = %version glibc-devel +Requires: %lname = %version +Requires: glibc-devel %description devel This is a library for reiserfs filesystem access and manipulation. The @@ -112,23 +105,6 @@ might be linked against any projects which needed reiserfs filesystem access. There are GNU Parted, GNU GRUB, Yaboot, Partimage, EVMS, etc. -The second goal is high maintainability source code. - -The third goal is to develop an alternative set of the reiserfsprogs as -small and nice frontends to this library. - -This package contains four programs that are simple frontends to -libreiserfs. There are: mkfs.reiserfs, resizefs.reiserfs, -cpfs.reiserfs, tunefs.reiserfs - -progsreiserfs supports versions 3.5, 3.6 with standard and relocated -journal. Also all possible blocksizes which supported by kernel (2.4.18 -with patches or 2.4.19) - -The project homepage is http://reiserfs.linux.kiev.ua - - - Authors: -------- Yury Umanets <torque(a)ukrpost.net> @@ -141,54 +117,44 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 + +%build cp /usr/share/gettext/config.rpath . libtoolize --force autoreconf - -%build export CFLAGS="$RPM_OPT_FLAGS" #CFLAGS+=--with-capabilities %configure --disable-static --enable-shared -make %{?jobs:-j %jobs} +make %{?_smp_mflags} + +%check #make check %install %makeinstall %{__rm} -f %{buildroot}%{_libdir}/*.la -%post -p /sbin/ldconfig +%post -n %lname -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig -%files +%files -n %lname %defattr(-,root,root) -%{_libdir}/libdal-*.so.* -%{_libdir}/libreiserfs-*.so.* -%{_mandir}/man8/reiserfs.8.gz +%_libdir/libdal-0.3.so.0* +%_libdir/libreiserfs-0.3.so.0* %files devel %defattr(-,root,root) -%dir /usr/include/dal -%dir /usr/include/reiserfs -/usr/include/dal/*.h -/usr/include/reiserfs/*.h +%_includedir/dal +%_includedir/reiserfs %{_libdir}/libdal.so %{_libdir}/libreiserfs.so -/usr/share/aclocal/progsreiserfs.m4 +%_datadir/aclocal/progsreiserfs.m4 %files progs %defattr(-,root,root) -/usr/sbin/cpfs.reiserfs -/usr/sbin/mkfs.reiserfs -/usr/sbin/resizefs.reiserfs -/usr/sbin/tunefs.reiserfs -%{_mandir}/man8/cpfs.reiserfs.8.gz -%{_mandir}/man8/mkfs.reiserfs.8.gz -%{_mandir}/man8/resizefs.reiserfs.8.gz -%{_mandir}/man8/tunefs.reiserfs.8.gz - -%clean -test ! -z "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT -rm -rf $RPM_BUILD_DIR/progsreiserfs-%{pversion} +%_sbindir/*.reiserfs +%_mandir/man8/*.reiserfs.8* +%_mandir/man8/reiserfs.8* %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.pvyUks/_old 2012-06-01 07:20:47.000000000 +0200 +++ /var/tmp/diff_new_pack.pvyUks/_new 2012-06-01 07:20:47.000000000 +0200 @@ -1 +1,4 @@ -libreiserfs +libreiserfs-0_3-0 +libreiserfs-devel + requires -libreiserfs-<targettype> + requires "libreiserfs-0_3-0-<targettype> = <version>" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lftp for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '12

01 Jun '12

Hello community, here is the log from the commit of package lftp for openSUSE:Factory checked in at 2012-06-01 07:20:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lftp (Old) and /work/SRC/openSUSE:Factory/.lftp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lftp", Maintainer is "VDziewiecki(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/lftp/lftp.changes 2012-04-17 07:45:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lftp.new/lftp.changes 2012-06-01 07:20:41.000000000 +0200 @@ -1,0 +2,15 @@ +Wed May 30 21:53:08 UTC 2012 - pascal.bleser(a)opensuse.org + +- update to 4.3.7: + * fixed script execution + * cls fixed to show correct time always + * torrent fixed for large PIDs + * don't check hostname in openssl case with ssl:check-hostname off + +------------------------------------------------------------------- +Mon May 21 15:07:54 UTC 2012 - pascal.bleser(a)opensuse.org + +- libgnutls-devel instead of gnutls-devel in order to build properly + on the upcoming 12.2 and reflect the upstream naming change + +------------------------------------------------------------------- Old: ---- lftp-4.3.6.tar.bz2 New: ---- lftp-4.3.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lftp.spec ++++++ --- /var/tmp/diff_new_pack.6kpMmM/_old 2012-06-01 07:20:43.000000000 +0200 +++ /var/tmp/diff_new_pack.6kpMmM/_new 2012-06-01 07:20:43.000000000 +0200 @@ -24,7 +24,7 @@ %endif Name: lftp -Version: 4.3.6 +Version: 4.3.7 Release: 0 %define vi_version 1.1 Url: http://lftp.yar.ru/ @@ -44,7 +44,6 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ -BuildRequires: gnutls-devel BuildRequires: gzip BuildRequires: libstdc++-devel BuildRequires: libtool @@ -57,7 +56,7 @@ BuildRequires: update-alternatives BuildRequires: update-desktop-files %if %{?with_gnutls:1}0 -BuildRequires: gnutls-devel +BuildRequires: libgnutls-devel %endif %if %{?with_openssl:1}0 BuildRequires: openssl-devel ++++++ lftp-4.3.6.tar.bz2 -> lftp-4.3.7.tar.bz2 ++++++ ++++ 10954 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kakasi for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '12

01 Jun '12

Hello community, here is the log from the commit of package kakasi for openSUSE:Factory checked in at 2012-06-01 07:20:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kakasi (Old) and /work/SRC/openSUSE:Factory/.kakasi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kakasi", Maintainer is "LZWang(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kakasi/kakasi.changes 2012-03-26 11:01:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kakasi.new/kakasi.changes 2012-06-01 07:20:35.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 30 17:03:49 UTC 2012 - jengelh(a)inai.de + +- Remove redundant tags/sections from specfile +- Parallel build with %_smp_mflags +- Source config.guess using a more future-proof location wildcard + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kakasi.spec ++++++ --- /var/tmp/diff_new_pack.oQlJ9l/_old 2012-06-01 07:20:36.000000000 +0200 +++ /var/tmp/diff_new_pack.oQlJ9l/_new 2012-06-01 07:20:36.000000000 +0200 @@ -62,20 +62,6 @@ (1) "Romaji" is an alphabetical description of Japanese pronunciation. - - -Authors: --------- - Originator: - Hironobu Takahashi <hironobu(a)trc.rwcp.or.jp> - - Members of KAKASI Project (Maintainers): - Hajime BABA <baba(a)kusastro.kyoto-u.ac.jp> - NOKUBI Takatsugu <knok(a)daionet.gr.jp> - Satoru Takabayashi <satoru-t(a)is.aist-nara.ac.jp> - Ken-ichi Hirose <kenzo-(a)tama.or.jp> - Ryuji Abe <raeva(a)t3.rim.or.jp> - %package -n kakasi-devel Summary: header file and libraries of KAKASI Group: Productivity/Text/Convertors @@ -89,20 +75,6 @@ %description -n kakasi-devel header file and libraries of KAKASI - - -Authors: --------- - Originator: - Hironobu Takahashi <hironobu(a)trc.rwcp.or.jp> - - Members of KAKASI Project (Maintainers): - Hajime BABA <baba(a)kusastro.kyoto-u.ac.jp> - NOKUBI Takatsugu <knok(a)daionet.gr.jp> - Satoru Takabayashi <satoru-t(a)is.aist-nara.ac.jp> - Ken-ichi Hirose <kenzo-(a)tama.or.jp> - Ryuji Abe <raeva(a)t3.rim.or.jp> - %package -n kakasi-dict Summary: The base dictionary of KAKASI Group: Productivity/Text/Convertors @@ -115,29 +87,15 @@ %description -n kakasi-dict The base dictionary of KAKASI - - -Authors: --------- - Originator: - Hironobu Takahashi <hironobu(a)trc.rwcp.or.jp> - - Members of KAKASI Project (Maintainers): - Hajime BABA <baba(a)kusastro.kyoto-u.ac.jp> - NOKUBI Takatsugu <knok(a)daionet.gr.jp> - Satoru Takabayashi <satoru-t(a)is.aist-nara.ac.jp> - Ken-ichi Hirose <kenzo-(a)tama.or.jp> - Ryuji Abe <raeva(a)t3.rim.or.jp> - %prep %setup0 -q %patch0 -p1 %patch1 %build -cp /usr/share/automake-1.11/config.* . +cp /usr/share/automake*/config.{guess,sub} . %configure --disable-static --with-pic -%{__make} %{?jobs:-j%jobs} +make %{?_smp_mflags} %install make DESTDIR=$RPM_BUILD_ROOT install @@ -147,9 +105,6 @@ $RPM_BUILD_ROOT/usr/share/man/ja/man1 rm -f %{buildroot}%{_libdir}/*.la -%clean -rm -rf $RPM_BUILD_ROOT; - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit iptraf for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '12

01 Jun '12

Hello community, here is the log from the commit of package iptraf for openSUSE:Factory checked in at 2012-06-01 07:20:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iptraf (Old) and /work/SRC/openSUSE:Factory/.iptraf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "iptraf", Maintainer is "VDziewiecki(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/iptraf/iptraf.changes 2012-05-10 14:32:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.iptraf.new/iptraf.changes 2012-06-01 07:20:33.000000000 +0200 @@ -1,0 +2,8 @@ +Thu May 31 11:48:35 UTC 2012 - jengelh(a)inai.de + +- Update to new upstream release 1.1.3.1 +* support SIT tunnels +* fix checksumming for odd-sized IPv4 packets +- iptraf-1.0.2-segfault.patch rendered obsolete by commit b3eec3f + +------------------------------------------------------------------- Old: ---- iptraf-1.0.2-segfault.patch iptraf-ng-1.1.2.tar.xz New: ---- iptraf-ng-1.1.3.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iptraf.spec ++++++ --- /var/tmp/diff_new_pack.3OCrTx/_old 2012-06-01 07:20:35.000000000 +0200 +++ /var/tmp/diff_new_pack.3OCrTx/_new 2012-06-01 07:20:35.000000000 +0200 @@ -17,7 +17,7 @@ Name: iptraf -Version: 1.1.2 +Version: 1.1.3.1 Release: 0 Summary: TCP/IP Network Monitor License: GPL-2.0+ @@ -26,8 +26,6 @@ #Git-Clone: git://git.fedorahosted.org/git/iptraf-ng Source: %name-ng-%version.tar.xz -#PATCH-FIX-UPSTREAM off-by-one allocation error (bnc#711726) -Patch1: iptraf-1.0.2-segfault.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake BuildRequires: ncurses-devel @@ -58,7 +56,6 @@ %prep %setup -qn %name-ng-%version -%patch -P 1 -p1 %build if [ ! -e configure ]; then -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit iproute2 for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '12

01 Jun '12

Hello community, here is the log from the commit of package iproute2 for openSUSE:Factory checked in at 2012-06-01 07:20:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iproute2 (Old) and /work/SRC/openSUSE:Factory/.iproute2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "iproute2", Maintainer is "BiLi(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/iproute2/iproute2.changes 2012-04-17 21:58:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.iproute2.new/iproute2.changes 2012-06-01 07:20:26.000000000 +0200 @@ -1,0 +2,9 @@ +Thu May 24 19:38:03 UTC 2012 - jengelh(a)inai.de + +- Update to new upstream release 3.4.0 +* for kernel 3.4 +* ss: use new INET_DIAG_SKMEMINFO option to get more memory + information for tcp socket +* ip: add ability to set link state + +------------------------------------------------------------------- Old: ---- iproute2-3.3.0.tar.sign iproute2-3.3.0.tar.xz New: ---- iproute2-3.4.0.tar.sign iproute2-3.4.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iproute2.spec ++++++ --- /var/tmp/diff_new_pack.vErXyx/_old 2012-06-01 07:20:28.000000000 +0200 +++ /var/tmp/diff_new_pack.vErXyx/_new 2012-06-01 07:20:28.000000000 +0200 @@ -17,10 +17,8 @@ Name: iproute2 -Provides: iproute = %version -Version: 3.3.0 +Version: 3.4.0 Release: 0 -Provides: iproute = %version Summary: Linux network configuration utilities License: GPL-2.0 Group: Productivity/Networking/Routing @@ -61,6 +59,7 @@ BuildRequires: pkgconfig(libnl-1) BuildRequires: pkgconfig(xtables) >= 1.4.11 %endif +Provides: iproute = %version-%release %description This package provides the tools ip, tc, and rtmon needed to use the new @@ -96,9 +95,8 @@ tar -xf "%{S:0}" --use=xz; %setup -DTq %endif -%patch0 -%patch1 -find . -name *.orig -print0 | xargs -r0 rm -v +%patch -P 0 -P 1 -p1 +find . -name *.orig -delete %build # build with -fPIC. For details see @@ -134,7 +132,7 @@ /sbin/* /bin/ip #EndUsrMerge -%_mandir/man7/* +#%_mandir/man7/* %_mandir/man8/* %dir %_sysconfdir/iproute2 %config(noreplace) %_sysconfdir/iproute2/* ++++++ iproute2-HZ.diff ++++++ --- /var/tmp/diff_new_pack.vErXyx/_old 2012-06-01 07:20:28.000000000 +0200 +++ /var/tmp/diff_new_pack.vErXyx/_new 2012-06-01 07:20:28.000000000 +0200 @@ -1,6 +1,12 @@ ---- lib/utils.c -+++ lib/utils.c 2007/07/12 09:05:56 -@@ -33,6 +33,10 @@ +--- + lib/utils.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +Index: iproute2-3.4.0/lib/utils.c +=================================================================== +--- iproute2-3.4.0.orig/lib/utils.c ++++ iproute2-3.4.0/lib/utils.c +@@ -30,6 +30,10 @@ #include "utils.h" @@ -11,7 +17,7 @@ int get_integer(int *val, const char *arg, int base) { long res; -@@ -330,8 +334,8 @@ +@@ -453,8 +457,8 @@ int matches(const char *cmd, const char int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits) { ++++++ iproute2-libdir-1.diff ++++++ --- /var/tmp/diff_new_pack.vErXyx/_old 2012-06-01 07:20:28.000000000 +0200 +++ /var/tmp/diff_new_pack.vErXyx/_new 2012-06-01 07:20:28.000000000 +0200 @@ -1,40 +1,39 @@ --- - Makefile | 8 ++++---- + Makefile | 6 +++--- include/iptables.h | 2 +- netem/Makefile | 6 ++++-- - 3 files changed, 9 insertions(+), 7 deletions(-) + 3 files changed, 8 insertions(+), 6 deletions(-) -Index: Makefile +Index: iproute2-3.4.0/Makefile =================================================================== ---- Makefile.orig -+++ Makefile +--- iproute2-3.4.0.orig/Makefile ++++ iproute2-3.4.0/Makefile @@ -1,10 +1,10 @@ - DESTDIR=/usr/ ROOTDIR=$(DESTDIR) - LIBDIR=/usr/lib/ + PREFIX=/usr + LIBDIR=$(PREFIX)/lib -SBINDIR=/sbin +SBINDIR=/usr/sbin CONFDIR=/etc/iproute2 --DOCDIR=/share/doc/iproute2 --MANDIR=/share/man -+DOCDIR=/usr/share/doc/packages/iproute2 -+MANDIR=/usr/share/man + DATADIR=$(PREFIX)/share +-DOCDIR=$(DATADIR)/doc/iproute2 ++DOCDIR=$(DATADIR)/doc/packages/iproute2 + MANDIR=$(DATADIR)/man ARPDDIR=/var/lib/arpd - # Path to db_185.h include -@@ -30,7 +30,7 @@ ADDLIB+=ipx_ntop.o ipx_pton.o - CC = gcc - HOSTCC = gcc - CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall --CFLAGS = $(CCOPTS) -I../include $(DEFINES) -+CFLAGS = -DLIBDIR=\"$(LIBDIR)\" $(CCOPTS) -I../include $(DEFINES) +@@ -35,7 +35,7 @@ HOSTCC = gcc + DEFINES += -D_GNU_SOURCE + CCOPTS = -O2 + WFLAGS = -Wall -Wstrict-prototypes +-CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) ++CFLAGS = -DLIBDIR=\"${LIBDIR}\" $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) YACCFLAGS = -d -t -v - SUBDIRS=lib ip tc misc netem genl -Index: include/iptables.h + SUBDIRS=lib ip tc misc netem genl man +Index: iproute2-3.4.0/include/iptables.h =================================================================== ---- include/iptables.h.orig -+++ include/iptables.h +--- iproute2-3.4.0.orig/include/iptables.h ++++ iproute2-3.4.0/include/iptables.h @@ -5,7 +5,7 @@ #include "libiptc/libiptc.h" @@ -44,10 +43,10 @@ #endif #ifndef IPPROTO_SCTP -Index: netem/Makefile +Index: iproute2-3.4.0/netem/Makefile =================================================================== ---- netem/Makefile.orig -+++ netem/Makefile +--- iproute2-3.4.0.orig/netem/Makefile ++++ iproute2-3.4.0/netem/Makefile @@ -5,6 +5,8 @@ HOSTCC ?= $(CC) CCOPTS = $(CBUILD_CFLAGS) LDLIBS += -lm -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit iksemel for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '12

01 Jun '12

Hello community, here is the log from the commit of package iksemel for openSUSE:Factory checked in at 2012-06-01 07:20:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iksemel (Old) and /work/SRC/openSUSE:Factory/.iksemel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "iksemel", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/iksemel/iksemel.changes 2012-02-29 14:07:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.iksemel.new/iksemel.changes 2012-06-01 07:20:21.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 21 12:30:07 UTC 2012 - jengelh(a)inai.de + +- Use BuildRequires: pkgconfig(gnutls) instead of gnutls-devel for + Factory in keeping with gnutls package naming changes. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iksemel.spec ++++++ --- /var/tmp/diff_new_pack.MgCtzZ/_old 2012-06-01 07:20:22.000000000 +0200 +++ /var/tmp/diff_new_pack.MgCtzZ/_new 2012-06-01 07:20:22.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package iksemel # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -24,11 +24,17 @@ Version: 1.4 Release: 0 Url: http://code.google.com/p/iksemel -Source: http://iksemel.googlecode.com/files/iksemel-%{version}.tar.bz2 + +#DL-URL: http://iksemel.googlecode.com/files/iksemel-%version.tar.gz +Source: %name-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %install_info_prereq BuildRequires: gcc-c++ -BuildRequires: gnutls-devel >= 0.1.0 +%if 0%{?suse_version} >= 1130 +BuildRequires: pkgconfig(gnutls) +%else +BuildRequires: gnutls-devel +%endif BuildRequires: lzo-devel BuildRequires: pkgconfig @@ -60,7 +66,7 @@ %build %configure --disable-static --with-pic -%{__make} %{?_smp_mflags} +make %{?_smp_mflags} %install %makeinstall @@ -70,7 +76,7 @@ %install_info --info-dir=%_infodir %_infodir/%name.info.gz %postun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz +%install_info_delete --info-dir=%_infodir %_infodir/%name.info.gz %post -n %lname -p /sbin/ldconfig @@ -79,19 +85,19 @@ %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO -%{_infodir}/iksemel* -%{_bindir}/ikslint -%{_bindir}/iksperf -%{_bindir}/iksroster +%_infodir/iksemel* +%_bindir/ikslint +%_bindir/iksperf +%_bindir/iksroster %files -n %lname %defattr(-,root,root) -%{_libdir}/libiksemel.so.* +%_libdir/libiksemel.so.* %files devel %defattr(-,root,root) -%{_includedir}/iksemel.h -%{_libdir}/libiksemel.so -%{_libdir}/pkgconfig/iksemel.pc +%_includedir/iksemel.h +%_libdir/libiksemel.so +%_libdir/pkgconfig/iksemel.pc %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnuplot for openSUSE:Factory
by root＠hilbert.suse.de 01 Jun '12

01 Jun '12

Hello community, here is the log from the commit of package gnuplot for openSUSE:Factory checked in at 2012-06-01 07:20:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnuplot (Old) and /work/SRC/openSUSE:Factory/.gnuplot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnuplot", Maintainer is "werner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/gnuplot/gnuplot.changes 2012-04-12 09:24:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnuplot.new/gnuplot.changes 2012-06-01 07:20:16.000000000 +0200 @@ -1,0 +2,8 @@ +Wed May 30 15:33:29 UTC 2012 - jengelh(a)inai.de + +- Remove redundant tags/sections from specfile +- Parallel build with %_smp_mflags +- Add patch to delete no-longer supported constructs from + configure.in/Makefile.am + +------------------------------------------------------------------- New: ---- gnuplot-automake.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnuplot.spec ++++++ --- /var/tmp/diff_new_pack.S9nWzL/_old 2012-06-01 07:20:18.000000000 +0200 +++ /var/tmp/diff_new_pack.S9nWzL/_new 2012-06-01 07:20:18.000000000 +0200 @@ -70,6 +70,7 @@ Patch2: gnuplot-4.6.0-fonts.diff Patch4: gnuplot-4.6.0-demo.diff Patch6: gnuplot-4.6.0-fix-format-errors.diff +Patch7: gnuplot-automake.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} %if "%_exec_prefix" == "/usr/X11R6" @@ -116,7 +117,7 @@ %{name} documentation files including the man and info pages %prep -%setup -q -n gnuplot-%{version} +%setup -q bunzip2 -dc %{_sourcedir}/gnuplot-fr.doc.bz2 > docs/gnuplot-fr.doc test $? -eq 0 || exit 1 %patch1 -p 0 -b .x11ovf @@ -124,6 +125,7 @@ %patch4 -p 0 -b .demo %patch6 -p 0 -b .formaterrors %patch0 -p 0 -b .0 +%patch -P 7 -p1 %build SECSVGA="-DSVGA_IS_SECURE=1" @@ -137,12 +139,8 @@ test -e $f || continue mv $f $f.bak done -%if 0%{?suse_version} >= 1110 - touch configure.in - rm -f config.status config.log config.cache configure aclocal.m4 - aclocal -I m4 - autoconf -%endif + + autoreconf -fi %configure \ --with-gcc \ --with-x \ @@ -171,9 +169,9 @@ --with-plot=%{_libdir} \ --enable-qt %if %suse_version <= 1140 - make %{?jobs:-j%jobs} RCC=/usr/bin/rcc LRELEASE=/usr/bin/lrelease + make %{?_smp_mflags} RCC=/usr/bin/rcc LRELEASE=/usr/bin/lrelease %else - make %{?jobs:-j%jobs} + make %{?_smp_mflags} %endif pushd docs/ make srcdir=. clean all html pdf gpcard.ps @@ -217,9 +215,6 @@ rm -f %{buildroot}/%{_docdir}/gnuplot/demo/Makefile* rm -f %{buildroot}/%{_datadir}/emacs/site-lisp/info-look.* -%clean - rm -rf %{buildroot} - %post doc %install_info --info-dir=.%{_infodir} .%{_infodir}/%{name}.info.gz ++++++ gnuplot-automake.diff ++++++ From: Jan Engelhardt <jengelh(a)inai.de> Date: 2012-05-30 17:27:56.732814252 +0200 Rip out obsolete constructs. --- Makefile.am | 1 - configure.in | 3 +-- src/Makefile.am | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) Index: gnuplot-4.6.0/Makefile.am =================================================================== --- gnuplot-4.6.0.orig/Makefile.am +++ gnuplot-4.6.0/Makefile.am @@ -1,5 +1,4 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- -AUTOMAKE_OPTIONS = foreign 1.2h SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share Index: gnuplot-4.6.0/configure.in =================================================================== --- gnuplot-4.6.0.orig/configure.in +++ gnuplot-4.6.0/configure.in @@ -10,7 +10,7 @@ AC_INIT(gnuplot, 4.6.0) AC_CONFIG_SRCDIR(src/graphics.c) AC_PREREQ(2.58) AM_CONFIG_HEADER(config.h:config.hin) -AM_INIT_AUTOMAKE(1.7.9) +AM_INIT_AUTOMAKE([foreign 1.7.9]) AM_MAINTAINER_MODE @@ -24,7 +24,6 @@ dnl Check for ANSI C prototypes, the con dnl and ANSI style stringification AC_GNU_SOURCE AC_PROG_CC -AM_C_PROTOTYPES AC_PROG_CPP AC_C_CONST AC_C_INLINE Index: gnuplot-4.6.0/src/Makefile.am =================================================================== --- gnuplot-4.6.0.orig/src/Makefile.am +++ gnuplot-4.6.0/src/Makefile.am @@ -1,5 +1,4 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- -AUTOMAKE_OPTIONS = ansi2knr foreign 1.2h # in the spirit of automake ... pkglibexecdir = $(libexecdir)/@PACKAGE@/@VERSION_MAJOR@ @@ -40,7 +39,7 @@ binonly: $(bin_PROGRAMS) transform = @program_transform_name@ GNUPLOT_X11 = `echo gnuplot_x11 | sed '$(transform)'`$(EXEEXT) -AM_CPPFLAGS = -I../term -I$(top_srcdir)/term -DBINDIR=\"$(bindir)\" -DX11_DRIVER_DIR=\"$(X11_DRIVER_DIR)\" -DQT_DRIVER_DIR=\"$(QT_DRIVER_DIR)\" -DGNUPLOT_SHARE_DIR=\"$(GNUPLOT_SHARE_DIR)\" -DGNUPLOT_PS_DIR=\"$(GNUPLOT_PS_DIR)\" -DGNUPLOT_JS_DIR=\"$(GNUPLOT_JS_DIR)\" -DGNUPLOT_LUA_DIR=\"$(GNUPLOT_LUA_DIR)\" -DCONTACT=\"$(EMAIL)\" -DHELPFILE=\"$(HELPFILE)\" -DGNUPLOT_X11=\"$(GNUPLOT_X11)\" -DXAPPLRESDIR=\"$(XAPPLRESDIR)\" +AM_CPPFLAGS = -DPROTOTYPES -I../term -I$(top_srcdir)/term -DBINDIR=\"$(bindir)\" -DX11_DRIVER_DIR=\"$(X11_DRIVER_DIR)\" -DQT_DRIVER_DIR=\"$(QT_DRIVER_DIR)\" -DGNUPLOT_SHARE_DIR=\"$(GNUPLOT_SHARE_DIR)\" -DGNUPLOT_PS_DIR=\"$(GNUPLOT_PS_DIR)\" -DGNUPLOT_JS_DIR=\"$(GNUPLOT_JS_DIR)\" -DGNUPLOT_LUA_DIR=\"$(GNUPLOT_LUA_DIR)\" -DCONTACT=\"$(EMAIL)\" -DHELPFILE=\"$(HELPFILE)\" -DGNUPLOT_X11=\"$(GNUPLOT_X11)\" -DXAPPLRESDIR=\"$(XAPPLRESDIR)\" gnuplot_SOURCES = alloc.c alloc.h ansichek.h axis.c axis.h binary.c \ breaders.c breaders.h bitmap.h color.c color.h command.c \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0