September 2014 - openSUSE Commits - openSUSE Mailing Lists

commit tk for openSUSE:Factory
by root＠hilbert.suse.de 07 Sep '14

07 Sep '14

Hello community, here is the log from the commit of package tk for openSUSE:Factory checked in at 2014-09-07 11:11:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tk (Old) and /work/SRC/openSUSE:Factory/.tk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tk" Changes: -------- --- /work/SRC/openSUSE:Factory/tk/tk.changes 2014-04-23 17:28:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tk.new/tk.changes 2014-09-07 11:11:54.000000000 +0200 @@ -1,0 +2,16 @@ +Thu Aug 28 14:37:33 UTC 2014 - vwallfahrer(a)suse.com + +- Update to 8.6.2: + * Ocaml trouble with Tk and tailcall splice. + * Accept [image create -format PNG] (upper case). + * fix png wrong component indices + * PNG parser accept uppercase -format + * fix double free of a TkFont + * support PPM maxval up to 65535 + * fix multi-interp font teardown double free + * fix option file \n syntax support + * X: correct fontconfig dependence + * fix @TK_LIBS@ in pkgconfig + * fix autoscroll initiation + +------------------------------------------------------------------- Old: ---- tk-fix-pkgconfig-file.patch tk8.6.1-src.tar.gz New: ---- tk8.6.2-src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tk.spec ++++++ --- /var/tmp/diff_new_pack.G7Qdmw/_old 2014-09-07 11:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.G7Qdmw/_new 2014-09-07 11:11:55.000000000 +0200 @@ -25,7 +25,7 @@ BuildRequires: pkg-config BuildRequires: tcl-devel Url: http://www.tcl.tk -Version: 8.6.1 +Version: 8.6.2 Release: 0 %define rrc %nil BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -52,8 +52,6 @@ Source3: http://tkcon.cvs.sourceforge.net/tkcon/tkcon/tkcon.tcl Patch0: %name.patch Patch1: tk-8.5.12-fix-xft.patch -# PATCH-FIX-UPSTREAM tk-fix-pkgconfig-file.patch badshah400(a)gmail.com -- Fix undefined token (@TK_LIBS@) in linker flag in pkgconfig file; patch sent upstream -Patch2: tk-fix-pkgconfig-file.patch %description Tk is a graphical user interface toolkit that takes developing desktop @@ -101,7 +99,6 @@ %setup -q -n %name%version %patch0 %patch1 -p1 -%patch2 -p1 %build cd unix ++++++ tk8.6.1-src.tar.gz -> tk8.6.2-src.tar.gz ++++++ ++++ 9704 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 installation-images-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 07 Sep '14

07 Sep '14

Hello community, here is the log from the commit of package installation-images-openSUSE for openSUSE:Factory checked in at 2014-09-07 11:11:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/installation-images-openSUSE (Old) and /work/SRC/openSUSE:Factory/.installation-images-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "installation-images-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/installation-images-openSUSE/installation-images-openSUSE.changes 2014-09-03 12:50:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.installation-images-openSUSE.new/installation-images-openSUSE.changes 2014-09-07 11:11:53.000000000 +0200 @@ -1,0 +2,25 @@ +Fri Sep 5 13:02:00 CEST 2014 - coolo(a)suse.de + +- run/lock is missing in more images (bnc #894648) +- optionally include custom gpg keys (bnc #895018) + Take gpg keys from build root to allow having several packages that + supply keys. +- 14.136 + +------------------------------------------------------------------- +Thu Sep 4 10:44:24 CEST 2014 - coolo(a)suse.de + +- increase the memory threshold to load images into RAM (bnc#893982) +- 14.135 + +------------------------------------------------------------------- +Thu Sep 4 10:12:28 CEST 2014 - coolo(a)suse.de + +- create /run/lock ourselves as it's %ghost now (bnc#894648) + +------------------------------------------------------------------- +Tue Sep 2 10:45:23 CEST 2014 - locilka(a)suse.cz + +- Removed "Firmware Test" from menu and firmwarekit package (bnc #894094) + +------------------------------------------------------------------- Old: ---- installation-images-14.134.tar.xz New: ---- installation-images-14.136.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.0poKBk/_old 2014-09-07 11:11:54.000000000 +0200 +++ /var/tmp/diff_new_pack.0poKBk/_new 2014-09-07 11:11:54.000000000 +0200 @@ -39,39 +39,23 @@ %endif %if %theme == SLES +BuildRequires: plymouth-theme-tribar +BuildRequires: sle12-desktop-migration BuildRequires: sles-release BuildRequires: sles-release-MINI -BuildRequires: sle12-desktop-migration -BuildRequires: plymouth-theme-tribar %else BuildRequires: openSUSE-release BuildRequires: openSUSE-release-mini %endif -BuildRequires: gamin-server -BuildRequires: vsftpd -BuildRequires: samba -BuildRequires: nfs-kernel-server -BuildRequires: SuSEfirewall2 -BuildRequires: vlan -BuildRequires: khmeros-fonts -BuildRequires: arabic-kacst-fonts -BuildRequires: thai-fonts -BuildRequires: indic-fonts -BuildRequires: lklug-fonts -BuildRequires: iscsiuio -BuildRequires: gptfdisk -BuildRequires: dracut-fips -BuildRequires: libopenssl1_0_0-hmac -BuildRequires: libcryptsetup4-hmac -BuildRequires: libgcrypt20-hmac -BuildRequires: openssh-fips BuildRequires: Mesa BuildRequires: Mesa-libEGL1 +BuildRequires: SuSEfirewall2 BuildRequires: aaa_base BuildRequires: aaa_base-extras BuildRequires: adaptec-firmware BuildRequires: alsa BuildRequires: alsa-utils +BuildRequires: arabic-kacst-fonts BuildRequires: audit-libs BuildRequires: bc BuildRequires: bind-libs @@ -98,6 +82,7 @@ BuildRequires: dmapi BuildRequires: dmraid BuildRequires: dosfstools +BuildRequires: dracut-fips BuildRequires: dump BuildRequires: e2fsprogs BuildRequires: ed @@ -108,12 +93,14 @@ BuildRequires: fbiterm BuildRequires: finger BuildRequires: fonts-config +BuildRequires: gamin-server BuildRequires: gdb BuildRequires: gettext-runtime-mini BuildRequires: glibc-i18ndata BuildRequires: gpart BuildRequires: gpg2 BuildRequires: gpm +BuildRequires: gptfdisk BuildRequires: graphviz BuildRequires: graphviz-gnome BuildRequires: haveged @@ -122,16 +109,29 @@ BuildRequires: hfsutils BuildRequires: icewm-lite BuildRequires: icmpinfo +BuildRequires: indic-fonts BuildRequires: initviocons BuildRequires: iproute2 BuildRequires: iputils +BuildRequires: iscsiuio BuildRequires: jfsutils BuildRequires: joe BuildRequires: kbd BuildRequires: kernel-default BuildRequires: kernel-firmware +BuildRequires: khmeros-fonts +BuildRequires: libcryptsetup4-hmac +BuildRequires: libgcrypt20-hmac +BuildRequires: libopenssl1_0_0-hmac +BuildRequires: lklug-fonts +BuildRequires: nfs-kernel-server +BuildRequires: openssh-fips BuildRequires: raleway-fonts +BuildRequires: samba BuildRequires: sysvinit-tools +BuildRequires: thai-fonts +BuildRequires: vlan +BuildRequires: vsftpd %ifnarch ppc64le aarch64 BuildRequires: kexec-tools %endif @@ -362,10 +362,10 @@ Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.134 +Version: 14.136 Release: 0 Provides: installation-images = %version-%release -Source: installation-images-14.134.tar.xz +Source: installation-images-14.136.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio ++++++ installation-images-14.134.tar.xz -> installation-images-14.136.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.134/VERSION new/installation-images-14.136/VERSION --- old/installation-images-14.134/VERSION 2014-08-27 15:36:13.000000000 +0200 +++ new/installation-images-14.136/VERSION 2014-09-05 13:01:54.000000000 +0200 @@ -1 +1 @@ -14.134 +14.136 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.134/changelog new/installation-images-14.136/changelog --- old/installation-images-14.134/changelog 2014-08-27 15:36:26.000000000 +0200 +++ new/installation-images-14.136/changelog 2014-09-05 13:01:58.000000000 +0200 @@ -1,4 +1,21 @@ -2014-08-27: HEAD +2014-09-05: HEAD + - run/lock is missing in more images (bnc #894648) + - optionally include custom gpg keys (bnc #895018) + - Take gpg keys from build root to allow having several packages that + - supply keys. + +2014-09-04: 14.135 + - Merge pull request #28 from jsrain/master + - increase the memory threshold to load images into RAM (bnc #893982) + - increase the memory threshold to load images into RAM (bnc #893982) + - Merge pull request #27 from lnussel/master + - create /run/lock ourselves as it's %ghost now + - create /run/lock ourselves as it's %ghost now (bnc #894648) + - Merge pull request #26 from kobliha/no-firmware-test-anymore + - Removed "Firmware Test" from menu and firmwarekit package (bnc #894094) + - Removed "Firmware Test" from menu and firmwarekit package (bnc #894094) + +2014-08-27: 14.134 - really use nfs-kernel-server 2014-08-27: 14.133 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.134/data/base/base.file_list new/installation-images-14.136/data/base/base.file_list --- old/installation-images-14.134/data/base/base.file_list 2014-07-18 14:23:15.000000000 +0200 +++ new/installation-images-14.136/data/base/base.file_list 2014-09-05 13:01:32.000000000 +0200 @@ -1,5 +1,6 @@ # some basic directories d bin dev etc lib mnt proc sbin tmp var +d run/lock c 1777 0 0 tmp # some basic devices diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.134/data/boot/message new/installation-images-14.136/data/boot/message --- old/installation-images-14.134/data/boot/message 2013-11-18 11:49:20.000000000 +0100 +++ new/installation-images-14.136/data/boot/message 2014-09-02 10:11:07.000000000 +0200 @@ -13,7 +13,6 @@ linux - Installation rescue - Rescue System mediachk - Check Installation Media - firmware - Firmware Test memtest - Memory Test Have a lot of fun... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.134/data/boot/syslinux.cfg new/installation-images-14.136/data/boot/syslinux.cfg --- old/installation-images-14.134/data/boot/syslinux.cfg 2014-08-27 14:13:53.000000000 +0200 +++ new/installation-images-14.136/data/boot/syslinux.cfg 2014-09-02 10:11:07.000000000 +0200 @@ -24,11 +24,6 @@ kernel linux append initrd=initrd splash=silent mediacheck=1 showopts -# bios test -label firmware - kernel linux - append initrd=biostest,initrd splash=silent install=exec:/bin/run_biostest showopts - # memory test label memtest kernel memtest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.134/data/initrd/initrd.file_list new/installation-images-14.136/data/initrd/initrd.file_list --- old/installation-images-14.134/data/initrd/initrd.file_list 2014-08-18 11:27:59.000000000 +0200 +++ new/installation-images-14.136/data/initrd/initrd.file_list 2014-09-05 13:01:32.000000000 +0200 @@ -285,14 +285,6 @@ ?libgcrypt20-hmac: -if exists(openSUSE-build-key) - openSUSE-build-key: - /usr/lib/rpm/gnupg/keys -elsif exists(suse-build-key) - suse-build-key: - /usr/lib/rpm/gnupg/keys -endif - ntfs-3g: / s mount.ntfs-3g /sbin/mount.ntfs @@ -617,3 +609,6 @@ e ldconfig -r . +# get the gpg keys to trust from build root +d /usr/lib/rpm/gnupg/keys +X /usr/lib/rpm/gnupg/keys /usr/lib/rpm/gnupg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.134/data/rescue/rescue.file_list new/installation-images-14.136/data/rescue/rescue.file_list --- old/installation-images-14.134/data/rescue/rescue.file_list 2014-08-12 16:25:52.000000000 +0200 +++ new/installation-images-14.136/data/rescue/rescue.file_list 2014-09-05 13:01:32.000000000 +0200 @@ -1,4 +1,5 @@ d run var +d run/lock s ../run var d bin dev etc home lib mnt proc sys sbin tmp root d media/{cdrom,floppy} @@ -53,7 +54,6 @@ ?acpica: ?efibootmgr: ?elilo: -?firmwarekit: ?grub2-i386-pc: ?grub2-x86_64-efi: ?grub2-powerpc-ieee1275: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.134/data/root/zenroot.file_list new/installation-images-14.136/data/root/zenroot.file_list --- old/installation-images-14.134/data/root/zenroot.file_list 2014-04-03 11:16:38.000000000 +0200 +++ new/installation-images-14.136/data/root/zenroot.file_list 2014-09-04 10:11:18.000000000 +0200 @@ -264,6 +264,7 @@ #d /var/X11R6/{bin,xkb/compiled,app-defaults} d /var/lib/xkb +d /run/lock s ../lock /var/spool/locks t /var/log/{faillog,lastlog,mail,messages,sendmail.st,wtmp,xdm.errors} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.134/etc/config new/installation-images-14.136/etc/config --- old/installation-images-14.134/etc/config 2014-03-18 09:04:29.000000000 +0100 +++ new/installation-images-14.136/etc/config 2014-09-05 07:13:48.000000000 +0200 @@ -85,7 +85,7 @@ version = 13.2 sle = 12 update = /linux/suse/<arch>-<sles> -image = 200 +image = 600 [Theme SLED] @@ -96,7 +96,7 @@ version = 13.2 sle = 12 update = /linux/suse/<arch>-<sled> -image = 200 +image = 600 [Theme Zen] @@ -107,6 +107,6 @@ version = 13.2 sle = 12 update = /linux/suse/<arch>-<sles> -image = 200 +image = 600 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit filesystem for openSUSE:Factory
by root＠hilbert.suse.de 07 Sep '14

07 Sep '14

Hello community, here is the log from the commit of package filesystem for openSUSE:Factory checked in at 2014-09-07 11:11:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/filesystem (Old) and /work/SRC/openSUSE:Factory/.filesystem.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "filesystem" Changes: -------- --- /work/SRC/openSUSE:Factory/filesystem/filesystem.changes 2014-04-28 09:05:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.filesystem.new/filesystem.changes 2014-09-07 11:11:51.000000000 +0200 @@ -1,0 +2,61 @@ +Wed Sep 3 16:04:23 CEST 2014 - ro(a)suse.de + +- drop /media directory (bnc#890198) + +------------------------------------------------------------------- +Fri Aug 29 07:10:41 UTC 2014 - lnussel(a)suse.de + +- make /run/lock %ghost to fix build failure + +------------------------------------------------------------------- +Wed Apr 23 18:44:15 CEST 2014 - ro(a)suse.de + +- make /var/run and /var/lock just ghost entries and create them + if they do not exist at all and rely on dracut hooks to + actually replace directories with symlinks there (bnc#874748) + +------------------------------------------------------------------- +Tue Apr 22 00:17:18 CEST 2014 - ro(a)suse.de + +- add vscan user to ignore home list + +------------------------------------------------------------------- +Fri Apr 11 14:02:07 CEST 2014 - ro(a)suse.de + +- change /sys to mode 0555 (bnc#871640) + +------------------------------------------------------------------- +Wed Mar 12 10:19:17 CET 2014 - ro(a)suse.de + +- make /var/lock a symlink to /run/lock (bnc#867873) + +------------------------------------------------------------------- +Fri Mar 7 11:11:05 CET 2014 - ro(a)suse.de + +- use lazy umount + +------------------------------------------------------------------- +Thu Mar 6 01:03:53 CET 2014 - ro(a)suse.de + +- use os.execute("umount ...") instead of posix.umount("...") + bnc#866964 + +------------------------------------------------------------------- +Mon Mar 3 11:48:31 CET 2014 - ro(a)suse.de + +- change pre to pretrans for directory/symlink conversion + +------------------------------------------------------------------- +Fri Feb 28 13:56:47 CET 2014 - ro(a)suse.de + +- drop /var/lib/pam_devperm (bnc#866234) + +------------------------------------------------------------------- +Thu Feb 27 18:48:24 CET 2014 - ro(a)suse.de + +- replace /var/run by symlink to /run +- try to handle case where /var/run is a bind-mount +- extend lua script in preinstall to handle this transition +- bnc#865893 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ filesystem.spec ++++++ --- /var/tmp/diff_new_pack.MeEUXZ/_old 2014-09-07 11:11:52.000000000 +0200 +++ /var/tmp/diff_new_pack.MeEUXZ/_new 2014-09-07 11:11:52.000000000 +0200 @@ -23,9 +23,10 @@ Version: %(echo %suse_version | cut -b-2).%(echo %suse_version | cut -b3) Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Obsoletes: aaa_dir -Provides: aaa_dir -Source: directory.list +Obsoletes: aaa_dir < %version-%release +Provides: aaa_dir = %version-%release +Url: https://build.opensuse.org/package/show/openSUSE:Factory/filesystem +Source0: directory.list Source1: filesystem.links Source2: languages Source3: ghost.list @@ -40,6 +41,8 @@ %prep %setup -c -n filesystem -T +%build + %install function create_dir () { local MODE=$1 @@ -125,7 +128,10 @@ ;; esac ln -sf $SRC $RPM_BUILD_ROOT$DEST - echo "$DEST" >> filesystem.list + case $DEST in + /var/run|/var/lock) echo "%ghost $DEST" >> filesystem.list ;; + *) echo "$DEST" >> filesystem.list ;; + esac ;; esac done < %{SOURCE1} @@ -152,6 +158,7 @@ while read LOGIN PASSWD UID_T GID_T NAME HOME_DIR SHELL_T ; do test "$LOGIN" = "abuild" && continue test "$LOGIN" = "icecream" && continue + test "$LOGIN" = "vscan" && continue test -n "$HOME_DIR" || continue test "$UID_T" -gt 100 && continue test -d $RPM_BUILD_ROOT/$HOME_DIR && continue @@ -189,9 +196,15 @@ exit 1 } -%pre -p <lua> +%pretrans -p <lua> os.remove ("/usr/include/X11") os.remove ("/usr/lib/X11") +if not posix.stat("/var/run") then + posix.symlink("/run","/var/run") +end +if not posix.stat("/var/lock") then + posix.symlink("/run/lock","/var/lock") +end %files -f filesystem.list ++++++ directory.list ++++++ --- /var/tmp/diff_new_pack.MeEUXZ/_old 2014-09-07 11:11:52.000000000 +0200 +++ /var/tmp/diff_new_pack.MeEUXZ/_new 2014-09-07 11:11:52.000000000 +0200 @@ -60,7 +60,6 @@ 0755 root root /lib/lsb 0755 root root /lib/modules 0755 root root /lib/firmware -0755 root root /media 0755 root root /mnt 0755 root root /opt 0555 root root /proc @@ -74,7 +73,7 @@ 0755 root root /srv/www 0755 root root /srv/www/cgi-bin 0755 root root /srv/www/htdocs -0755 root root /sys +0555 root root /sys 1777 root root /tmp 0755 root root /usr 0755 root root /usr/bin @@ -170,10 +169,7 @@ 0755 root root /var/games 0755 root root /var/lib/misc 0755 nobody root /var/lib/nobody -0700 root root /var/lib/pam_devperm 0755 wwwrun root /var/lib/wwwrun -1775 root lock /var/lock -0755 root root /var/run 0755 root root /var/spool 0755 lp lp /var/spool/lpd 0770 mail mail /var/spool/clientmqueue ++++++ filesystem.links ++++++ --- /var/tmp/diff_new_pack.MeEUXZ/_old 2014-09-07 11:11:52.000000000 +0200 +++ /var/tmp/diff_new_pack.MeEUXZ/_new 2014-09-07 11:11:52.000000000 +0200 @@ -1,7 +1,12 @@ # links to be created init.d /etc/rc.d ../var/tmp /usr/tmp -../lock /var/spool/locks # Required for FHS 2.1 spool/mail /var/mail +# systemd +../run /var/run +../run/lock /var/lock +# modify +../../run/lock /var/spool/locks + ++++++ ghost.list ++++++ --- /var/tmp/diff_new_pack.MeEUXZ/_old 2014-09-07 11:11:52.000000000 +0200 +++ /var/tmp/diff_new_pack.MeEUXZ/_new 2014-09-07 11:11:52.000000000 +0200 @@ -1,2 +1,3 @@ 1777 root root /tmp/.X11-unix 1777 root root /tmp/.ICE-unix +0775 root lock /run/lock -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit util-linux for openSUSE:Factory
by root＠hilbert.suse.de 07 Sep '14

07 Sep '14

Hello community, here is the log from the commit of package util-linux for openSUSE:Factory checked in at 2014-09-07 11:11:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/util-linux (Old) and /work/SRC/openSUSE:Factory/.util-linux.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "util-linux" Changes: -------- --- /work/SRC/openSUSE:Factory/util-linux/python-libmount.changes 2014-08-29 17:42:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.util-linux.new/python-libmount.changes 2014-09-07 11:11:47.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Sep 3 16:21:57 CEST 2014 - sbrabec(a)suse.cz + +- Update to version 2.25.1: + * bug fixes (removed util-linux-bash-completion-blockdev.patch, + util-linux-slash-in-format-string.patch) + * translation updates + * correct support for plurals + * gpt: use real sector size to set PTMAGIC_OFFSET + * gpt: add Microsoft Storage Spaces GUID + * libmount: use -t for type.subtype in helpers API + * erase all traces of the long-obsolete xiafs + +------------------------------------------------------------------- util-linux-systemd.changes: same change util-linux.changes: same change Old: ---- util-linux-2.25.tar.sign util-linux-2.25.tar.xz util-linux-bash-completion-blockdev.patch util-linux-slash-in-format-string.patch New: ---- util-linux-2.25.1.tar.sign util-linux-2.25.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-libmount.spec ++++++ --- /var/tmp/diff_new_pack.Q6gLZN/_old 2014-09-07 11:11:49.000000000 +0200 +++ /var/tmp/diff_new_pack.Q6gLZN/_new 2014-09-07 11:11:49.000000000 +0200 @@ -23,7 +23,7 @@ Name: python-libmount %define _name util-linux -# WARNING: After editing this file please call pre_checkin.sh to update spec files: +# WARNING: Never edit this file!!! Edit util-linux.spec and call pre_checkin.sh to update spec files: %define _name util-linux # To prevent dependency loop in automatic build systems, we want to # build util-linux in parts. To build all at once, set build_all to 1. @@ -76,7 +76,7 @@ %endif Summary: %main_summary License: GPL-2.0+ -Group: %group_pl +Group: %main_group BuildRequires: audit-devel BuildRequires: bc BuildRequires: binutils-devel @@ -120,7 +120,7 @@ %endif %endif #END SECOND STAGE DEPENDENCIES -Version: 2.25 +Version: 2.25.1 Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -160,9 +160,6 @@ Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff # PATCH-FEATURE-SUSE -- Report about disabled encryption to stderr. Patch12: util-linux-noenc-suse.patch -# PATCH-FIX-UPSTREAM util-linux-bash-completion-blockdev.patch sbrabec(a)suse.cz -- Fix bash-completion installation. -Patch13: util-linux-bash-completion-blockdev.patch -Patch14: util-linux-slash-in-format-string.patch ## ## klogconsole ## @@ -386,8 +383,6 @@ %setup -q -n %{_name}-%{version} -b 40 %patch4 -p1 %patch12 -p1 -%patch13 -p1 -%patch14 -p1 # # setctsid cp -p %{S:22} %{S:23} . @@ -610,7 +605,7 @@ %endif # FIXME: These sometimes fails: export TS_OPT_libmount_lock_known_fail="yes" -# integer overflow (https://github.com/karelzak/util-linux/commit/3a9ec12d6664527fad9c56347c88f…) +# FIXME: It still fails with 3a9ec12: export TS_OPT_ipcs_limits2_known_fail="yes" # # hacks ++++++ util-linux-systemd.spec ++++++ --- /var/tmp/diff_new_pack.Q6gLZN/_old 2014-09-07 11:11:49.000000000 +0200 +++ /var/tmp/diff_new_pack.Q6gLZN/_new 2014-09-07 11:11:49.000000000 +0200 @@ -23,7 +23,7 @@ Name: util-linux-systemd %define _name util-linux -# WARNING: After editing this file please call pre_checkin.sh to update spec files: +# WARNING: Never edit this file!!! Edit util-linux.spec and call pre_checkin.sh to update spec files: %define _name util-linux # To prevent dependency loop in automatic build systems, we want to # build util-linux in parts. To build all at once, set build_all to 1. @@ -120,7 +120,7 @@ %endif %endif #END SECOND STAGE DEPENDENCIES -Version: 2.25 +Version: 2.25.1 Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -160,9 +160,6 @@ Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff # PATCH-FEATURE-SUSE -- Report about disabled encryption to stderr. Patch12: util-linux-noenc-suse.patch -# PATCH-FIX-UPSTREAM util-linux-bash-completion-blockdev.patch sbrabec(a)suse.cz -- Fix bash-completion installation. -Patch13: util-linux-bash-completion-blockdev.patch -Patch14: util-linux-slash-in-format-string.patch ## ## klogconsole ## @@ -386,8 +383,6 @@ %setup -q -n %{_name}-%{version} -b 40 %patch4 -p1 %patch12 -p1 -%patch13 -p1 -%patch14 -p1 # # setctsid cp -p %{S:22} %{S:23} . @@ -610,7 +605,7 @@ %endif # FIXME: These sometimes fails: export TS_OPT_libmount_lock_known_fail="yes" -# integer overflow (https://github.com/karelzak/util-linux/commit/3a9ec12d6664527fad9c56347c88f…) +# FIXME: It still fails with 3a9ec12: export TS_OPT_ipcs_limits2_known_fail="yes" # # hacks ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.Q6gLZN/_old 2014-09-07 11:11:49.000000000 +0200 +++ /var/tmp/diff_new_pack.Q6gLZN/_new 2014-09-07 11:11:49.000000000 +0200 @@ -120,7 +120,7 @@ %endif %endif #END SECOND STAGE DEPENDENCIES -Version: 2.25 +Version: 2.25.1 Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -160,9 +160,6 @@ Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff # PATCH-FEATURE-SUSE -- Report about disabled encryption to stderr. Patch12: util-linux-noenc-suse.patch -# PATCH-FIX-UPSTREAM util-linux-bash-completion-blockdev.patch sbrabec(a)suse.cz -- Fix bash-completion installation. -Patch13: util-linux-bash-completion-blockdev.patch -Patch14: util-linux-slash-in-format-string.patch ## ## klogconsole ## @@ -386,8 +383,6 @@ %setup -q -n %{_name}-%{version} -b 40 %patch4 -p1 %patch12 -p1 -%patch13 -p1 -%patch14 -p1 # # setctsid cp -p %{S:22} %{S:23} . @@ -610,7 +605,7 @@ %endif # FIXME: These sometimes fails: export TS_OPT_libmount_lock_known_fail="yes" -# integer overflow (https://github.com/karelzak/util-linux/commit/3a9ec12d6664527fad9c56347c88f…) +# FIXME: It still fails with 3a9ec12: export TS_OPT_ipcs_limits2_known_fail="yes" # # hacks ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.Q6gLZN/_old 2014-09-07 11:11:49.000000000 +0200 +++ /var/tmp/diff_new_pack.Q6gLZN/_new 2014-09-07 11:11:49.000000000 +0200 @@ -21,11 +21,13 @@ sed ' s/spec file for package util-linux/spec file for package python-libmount/; /^Name:/s/util-linux/python-libmount/; + s/WARNING: After editing this file please/WARNING: Never edit this file!!! Edit util-linux.spec and/ ' <util-linux.spec >python-libmount.spec sed ' s/spec file for package util-linux/spec file for package util-linux-systemd/; /^Name:/s/util-linux/util-linux-systemd/; + s/WARNING: After editing this file please/WARNING: Never edit this file!!! Edit util-linux.spec and/ ' <util-linux.spec >util-linux-systemd.spec cp -a util-linux.changes python-libmount.changes ++++++ util-linux-2.25.tar.xz -> util-linux-2.25.1.tar.xz ++++++ ++++ 114842 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 translation-update-upstream for openSUSE:Factory
by root＠hilbert.suse.de 07 Sep '14

07 Sep '14

Hello community, here is the log from the commit of package translation-update-upstream for openSUSE:Factory checked in at 2014-09-07 11:11:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/translation-update-upstream (Old) and /work/SRC/openSUSE:Factory/.translation-update-upstream.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "translation-update-upstream" Changes: -------- --- /work/SRC/openSUSE:Factory/translation-update-upstream/translation-update-upstream.changes 2014-05-22 20:37:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.translation-update-upstream.new/translation-update-upstream.changes 2014-09-07 11:11:45.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Sep 4 17:32:24 CEST 2014 - sbrabec(a)suse.cz + +- upstream-collect.sh supplementary script: Fixed inverted po file + age check (bnc#889513). +- create-tlst-step2-create-gnome_gtp.sh: Add support for udisks. +- Reset translation tarballs: use only packaged translations. + +------------------------------------------------------------------- Old: ---- translation-update-mandatory-20130214.tar.bz2 translation-update-upstream-20130214.tar.bz2 New: ---- translation-update-mandatory-20140905.tar.bz2 translation-update-upstream-20140905.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ translation-update-upstream.spec ++++++ --- /var/tmp/diff_new_pack.dEWDoJ/_old 2014-09-07 11:11:47.000000000 +0200 +++ /var/tmp/diff_new_pack.dEWDoJ/_new 2014-09-07 11:11:47.000000000 +0200 @@ -17,7 +17,7 @@ Name: translation-update-upstream -Version: 20130214 +Version: 20140905 Release: 0 Summary: Tool for Translation Update from Upstream License: GPL-2.0+ @@ -122,8 +122,8 @@ # short form of these locales should be used rm -fv $RPM_BUILD_ROOT%{_datadir}/%{name}/po/*/my_MM.po # these are nonsenses -rm -v $RPM_BUILD_ROOT%{_datadir}/%{name}/po/glib-networking/master.po -rm -v $RPM_BUILD_ROOT%{_datadir}/%{name}/po/glib20/glib.glib-2-30.gu.po +#rm -v $RPM_BUILD_ROOT%{_datadir}/%{name}/po/glib-networking/master.po +#rm -v $RPM_BUILD_ROOT%{_datadir}/%{name}/po/glib20/glib.glib-2-30.gu.po # # go through valid locales and fail in invalid ones # ++++++ create-tlst-step2-create-gnome_gtp.sh ++++++ --- /var/tmp/diff_new_pack.dEWDoJ/_old 2014-09-07 11:11:47.000000000 +0200 +++ /var/tmp/diff_new_pack.dEWDoJ/_new 2014-09-07 11:11:47.000000000 +0200 @@ -61,6 +61,7 @@ echo gnome-phone-manager phonemgr gnome-phone-manager gnome-3-10 echo gnome-phone-manager phonemgr gnome-phone-manager master echo network-manager-applet NetworkManager-gnome nm-applet master + echo udisks udisks2 udisks2 master # For other versions than sles10: # echo network-manager-applet NetworkManager nm-applet ) | ++++++ translation-update-mandatory-20130214.tar.bz2 -> translation-update-mandatory-20140905.tar.bz2 ++++++ ++++++ translation-update-upstream-20130214.tar.bz2 -> translation-update-upstream-20140905.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/translation-update-upstream/translation-update-upstream-20130214.tar.bz2 /work/SRC/openSUSE:Factory/.translation-update-upstream.new/translation-update-upstream-20140905.tar.bz2 differ: char 11, line 1 ++++++ upstream-collect.sh ++++++ --- /var/tmp/diff_new_pack.dEWDoJ/_old 2014-09-07 11:11:47.000000000 +0200 +++ /var/tmp/diff_new_pack.dEWDoJ/_new 2014-09-07 11:11:47.000000000 +0200 @@ -149,6 +149,7 @@ export PATH=~/.upstream-collect.tmp:$PATH +# FIXME: Even in incremental mode, we should drop all updates that generate empty update file after the run. These files are obsolete, included into package, and may even degrade translation quality. if $INCREMENTAL ; then # more tarballs are available => use the latest one # FIXME: Fix 20090213.10 < 20090213.9 @@ -559,10 +560,11 @@ OLD_UPDATE=false PLURAL_FAILURE=false if test -f $WORK_DIR/UPDATE/po/$REAL_DOMAIN/$PO ; then - if $WORK_DIR/msgheadermerge $WORK_DIR/UPDATE/po/$REAL_DOMAIN/$PO $PO ${PO%.po}-uheader.po --mergemode --continue ; then + if ! $WORK_DIR/msgheadermerge $WORK_DIR/UPDATE/po/$REAL_DOMAIN/$PO $PO ${PO%.po}-uheader.po --mergemode --continue ; then echo >>$WORK_DIR/upstream-collect.log "package=$PACKAGE domain=$DOMAIN gettext-package=$REAL_DOMAIN repository=$REPO directory=$RPMPODIR branch=${BRANCH:(default)} po=$PO: old po file, skipping fixes" OLD_UPDATE=true fi + # FIXME: There could be an exotic case, where obsolete update adds new strings that contain plurals, and plural number changed. In such case, exclusion of updates may cause plural clash. In such case we have to validate additions only with the new or old plural-form header, and if both fails, skip additions as well. (bnc#894913) msgcat --force-po --use-first ${PO%.po}-uheader.po ${PO%.po}-backport.po~ $WORK_DIR/UPDATE/po/$REAL_DOMAIN/$PO -o ${PO%.po}-upstream.po if ! validate_po_with_plural_check ${PO%.po}-upstream.po ; then if $PLURAL_FAILURE ; 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 make for openSUSE:Factory
by root＠hilbert.suse.de 07 Sep '14

07 Sep '14

Hello community, here is the log from the commit of package make for openSUSE:Factory checked in at 2014-09-07 11:11:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/make (Old) and /work/SRC/openSUSE:Factory/.make.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "make" Changes: -------- --- /work/SRC/openSUSE:Factory/make/make.changes 2014-01-23 15:49:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.make.new/make.changes 2014-09-07 11:11:44.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Mar 11 14:10:15 CET 2014 - draht(a)suse.de + +- make-testcases_timeout.diff: increase the timeout of test cases + from 5 to 8 seconds. With some testcases using sleep with 2 + seconds or more, the tests can fail erroneously on a busy build + system. + +------------------------------------------------------------------- New: ---- make-testcases_timeout.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ make.spec ++++++ --- /var/tmp/diff_new_pack.XgY6HQ/_old 2014-09-07 11:11:45.000000000 +0200 +++ /var/tmp/diff_new_pack.XgY6HQ/_new 2014-09-07 11:11:45.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package make # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -29,6 +29,7 @@ Source1: http://ftp.gnu.org/gnu/make/make-%version.tar.bz2.sig # keyring downloaded from http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=make Source2: %name.keyring +Patch1: make-testcases_timeout.diff Patch64: make-library-search-path.diff #BuildRequires: gpg-offline BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -38,6 +39,7 @@ %prep %setup -q +%patch1 -p0 if [ %_lib == lib64 ]; then %patch64 fi ++++++ make-testcases_timeout.diff ++++++ diff -rNU 20 ../make-4.0-o/tests/test_driver.pl ./tests/test_driver.pl --- ../make-4.0-o/tests/test_driver.pl 2013-10-09 08:05:39.000000000 +0200 +++ ./tests/test_driver.pl 2014-03-11 14:08:15.000000000 +0100 @@ -33,41 +33,41 @@ # The number of test categories we've run $categories_run = 0; # The number of test categroies that have passed $categories_passed = 0; # The total number of individual tests that have been run $total_tests_run = 0; # The total number of individual tests that have passed $total_tests_passed = 0; # The number of tests in this category that have been run $tests_run = 0; # The number of tests in this category that have passed $tests_passed = 0; # Yeesh. This whole test environment is such a hack! $test_passed = 1; # Timeout in seconds. If the test takes longer than this we'll fail it. -$test_timeout = 5; +$test_timeout = 8; # Path to Perl $perl_name = $^X; # %makeENV is the cleaned-out environment. %makeENV = (); # %extraENV are any extra environment variables the tests might want to set. # These are RESET AFTER EVERY TEST! %extraENV = (); # %origENV is the caller's original environment %origENV = %ENV; sub resetENV { # We used to say "%ENV = ();" but this doesn't work in Perl 5.000 # through Perl 5.004. It was fixed in Perl 5.004_01, but we don't # want to require that here, so just delete each one individually. foreach $v (keys %ENV) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit timezone for openSUSE:Factory
by root＠hilbert.suse.de 07 Sep '14

07 Sep '14

Hello community, here is the log from the commit of package timezone for openSUSE:Factory checked in at 2014-09-07 11:11:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/timezone (Old) and /work/SRC/openSUSE:Factory/.timezone.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "timezone" Changes: -------- --- /work/SRC/openSUSE:Factory/timezone/timezone-java.changes 2014-06-19 13:20:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.timezone.new/timezone-java.changes 2014-09-07 11:11:41.000000000 +0200 @@ -1,0 +2,27 @@ +Wed Sep 3 13:03:39 UTC 2014 - lchiquitto(a)suse.com + +- update to 2014g (bnc#894862): + * Turks & Caicos are switching from US eastern time to UTC-4 + year-round, modeled as a switch from EST/EDT to AST on + 2014-11-02 at 02:00. + * Many past time stamps were changed for correctness. + * Many performance enhancements and fixes in the time zone + manipulation utilities. +- iso3166-uk.diff, tzcode-fromname.patch, tzcode-zic.diff, + tzdata-china.diff: refresh. +- tzcode-symlink.patch: rebase. + +------------------------------------------------------------------- +Wed Sep 3 12:43:19 UTC 2014 - lchiquitto(a)suse.com + +- update to 2014f (bnc#890921, bnc#892843): + * Russia will subtract an hour from most of its time zones on + 2014-10-26 at 02:00 local time. + * Many time zone abbreviations were adjusted or fixed. + * Many past time stamps were changed for correctness. + * A new file 'zone1970.tab' was added. The new file's extended + format allows multiple country codes per zone. New applications + should use the new file. + * Some fixes in 'localtime', 'zic', 'mktime' and 'yearistype'. + +------------------------------------------------------------------- timezone.changes: same change Old: ---- tzcode2014e.tar.gz tzdata2014e.tar.gz New: ---- tzcode2014g.tar.gz tzdata2014g.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ timezone-java.spec ++++++ --- /var/tmp/diff_new_pack.jP2eox/_old 2014-09-07 11:11:43.000000000 +0200 +++ /var/tmp/diff_new_pack.jP2eox/_new 2014-09-07 11:11:43.000000000 +0200 @@ -25,7 +25,7 @@ Group: System/Base # COMMON-BEGIN # COMMON-BEGIN -Version: 2014e +Version: 2014g Release: 0 Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz Source1: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz ++++++ timezone.spec ++++++ --- /var/tmp/diff_new_pack.jP2eox/_old 2014-09-07 11:11:43.000000000 +0200 +++ /var/tmp/diff_new_pack.jP2eox/_new 2014-09-07 11:11:43.000000000 +0200 @@ -23,7 +23,7 @@ Url: http://www.iana.org/time-zones PreReq: filesystem, coreutils # COMMON-BEGIN -Version: 2014e +Version: 2014g Release: 0 Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz Source1: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz @@ -88,6 +88,7 @@ ln -sf /etc/localtime %{buildroot}%{_prefix}/share/zoneinfo/posixrules install -m 644 iso3166.tab %{buildroot}%{_prefix}/share/zoneinfo/iso3166.tab install -m 644 zone.tab %{buildroot}%{_prefix}/share/zoneinfo/zone.tab +install -m 644 zone1970.tab %{buildroot}%{_prefix}/share/zoneinfo/zone1970.tab install -D -m 755 tzselect %{buildroot}%{_bindir}/tzselect install -D -m 755 zdump %{buildroot}%{_sbindir}/zdump install -D -m 755 zic %{buildroot}%{_sbindir}/zic ++++++ iso3166-uk.diff ++++++ --- /var/tmp/diff_new_pack.jP2eox/_old 2014-09-07 11:11:44.000000000 +0200 +++ /var/tmp/diff_new_pack.jP2eox/_new 2014-09-07 11:11:44.000000000 +0200 @@ -1,5 +1,7 @@ ---- timezone-2013g.orig/iso3166.tab -+++ timezone-2013g/iso3166.tab +Index: timezone-2014g/iso3166.tab +=================================================================== +--- timezone-2014g.orig/iso3166.tab ++++ timezone-2014g/iso3166.tab @@ -100,7 +100,7 @@ FM Micronesia FO Faroe Islands FR France ++++++ tzcode-fromname.patch ++++++ --- /var/tmp/diff_new_pack.jP2eox/_old 2014-09-07 11:11:44.000000000 +0200 +++ /var/tmp/diff_new_pack.jP2eox/_new 2014-09-07 11:11:44.000000000 +0200 @@ -1,8 +1,8 @@ -Index: timezone-2014b/zic.c +Index: timezone-2014g/zic.c =================================================================== ---- timezone-2014b.orig/zic.c -+++ timezone-2014b/zic.c -@@ -656,17 +656,17 @@ dolink(const char *const fromfield, cons +--- timezone-2014g.orig/zic.c ++++ timezone-2014g/zic.c +@@ -729,17 +729,17 @@ dolink(const char *const fromfield, cons result = link(fromname, toname); if (result != 0) { ++++++ tzcode-link.diff ++++++ --- /var/tmp/diff_new_pack.jP2eox/_old 2014-09-07 11:11:44.000000000 +0200 +++ /var/tmp/diff_new_pack.jP2eox/_new 2014-09-07 11:11:44.000000000 +0200 @@ -1,9 +1,26 @@ -Index: timezone-2013g/zic.c +This patch is used on openSUSE versions older than 12.2. +Back then, /etc/localtime was either a hard link to a zone +file in /usr/share/zoneinfo or a copy of it. + +By default, zic tries the following approaches to create +/etc/localtime: + + 1. Hard link + 2. Symbolic link + 3. File copy + +This patch changes the order to: + + 1. Hard link + 2. File copy + 3. Symbolic link + +Index: timezone-2014g/zic.c =================================================================== ---- timezone-2013g.orig/zic.c -+++ timezone-2013g/zic.c -@@ -593,6 +593,23 @@ _("%s: More than one -L option specified - return (errors == 0) ? EXIT_SUCCESS : EXIT_FAILURE; +--- timezone-2014g.orig/zic.c ++++ timezone-2014g/zic.c +@@ -686,6 +686,23 @@ namecheck(const char *name) + componentcheck(name, component, cp); } +static int @@ -26,7 +43,7 @@ static void dolink(const char *const fromfield, const char *const tofield) { -@@ -627,6 +644,8 @@ dolink(const char *const fromfield, cons +@@ -728,6 +745,8 @@ dolink(const char *const fromfield, cons exit(EXIT_FAILURE); result = link(fromname, toname); ++++++ tzcode-symlink.patch ++++++ --- /var/tmp/diff_new_pack.jP2eox/_old 2014-09-07 11:11:44.000000000 +0200 +++ /var/tmp/diff_new_pack.jP2eox/_new 2014-09-07 11:11:44.000000000 +0200 @@ -1,38 +1,55 @@ -Index: timezone-2014b/zic.c +This patch is used on openSUSE 12.2 or newer. Nowadays, +/etc/localtime is by default a symbolic link to a zone +file in /usr/share/zoneinfo. + +By default, zic tries the following approaches to create +/etc/localtime: + + 1. Hard link + 2. Symbolic link + 3. File copy + +This patch changes the logic slightly: keep using symbolic +links if /etc/localtime is already one. If it isn't, use +the default order as listed above. + +Index: timezone-2014g/zic.c =================================================================== ---- timezone-2014b.orig/zic.c -+++ timezone-2014b/zic.c -@@ -120,7 +120,7 @@ static int addtype(zic_t gmtoff, const c - static void leapadd(zic_t t, int positive, int rolling, int count); +--- timezone-2014g.orig/zic.c ++++ timezone-2014g/zic.c +@@ -106,7 +106,7 @@ static int addtype(zic_t, char const *, + static void leapadd(zic_t, bool, int, int); static void adjleap(void); static void associate(void); -static void dolink(const char * fromfield, const char * tofield); +static void dolink(const char * fromfield, const char * tofield, int defaultsymlink); static char ** getfields(char * buf); - static zic_t gethms(const char * string, const char * errstrng, - int signable); -@@ -603,7 +603,7 @@ _("%s: More than one -L option specified + static zic_t gethms(const char * string, const char * errstring, + bool); +@@ -608,7 +608,7 @@ _("%s: More than one -L option specified */ for (i = 0; i < nlinks; ++i) { eat(links[i].l_filename, links[i].l_linenum); - dolink(links[i].l_from, links[i].l_to); -+ dolink(links[i].l_from, links[i].l_to, FALSE); ++ dolink(links[i].l_from, links[i].l_to, false); if (noise) for (j = 0; j < nlinks; ++j) if (strcmp(links[i].l_to, -@@ -612,18 +612,19 @@ _("%s: More than one -L option specified +@@ -617,11 +617,11 @@ _("%s: More than one -L option specified } if (lcltime != NULL) { - eat("command line", 1); + eat(_("command line"), 1); - dolink(lcltime, TZDEFAULT); -+ dolink(lcltime, TZDEFAULT, TRUE); ++ dolink(lcltime, TZDEFAULT, true); } if (psxrules != NULL) { - eat("command line", 1); + eat(_("command line"), 1); - dolink(psxrules, TZDEFRULES); -+ dolink(psxrules, TZDEFRULES, FALSE); ++ dolink(psxrules, TZDEFRULES, false); } - return (errors == 0) ? EXIT_SUCCESS : EXIT_FAILURE; + if (warnings && (ferror(stderr) || fclose(stderr) != 0)) + return EXIT_FAILURE; +@@ -687,8 +687,9 @@ namecheck(const char *name) } static void @@ -42,34 +59,33 @@ + struct stat st; register char * fromname; register char * toname; - -@@ -634,6 +635,10 @@ dolink(const char *const fromfield, cons + register int fromisdir; +@@ -701,6 +702,10 @@ dolink(const char *const fromfield, cons fromname = ecatalloc(fromname, "/"); fromname = ecatalloc(fromname, fromfield); } + + if (lstat(fromname, &st) == 0 && S_ISLNK(st.st_mode)) -+ defaultsymlink = TRUE; ++ defaultsymlink = true; + if (tofield[0] == '/') toname = ecpyalloc(tofield); else { -@@ -647,15 +652,16 @@ dolink(const char *const fromfield, cons - */ - if (!itsdir(toname)) - (void) remove(toname); -- if (link(fromname, toname) != 0 -+ if (defaultsymlink || link(fromname, toname) != 0 - && access(fromname, F_OK) == 0 && !itsdir(fromname)) { +@@ -721,14 +726,15 @@ dolink(const char *const fromfield, cons + } + if (itsdir(toname) <= 0) + remove(toname); +- if (link(fromname, toname) != 0) { ++ if (defaultsymlink || link(fromname, toname) != 0) { int result; - if (mkdirs(toname) != 0) + if (! mkdirs(toname)) exit(EXIT_FAILURE); - result = link(fromname, toname); - if (result != 0) { -+ if (!defaultsymlink) result = link(fromname, toname); -+ ++ if (!defaultsymlink) ++ result = link(fromname, toname); + if ((defaultsymlink || (!defaultsymlink && result != 0))) { const char *s = fromname; const char *t; ++++++ tzcode-zic.diff ++++++ --- /var/tmp/diff_new_pack.jP2eox/_old 2014-09-07 11:11:44.000000000 +0200 +++ /var/tmp/diff_new_pack.jP2eox/_new 2014-09-07 11:11:44.000000000 +0200 @@ -1,8 +1,8 @@ -Index: timezone-2014b/zic.c +Index: timezone-2014g/zic.c =================================================================== ---- timezone-2014b.orig/zic.c -+++ timezone-2014b/zic.c -@@ -674,8 +674,10 @@ dolink(const char *const fromfield, cons +--- timezone-2014g.orig/zic.c ++++ timezone-2014g/zic.c +@@ -747,8 +747,10 @@ dolink(const char *const fromfield, cons "../"); symlinkcontents = ecatalloc(symlinkcontents, t); result = symlink(symlinkcontents, toname); ++++++ tzdata-china.diff ++++++ --- /var/tmp/diff_new_pack.jP2eox/_old 2014-09-07 11:11:44.000000000 +0200 +++ /var/tmp/diff_new_pack.jP2eox/_new 2014-09-07 11:11:44.000000000 +0200 @@ -1,22 +1,23 @@ -Index: timezone-2014b/asia +Index: timezone-2014g/asia =================================================================== ---- timezone-2014b.orig/asia -+++ timezone-2014b/asia -@@ -489,6 +489,9 @@ Zone Asia/Kashgar 5:03:56 - LMT 1928 # o +--- timezone-2014g.orig/asia ++++ timezone-2014g/asia +@@ -523,6 +523,10 @@ Rule PRC 1987 1991 - Apr Sun>=10 0:00 1: + Zone Asia/Shanghai 8:05:43 - LMT 1901 + 8:00 Shang C%sT 1949 8:00 PRC C%sT - - ++ +# Nowadays, China Standard Time is known as "Beijing Time" +Zone Asia/Beijing 8:00 PRC C%sT + - # Hong Kong (Xianggang) - - # Milne gives 7:36:41.7; round this. -Index: timezone-2014b/backward + # Xinjiang time, used by many in western China; represented by Ürümqi / Ürümchi + # / Wulumuqi. (Please use Asia/Shanghai if you prefer Beijing time.) + Zone Asia/Urumqi 5:50:20 - LMT 1928 +Index: timezone-2014g/backward =================================================================== ---- timezone-2014b.orig/backward -+++ timezone-2014b/backward -@@ -89,14 +89,13 @@ Link America/Mexico_City Mexico/General +--- timezone-2014g.orig/backward ++++ timezone-2014g/backward +@@ -92,7 +92,7 @@ Link America/Mexico_City Mexico/General Link Pacific/Auckland NZ Link Pacific/Chatham NZ-CHAT Link America/Denver Navajo @@ -25,32 +26,15 @@ Link Pacific/Pohnpei Pacific/Ponape Link Pacific/Pago_Pago Pacific/Samoa Link Pacific/Chuuk Pacific/Truk - Link Pacific/Chuuk Pacific/Yap - Link Europe/Warsaw Poland - Link Europe/Lisbon Portugal --Link Asia/Taipei ROC - Link Asia/Seoul ROK - Link Asia/Singapore Singapore - Link Europe/Istanbul Turkey -Index: timezone-2014b/zone.tab +Index: timezone-2014g/zone.tab =================================================================== ---- timezone-2014b.orig/zone.tab -+++ timezone-2014b/zone.tab -@@ -155,11 +155,12 @@ CK -2114-15946 Pacific/Rarotonga +--- timezone-2014g.orig/zone.tab ++++ timezone-2014g/zone.tab +@@ -143,6 +143,7 @@ CK -2114-15946 Pacific/Rarotonga CL -3327-07040 America/Santiago most locations - CL -2709-10926 Pacific/Easter Easter Island & Sala y Gomez + CL -2709-10926 Pacific/Easter Easter Island CM +0403+00942 Africa/Douala --CN +3114+12128 Asia/Shanghai east China - Beijing, Guangdong, Shanghai, etc. --CN +4545+12641 Asia/Harbin Heilongjiang (except Mohe), Jilin --CN +2934+10635 Asia/Chongqing central China - Sichuan, Yunnan, Guangxi, Shaanxi, Guizhou, etc. --CN +4348+08735 Asia/Urumqi most of Tibet & Xinjiang --CN +3929+07559 Asia/Kashgar west Tibet & Xinjiang +CN +3955+11626 Asia/Beijing China Standard Time -+CN +3114+12128 Asia/Shanghai China east -+CN +4545+12641 Asia/Harbin China north -+CN +2934+10635 Asia/Chongqing China mountains -+CN +4348+08735 Asia/Urumqi China Xinjiang-Tibet -+CN +3929+07559 Asia/Kashgar China west Xinjiang + CN +3114+12128 Asia/Shanghai Beijing Time + CN +4348+08735 Asia/Urumqi Xinjiang Time CO +0436-07405 America/Bogota - CR +0956-08405 America/Costa_Rica - CU +2308-08222 America/Havana -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pcre for openSUSE:Factory
by root＠hilbert.suse.de 07 Sep '14

07 Sep '14

Hello community, here is the log from the commit of package pcre for openSUSE:Factory checked in at 2014-09-07 11:11:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcre (Old) and /work/SRC/openSUSE:Factory/.pcre.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pcre" Changes: -------- --- /work/SRC/openSUSE:Factory/pcre/pcre.changes 2014-09-03 18:20:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pcre.new/pcre.changes 2014-09-07 11:11:40.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Sep 2 07:30:08 UTC 2014 - jengelh(a)inai.de + +- Improve on RPM group classification +- Remove defunct %gpg_verify (replaced by source validators), + defunct freecode link + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcre.spec ++++++ --- /var/tmp/diff_new_pack.qgFYlM/_old 2014-09-07 11:11:41.000000000 +0200 +++ /var/tmp/diff_new_pack.qgFYlM/_new 2014-09-07 11:11:41.000000000 +0200 @@ -21,10 +21,9 @@ Release: 0 Summary: A library for Perl-compatible regular expressions License: BSD-3-Clause -Group: System/Libraries +Group: Development/Libraries/C and C++ Url: http://www.pcre.org/ #SVN-Clone: svn://vcs.exim.org/pcre/code/trunk -#Freecode-URL: http://freecode.com/projects/pcre Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{name}-%{version}.tar.bz2 Source2: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{name}-%{version}.tar.bz2.sig Source3: %{name}.keyring @@ -53,7 +52,7 @@ %package devel Summary: A library for Perl-compatible regular expressions -Group: System/Libraries +Group: Development/Libraries/C and C++ Requires: libpcre1 = %{version} Requires: libpcre16-0 = %{version} Requires: libpcrecpp0 = %{version} @@ -72,7 +71,7 @@ %package devel-static Summary: A library for Perl-compatible regular expressions -Group: System/Libraries +Group: Development/Libraries/C and C++ Requires: pcre-devel = %{version} %description devel-static @@ -130,7 +129,7 @@ %package doc Summary: A library for Perl-compatible regular expressions -Group: System/Libraries +Group: Documentation/HTML %if 0%{?suse_version} >= 1120 BuildArch: noarch %endif @@ -142,7 +141,7 @@ %package tools Summary: A library for Perl-compatible regular expressions -Group: System/Libraries +Group: Productivity/Text/Utilities Recommends: %{name}-doc %description tools @@ -151,7 +150,6 @@ as Perl 5. %prep -%{?gpg_verify: %gpg_verify %{SOURCE2}} %setup -q %patch0 -p1 %patch1 -p1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit audit for openSUSE:Factory
by root＠hilbert.suse.de 07 Sep '14

07 Sep '14

Hello community, here is the log from the commit of package audit for openSUSE:Factory checked in at 2014-09-07 11:11:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/audit (Old) and /work/SRC/openSUSE:Factory/.audit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "audit" Changes: -------- --- /work/SRC/openSUSE:Factory/audit/audit-secondary.changes 2014-08-25 12:59:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.audit.new/audit-secondary.changes 2014-09-07 11:11:39.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Sep 2 17:35:12 UTC 2014 - tonyj(a)suse.com + +- Update to version 2.4. See audit.spec (libaudit1) for upstream + changelog + Drop patch: auditd-donot-start-if-kernel-cmdline-disabled.patch + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/audit/audit.changes 2014-04-22 07:42:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.audit.new/audit.changes 2014-09-07 11:11:39.000000000 +0200 @@ -1,0 +2,40 @@ +Tue Sep 2 17:33:11 UTC 2014 - tonyj(a)suse.com + +- Update to version 2.4 + + Changelog 2.4 + - Optionally parse loginuids, (e)uids, & (e)gids in ausearch/report + - In auvirt, anomaly events don't have uuid (#1111448) + - Fix category handling in various records (#1120286) + - Fix ausearch handling of session id on 32 bit systems + - Set systemd startup to wait until systemd-tmpfiles-setup.service (#1097314) + - Interpret a0 of socketcall and ipccall syscalls + - Add pkgconfig file for libaudit + - Add go language bindings for limited use of libaudit + - Fix ausearch handling of exit code on 32 bit systems + - Fix bug in aureport string linked list handling + - Document week-ago time setting in ausearch/report man page + - Update tables for 3.16 kernel + - In aulast, on bad logins only record user_login proof and use it + - Add libaudit API for kernel features + - If audit=0 on kernel cmnd line, skip systemd activation (Cristian RodrÃguez) + - Add checkpoint --start option to ausearch (Burn Alting) + - Fix arch matching in ausearch + - Add --loginuid-immutable option to auditctl + - Fix memory leak in auditd when log_format is set to NOLOG + - Update auditctl to display features in the status command + - Add ausearch_add_timestamp_item_ex() to auparse + + Changelog 2.3.7 + - Limit number of options in a rule in libaudit + - Auditctl cannot load rule with lots of syscalls (#1089713) + - In ausearch, fix checkpointing when inode is reused by new log (Burn Alting) + - Add PROCTITLE and FEATURE_CHANGE event types + +------------------------------------------------------------------- +Tue Sep 2 17:33:11 UTC 2014 - tonyj(a)suse.com + +- Add support for ppc64le (bnc#891861) + New patch: audit-add-ppc64le-mach-support.patch + +------------------------------------------------------------------- Old: ---- audit-2.3.6.tar.gz auditd-donot-start-if-kernel-cmdline-disabled.patch New: ---- audit-2.4.tar.gz audit-add-ppc64le-mach-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audit-secondary.spec ++++++ --- /var/tmp/diff_new_pack.oBE0cX/_old 2014-09-07 11:11:40.000000000 +0200 +++ /var/tmp/diff_new_pack.oBE0cX/_new 2014-09-07 11:11:40.000000000 +0200 @@ -30,7 +30,7 @@ Summary: Secondary packages for audit License: GPL-2.0+ Group: System/Monitoring -Version: 2.3.6 +Version: 2.4 Release: 0 Url: http://people.redhat.com/sgrubb/audit/ Source0: http://people.redhat.com/sgrubb/audit/%{_name}-%{version}.tar.gz @@ -39,7 +39,6 @@ Patch3: audit-no_m4_dir.patch Patch4: audit-allow-manual-stop.patch Patch5: audit-ausearch-do-not-require-tclass.patch -Patch6: auditd-donot-start-if-kernel-cmdline-disabled.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: audit-devel = %{version} BuildRequires: autoconf >= 2.12 @@ -97,7 +96,6 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 %build autoreconf -fi export CFLAGS="%{optflags} -fno-strict-aliasing" @@ -140,6 +138,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python%{py_ver}/site-packages/auparse.a rm -f $RPM_BUILD_ROOT/%{_libdir}/python%{py_ver}/site-packages/auparse.la rm -f $RPM_BUILD_ROOT/%{_libdir}/python%{py_ver}/site-packages/auparse-1.0-py%{py_ver}.egg-info +rm -f $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/audit.pc # cleanup files handled by audit.spec rm -rf $RPM_BUILD_ROOT/%{_includedir} rm -f $RPM_BUILD_ROOT/%{_libdir}/lib{audit,auparse}.* ++++++ audit.spec ++++++ --- /var/tmp/diff_new_pack.oBE0cX/_old 2014-09-07 11:11:40.000000000 +0200 +++ /var/tmp/diff_new_pack.oBE0cX/_new 2014-09-07 11:11:40.000000000 +0200 @@ -20,13 +20,14 @@ Summary: First part of auditing package License: GPL-2.0+ Group: System/Monitoring -Version: 2.3.6 +Version: 2.4 Release: 0 Url: http://people.redhat.com/sgrubb/audit/ Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz Source1: baselibs.conf Source2: README-BEFORE-ADDING-PATCHES Patch1: audit-no_m4_dir.patch +Patch2: audit-add-ppc64le-mach-support.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf >= 2.12 BuildRequires: gcc-c++ @@ -76,6 +77,7 @@ %prep %setup -q -n %{name}-%{version} %patch1 -p1 +%patch2 -p1 %build autoreconf -fi @@ -137,5 +139,6 @@ %{_includedir}/auparse.h %{_includedir}/auparse-defs.h %{_mandir}/man3/* +%{_libdir}/pkgconfig/audit.pc %changelog ++++++ audit-2.3.6.tar.gz -> audit-2.4.tar.gz ++++++ ++++ 5438 lines of diff (skipped) ++++++ audit-add-ppc64le-mach-support.patch ++++++ From: Tony Jones <tonyj(a)suse.de> Subject: audit: add ppc64le mach support References: bnc#891861 Commit-id: https://fedorahosted.org/audit/changeset/1013 Signed-off-by: Tony Jones <tonyj(a)suse.de> --- lib/libaudit.c | 5 +++++ lib/libaudit.h | 6 +++++- lib/lookup_table.c | 3 +++ lib/machinetab.h | 1 + 4 files changed, 14 insertions(+), 1 deletion(-) --- a/lib/machinetab.h +++ b/lib/machinetab.h @@ -27,6 +27,7 @@ _S(MACH_X86, "i686" ) _S(MACH_86_64, "x86_64" ) _S(MACH_IA64, "ia64" ) _S(MACH_PPC64, "ppc64" ) +_S(MACH_PPC64LE, "ppc64le") _S(MACH_PPC, "ppc" ) _S(MACH_S390X, "s390x" ) _S(MACH_S390, "s390" ) --- a/lib/lookup_table.c +++ b/lib/lookup_table.c @@ -70,6 +70,7 @@ static const struct int_transtab elftab[ { MACH_86_64, AUDIT_ARCH_X86_64 }, { MACH_IA64, AUDIT_ARCH_IA64 }, { MACH_PPC64, AUDIT_ARCH_PPC64 }, + { MACH_PPC64LE, AUDIT_ARCH_PPC64LE}, { MACH_PPC, AUDIT_ARCH_PPC }, { MACH_S390X, AUDIT_ARCH_S390X }, { MACH_S390, AUDIT_ARCH_S390 }, @@ -123,6 +124,7 @@ int audit_name_to_syscall(const char *sc found = ia64_syscall_s2i(sc, &res); break; case MACH_PPC64: + case MACH_PPC64LE: case MACH_PPC: found = ppc_syscall_s2i(sc, &res); break; @@ -169,6 +171,7 @@ const char *audit_syscall_to_name(int sc case MACH_IA64: return ia64_syscall_i2s(sc); case MACH_PPC64: + case MACH_PPC64LE: case MACH_PPC: return ppc_syscall_i2s(sc); case MACH_S390X: --- a/lib/libaudit.c +++ b/lib/libaudit.c @@ -1128,6 +1128,11 @@ int audit_determine_machine(const char * return -6; break; #endif + case MACH_PPC64LE: + if (bits != __AUDIT_ARCH_64BIT) + return -6; + break; + case MACH_86_64: /* fallthrough */ case MACH_PPC64: /* fallthrough */ case MACH_S390X: /* fallthrough */ --- a/lib/libaudit.h +++ b/lib/libaudit.h @@ -339,6 +339,9 @@ extern "C" { #define AUDIT_ARCH_AARCH64 (EM_AARCH64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) #endif +#ifndef AUDIT_ARCH_PPC64LE +#define AUDIT_ARCH_PPC64LE (EM_PPC64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) +#endif ////////////////////////////////////////////////////// // This is an external ABI. Any changes in here will @@ -418,7 +421,8 @@ typedef enum { MACH_S390, MACH_ALPHA, MACH_ARM, - MACH_AARCH64 + MACH_AARCH64, + MACH_PPC64LE } machine_t; /* These are the valid audit failure tunable enum values */ ++++++ audit-allow-manual-stop.patch ++++++ --- /var/tmp/diff_new_pack.oBE0cX/_old 2014-09-07 11:11:40.000000000 +0200 +++ /var/tmp/diff_new_pack.oBE0cX/_new 2014-09-07 11:11:40.000000000 +0200 @@ -14,10 +14,10 @@ --- a/init.d/auditd.service +++ b/init.d/auditd.service @@ -4,7 +4,6 @@ DefaultDependencies=no - After=local-fs.target + After=local-fs.target systemd-tmpfiles-setup.service Conflicts=shutdown.target Before=sysinit.target shutdown.target -RefuseManualStop=yes + ConditionKernelCommandLine=!audit=0 [Service] - ExecStart=/sbin/auditd -n -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit LHAPDF for openSUSE:Factory
by root＠hilbert.suse.de 07 Sep '14

07 Sep '14

Hello community, here is the log from the commit of package LHAPDF for openSUSE:Factory checked in at 2014-09-07 11:10:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/LHAPDF (Old) and /work/SRC/openSUSE:Factory/.LHAPDF.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "LHAPDF" Changes: -------- --- /work/SRC/openSUSE:Factory/LHAPDF/LHAPDF.changes 2014-06-24 15:16:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.LHAPDF.new/LHAPDF.changes 2014-09-07 11:10:24.000000000 +0200 @@ -1,0 +2,30 @@ +Sat Sep 6 22:23:20 UTC 2014 - badshah400(a)gmail.com + +- Update to version 6.1.4: + - Adding multiset variants of the 5 getmin/max LHAGlue + functions + - Adding the 'unofficial' getminmax Fortran function to + LHAGlue.cc + - Treat PID 0 as an alias for 21 in PDF::hasFlavor as well as + the PDF::xf* functions + - Clarify in lhapdf script help that 'list' by default shows all + available sets, not those installed on the user's system + - Update CONFIGFLAGS docs to fix some errors w.r.t. actual flag + usage + - Treat a DataVersion of 0 as unvalidated: valid numbers now + start at 1 + - Remove the LHAPDF ID from the warning printout about + unvalidated PDFs, since in that case there will usually be no + standard ID number and it just gets unhelpfully reported as -1 + - Detect and report improperly terminated grid files (ones + missing a --- final line) + - Replace asserts with exceptions and improve subgrid error + reporting in GridPDF + - Report the value of Q2 that causes a subgrid-finding failure + - Improve testgrid to use PDFNAME/MEMNUM arg syntax + - Forbid compilation if the demon combination of Boost < 1.47 + and GCC >= 4.6, with a serious bug in BOOST_FOREACH, is found: + http://code-muse.com/2013/08/06/boostforeach-and-compiler-bugs + - Improved AlphaS ODE solver performance. + +------------------------------------------------------------------- Old: ---- LHAPDF-6.1.3.tar.gz New: ---- LHAPDF-6.1.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ LHAPDF.spec ++++++ --- /var/tmp/diff_new_pack.28Y7JI/_old 2014-09-07 11:10:25.000000000 +0200 +++ /var/tmp/diff_new_pack.28Y7JI/_new 2014-09-07 11:10:25.000000000 +0200 @@ -20,7 +20,7 @@ %define execname lhapdf Name: LHAPDF -Version: 6.1.3 +Version: 6.1.4 Release: 0 Summary: A library for unified and easy to use interface to modern PDF sets License: GPL-3.0 ++++++ LHAPDF-6.1.3.tar.gz -> LHAPDF-6.1.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/AUTHORS new/LHAPDF-6.1.4/AUTHORS --- old/LHAPDF-6.1.3/AUTHORS 2014-05-19 11:56:01.000000000 +0200 +++ new/LHAPDF-6.1.4/AUTHORS 2014-07-27 22:23:30.000000000 +0200 @@ -20,3 +20,17 @@ Juan Rojo Marek Schoenherr Mike Whalley + + +CITATION +======== + +Please cite the contribution + + "New access to PDF data via LHAPDF6", by A. Buckley + in "Les Houches 2013: Physics at TeV Colliders: Standard Model Working Group Report" + http://arxiv.org/abs/1405.1067 + http://inspirehep.net/search?p=find+eprint+1405.1067 + +A full write-up of LHAPDF6 will appear as soon as possible and +will replace this current recommendation. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/ChangeLog new/LHAPDF-6.1.4/ChangeLog --- old/LHAPDF-6.1.3/ChangeLog 2014-06-17 16:51:19.000000000 +0200 +++ new/LHAPDF-6.1.4/ChangeLog 2014-08-19 10:49:01.000000000 +0200 @@ -1,3 +1,52 @@ +2014-08-19 Andy Buckley <andy.buckley(a)cern.ch> + + * LHAPDF 6.1.4 release + +2014-08-15 Andy Buckley <andy.buckley(a)cern.ch> + + * Adding multiset variants of the 5 getmin/max LHAGlue functions. + + * Adding the 'unofficial' getminmax Fortran function to LHAGlue.cc + (thanks to Andrey Sapronov for the report and patch). + +2014-07-18 Andy Buckley <andy.buckley(a)cern.ch> + + * Treat PID 0 as an alias for 21 in PDF::hasFlavor as well as the + PDF::xf* functions. Thanks to Nathan Hartland for the report. + +2014-07-10 Andy Buckley <andy.buckley(a)cern.ch> + + * Clarify in lhapdf script help that 'list' by default shows all + available sets, not those installed on the user's system. + +2014-07-09 Andy Buckley <andy.buckley(a)cern.ch> + + * Update CONFIGFLAGS docs to fix some errors w.r.t. actual flag usage. + + * Treat a DataVersion of 0 as unvalidated: valid numbers now start at 1. + + * Remove the LHAPDF ID from the warning printout about unvalidated + PDFs, since in that case there will usually be no standard ID + number and it just gets unhelpfully reported as -1. + + * Detect and report improperly terminated grid files (ones missing a --- final line). + + * Replace asserts with exceptions and improve subgrid error reporting in GridPDF. + + * Report the value of Q2 that causes a subgrid-finding failure. + + * Improve testgrid to use PDFNAME/MEMNUM arg syntax. + +2014-07-7 David Grellscheid <david.grellscheid(a)ippp.dur.ac.uk> + + * Forbid compilation if the demon combination of Boost < 1.47 and + GCC >= 4.6, with a serious bug in BOOST_FOREACH, is found: + http://code-muse.com/2013/08/06/boostforeach-and-compiler-bugs + +2014-06-18 Karl Nordstrom <karl.nordstrom(a)cern.ch> + + * Improved AlphaS ODE solver performance. + 2014-06-17 Andy Buckley <andy.buckley(a)cern.ch> * 6.1.3 release! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/INSTALL new/LHAPDF-6.1.4/INSTALL --- old/LHAPDF-6.1.3/INSTALL 2014-05-27 15:16:57.000000000 +0200 +++ new/LHAPDF-6.1.4/INSTALL 2014-07-12 22:52:55.000000000 +0200 @@ -159,11 +159,12 @@ The Mac OS X "Homebrew" system (http://brew.sh/) comes recommended by several LHAPDF developers. Many HEP packages are already available for Homebrew via the -homebrew-hep project: http://davidchall.github.io/homebrew-hep/ Success has also -been reported with the MacPorts system (http://www.macports.org/). With both -these approaches, you should set your environment to *only* use compilers and -Python from the Brew/Ports area and to ignore the system packages: a hybrid -approach will only cause unnecessary pain. +homebrew-hep project: http://davidchall.github.io/homebrew-hep/ . Success has +also been reported with the MacPorts system (http://www.macports.org/): please +see HepForge's information about MacPorts at https://www.hepforge.org/docs/macosx . +With both these approaches, you should set your environment to *only* use +compilers and Python from the Brew/Ports area and to ignore the system packages: +a hybrid approach will only cause unnecessary pain. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/Makefile.in new/LHAPDF-6.1.4/Makefile.in --- old/LHAPDF-6.1.3/Makefile.in 2014-06-17 15:35:58.000000000 +0200 +++ new/LHAPDF-6.1.4/Makefile.in 2014-08-15 16:49:15.000000000 +0200 @@ -95,11 +95,11 @@ $(top_srcdir)/config/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \ - $(top_srcdir)/m4/boost.m4 $(top_srcdir)/m4/compilerflags.m4 \ - $(top_srcdir)/m4/cython.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/boost.m4 $(top_srcdir)/m4/boost_bug.m4 \ + $(top_srcdir)/m4/compilerflags.m4 $(top_srcdir)/m4/cython.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/TODO new/LHAPDF-6.1.4/TODO --- old/LHAPDF-6.1.3/TODO 2014-06-17 17:03:17.000000000 +0200 +++ new/LHAPDF-6.1.4/TODO 2014-08-15 22:11:18.000000000 +0200 @@ -98,6 +98,14 @@ VERSION 6.2 ----------- +- **Nuclear PDFs** + + There's definitely a need for interfaces both to individual nuclear modification + functions (like PDFs themselves, a function of x,Q2) for application on top + of nucleon PDFs, and for all-inclusive nuclear PDFs. Individual "sets" for + each nucleus (A) as well as error sets: need to decide on groupings as well + as the API. Quite active, cf. "Lisbon Accord". + - **Optimize the grid PDF interpolator code** Cache log(x), log(Q) between samplings -> log() still accounts for 15% of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/aclocal.m4 new/LHAPDF-6.1.4/aclocal.m4 --- old/LHAPDF-6.1.3/aclocal.m4 2014-06-17 15:35:57.000000000 +0200 +++ new/LHAPDF-6.1.4/aclocal.m4 2014-08-15 16:49:14.000000000 +0200 @@ -1384,6 +1384,7 @@ m4_include([m4/ax_cxx_compile_stdcxx_11.m4]) m4_include([m4/boost.m4]) +m4_include([m4/boost_bug.m4]) m4_include([m4/compilerflags.m4]) m4_include([m4/cython.m4]) m4_include([m4/libtool.m4]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/configure new/LHAPDF-6.1.4/configure --- old/LHAPDF-6.1.3/configure 2014-06-17 15:35:58.000000000 +0200 +++ new/LHAPDF-6.1.4/configure 2014-08-15 16:49:15.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for LHAPDF 6.1.3. +# Generated by GNU Autoconf 2.69 for LHAPDF 6.1.4. # # Report bugs to <lhapdf(a)projects.hepforge.org>. # @@ -650,8 +650,8 @@ # Identity of this package. PACKAGE_NAME='LHAPDF' PACKAGE_TARNAME='LHAPDF' -PACKAGE_VERSION='6.1.3' -PACKAGE_STRING='LHAPDF 6.1.3' +PACKAGE_VERSION='6.1.4' +PACKAGE_STRING='LHAPDF 6.1.4' PACKAGE_BUGREPORT='lhapdf(a)projects.hepforge.org' PACKAGE_URL='' @@ -1422,7 +1422,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures LHAPDF 6.1.3 to adapt to many kinds of systems. +\`configure' configures LHAPDF 6.1.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1492,7 +1492,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LHAPDF 6.1.3:";; + short | recursive ) echo "Configuration of LHAPDF 6.1.4:";; esac cat <<\_ACEOF @@ -1609,7 +1609,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -LHAPDF configure 6.1.3 +LHAPDF configure 6.1.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2095,11 +2095,53 @@ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_cxx_check_header_mongrel + +# ac_fn_cxx_try_run LINENO +# ------------------------ +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_cxx_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_run cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by LHAPDF $as_me 6.1.3, which was +It was created by LHAPDF $as_me 6.1.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2966,7 +3008,7 @@ # Define the identity of the package. PACKAGE='LHAPDF' - VERSION='6.1.3' + VERSION='6.1.4' cat >>confdefs.h <<_ACEOF @@ -16735,6 +16777,69 @@ + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if boost rvalue bug is present" >&5 +$as_echo_n "checking if boost rvalue bug is present... " >&6; } +oldcppflags_boost="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" +if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + #include <boost/shared_ptr.hpp> + #include <boost/foreach.hpp> + #include <vector> + const std::vector<boost::shared_ptr<int> > f() + { + return std::vector<boost::shared_ptr<int> >(4, + boost::shared_ptr<int>(new int(12))); + } + +int +main () +{ +int sum = 48; + BOOST_FOREACH(const boost::shared_ptr<int> &pi, f()) + { + sum -= *pi; + } + return sum; + + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_run "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + as_fn_error $? " +*********************************************** +*** Boost is too old for this compiler version. $CXX needs boost > 1_47. +*** See http://code-muse.com/2013/08/06/boostforeach-and-compiler-bugs +***********************************************" "$LINENO" 5 + + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +CPPFLAGS="$oldcppflags_boost" + + ## Export base compiler flags @@ -17326,7 +17431,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by LHAPDF $as_me 6.1.3, which was +This file was extended by LHAPDF $as_me 6.1.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17392,7 +17497,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -LHAPDF config.status 6.1.3 +LHAPDF config.status 6.1.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/configure.ac new/LHAPDF-6.1.4/configure.ac --- old/LHAPDF-6.1.3/configure.ac 2014-06-12 21:30:54.000000000 +0200 +++ new/LHAPDF-6.1.4/configure.ac 2014-08-15 16:48:59.000000000 +0200 @@ -1,7 +1,7 @@ ## Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([LHAPDF],[6.1.3],[lhapdf(a)projects.hepforge.org],[LHAPDF]) +AC_INIT([LHAPDF],[6.1.4],[lhapdf(a)projects.hepforge.org],[LHAPDF]) if test "$prefix" = "$PWD"; then AC_MSG_ERROR([Installation into the build directory is not supported: use a different --prefix argument]) fi @@ -168,6 +168,7 @@ BOOST_FIND_HEADER([boost/math/distributions/chi_squared.hpp]) BOOST_FIND_HEADER([boost/math/special_functions/erf.hpp]) +BOOST_BUG_IN_FOREACH ## Export base compiler flags AC_SUBST(AM_CPPFLAGS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/doc/Makefile.in new/LHAPDF-6.1.4/doc/Makefile.in --- old/LHAPDF-6.1.3/doc/Makefile.in 2014-06-17 15:35:58.000000000 +0200 +++ new/LHAPDF-6.1.4/doc/Makefile.in 2014-08-15 16:49:15.000000000 +0200 @@ -82,11 +82,11 @@ $(srcdir)/Doxyfile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \ - $(top_srcdir)/m4/boost.m4 $(top_srcdir)/m4/compilerflags.m4 \ - $(top_srcdir)/m4/cython.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/boost.m4 $(top_srcdir)/m4/boost_bug.m4 \ + $(top_srcdir)/m4/compilerflags.m4 $(top_srcdir)/m4/cython.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -367,8 +367,8 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@WITH_DOXYGEN_FALSE@uninstall-local: @WITH_DOXYGEN_FALSE@mostlyclean-local: +@WITH_DOXYGEN_FALSE@uninstall-local: clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/doc/pdfsets.dox new/LHAPDF-6.1.4/doc/pdfsets.dox --- old/LHAPDF-6.1.3/doc/pdfsets.dox 2014-06-02 12:48:03.000000000 +0200 +++ new/LHAPDF-6.1.4/doc/pdfsets.dox 2014-08-15 22:06:40.000000000 +0200 @@ -1,7 +1,7 @@ /** @page pdfsets PDF sets -Official LHAPDF 6.1 PDF sets: currently 254 available, of which 239 are validated. +Official LHAPDF 6.1 PDF sets: currently 264 available, of which 249 are validated. See http://www.hepforge.org/archive/lhapdf/pdfsets/6.1 for data downloads. @@ -272,6 +272,16 @@ <tr style="background-color: #efe;"><td>247000</td><td><a href="http://www.hepforge.org/archive/lhapdf/pdfsets/6.1/NNPDF23_lo_as_0130_qed.t…">NNPDF23_lo_as_0130_qed</a></td><td>101</td><td>1</td><td></td></tr> <tr style="background-color: #efe;"><td>247200</td><td><a href="http://www.hepforge.org/archive/lhapdf/pdfsets/6.1/NNPDF23_nlo_as_0119_qed_…">NNPDF23_nlo_as_0119_qed_mc</a></td><td>101</td><td>1</td><td></td></tr> <tr style="background-color: #efe;"><td>247400</td><td><a href="http://www.hepforge.org/archive/lhapdf/pdfsets/6.1/NNPDF23_nnlo_as_0119_qed…">NNPDF23_nnlo_as_0119_qed_mc</a></td><td>101</td><td>1</td><td></td></tr> + <tr style="background-color: #efe;"><td>250000</td><td><a href="http://www.hepforge.org/archive/lhapdf/pdfsets/6.1/NNPDFpol10_100.tar.gz">NNPDFpol10_100</a></td><td>101</td><td>1</td><td></td></tr> + <tr style="background-color: #efe;"><td>251000</td><td><a href="http://www.hepforge.org/archive/lhapdf/pdfsets/6.1/NNPDFpol11_100.tar.gz">NNPDFpol11_100</a></td><td>101</td><td>1</td><td></td></tr> + <tr style="background-color: #efe;"><td>260000</td><td><a href="http://www.hepforge.org/archive/lhapdf/pdfsets/6.1/NNPDF30_nlo_as_0118.tar.…">NNPDF30_nlo_as_0118</a></td><td>101</td><td>1</td><td></td></tr> + <tr style="background-color: #efe;"><td>260200</td><td><a href="http://www.hepforge.org/archive/lhapdf/pdfsets/6.1/NNPDF30_nlo_as_0118_nf_3…">NNPDF30_nlo_as_0118_nf_3</a></td><td>101</td><td>1</td><td></td></tr> + <tr style="background-color: #efe;"><td>260400</td><td><a href="http://www.hepforge.org/archive/lhapdf/pdfsets/6.1/NNPDF30_nlo_as_0118_nf_4…">NNPDF30_nlo_as_0118_nf_4</a></td><td>101</td><td>1</td><td></td></tr> + <tr style="background-color: #efe;"><td>260600</td><td><a href="http://www.hepforge.org/archive/lhapdf/pdfsets/6.1/NNPDF30_nlo_as_0118_nf_6…">NNPDF30_nlo_as_0118_nf_6</a></td><td>101</td><td>1</td><td></td></tr> + <tr style="background-color: #efe;"><td>261000</td><td><a href="http://www.hepforge.org/archive/lhapdf/pdfsets/6.1/NNPDF30_nnlo_as_0118.tar…">NNPDF30_nnlo_as_0118</a></td><td>101</td><td>1</td><td></td></tr> + <tr style="background-color: #efe;"><td>261200</td><td><a href="http://www.hepforge.org/archive/lhapdf/pdfsets/6.1/NNPDF30_nnlo_as_0118_nf_…">NNPDF30_nnlo_as_0118_nf_3</a></td><td>101</td><td>1</td><td></td></tr> + <tr style="background-color: #efe;"><td>261400</td><td><a href="http://www.hepforge.org/archive/lhapdf/pdfsets/6.1/NNPDF30_nnlo_as_0118_nf_…">NNPDF30_nnlo_as_0118_nf_4</a></td><td>101</td><td>1</td><td></td></tr> + <tr style="background-color: #efe;"><td>261600</td><td><a href="http://www.hepforge.org/archive/lhapdf/pdfsets/6.1/NNPDF30_nnlo_as_0118_nf_…">NNPDF30_nnlo_as_0118_nf_6</a></td><td>101</td><td>1</td><td></td></tr> </table> */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/examples/Makefile.in new/LHAPDF-6.1.4/examples/Makefile.in --- old/LHAPDF-6.1.3/examples/Makefile.in 2014-06-17 15:35:58.000000000 +0200 +++ new/LHAPDF-6.1.4/examples/Makefile.in 2014-08-15 16:49:15.000000000 +0200 @@ -87,11 +87,11 @@ $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \ - $(top_srcdir)/m4/boost.m4 $(top_srcdir)/m4/compilerflags.m4 \ - $(top_srcdir)/m4/cython.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/boost.m4 $(top_srcdir)/m4/boost_bug.m4 \ + $(top_srcdir)/m4/compilerflags.m4 $(top_srcdir)/m4/cython.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/include/LHAPDF/AlphaS.h new/LHAPDF-6.1.4/include/LHAPDF/AlphaS.h --- old/LHAPDF-6.1.3/include/LHAPDF/AlphaS.h 2014-06-17 15:31:21.000000000 +0200 +++ new/LHAPDF-6.1.4/include/LHAPDF/AlphaS.h 2014-06-24 13:47:05.000000000 +0200 @@ -294,7 +294,7 @@ private: /// Vector of Q2s in case specific anchor points are used - std::vector<double> _q2s; + mutable std::vector<double> _q2s; /// Whether or not the ODE has been solved yet mutable bool _calculated; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/include/LHAPDF/GridPDF.h new/LHAPDF-6.1.4/include/LHAPDF/GridPDF.h --- old/LHAPDF-6.1.3/include/LHAPDF/GridPDF.h 2014-06-17 15:31:21.000000000 +0200 +++ new/LHAPDF-6.1.4/include/LHAPDF/GridPDF.h 2014-07-09 14:46:30.000000000 +0200 @@ -177,9 +177,12 @@ /// Get the N-flavour subgrid containing Q2 = q2 const KnotArrayNF& subgrid(double q2) const { assert(q2 >= 0); + assert(!q2Knots().empty()); map<double, KnotArrayNF>::const_iterator it = _knotarrays.upper_bound(q2); - if (it == _knotarrays.begin()) throw GridError("Requested Q2 is lower than any available Q2 subgrid"); - if (it == _knotarrays.end() && q2 > q2Knots().back()) throw GridError("Requested Q2 is higher than any available Q2 subgrid"); + if (it == _knotarrays.begin()) + throw GridError("Requested Q2 " + to_str(q2) + " is lower than any available Q2 subgrid (lowest Q2 = " + to_str(q2Knots().front()) + ")"); + if (it == _knotarrays.end() && q2 > q2Knots().back()) + throw GridError("Requested Q2 " + to_str(q2) + " is higher than any available Q2 subgrid (highest Q2 = " + to_str(q2Knots().back()) + ")"); --it; // upper_bound (and lower_bound) returns the entry *above* q2: we need to decrement by one element // std::cout << "Using subgrid #" << std::distance(_knotarrays.begin(), it) << std::endl; return it->second; @@ -209,8 +212,8 @@ for (map<double, KnotArrayNF>::const_iterator isub = _knotarrays.begin(); isub != _knotarrays.end(); ++isub) { const KnotArrayNF& subgrid = isub->second; const KnotArray1F& grid1 = subgrid.get_first(); - if (grid1.q2s().empty()) continue; - BOOST_FOREACH (const double& q2, grid1.q2s()) { + if (grid1.q2s().empty()) continue; //< @todo This shouldn't be possible, right? Throw instead, or ditch the check? + BOOST_FOREACH (double q2, grid1.q2s()) { if (_q2knots.empty() || q2 != _q2knots.back()) _q2knots.push_back(q2); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/include/LHAPDF/Makefile.in new/LHAPDF-6.1.4/include/LHAPDF/Makefile.in --- old/LHAPDF-6.1.3/include/LHAPDF/Makefile.in 2014-06-17 15:35:58.000000000 +0200 +++ new/LHAPDF-6.1.4/include/LHAPDF/Makefile.in 2014-08-15 16:49:15.000000000 +0200 @@ -84,11 +84,11 @@ $(srcdir)/Version.h.in $(am__pkginclude_HEADERS_DIST) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \ - $(top_srcdir)/m4/boost.m4 $(top_srcdir)/m4/compilerflags.m4 \ - $(top_srcdir)/m4/cython.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/boost.m4 $(top_srcdir)/m4/boost_bug.m4 \ + $(top_srcdir)/m4/compilerflags.m4 $(top_srcdir)/m4/cython.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/include/LHAPDF/PDF.h new/LHAPDF-6.1.4/include/LHAPDF/PDF.h --- old/LHAPDF-6.1.3/include/LHAPDF/PDF.h 2014-06-17 15:31:21.000000000 +0200 +++ new/LHAPDF-6.1.4/include/LHAPDF/PDF.h 2014-07-18 14:08:26.000000000 +0200 @@ -68,9 +68,8 @@ print(std::cout, v); } /// Print out a warning message if this PDF data is unvalidated - if (_info.get_entry_as<int>("DataVersion", -1) < 0) { - std::cerr << "WARNING: PDF #" << lhapdfID() << " is preliminary, unvalidated, " - << "and not for production use!" << std::endl; + if (_info.get_entry_as<int>("DataVersion", -1) <= 0) { + std::cerr << "WARNING: this PDF is preliminary, unvalidated, and not for production use!" << std::endl; } } @@ -115,13 +114,9 @@ throw RangeError("Unphysical Q2 given: " + to_str(q2)); } // Treat PID = 0 as always equivalent to a gluon: query as PID = 21 - const int id2 = (id != 0) ? id : 21; + const int id2 = (id != 0) ? id : 21; //< @note Treat 0 as an alias for 21 // Undefined PIDs - if (!hasFlavor(id2)) { - /// @todo Should look up the UndefFlavorAction flag, but efficiency hit for top? - //throw FlavorError("Undefined flavour requested: " + to_str(id)); - return 0.0; - } + if (!hasFlavor(id2)) return 0.0; // Call the delegated method in the concrete PDF object to calculate the in-range value double xfx = _xfxQ2(id2, x, q2); // Apply positivity forcing at the enabled level @@ -475,8 +470,9 @@ /// Checks whether @a id is a valid parton for this PDF. bool hasFlavor(int id) const { + const int id2 = (id != 0) ? id : 21; //< @note Treat 0 as an alias for 21 const vector<int>& ids = flavors(); - return find(ids.begin(), ids.end(), id) != ids.end(); + return find(ids.begin(), ids.end(), id2) != ids.end(); } /// @brief Order of QCD at which this PDF has been constructed @@ -488,8 +484,7 @@ return info().get_entry_as<int>("OrderQCD"); } /// @deprecated Use orderQCD instead - int qcdOrder() const { - return orderQCD(); } + int qcdOrder() const { return orderQCD(); } //@} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/include/LHAPDF/Version.h new/LHAPDF-6.1.4/include/LHAPDF/Version.h --- old/LHAPDF-6.1.3/include/LHAPDF/Version.h 2014-06-17 15:36:09.000000000 +0200 +++ new/LHAPDF-6.1.4/include/LHAPDF/Version.h 2014-08-15 16:49:46.000000000 +0200 @@ -11,10 +11,10 @@ #include <string> /* "LHAPDF version string" */ -#define LHAPDF_VERSION "6.1.3" +#define LHAPDF_VERSION "6.1.4" /* "LHAPDF version as an int" */ -#define LHAPDF_VERSION_CODE 60103 +#define LHAPDF_VERSION_CODE 60104 /* "Whether PDFLIB Fortran compatibility is available" */ #define LHAPDF_PDFLIB 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/include/Makefile.in new/LHAPDF-6.1.4/include/Makefile.in --- old/LHAPDF-6.1.3/include/Makefile.in 2014-06-17 15:35:58.000000000 +0200 +++ new/LHAPDF-6.1.4/include/Makefile.in 2014-08-15 16:49:15.000000000 +0200 @@ -81,11 +81,11 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \ - $(top_srcdir)/m4/boost.m4 $(top_srcdir)/m4/compilerflags.m4 \ - $(top_srcdir)/m4/cython.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/boost.m4 $(top_srcdir)/m4/boost_bug.m4 \ + $(top_srcdir)/m4/compilerflags.m4 $(top_srcdir)/m4/cython.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/lhapdf.in new/LHAPDF-6.1.4/lhapdf.in --- old/LHAPDF-6.1.3/lhapdf.in 2014-06-16 16:07:31.000000000 +0200 +++ new/LHAPDF-6.1.4/lhapdf.in 2014-07-10 14:59:35.000000000 +0200 @@ -366,8 +366,9 @@ help='update list of available PDF sets') list_cmd = Subcommand('list', aliases=('ls',), usage='%prog [options] pattern...', - description='List all available PDF sets, or search using a pattern.' + pattern_match_desc, - help='list installed/available PDF sets') + description='List all standard PDF sets, or search using a pattern.' + pattern_match_desc, + help='list PDF sets (by default lists all sets available for download; ' + + 'use --installed or --outdated to explore those installed on the current system)') list_cmd.parser.add_option('--installed', dest="INSTALLED", action='store_true', help='list installed PDF sets') list_cmd.parser.add_option('--outdated', dest="OUTDATED", action='store_true', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/lhapdf.pc new/LHAPDF-6.1.4/lhapdf.pc --- old/LHAPDF-6.1.3/lhapdf.pc 2014-06-17 15:36:09.000000000 +0200 +++ new/LHAPDF-6.1.4/lhapdf.pc 2014-08-15 16:49:45.000000000 +0200 @@ -7,7 +7,7 @@ Name: lhapdf Description: LHAPDF parton density library URL: https://lhapdf.hepforge.org -Version: 6.1.3 +Version: 6.1.4 Libs: -L${exec_prefix}/lib -lLHAPDF Cflags: -I${prefix}/include #-I diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/m4/boost_bug.m4 new/LHAPDF-6.1.4/m4/boost_bug.m4 --- old/LHAPDF-6.1.3/m4/boost_bug.m4 1970-01-01 01:00:00.000000000 +0100 +++ new/LHAPDF-6.1.4/m4/boost_bug.m4 2014-07-09 18:59:56.000000000 +0200 @@ -0,0 +1,42 @@ +AC_DEFUN([BOOST_BUG_IN_FOREACH], +[ +dnl +dnl see http://code-muse.com/2013/08/06/boostforeach-and-compiler-bugs +dnl +m4_pattern_allow([BOOST_FOREACH]) +AC_MSG_CHECKING([if boost rvalue bug is present]) +oldcppflags_boost="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" +AC_RUN_IFELSE([ + AC_LANG_PROGRAM([[ + #include <boost/shared_ptr.hpp> + #include <boost/foreach.hpp> + #include <vector> + const std::vector<boost::shared_ptr<int> > f() + { + return std::vector<boost::shared_ptr<int> >(4, + boost::shared_ptr<int>(new int(12))); + } + ]], + [[int sum = 48; + BOOST_FOREACH(const boost::shared_ptr<int> &pi, f()) + { + sum -= *pi; + } + return sum; + ]] + )], + [ + AC_MSG_RESULT([no]) + ], + [ + AC_MSG_RESULT([yes]) + AC_MSG_ERROR([ +*********************************************** +*** Boost is too old for this compiler version. $CXX needs boost > 1_47. +*** See http://code-muse.com/2013/08/06/boostforeach-and-compiler-bugs +***********************************************]) + ] +) +CPPFLAGS="$oldcppflags_boost" +]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/pdfsets.index new/LHAPDF-6.1.4/pdfsets.index --- old/LHAPDF-6.1.3/pdfsets.index 2014-05-27 14:54:26.000000000 +0200 +++ new/LHAPDF-6.1.4/pdfsets.index 2014-08-15 22:06:24.000000000 +0200 @@ -252,3 +252,13 @@ 247000 NNPDF23_lo_as_0130_qed 1 247200 NNPDF23_nlo_as_0119_qed_mc 1 247400 NNPDF23_nnlo_as_0119_qed_mc 1 +250000 NNPDFpol10_100 1 +251000 NNPDFpol11_100 1 +260000 NNPDF30_nlo_as_0118 1 +260200 NNPDF30_nlo_as_0118_nf_3 1 +260400 NNPDF30_nlo_as_0118_nf_4 1 +260600 NNPDF30_nlo_as_0118_nf_6 1 +261000 NNPDF30_nnlo_as_0118 1 +261200 NNPDF30_nnlo_as_0118_nf_3 1 +261400 NNPDF30_nnlo_as_0118_nf_4 1 +261600 NNPDF30_nnlo_as_0118_nf_6 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/src/AlphaS_Ipol.cc new/LHAPDF-6.1.4/src/AlphaS_Ipol.cc --- old/LHAPDF-6.1.3/src/AlphaS_Ipol.cc 2014-06-17 17:50:46.000000000 +0200 +++ new/LHAPDF-6.1.4/src/AlphaS_Ipol.cc 2014-06-24 13:47:05.000000000 +0200 @@ -87,13 +87,10 @@ // Remember to take situations where the first knot also is a // flavor threshold into account double dlogq2, dlogas; - if( _q2s[0] != _q2s[1] ) { - dlogq2 = log10( _q2s[1] / _q2s[0] ); - dlogas = log10( _as[1] / _as[0] ); - } else { - dlogq2 = log10( _q2s[2] / _q2s[0] ); - dlogas = log10( _as[2] / _as[0] ); - } + unsigned int next_point = 1; + while ( _q2s[0] == _q2s[next_point] ) next_point++; + dlogq2 = log10( _q2s[next_point] / _q2s[0] ); + dlogas = log10( _as[next_point] / _as[0] ); const double loggrad = dlogas / dlogq2; return _as[0] * pow( q2/_q2s[0] , loggrad ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/src/AlphaS_ODE.cc new/LHAPDF-6.1.4/src/AlphaS_ODE.cc --- old/LHAPDF-6.1.3/src/AlphaS_ODE.cc 2014-06-15 23:07:50.000000000 +0200 +++ new/LHAPDF-6.1.4/src/AlphaS_ODE.cc 2014-07-09 18:59:56.000000000 +0200 @@ -120,19 +120,74 @@ // If a vector of knots in q2 has been given, solve for those. if ( !_q2s.empty() ) { + // If for some reason the highest q2 knot is below m_{Z}, + // force a knot there anyway (since we know it, might as well + // use it) + if ( _q2s[_q2s.size()-1] < sqr(_mz) ) _q2s.push_back(sqr(_mz)); + + // Find the index of the knot right below m_{Z} + unsigned int index_of_mz_lower = 0; + + while ( _q2s[index_of_mz_lower + 1] < sqr(_mz) ) { + if ( index_of_mz_lower == _q2s.size() -1 ) break; + index_of_mz_lower++; + } + + vector<pair<int, double> > grid; // for storing in correct order + vector<double> alphas; double low_lim = 0; double last_val = -1; - // BOOST_FOREACH (double q2, _q2s) - for ( size_t ind = 0; ind < _q2s.size(); ++ind) { + bool threshold = false; + + // We do this by starting from m_{Z}, going down to the lowest q2, + // and then jumping back up to m_{Z} to avoid calculating things twice + for ( int ind = index_of_mz_lower; ind >= 0; --ind) { + const double q2 = _q2s[ind]; + // Deal with cases with two identical adjacent points (thresholds) by decreasing step size, + // allowed errors, and accuracy. + if ( ind != 0 ) { + if ( q2 == _q2s[ind-1] ) { + last_val = q2; + threshold = true; + _solve(q2, t, y, allowed_relative/5, h/5, accuracy/5); + grid.push_back(make_pair(ind, y)); + // Define divergence after y > 2. -- we have no accuracy after that any way + if ( y > 2. ) { low_lim = q2; } + continue; + } + } + // If q2 is lower than a value that already diverged, it will also diverge + if ( q2 < low_lim ) { + alphas.push_back( std::numeric_limits<double>::max() ); + continue; + // If last point was the same we don't need to recalculate + } else if ( q2 == last_val ) { + alphas.push_back(y); + continue; + // Else calculate + } else { + last_val = q2; + if ( threshold ) { _solve(q2, t, y, allowed_relative/5, h/5, accuracy/5); threshold = false; } + else { _solve(q2, t, y, allowed_relative, h, accuracy); } + grid.push_back(make_pair(ind, y)); + // Define divergence after y > 2. -- we have no accuracy after that any way + if ( y > 2. ) { low_lim = q2; } + } + } + + t = sqr(_mz); // starting point + y = _alphas_mz; // starting value + + for ( size_t ind = index_of_mz_lower + 1; ind < _q2s.size(); ++ind) { double q2 = _q2s[ind]; - /// Deal with cases with two identical adjacent points (thresholds) by decreasing step size, - /// allowed errors, and accuracy. + // Deal with cases with two identical adjacent points (thresholds) by decreasing step size, + // allowed errors, and accuracy. if ( ind != _q2s.size() - 1 ) { if ( q2 == _q2s[ind+1] ) { last_val = q2; _solve(q2, t, y, allowed_relative/5, h/5, accuracy/5); - alphas.push_back(y); + grid.push_back(make_pair(ind, y)); // Define divergence after y > 2. -- we have no accuracy after that any way if ( y > 2. ) { low_lim = q2; } continue; @@ -141,8 +196,6 @@ // If q2 is lower than a value that already diverged, it will also diverge if ( q2 < low_lim ) { alphas.push_back( std::numeric_limits<double>::max() ); - t = sqr(_mz); - y = _alphas_mz; continue; // If last point was the same we don't need to recalculate } else if ( q2 == last_val ) { @@ -152,12 +205,19 @@ } else { last_val = q2; _solve(q2, t, y, allowed_relative, h, accuracy); - alphas.push_back(y); + grid.push_back(make_pair(ind, y)); // Define divergence after y > 2. -- we have no accuracy after that any way if ( y > 2. ) { low_lim = q2; } } } + std::sort(grid.begin(), grid.end(), + boost::bind(&std::pair<int, double>::first, _1) < boost::bind(&std::pair<int, double>::first, _2)); + + for ( size_t x = 0; x < grid.size(); ++x ) { + alphas.push_back(grid.at(x).second); + } + _ipol.setQ2Values(_q2s); _ipol.setAlphaSValues(alphas); @@ -201,8 +261,6 @@ std::sort(grid.begin(), grid.end(), boost::bind(&std::pair<int, double>::first, _1) < boost::bind(&std::pair<int, double>::first, _2)); - // Need to do this since BOOST_FOREACH can't deal with arguments - // with ,s (and I don't want to clutter with a typedef) for ( size_t x = 0; x < grid.size(); ++x ) { alphas.push_back(grid.at(x).second); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/src/GridPDF.cc new/LHAPDF-6.1.4/src/GridPDF.cc --- old/LHAPDF-6.1.3/src/GridPDF.cc 2014-04-17 14:40:51.000000000 +0200 +++ new/LHAPDF-6.1.4/src/GridPDF.cc 2014-07-15 11:22:13.000000000 +0200 @@ -83,7 +83,7 @@ void GridPDF::_loadData(const std::string& mempath) { - string line; + string line, prevline; int iblock(0), iblockline(0), iline(0); vector<double> xs, q2s; const size_t npid = flavors().size(); @@ -95,6 +95,7 @@ while (getline(file, line)) { // Trim the current line to ensure that there is no effect of leading spaces, etc. trim(line); + prevline = line; // used to test the last line after the while loop fails // If the line is commented out, increment the line number but not the block line iline += 1; @@ -113,8 +114,13 @@ nparser.reset(line); if (iblockline == 1) { // x knots line while (nparser >> token) xs.push_back(token); + if (xs.empty()) + throw ReadError("Empty x knot array on line " + to_str(iline)); } else if (iblockline == 2) { // Q knots line while (nparser >> token) q2s.push_back(token*token); // note Q -> Q2 + if (q2s.empty()) + throw ReadError("Empty Q knot array on line " + to_str(iline)); + //cout << q2s.size() << ", " << q2s.front() << ", " << q2s.back() << endl; } else if (iblockline == 3) { // internal flavor IDs line // DO NOTHING FOR NOW: only handling this for prospective forward compatibility /// @todo Handle internal partial flavour representations @@ -149,11 +155,9 @@ // Escape here if we've just finished reading the 0th (metadata) block if (iblock == 1) continue; - // Die with an assert if the block was of zero size - /// @todo Convert to throwing some exception? Is this ever allowable? - assert(xs.size() > 0); - assert(q2s.size() > 0); - assert(ipid_xfs.size() > 0); + // Throw if the block was of zero size + if (ipid_xfs.empty()) + throw ReadError("Empty xf values array in block " + to_str(iblock) + ", ended on line " + to_str(iline)); // Register data from the previous (>0th) block into the GridPDF data structure KnotArrayNF& arraynf = _knotarrays[q2s.front()]; //< Reference to newly created subgrid object @@ -167,9 +171,11 @@ //cout << _knotarrays.size() << endl; xs.clear(); q2s.clear(); for (size_t ipid = 0; ipid < npid; ++ipid) ipid_xfs[ipid].clear(); - } } + // File reading finished: complain if it was not properly terminated + if (prevline != "---") + throw ReadError("Grid file " + mempath + " is not properly terminated: .dat files MUST end with a --- separator line"); } catch (Exception& e) { throw; } catch (std::exception& e) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/src/LHAGlue.cc new/LHAPDF-6.1.4/src/LHAGlue.cc --- old/LHAPDF-6.1.3/src/LHAGlue.cc 2014-05-28 17:03:54.000000000 +0200 +++ new/LHAPDF-6.1.4/src/LHAGlue.cc 2014-08-15 19:21:33.000000000 +0200 @@ -507,31 +507,64 @@ } + void getxminm_(const int& nset, const int& nmem, double& xmin) { + ACTIVESETS[nset].loadMember(nmem); + xmin = ACTIVESETS[nset].activemember()->info().get_entry_as<double>("XMin"); + } + void getxmin_(const int& nmem, double& xmin) { currentset = 1; - ACTIVESETS[1].loadMember(nmem); - xmin = ACTIVESETS[1].activemember()->info().get_entry_as<double>("XMin"); + getxminm_(currentset, nmem, xmin); + } + + + void getxmaxm_(const int& nset, const int& nmem, double& xmax) { + ACTIVESETS[nset].loadMember(nmem); + xmax = ACTIVESETS[nset].activemember()->info().get_entry_as<double>("XMax"); } void getxmax_(const int& nmem, double& xmax) { currentset = 1; - ACTIVESETS[1].loadMember(nmem); - xmax = ACTIVESETS[1].activemember()->info().get_entry_as<double>("XMax"); + getxmaxm_(currentset, nmem, xmax); + } + + + void getq2minm_(const int& nset, const int& nmem, double& q2min) { + ACTIVESETS[nset].loadMember(nmem); + q2min = LHAPDF::sqr(ACTIVESETS[nset].activemember()->info().get_entry_as<double>("QMin")); } void getq2min_(const int& nmem, double& q2min) { currentset = 1; - ACTIVESETS[1].loadMember(nmem); - q2min = LHAPDF::sqr(ACTIVESETS[1].activemember()->info().get_entry_as<double>("QMin")); + getq2minm_(currentset, nmem, q2min); + } + + + void getq2maxm_(const int& nset, const int& nmem, double& q2max) { + ACTIVESETS[nset].loadMember(nmem); + q2max = LHAPDF::sqr(ACTIVESETS[nset].activemember()->info().get_entry_as<double>("QMax")); } void getq2max_(const int& nmem, double& q2max) { currentset = 1; - ACTIVESETS[1].loadMember(nmem); - q2max = LHAPDF::sqr(ACTIVESETS[1].activemember()->info().get_entry_as<double>("QMax")); + getq2maxm_(currentset, nmem, q2max); } + void getminmaxm_(const int& nset, const int& nmem, double& xmin, double& xmax, double& q2min, double& q2max) { + ACTIVESETS[nset].loadMember(nmem); + xmin = ACTIVESETS[nset].activemember()->info().get_entry_as<double>("XMin"); + xmax = ACTIVESETS[nset].activemember()->info().get_entry_as<double>("XMax"); + q2min = LHAPDF::sqr(ACTIVESETS[nset].activemember()->info().get_entry_as<double>("QMin")); + q2max = LHAPDF::sqr(ACTIVESETS[nset].activemember()->info().get_entry_as<double>("QMax")); + } + + void getminmax_(const int& nmem, double& xmin, double& xmax, double& q2min, double& q2max) { + currentset = 1; + getminmaxm_(currentset, nmem, xmin, xmax, q2min, q2max); + } + + /// Backwards compatibility functions for LHAPDF5 calculations of /// PDF uncertainties and PDF correlations (G. Watt, March 2014). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/src/Makefile.in new/LHAPDF-6.1.4/src/Makefile.in --- old/LHAPDF-6.1.3/src/Makefile.in 2014-06-17 15:35:58.000000000 +0200 +++ new/LHAPDF-6.1.4/src/Makefile.in 2014-08-15 16:49:15.000000000 +0200 @@ -85,11 +85,11 @@ $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \ - $(top_srcdir)/m4/boost.m4 $(top_srcdir)/m4/compilerflags.m4 \ - $(top_srcdir)/m4/cython.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/boost.m4 $(top_srcdir)/m4/boost_bug.m4 \ + $(top_srcdir)/m4/compilerflags.m4 $(top_srcdir)/m4/cython.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/src/yamlcpp/Makefile.in new/LHAPDF-6.1.4/src/yamlcpp/Makefile.in --- old/LHAPDF-6.1.3/src/yamlcpp/Makefile.in 2014-06-17 15:35:58.000000000 +0200 +++ new/LHAPDF-6.1.4/src/yamlcpp/Makefile.in 2014-08-15 16:49:16.000000000 +0200 @@ -89,11 +89,11 @@ $(top_srcdir)/config/depcomp $(dist_noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \ - $(top_srcdir)/m4/boost.m4 $(top_srcdir)/m4/compilerflags.m4 \ - $(top_srcdir)/m4/cython.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/boost.m4 $(top_srcdir)/m4/boost_bug.m4 \ + $(top_srcdir)/m4/compilerflags.m4 $(top_srcdir)/m4/cython.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/tests/Makefile.in new/LHAPDF-6.1.4/tests/Makefile.in --- old/LHAPDF-6.1.3/tests/Makefile.in 2014-06-17 16:52:08.000000000 +0200 +++ new/LHAPDF-6.1.4/tests/Makefile.in 2014-08-15 16:49:16.000000000 +0200 @@ -86,11 +86,11 @@ $(top_srcdir)/config/depcomp $(top_srcdir)/config/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \ - $(top_srcdir)/m4/boost.m4 $(top_srcdir)/m4/compilerflags.m4 \ - $(top_srcdir)/m4/cython.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/boost.m4 $(top_srcdir)/m4/boost_bug.m4 \ + $(top_srcdir)/m4/compilerflags.m4 $(top_srcdir)/m4/cython.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/tests/testgrid.cc new/LHAPDF-6.1.4/tests/testgrid.cc --- old/LHAPDF-6.1.3/tests/testgrid.cc 2014-06-16 12:08:01.000000000 +0200 +++ new/LHAPDF-6.1.4/tests/testgrid.cc 2014-07-09 14:02:58.000000000 +0200 @@ -3,11 +3,10 @@ #include "LHAPDF/GridPDF.h" #include <iostream> #include <fstream> -using namespace LHAPDF; using namespace std; -void safeprint(const PDF& pdf, const string& key) { +void safeprint(const LHAPDF::PDF& pdf, const string& key) { if (pdf.info().has_key(key)) cout << key << " = " << pdf.info().get_entry(key) << endl; } @@ -21,40 +20,39 @@ } const string setname = (argc < 2) ? "CT10nlo" : argv[1]; - for (int i = 0; i <= 1; ++i) { - const GridPDF pdf(setname, i); + const LHAPDF::PDF* basepdf = LHAPDF::mkPDF(setname); + const LHAPDF::GridPDF& pdf = * dynamic_cast<const LHAPDF::GridPDF*>(basepdf); - BOOST_FOREACH (const string& p, paths()) cout << p << " : "; cout << endl; + BOOST_FOREACH (const string& p, LHAPDF::paths()) cout < pids = pdf.info().get_entry_as< vector<int> >("Flavors"); - cout << "Flavors (ints) = "; - BOOST_FOREACH (int f, pids) cout << f << " "; cout << endl; - cout << "Flavors (vec<int>) = " << LHAPDF::to_str(pids) << endl; - - cout << "x0, Q0 = " << pdf.subgrid(21, 100).xf(0, 0) << endl; - cout << "x1, Q0 = " << pdf.subgrid(21, 100).xf(1, 0) << endl; - cout << "x0, Q1 = " << pdf.subgrid(21, 100).xf(0, 1) << endl; - cout << "x1, Q1 = " << pdf.subgrid(21, 100).xf(1, 1) << endl; - - cout << pdf.xfxQ(21, 0.7, 10.0) << endl; - cout << pdf.xfxQ2(21, 0.2, 126) << endl; - BOOST_FOREACH (int pid, pdf.flavors()) { - cout << pid << " = " << pdf.xfxQ2(pid, 0.2, 124) << endl; - } + safeprint(pdf, "Verbosity"); + safeprint(pdf, "PdfDesc"); + safeprint(pdf, "SetDesc"); + cout << "Flavors (str) = " << pdf.info().get_entry("Flavors") << endl; + vector<int> pids = pdf.info().get_entry_as< vector<int> >("Flavors"); + cout << "Flavors (ints) = "; + BOOST_FOREACH (int f, pids) cout << f << " "; cout << endl; + cout << "Flavors (vec<int>) = " << LHAPDF::to_str(pids) << endl; + + cout << "x0, Q0 = " << pdf.subgrid(21, 100).xf(0, 0) << endl; + cout << "x1, Q0 = " << pdf.subgrid(21, 100).xf(1, 0) << endl; + cout << "x0, Q1 = " << pdf.subgrid(21, 100).xf(0, 1) << endl; + cout << "x1, Q1 = " << pdf.subgrid(21, 100).xf(1, 1) << endl; + + cout << pdf.xfxQ(21, 0.7, 10.0) << endl; + cout << pdf.xfxQ(21, 0.2, 126) << endl; + BOOST_FOREACH (int pid, pdf.flavors()) { + cout << pid << " = " << pdf.xfxQ(pid, 0.2, 124) << endl; + } - ofstream f("pdf.dat"); - for (double x = 0; x <= 1; x += 0.02) { - for (double log10q2 = 1; log10q2 < 5; log10q2 += 0.05) { - f << x << " " << log10q2 << " " << pdf.xfxQ2(21, x, pow(10, log10q2)) << endl; - } + ofstream f("pdf.dat"); + for (double x = 0; x <= 1; x += 0.02) { + for (double log10q2 = 1; log10q2 < 5; log10q2 += 0.05) { + f << x << " " << log10q2 << " " << pdf.xfxQ2(21, x, pow(10, log10q2)) << endl; } - f.close(); - cout << endl; } + f.close(); + cout << endl; return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/wrappers/Makefile.in new/LHAPDF-6.1.4/wrappers/Makefile.in --- old/LHAPDF-6.1.3/wrappers/Makefile.in 2014-06-17 15:35:58.000000000 +0200 +++ new/LHAPDF-6.1.4/wrappers/Makefile.in 2014-08-15 16:49:16.000000000 +0200 @@ -81,11 +81,11 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \ - $(top_srcdir)/m4/boost.m4 $(top_srcdir)/m4/compilerflags.m4 \ - $(top_srcdir)/m4/cython.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/boost.m4 $(top_srcdir)/m4/boost_bug.m4 \ + $(top_srcdir)/m4/compilerflags.m4 $(top_srcdir)/m4/cython.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LHAPDF-6.1.3/wrappers/python/Makefile.in new/LHAPDF-6.1.4/wrappers/python/Makefile.in --- old/LHAPDF-6.1.3/wrappers/python/Makefile.in 2014-06-17 15:35:58.000000000 +0200 +++ new/LHAPDF-6.1.4/wrappers/python/Makefile.in 2014-08-15 16:49:16.000000000 +0200 @@ -82,11 +82,11 @@ $(srcdir)/setup.py.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \ - $(top_srcdir)/m4/boost.m4 $(top_srcdir)/m4/compilerflags.m4 \ - $(top_srcdir)/m4/cython.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/boost.m4 $(top_srcdir)/m4/boost_bug.m4 \ + $(top_srcdir)/m4/compilerflags.m4 $(top_srcdir)/m4/cython.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -369,8 +369,8 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@WITH_PYTHON_FALSE@install-exec-local: @WITH_PYTHON_FALSE@uninstall-local: +@WITH_PYTHON_FALSE@install-exec-local: @WITH_PYTHON_FALSE@distclean-local: clean: clean-am -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python3-veusz for openSUSE:Factory
by root＠hilbert.suse.de 07 Sep '14

07 Sep '14

Hello community, here is the log from the commit of package python3-veusz for openSUSE:Factory checked in at 2014-09-07 11:10:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-veusz (Old) and /work/SRC/openSUSE:Factory/.python3-veusz.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-veusz" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-veusz/python3-veusz.changes 2014-05-09 06:59:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-veusz.new/python3-veusz.changes 2014-09-07 11:10:22.000000000 +0200 @@ -1,0 +2,21 @@ +Sat Aug 30 22:02:55 UTC 2014 - badshah400(a)gmail.com + +- Update to version 1.21.1: + + Add swap option on keys, swapping symbol and text + + Bug fixes: + - Fix missing labels if colorbar out of plot + - Preserve tags when reloading datasets + - Handle nan/inf/-inf when as value in UI + - Remove dependence on pyqtconfig in build system + - Handle errors properly in 2D CSV read + - Do not crash if selecting siblings of document widget + - Fix accidental modification of data by line widget + - Improve PDF bounding box rounding to prevent chopping near + edge + - Fix function plotter in embedding + - Fix astropy version checking + - Fix crash for error bar in CSV with blank previous column +- Drop python-veusz-test-disable-contour_labels.patch; patch + incorporated upstream. + +------------------------------------------------------------------- Old: ---- veusz-1.21.tar.gz veusz-test-disable-contour_labels.patch New: ---- veusz-1.21.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-veusz.spec ++++++ --- /var/tmp/diff_new_pack.8Njf1V/_old 2014-09-07 11:10:23.000000000 +0200 +++ /var/tmp/diff_new_pack.8Njf1V/_new 2014-09-07 11:10:23.000000000 +0200 @@ -19,7 +19,7 @@ %define pyname veusz Name: python3-veusz -Version: 1.21 +Version: 1.21.1 Release: 0 # The entire source code is GPL-2.0+ except helpers/src/_nc_cntr.c which is Python-2.0 Summary: GUI scientific plotting package @@ -28,8 +28,6 @@ Url: http://home.gna.org/veusz/ Source0: http://download.gna.org/veusz/veusz-%{version}.tar.gz Source3: %{pyname}_256.png -# PATCH-FIX-UPSTREAM veusz-test-disable-contour_labels.patch badshah400(a)gmail.com -- Disable an erroneous test that causes build failures, patch came from upstream -Patch0: veusz-test-disable-contour_labels.patch BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: hicolor-icon-theme @@ -62,7 +60,6 @@ %prep %setup -q -n %{pyname}-%{version} -%patch0 -p1 find -name \*~ | xargs rm -f %build ++++++ veusz-1.21.tar.gz -> veusz-1.21.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.21/ChangeLog new/veusz-1.21.1/ChangeLog --- old/veusz-1.21/ChangeLog 2014-05-03 10:14:11.000000000 +0200 +++ new/veusz-1.21.1/ChangeLog 2014-08-30 14:17:35.000000000 +0200 @@ -1,3 +1,19 @@ +Changes in 1.21.1 + * Add swap option on keys, swapping symbol and text + +Bug fixes + * Fix missing labels if colorbar out of plot + * Preserve tags when reloading datasets + * Handle nan/inf/-inf when as value in UI + * Remove dependence on pyqtconfig in build system + * Handle errors properly in 2D CSV read + * Do not crash if selecting siblings of document widget + * Fix accidental modification of data by line widget + * Improve PDF bounding box rounding to prevent chopping near edge + * Fix function plotter in embedding + * Fix astropy version checking + * Fix crash for error bar in CSV with blank previous column + Changes in 1.21: * Add HDF5 saved document format * Add filled curve error bar style diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.21/PKG-INFO new/veusz-1.21.1/PKG-INFO --- old/veusz-1.21/PKG-INFO 2014-05-03 10:53:27.000000000 +0200 +++ new/veusz-1.21.1/PKG-INFO 2014-08-23 17:16:03.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: veusz -Version: 1.21 +Version: 1.21.1 Summary: A scientific plotting package Home-page: http://home.gna.org/veusz/ Author: Jeremy Sanders diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.21/README new/veusz-1.21.1/README --- old/veusz-1.21/README 2014-05-03 10:14:11.000000000 +0200 +++ new/veusz-1.21.1/README 2014-08-23 17:15:18.000000000 +0200 @@ -1,5 +1,5 @@ -Veusz 1.21 ----------- +Veusz 1.21.1 +------------ http://home.gna.org/veusz/ Veusz is a scientific plotting package. It is designed to produce @@ -12,39 +12,21 @@ manipulation and editing of datasets. Data can be captured from external sources such as Internet sockets or other programs. -Changes in 1.21: - * Add HDF5 saved document format - * Add filled curve error bar style - * Add fill left/right options for point plotter - * Add filetype filters to import dialog file browser dialog - * In file completer in import dialog, use selected tab as filter - * Move code to use PyQt new style signals - * Add a master color setting for xy point and nonorthpoint plot - * Line labelling algorithm much improved in contour plots, which - rotates text to match line angle and avoids label overlaps - * More accurate axis tick label bounding boxes, allowing rotated - labels to be placed close together - * Add reflection and rotation options to vector field widget - * Switch to scientific notation earlier when showing float settings +Changes in 1.21.1 + * Add swap option on keys, swapping symbol and text -Bug fixes: - * Direction combo did not work in import dialog - * Saving text datasets did not work in Python3 - * Fix partial dataset evaluation issue when loading documents - * 2D non-regular pixel spaced images give error if clipped in y - * Handle Unicode quoted characters in simple text data files - * xcent/ycent in Dataset2D import plugins were ignored - * promote_tab broken for import plugins - * Full screen view when all pages are deleted - * Crash with empty dataset and boxplot widget - * Fix copy and paste of datasets - * Python 3 resizing axis bug - * Crash if picking/zooming on document with no pages - * Crash if reediting histogram dataset with blank output entry - * Use end of text formatting string beyond format specifier - * When writing SVG text as text, use xml:space="preserve" to - avoid missing whitespace - * Embedding socket issue on Python 3.4+ +Bug fixes + * Fix missing labels if colorbar out of plot + * Preserve tags when reloading datasets + * Handle nan/inf/-inf when as value in UI + * Remove dependence on pyqtconfig in build system + * Handle errors properly in 2D CSV read + * Do not crash if selecting siblings of document widget + * Fix accidental modification of data by line widget + * Improve PDF bounding box rounding to prevent chopping near edge + * Fix function plotter in embedding + * Fix astropy version checking + * Fix crash for error bar in CSV with blank previous column Features of package: Plotting features: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.21/VERSION new/veusz-1.21.1/VERSION --- old/veusz-1.21/VERSION 2014-05-03 10:15:32.000000000 +0200 +++ new/veusz-1.21.1/VERSION 2014-08-23 17:15:18.000000000 +0200 @@ -1 +1 @@ -1.21 +1.21.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.21/pyqtdistutils.py new/veusz-1.21.1/pyqtdistutils.py --- old/veusz-1.21/pyqtdistutils.py 2013-11-09 11:23:50.000000000 +0100 +++ new/veusz-1.21.1/pyqtdistutils.py 2014-08-23 17:15:18.000000000 +0200 @@ -10,7 +10,37 @@ import os import sys -import PyQt4.pyqtconfig +import sip +sip.setapi('QString', 2) + +import sipconfig +import PyQt4.QtCore + +################################################################## +# try to get various useful things we need in order to build +# this is likely to break, I'm sure + +QT_LIB_DIR = PyQt4.QtCore.QLibraryInfo.location( + PyQt4.QtCore.QLibraryInfo.LibrariesPath) +QT_INC_DIR = PyQt4.QtCore.QLibraryInfo.location( + PyQt4.QtCore.QLibraryInfo.HeadersPath) +QT_IS_FRAMEWORK = os.path.exists( + os.path.join(QT_LIB_DIR, 'QtCore.framework') ) + +try: + # >= 4.10 + SIP_FLAGS = PyQt4.QtCore.PYQT_CONFIGURATION['sip_flags'] +except: + import PyQt4.pyqtconfig + SIP_FLAGS = PyQt4.pyqtconfig.Configuration().pyqt_sip_flags + +PYQT_SIP_DIR = os.path.join( + sipconfig.Configuration().default_sip_dir, 'PyQt4') + +SIP_BIN = sipconfig.Configuration().sip_bin +SIP_INC_DIR = sipconfig.Configuration().sip_inc_dir + +################################################################## def replace_suffix(path, new_suffix): return os.path.splitext(path)[0] + new_suffix @@ -35,43 +65,34 @@ raise RuntimeError('cannot parse SIP-generated "%s"' % sbf) - def _find_sip(self): - cfg = PyQt4.pyqtconfig.Configuration() - return cfg.sip_bin - - def _sip_inc_dir(self): - cfg = PyQt4.pyqtconfig.Configuration() - return cfg.sip_inc_dir + def get_includes(self): - def get_includes(self, cfg): incdirs = [] for mod in ('QtCore', 'QtGui', 'QtXml'): - if cfg.qt_framework: - incdirs.append( os.path.join(cfg.qt_lib_dir, - mod + '.framework', 'Headers') ) + if QT_IS_FRAMEWORK: + incdirs.append( + os.path.join(QT_LIB_DIR, mod + '.framework', 'Headers') ) else: - incdirs.append( os.path.join(cfg.qt_inc_dir, mod) ) + incdirs.append( os.path.join(QT_INC_DIR, mod) ) return incdirs def swig_sources (self, sources, extension=None): if not self.extensions: return - cfg = PyQt4.pyqtconfig.Configuration() - # add directory of input files as include path indirs = list(set([os.path.dirname(x) for x in sources])) # Add the SIP and Qt include directories to the include path extension.include_dirs += [ - cfg.sip_inc_dir, - cfg.qt_inc_dir, - ] + self.get_includes(cfg) + indirs + SIP_INC_DIR, + QT_INC_DIR, + ] + self.get_includes() + indirs # link against libraries - if cfg.qt_framework: + if QT_IS_FRAMEWORK: extension.extra_link_args = [ - '-F', os.path.join(cfg.qt_lib_dir), + '-F', os.path.join(QT_LIB_DIR), '-framework', 'QtGui', '-framework', 'QtCore', '-framework', 'QtXml' @@ -80,7 +101,7 @@ extension.libraries = ['QtGui4', 'QtCore4', 'QtXml4'] else: extension.libraries = ['QtGui', 'QtCore', 'QtXml'] - extension.library_dirs = [cfg.qt_lib_dir] + extension.library_dirs = [QT_LIB_DIR] depends = extension.depends @@ -101,25 +122,22 @@ if not source.endswith('.sip')] generated_sources = [] - sip_bin = self._find_sip() - for sip in sip_sources: # Use the sbf file as dependency check sipbasename = os.path.basename(sip) sbf = os.path.join(self.build_temp, replace_suffix(sipbasename, '.sbf')) if newer_group([sip]+depends, sbf) or self.force: - self._sip_compile(sip_bin, sip, sbf) + self._sip_compile(sip, sbf) out = self._get_sip_output_list(sbf) generated_sources.extend(out) return generated_sources + other_sources - def _sip_compile(self, sip_bin, source, sbf): - cfg = PyQt4.pyqtconfig.Configuration() - self.spawn([sip_bin, + def _sip_compile(self, source, sbf): + self.spawn([SIP_BIN, '-c', self.build_temp, - ] + cfg.pyqt_sip_flags.split() + [ - '-I', cfg.pyqt_sip_dir, + ] + SIP_FLAGS.split() + [ + '-I', PYQT_SIP_DIR, '-b', sbf, source]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.21/support/veusz.desktop new/veusz-1.21.1/support/veusz.desktop --- old/veusz-1.21/support/veusz.desktop 2014-02-01 18:09:03.000000000 +0100 +++ new/veusz-1.21.1/support/veusz.desktop 2014-08-23 17:15:18.000000000 +0200 @@ -3,9 +3,9 @@ Name=Veusz GenericName=Scientific plotting Comment=Scientific plotting and graphing package -MimeType=application/x-veusz +MimeType=application/x-veusz; Exec=veusz %F Icon=veusz Terminal=false Type=Application -Categories=Graphics; +Categories=DataVisualization;Science; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.21/tests/runselftest.py new/veusz-1.21.1/tests/runselftest.py --- old/veusz-1.21/tests/runselftest.py 2014-04-27 15:02:31.000000000 +0200 +++ new/veusz-1.21.1/tests/runselftest.py 2014-06-11 19:42:38.000000000 +0200 @@ -77,6 +77,14 @@ # fails on Linux Arm 'spectrum.vsz', 'hatching.vsz', + + # fails on suse / fedora + 'contour_labels.vsz', + # new arm self test failures + 'example_import.vsz', + 'profile.vsz', + '1dto2d.vsz', + # don't expect this to work 'mathml.vsz', ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.21/veusz/dataimport/base.py new/veusz-1.21.1/veusz/dataimport/base.py --- old/veusz-1.21/veusz/dataimport/base.py 2013-12-31 21:18:53.000000000 +0100 +++ new/veusz-1.21.1/veusz/dataimport/base.py 2014-07-20 14:03:16.000000000 +0200 @@ -150,15 +150,23 @@ return f def _deleteLinkedDatasets(self, document): - """Delete linked datasets from document linking to self.""" + """Delete linked datasets from document linking to self. + Returns tags for deleted datasets. + """ + tags = {} for name, ds in list(document.data.items()): if ds.linked == self: + tags[name] = document.data[name].tags document.deleteData(name) + return tags - def _moveReadDatasets(self, tempdoc, document): + def _moveReadDatasets(self, tempdoc, document, tags): """Move datasets from tempdoc to document if they do not exist - in the destination.""" + in the destination. + + tags is a dict of tags for each dataset + """ read = [] for name, ds in list(tempdoc.data.items()): @@ -171,6 +179,9 @@ outname = self.params.renames[name] ds.linked = self + if name in tags: + ds.tags = tags[name] + document.setData(outname, ds) return read @@ -196,9 +207,9 @@ return ([], errors) # delete datasets which are linked and imported here - self._deleteLinkedDatasets(document) + tags = self._deleteLinkedDatasets(document) # move datasets into document - read = self._moveReadDatasets(tempdoc, document) + read = self._moveReadDatasets(tempdoc, document, tags) # return errors (if any) errors = op.outinvalids diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.21/veusz/dataimport/readcsv.py new/veusz-1.21.1/veusz/dataimport/readcsv.py --- old/veusz-1.21/veusz/dataimport/readcsv.py 2014-04-27 15:02:31.000000000 +0200 +++ new/veusz-1.21.1/veusz/dataimport/readcsv.py 2014-08-23 17:15:18.000000000 +0200 @@ -136,6 +136,8 @@ # loop to find previous valid column prevcol = colnum - 1 while prevcol >= 0: + if prevcol not in self.colnames: + break n = self.colnames[prevcol] if len(n) > 0 and n[-1] not in "+-": # we add a \0 here so that there's no chance of the user @@ -143,9 +145,9 @@ name = n + '\0' + name return self.coltypes[prevcol], name prevcol -= 1 - else: - # did not find anything - name = self._generateName(colnum) + + # did not find anything + name = self._generateName(colnum) # examine whether object type is at end of name # convert, and remove, if is diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.21/veusz/dataimport/simpleread.py new/veusz-1.21.1/veusz/dataimport/simpleread.py --- old/veusz-1.21/veusz/dataimport/simpleread.py 2014-04-27 15:02:31.000000000 +0200 +++ new/veusz-1.21.1/veusz/dataimport/simpleread.py 2014-08-23 17:15:18.000000000 +0200 @@ -470,7 +470,7 @@ # add on converted text - yuck - double conversion self.remainingline.append('%e' % v) else: - self.remainingline.append(v) + self.remainingline.append(t) return True class SimpleRead(object): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.21/veusz/embed.py new/veusz-1.21.1/veusz/embed.py --- old/veusz-1.21/veusz/embed.py 2014-05-03 10:14:11.000000000 +0200 +++ new/veusz-1.21.1/veusz/embed.py 2014-06-11 19:42:38.000000000 +0200 @@ -224,6 +224,9 @@ else: possiblecommands += [[ '/Applications/Veusz.app/Contents/MacOS/Veusz' ]] + possiblecommands += [[ + os.path.expanduser('~/Applications/Veusz.app/Contents/MacOS/Veusz')]] + for cmd in possiblecommands: # only try to run commands that exist as error handling diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.21/veusz/embed_remote.py new/veusz-1.21.1/veusz/embed_remote.py --- old/veusz-1.21/veusz/embed_remote.py 2014-02-08 13:25:58.000000000 +0100 +++ new/veusz-1.21.1/veusz/embed_remote.py 2014-08-23 17:15:18.000000000 +0200 @@ -24,6 +24,7 @@ from .compat import citems, pickle from .windows.simplewindow import SimpleWindow from . import document +from . import setting from . import qtall as qt4 """Program to be run by embedding interface to run Veusz commands.""" @@ -57,6 +58,14 @@ self.ci.addCommand('SetAntiAliasing', self.cmdSetAntiAliasing) self.ci.addCommand('_apiVersion', self.cmd_apiVersion) + setting.transient_settings['unsafe_mode'] = True + + self.document.sigLog.connect(self.logEmitted) + + def logEmitted(self, msg): + """Write anything logged to stderr.""" + sys.stderr.write(msg + '\n') + def cmdClose(self): """Close() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.21/veusz/plugins/datasetplugin.py new/veusz-1.21.1/veusz/plugins/datasetplugin.py --- old/veusz-1.21/veusz/plugins/datasetplugin.py 2014-04-27 15:02:31.000000000 +0200 +++ new/veusz-1.21.1/veusz/plugins/datasetplugin.py 2014-08-23 17:15:18.000000000 +0200 @@ -291,7 +291,9 @@ perr=ds.perr, nerr=ds.nerr) elif ds.dimensions == 2: return Dataset2D(name, ds.data, - rangex=ds.xrange, rangey=ds.yrange) + xrange=ds.xrange, yrange=ds.yrange, + xedge=ds.xedge, yedge=ds.yedge, + xcent=ds.xcent, ycent=ds.ycent) else: raise RuntimeError("Invalid number of dimensions in dataset") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.21/veusz/plugins/votable.py new/veusz-1.21.1/veusz/plugins/votable.py --- old/veusz-1.21/veusz/plugins/votable.py 2013-12-04 20:29:04.000000000 +0100 +++ new/veusz-1.21.1/veusz/plugins/votable.py 2014-08-23 17:15:18.000000000 +0200 @@ -23,7 +23,7 @@ try: import astropy.version - if astropy.version.version >= 0.2: + if [int(x) for x in astropy.version.version.split('.')] >= [0, 2]: from astropy.io.votable.table import parse else: from astropy.io.vo.table import parse diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.21/veusz/setting/setting.py new/veusz-1.21.1/veusz/setting/setting.py --- old/veusz-1.21/veusz/setting/setting.py 2014-04-27 15:02:31.000000000 +0200 +++ new/veusz-1.21.1/veusz/setting/setting.py 2014-08-23 17:15:18.000000000 +0200 @@ -1308,7 +1308,7 @@ self.val, datatype=self.datatype, dimensions=self.dimensions) if ds: # get numpy array of values - return ds.data + return N.array(ds.data) else: # list of values return N.array(self.val) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.21/veusz/setting/settingdb.py new/veusz-1.21.1/veusz/setting/settingdb.py --- old/veusz-1.21/veusz/setting/settingdb.py 2014-04-27 15:02:31.000000000 +0200 +++ new/veusz-1.21.1/veusz/setting/settingdb.py 2014-08-23 17:15:18.000000000 +0200 @@ -21,6 +21,7 @@ from __future__ import division, print_function import sys +import numpy as N from .. import qtall as qt4 def _(text, disambiguation=None, context="Preferences"): @@ -210,7 +211,13 @@ def ui_floattostring(f): """Convert float to string with more precision.""" - if 1e-4 <= abs(f) <= 1e5 or f == 0: + if not N.isfinite(f): + if N.isnan(f): + return 'nan' + if f < 0: + return '-inf' + return 'inf' + elif 1e-4 <= abs(f) <= 1e5 or f == 0: s = '%.14g' % f # strip excess zeros to right if s.find('.') >= 0: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.21/veusz/utils/pdf.py new/veusz-1.21.1/veusz/utils/pdf.py --- old/veusz-1.21/veusz/utils/pdf.py 2013-11-09 11:23:50.000000000 +0100 +++ new/veusz-1.21.1/veusz/utils/pdf.py 2014-08-23 17:15:18.000000000 +0200 @@ -18,6 +18,7 @@ from __future__ import division import re +import math from ..compat import crange @@ -36,9 +37,10 @@ widthfactor = box[2] / pagewidth newbox = ('/MediaBox [%i %i %i %i]' % ( 0, - int(box[3]-widthfactor*requiredheight), - int(widthfactor*requiredwidth), - int(box[3]))).encode('ascii') + int(math.floor(box[3]-widthfactor*requiredheight)), + int(math.ceil(widthfactor*requiredwidth)), + int(math.ceil(box[3])) + )).encode('ascii') text = text[:m.start()] + newbox + text[m.end():] return text diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.21/veusz/widgets/axis.py new/veusz-1.21.1/veusz/widgets/axis.py --- old/veusz-1.21/veusz/widgets/axis.py 2014-04-27 15:02:31.000000000 +0200 +++ new/veusz-1.21.1/veusz/widgets/axis.py 2014-06-11 19:49:36.000000000 +0200 @@ -1000,6 +1000,10 @@ If the edge of the plot is within textheight then suppress text """ + + if outerbounds is None: + return False + s = self.settings height = utils.FontMetrics( s.get('Label').makeQFont(painter), painter.device()).height() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.21/veusz/widgets/colorbar.py new/veusz-1.21.1/veusz/widgets/colorbar.py --- old/veusz-1.21/veusz/widgets/colorbar.py 2013-11-09 11:23:50.000000000 +0100 +++ new/veusz-1.21.1/veusz/widgets/colorbar.py 2014-06-11 19:48:53.000000000 +0200 @@ -243,7 +243,7 @@ painter.drawRect( routside ) # actually draw axis - axis.Axis._axisDraw(self, bounds, parentposn, outerbounds, painter, + axis.Axis._axisDraw(self, bounds, parentposn, None, painter, phelper) # allow the factory to instantiate a colorbar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.21/veusz/widgets/key.py new/veusz-1.21.1/veusz/widgets/key.py --- old/veusz-1.21/veusz/widgets/key.py 2013-11-09 11:23:50.000000000 +0100 +++ new/veusz-1.21.1/veusz/widgets/key.py 2014-06-11 19:42:38.000000000 +0200 @@ -238,6 +238,13 @@ maxval = 100, formatting = True) ) + s.add( setting.Bool( + 'symbolswap', + False, + descr=_('Put key symbol on right and text on left'), + usertext=_('Swap symbol'), + formatting=True) ) + @classmethod def allowedParentTypes(klass): from . import graph @@ -383,7 +390,7 @@ c.getKeyText(i)).getDimensions() maxwidth = max(maxwidth, w) lines = max(1, math.ceil(h/height)) - + totallines += lines entries.append( (c, i, lines) ) @@ -451,6 +458,8 @@ textpen = s.get('Text').makeQPen() + swap = s.symbolswap + # plot dataset entries for (plotter, num, xp, yp, lines) in layout: xpos = x + xp*(maxwidth+2*height+symbolwidth) @@ -463,18 +472,28 @@ keyoffset = (lines-1)*height/2.0 elif s.keyAlign == 'bottom': keyoffset = (lines-1)*height - - plotter.drawKeySymbol(num, painter, xpos, ypos+keyoffset, + + sx = xpos + if swap: + sx += maxwidth + height + plotter.drawKeySymbol(num, painter, sx, ypos+keyoffset, symbolwidth, height) painter.restore() # write key text if showtext: painter.setPen(textpen) + if swap: + lx = xpos + maxwidth + alignx = 1 + else: + lx = xpos + height + symbolwidth + alignx = -1 + utils.Renderer(painter, font, - xpos + height + symbolwidth, ypos, + lx, ypos, plotter.getKeyText(num), - -1, 1).render() + alignx, 1).render() phelper.setControlGraph( self, [ControlKey(self, parentposn, boxposn, boxdims, height)] ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/veusz-1.21/veusz/windows/treeeditwindow.py new/veusz-1.21.1/veusz/windows/treeeditwindow.py --- old/veusz-1.21/veusz/windows/treeeditwindow.py 2014-04-27 15:02:31.000000000 +0200 +++ new/veusz-1.21.1/veusz/windows/treeeditwindow.py 2014-08-23 17:15:18.000000000 +0200 @@ -1160,6 +1160,10 @@ def _selectWidgetSiblings(self, w, wtype): """Select siblings of widget given with type.""" + + if w.parent is None: + return + for c in w.parent.children: if c is not w and c.typename == wtype: idx = self.treemodel.getWidgetIndex(c) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqt5-qtquickcontrols for openSUSE:Factory
by root＠hilbert.suse.de 07 Sep '14

07 Sep '14

Hello community, here is the log from the commit of package libqt5-qtquickcontrols for openSUSE:Factory checked in at 2014-09-07 11:10:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtquickcontrols (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtquickcontrols.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtquickcontrols" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtquickcontrols/libqt5-qtquickcontrols.changes 2014-08-08 10:13:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtquickcontrols.new/libqt5-qtquickcontrols.changes 2014-09-07 11:10:20.000000000 +0200 @@ -1,0 +2,54 @@ +Thu Sep 4 20:37:34 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 5.3.2~git20140904 (ra7d03f5): + * Tip of the bugfix 5.3.2 branch: + * Fix menu/combobox popup positioning + * Dialogs: correct C++ warnings + * Dialogs must know when they are closed by the + operating system + * Dialog: initialize enabled and clicked buttons + * Dialogs: buttonless fully-filled dialog example + * Dialog: do not emit signals twice when a button + is clicked + * QtQuick.Dialogs FileDialog: default mode is ExistingFile + * QtQuick.Dialogs FontDialog: fix a binding loop issue + * Fix tooltip position when used with QQuickWidget + * Doc: Updated the Calendar example documentation + * Make the default style "Base" when built without + widgets support + * QQuickPopupWindow: Use actual item size as content size + * QtQuick.Dialogs: check for inheriting from QApplication + * Updated the example so that it adapts to the + orientation change + * Centralize determination of "no desktop" configurations + * Do not embed the Desktop style into resources on + irrelevant platforms + * Improve implicit size of Calendar on high DPI devices. + * MenuStyle: fix default text rendering type + * SpinBox: don't force active focus when tapping + the buttons on touch + * Fixed incorrect cursor when moving column in TableView + * Doc: Updated the example documentation + * Dialog: Add missing docs + * Fix editable ComboBox mouse cursor + * Doc: Update image for ApplicationWindow + * Fix SpinBox mouse cursor + * Mention that ApplicationWindow is not visible by default. + * Allow QT_QUICK_CONTROLS_STYLE pointing to resources + * TextField/Area: soft dependency to inputMethodHints + * Use the correct parent window for menu popups + * Revise unstable and slow GridLayout auto test + * Doc: Add a link to Tab in TabView documentation + * Doc: Added images and missing snippets + * Cleanup whitespace + * Remove QtWidgets dependency for WinRT + * Remove Widgets dependency for QNX + * ComboBox: open the popup on release on touch devices + * Slider: fix behavior inside a flickable on touch + * Singleton SystemPalette + * Kill unnecessary SystemPalette instances + * Remove unused BasicButton::__textColor + * Fix grammar in Layout::fillWidth and + Layout::fillHeight documentation. + +------------------------------------------------------------------- Old: ---- qtquickcontrols-opensource-src-5.3.1.tar.xz New: ---- qtquickcontrols-opensource-src-5.3.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtquickcontrols.spec ++++++ --- /var/tmp/diff_new_pack.Fk9py4/_old 2014-09-07 11:10:21.000000000 +0200 +++ /var/tmp/diff_new_pack.Fk9py4/_new 2014-09-07 11:10:21.000000000 +0200 @@ -16,23 +16,19 @@ # -%define qt5_snapshot 0 +%define qt5_snapshot 1 Name: libqt5-qtquickcontrols -Version: 5.3.1 +Version: 5.3.2~git20140904 Release: 0 Summary: Qt 5 Quick Controls Addon License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Group: Development/Libraries/X11 Url: http://qt.digia.com %define base_name libqt5 -%define real_version 5.3.1 -%define so_version 5.3.1 -%if %qt5_snapshot -%define tar_version qtquickcontrols-%{real_version} -%else +%define real_version 5.3.2 +%define so_version 5.3.2 %define tar_version qtquickcontrols-opensource-src-%{real_version} -%endif Source: %{tar_version}.tar.xz BuildRequires: fdupes BuildRequires: libQt5Core-private-headers-devel >= %{version} @@ -60,11 +56,7 @@ Examples for libqt5-qtquickcontrols module. %prep -%if %qt5_snapshot -%setup -q -n qtquickcontrols-%{real_version} -%else %setup -q -n qtquickcontrols-opensource-src-%{real_version} -%endif %build %if %qt5_snapshot ++++++ qtquickcontrols-opensource-src-5.3.1.tar.xz -> qtquickcontrols-opensource-src-5.3.2.tar.xz ++++++ ++++ 3468 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 php5-pear-phpunit-bytekit for openSUSE:Factory
by root＠hilbert.suse.de 07 Sep '14

07 Sep '14

Hello community, here is the log from the commit of package php5-pear-phpunit-bytekit for openSUSE:Factory checked in at 2014-09-07 11:10:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5-pear-phpunit-bytekit (Old) and /work/SRC/openSUSE:Factory/.php5-pear-phpunit-bytekit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5-pear-phpunit-bytekit" Changes: -------- --- /work/SRC/openSUSE:Factory/php5-pear-phpunit-bytekit/php5-pear-phpunit-bytekit.changes 2011-12-20 10:55:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.php5-pear-phpunit-bytekit.new/php5-pear-phpunit-bytekit.changes 2014-09-07 11:10:19.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Jul 5 09:48:30 UTC 2014 - gerrit.beine(a)gmx.de + +- Update to version 1.1.3 + +------------------------------------------------------------------- Old: ---- bytekit-1.1.1.tgz New: ---- bytekit-1.1.3.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5-pear-phpunit-bytekit.spec ++++++ --- /var/tmp/diff_new_pack.xFi4k4/_old 2014-09-07 11:10:20.000000000 +0200 +++ /var/tmp/diff_new_pack.xFi4k4/_new 2014-09-07 11:10:20.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package php5-pear-phpunit-bytekit # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,12 +22,12 @@ Summary: A php-bytekit cli License: BSD-3-Clause Group: Development/Libraries/PHP -Version: 1.1.1 +Version: 1.1.3 Release: 0 Source0: http://pear.phpunit.de/get/%{pear_name}-%{version}.tgz Url: http://pear.phpunit.de/ -Requires: php5-pear-channel-phpunit Requires: php5 >= 5.2.0 +Requires: php5-pear-channel-phpunit BuildRequires: php-macros BuildRequires: php5-pear >= 1.8.1 @@ -43,12 +43,12 @@ BuildArch: noarch # Fix for renaming (package convention) -Provides: php5-pear-%{pear_sname} = %{version} -Provides: php-pear-%{pear_sname} = %{version} Provides: pear-%{pear_sname} = %{version} -Obsoletes: php5-pear-%{pear_sname} < %{version} -Obsoletes: php-pear-%{pear_sname} < %{version} +Provides: php-pear-%{pear_sname} = %{version} +Provides: php5-pear-%{pear_sname} = %{version} Obsoletes: pear-%{pear_sname} < %{version} +Obsoletes: php-pear-%{pear_sname} < %{version} +Obsoletes: php5-pear-%{pear_sname} < %{version} %description A command-line tool built on the PHP Bytekit extension. ++++++ bytekit-1.1.1.tgz -> bytekit-1.1.3.tgz ++++++ ++++ 4176 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 dianara for openSUSE:Factory
by root＠hilbert.suse.de 07 Sep '14

07 Sep '14

Hello community, here is the log from the commit of package dianara for openSUSE:Factory checked in at 2014-09-07 11:10:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dianara (Old) and /work/SRC/openSUSE:Factory/.dianara.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dianara" Changes: -------- --- /work/SRC/openSUSE:Factory/dianara/dianara.changes 2014-08-13 08:49:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dianara.new/dianara.changes 2014-09-07 11:10:18.000000000 +0200 @@ -1,0 +2,22 @@ +Sat Sep 6 16:06:11 UTC 2014 - sor.alexei(a)meowr.ru + +- Update to 1.2.3 + * Configurable fonts. + * Ability to open the parent post for posts in the timelines, if they were + replies to something, such as a shared comment appearing in the timeline. + * Option to send a message to a contact directly from the avatar menu + and from the contact list. + * Show your user ID in popup notifications. Useful if you run more than one + instance of Dianara for different accounts. + * Show total number of items in timelines, in the tooltips of their tabs, + and the total number of pages with the current page number, at the bottom. + * Show how many Meanwhile items are highlighted, among those that are new. + * Some settings in Configure dialog have been rearranged. + * Filter comparison for "Activity description" removes links from it, + allowing for simpler rules. + * More details about post location, in the tooltip of the location name. + * Fixed Meanwhile feed growing very wide sometimes. + * Fixed Edit button not working on posts opened in separate window. + * Other bug fixes and minor changes. + +------------------------------------------------------------------- @@ -5 +27,2 @@ - * Proxy configuration support. Password is not stored securely, so if you wish, you can leave it empty and be prompted for it on startup. + * Proxy configuration support. Password is not stored securely, so you can + leave it empty and be prompted for it on startup. @@ -9 +32,2 @@ - * Enhanced initialization, so Dianara will keep on trying to get all initial data (your profile, etc) if it fails initially. + * Enhanced initialization, so Dianara will keep on trying to get all initial + data (your profile, etc) if it fails initially. @@ -14 +38,2 @@ - * Link color is no longer specified, so other contacts will see links in the color configured by them. + * Link color is no longer specified, so other contacts will see links + in the color configured by them. @@ -20 +45,2 @@ - * Pressing Enter in title field jumps to message body. Likewise, pressing the Up Arrow at the start of the message jumps to the title field. + * Pressing Enter in title field jumps to message body. Likewise, pressing + the Up Arrow at the start of the message jumps to the title field. @@ -24 +50,3 @@ - * Partial updates to Polish translation by Derping Muffins and CyberKiller, and German translation by Emvigo. + * Partial updates to Polish translation by Derping Muffins and CyberKiller, + and German translation by Emvigo. + * Other small fixes. @@ -33 +61 @@ - * Nicer download of media attachments + * Nicer download of media attachments. @@ -35,8 +63,8 @@ - Using this, you can run 2 or 3 instances of Dianara for different accounts - * System tray icon can be configured to show your avatar, or a custom image - * Added an optional toolbar - * Added some widgets to the status bar - * Avatar button gets highlighted when hovering, to make it more obvious - * New messages are highlighted with a gradient on the right side - * Added partial german translation, by Emvigo - * Some minor fixes + Using this, you can run 2 or 3 instances of Dianara for different accounts. + * System tray icon can be configured to show your avatar, or a custom image. + * Added an optional toolbar. + * Added some widgets to the status bar. + * Avatar button gets highlighted when hovering, to make it more obvious. + * New messages are highlighted with a gradient on the right side. + * Added partial German translation, by Emvigo. + * Some minor fixes. Old: ---- dianara-v1.2.2.tar.gz New: ---- dianara-v1.2.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dianara.spec ++++++ --- /var/tmp/diff_new_pack.IQ9uhK/_old 2014-09-07 11:10:19.000000000 +0200 +++ /var/tmp/diff_new_pack.IQ9uhK/_new 2014-09-07 11:10:19.000000000 +0200 @@ -18,12 +18,12 @@ Name: dianara %define _name Dianara -Version: 1.2.2 +Version: 1.2.3 Release: 0 -Summary: A pump.io application for the desktop +Summary: Pump.io social network desktop client License: GPL-2.0+ -Group: System/GUI -Url: http://dianara.nongnu.org/ +Group: System/GUI/Other +Url: http://jancoding.wordpress.com/dianara Source: http://download.savannah.gnu.org/releases/%{name}/%{name}-v%{version}.tar.gz BuildRequires: file-devel @@ -37,8 +37,9 @@ BuildRequires: pkgconfig(qoauth) %description -This is a pump.io client. With it, you can access your pump.io account -without using a web browser. +Dianara is a Pump.io client, a desktop application for GNU/Linux that +allows users to manage their Pump.io social networking accounts without +the need to use a web browser. You can read your timelines, post messages and pictures, and manage your contacts. @@ -46,7 +47,7 @@ %setup -q -n %{name}-v%{version} %build -qmake -makefile %{_name}.pro \ +%{_libdir}/qt4/bin/qmake -makefile %{_name}.pro \ QMAKE_CFLAGS="%{optflags}" \ QMAKE_CXXFLAGS="%{optflags}" make %{?_smp_mflags} @@ -55,11 +56,9 @@ mkdir -p %{buildroot}%{_datadir}/%{name}/locale/ install -Dm 0755 %{name} %{buildroot}%{_bindir}/%{name} install -m 0644 translations/*.qm %{buildroot}%{_datadir}/%{name}/locale/ -pushd icon -ls | while read size; do - install -Dm 0644 $size/%{name}.png %{buildroot}/%{_datadir}/icons/hicolor/$size/apps/%{name}.png +ls icon | while read size; do + install -Dm 0644 icon/$size/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/$size/apps/%{name}.png done -popd install -Dm 0644 %{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop %suse_update_desktop_file -r %{name} Network InstantMessaging @@ -67,7 +66,7 @@ %files %defattr(-,root,root) -%doc LICENSE README +%doc CHANGELOG LICENSE README %{_bindir}/%{name} %{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop ++++++ dianara-v1.2.2.tar.gz -> dianara-v1.2.3.tar.gz ++++++ ++++ 39398 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 taskwarrior for openSUSE:Factory
by root＠hilbert.suse.de 07 Sep '14

07 Sep '14

Hello community, here is the log from the commit of package taskwarrior for openSUSE:Factory checked in at 2014-09-07 11:10:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/taskwarrior (Old) and /work/SRC/openSUSE:Factory/.taskwarrior.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "taskwarrior" Changes: -------- --- /work/SRC/openSUSE:Factory/taskwarrior/taskwarrior.changes 2014-03-10 12:44:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.taskwarrior.new/taskwarrior.changes 2014-09-07 11:10:16.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Aug 30 14:11:48 UTC 2014 - infroma(a)gmail.com + +- install fish completion scripts to the proper directory + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ taskwarrior.spec ++++++ --- /var/tmp/diff_new_pack.O8xwhK/_old 2014-09-07 11:10:17.000000000 +0200 +++ /var/tmp/diff_new_pack.O8xwhK/_new 2014-09-07 11:10:17.000000000 +0200 @@ -81,6 +81,10 @@ mv %{scriptsdir}zsh/_task %{buildroot}%{_datadir}/zsh/site-functions/ rmdir %{scriptsdir}zsh +install -m 0755 -d %{buildroot}%{_datadir}/fish/completions/ +mv %{scriptsdir}fish/task.fish %{buildroot}%{_datadir}/fish/completions/ +rmdir %{scriptsdir}fish + install -m 0755 -d %{buildroot}%{_datadir}/vim/site/ftdetect/ install -m 0755 -d %{buildroot}%{_datadir}/vim/site/syntax/ mv %{scriptsdir}vim/ftdetect/*vim %{buildroot}%{_datadir}/vim/site/ftdetect @@ -101,6 +105,8 @@ %{_datadir}/man/man5/task* %config %{_sysconfdir}/bash_completion.d/task.sh %{_datadir}/zsh/site-functions/ +%dir %{_datadir}/fish/ +%{_datadir}/fish/completions/ %{_datadir}/vim/site/ftdetect/task.vim %{_datadir}/vim/site/syntax/task*.vim -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit votca-csg for openSUSE:Factory
by root＠hilbert.suse.de 07 Sep '14

07 Sep '14

Hello community, here is the log from the commit of package votca-csg for openSUSE:Factory checked in at 2014-09-07 11:10:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/votca-csg (Old) and /work/SRC/openSUSE:Factory/.votca-csg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "votca-csg" Changes: -------- --- /work/SRC/openSUSE:Factory/votca-csg/votca-csg.changes 2014-02-22 18:17:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.votca-csg.new/votca-csg.changes 2014-09-07 11:10:14.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Sep 5 22:00:07 UTC 2014 - junghans(a)votca.org + +- Update to 1.2.4 + - support for Gromacs 5.0 + +------------------------------------------------------------------- Old: ---- votca-csg-1.2.3.tar.gz votca-csg-manual-1.2.3.pdf votca-csg-tutorials-1.2.3.tar.gz New: ---- votca-csg-1.2.4.tar.gz votca-csg-manual-1.2.4.pdf votca-csg-tutorials-1.2.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ votca-csg.spec ++++++ --- /var/tmp/diff_new_pack.EA6ngx/_old 2014-09-07 11:10:16.000000000 +0200 +++ /var/tmp/diff_new_pack.EA6ngx/_new 2014-09-07 11:10:16.000000000 +0200 @@ -1,7 +1,7 @@ # # votca-csg.spec # -# Copyright (c) 2013,2014 Christoph Junghans +# Copyright (c) 2013-2014 Christoph Junghans # # Originally written by Jussi Lehtola <jussilehtola(a)fedoraproject.org> # Fixed for multi-distro build by Klaus Kaempf <kkaempf(a)suse.de> @@ -10,15 +10,15 @@ # Name: votca-csg -Version: 1.2.3 +Version: 1.2.4 Release: 0 Summary: VOTCA coarse-graining engine Group: Productivity/Scientific/Chemistry License: Apache-2.0 URL: http://www.votca.org -Source0: http://votca.googlecode.com/files/%{name}-%{version}.tar.gz -Source1: http://votca.googlecode.com/files/%{name}-tutorials-%{version}.tar.gz -Source2: http://votca.googlecode.com/files/%{name}-manual-%{version}.pdf +Source0: http://downloads.votca.googlecode.com/hg/%{name}-%{version}.tar.gz +Source1: http://downloads.votca.googlecode.com/hg/%{name}-tutorials-%{version}.tar.gz +Source2: http://downloads.votca.googlecode.com/hg/%{name}-manual-%{version}.pdf BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -116,6 +116,7 @@ rm -rf %{name}-tutorials-%{version}/.hg* %build +pkg-config libgromacs && DEV=ON || DEV=OFF %if %{defined fedora} mkdir build cd build @@ -125,8 +126,10 @@ mkdir build cd build %endif -%{cmake} -DCMAKE_INSTALL_PREFIX=/usr \ +%{cmake} \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DWITH_RC_FILES=OFF \ + -DWITH_GMX_DEVEL="$DEV" \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \ ++++++ votca-csg-1.2.3.tar.gz -> votca-csg-1.2.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-csg-1.2.3/CMakeLists.txt new/votca-csg-1.2.4/CMakeLists.txt --- old/votca-csg-1.2.3/CMakeLists.txt 2012-08-15 06:27:37.000000000 +0200 +++ new/votca-csg-1.2.4/CMakeLists.txt 2014-08-31 23:55:07.000000000 +0200 @@ -2,7 +2,7 @@ project(votca-csg) -set(PROJECT_VERSION "1.2.3") +set(PROJECT_VERSION "1.2.4") set(PROJECT_CONTACT "bugs(a)votca.org") string(REGEX REPLACE "^[1-9]+\\.([1-9]+).*$" "\\1" SOVERSION "${PROJECT_VERSION}") if (NOT ${SOVERSION} MATCHES "[1-9]+") @@ -46,6 +46,8 @@ ######################################################################## #Find external packages ######################################################################## +find_package(Threads REQUIRED) +set(THREAD_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) find_package(TXT2TAGS) option(EXTERNAL_BOOST "Use external boost" ON) if (EXTERNAL_BOOST) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-csg-1.2.3/CMakeModules/FindGROMACS.cmake new/votca-csg-1.2.4/CMakeModules/FindGROMACS.cmake --- old/votca-csg-1.2.3/CMakeModules/FindGROMACS.cmake 2012-08-15 06:27:37.000000000 +0200 +++ new/votca-csg-1.2.4/CMakeModules/FindGROMACS.cmake 2014-08-31 23:55:07.000000000 +0200 @@ -30,70 +30,54 @@ elseif(${GROMACS_NUM_COMPONENTS_WANTED} GREATER 1) message(FATAL_ERROR "We only support finding one gromacs component at this point, go and implement it ;-)") elseif(${GROMACS_FIND_COMPONENTS} MATCHES "^lib(gmx|gromacs)(_d)?$") - set(GROMACS_PKG "${GROMACS_FIND_COMPONENTS}") + if(NOT GROMACS_PKG_OVERWRITE) + set(GROMACS_PKG "${GROMACS_FIND_COMPONENTS}") + else() + set(GROMACS_PKG "${GROMACS_PKG_OVERWRITE}") + endif() string(REGEX REPLACE "^lib(.*)" "\\1" GROMACS_LIBRARY_NAME "${GROMACS_PKG}") else() message(FATAL_ERROR "We do not support finding ${GROMACS_FIND_COMPONENTS}, go and implement it ;-)") endif() -if(GMX_DOUBLE AND NOT "${GROMACS_PKG}" MATCHES "_d$") - message(FATAL_ERROR "GMX_DOUBLE was true, but I was asked to find ${GROMACS_PKG} (without _d at the end) - unlogical!") -endif(GMX_DOUBLE AND NOT "${GROMACS_PKG}" MATCHES "_d$") - pkg_check_modules(PC_GROMACS ${GROMACS_PKG}) -if (GMX_DOUBLE) - list(APPEND GMX_DEFS "-DGMX_DOUBLE") -endif(GMX_DOUBLE) -if (PC_GROMACS_CFLAGS_OTHER) - foreach(DEF ${PC_GROMACS_CFLAGS_OTHER}) - if (${DEF} MATCHES "^-D") - list(APPEND GMX_DEFS ${DEF}) - endif (${DEF} MATCHES "^-D") - endforeach(DEF) - list(REMOVE_DUPLICATES GMX_DEFS) -endif (PC_GROMACS_CFLAGS_OTHER) -set(GROMACS_DEFINITIONS "${GMX_DEFS}" CACHE STRING "extra GROMACS definitions") find_library(GROMACS_LIBRARY NAMES ${GROMACS_LIBRARY_NAME} HINTS ${PC_GROMACS_LIBRARY_DIRS} ) if (GROMACS_LIBRARY) - if("${GROMACS_LIBRARY}" MATCHES "lib(gmx|gromacs)[^;]*\\.a") - if(PC_GROMACS_LIBRARIES) - list(REMOVE_ITEM PC_GROMACS_LIBRARIES ${GROMACS_LIBRARY_NAME}) - foreach (LIB ${PC_GROMACS_LIBRARIES}) - find_library(GROMACS_${LIB} NAMES ${LIB} HINTS ${PC_GROMACS_LIBRARY_DIRS} ) - list(APPEND GMX_DEP_LIBRARIES ${GROMACS_${LIB}}) - unset(GROMACS_${LIB} CACHE) - endforeach(LIB) - endif(PC_GROMACS_LIBRARIES) - if(PC_GROMACS_CFLAGS_OTHER) - foreach(LIB ${PC_GROMACS_CFLAGS_OTHER}) - if (${LIB} MATCHES "thread") - find_package(Threads REQUIRED) - list(APPEND GMX_DEP_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) - endif (${LIB} MATCHES "thread") - endforeach(LIB) - endif(PC_GROMACS_CFLAGS_OTHER) - set(GROMACS_DEP_LIBRARIES "${GMX_DEP_LIBRARIES}" CACHE FILEPATH "gromacs depency libs (only needed for static (.a) libgmx") - endif("${GROMACS_LIBRARY}" MATCHES "lib(gmx|gromacs)[^;]*\\.a") include(CheckLibraryExists) - check_library_exists("${GROMACS_LIBRARY};${GROMACS_DEP_LIBRARIES}" GromacsVersion "" FOUND_GROMACS_VERSION) + check_library_exists("${GROMACS_LIBRARY}" GromacsVersion "" FOUND_GROMACS_VERSION) if(NOT FOUND_GROMACS_VERSION) - message(FATAL_ERROR "Could not find GromacsVersion in ${GROMACS_LIBRARY};${GROMACS_DEP_LIBRARIES}, take look at the error message in ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log to find out what was going wrong. If you don't have pkg-config installed you will most likely have to set GROMACS_LIBRARY and GROMACS_DEP_LIBRARY by hand which sets the gromacs lib and it's depencies (i.e. -DGROMACS_LIBRARY='/path/to/libgmx.so' -DGROMACS_DEP_LIBRARIES='/path/to/libblas.so;/path/to/libm.so') !") + message(FATAL_ERROR "Could not find GromacsVersion in ${GROMACS_LIBRARY}, take look at the error message in ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log to find out what was going wrong. If you don't have pkg-config installed you will most likely have to set GROMACS_LIBRARY by hand which sets the gromacs lib and it's dependencies (i.e. -DGROMACS_LIBRARY='/path/to/libgmx.so;/path/to/libblas.so;/path/to/libm.so')!") endif(NOT FOUND_GROMACS_VERSION) - check_library_exists("${GROMACS_LIBRARY};${GROMACS_DEP_LIBRARIES}" init_mtop "" FOUND_GROMACS_INIT_MTOP) + check_library_exists("${GROMACS_LIBRARY}" init_mtop "" FOUND_GROMACS_INIT_MTOP) if(NOT FOUND_GROMACS_INIT_MTOP) message(FATAL_ERROR "Could not find init_mtop in the gromacs library, take look at the error message in ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log to find out what was going wrong. This most likely means that your gromacs version is too old, we need at least gromacs 4.0.7.") endif(NOT FOUND_GROMACS_INIT_MTOP) set(GMX_VERSION 40) - check_library_exists("${GROMACS_LIBRARY};${GROMACS_DEP_LIBRARIES}" output_env_init "" FOUND_GROMACS_OUTPUT_ENV_INIT) + check_library_exists("${GROMACS_LIBRARY}" output_env_init "" FOUND_GROMACS_OUTPUT_ENV_INIT) if(FOUND_GROMACS_OUTPUT_ENV_INIT) set(GMX_VERSION 45) endif(FOUND_GROMACS_OUTPUT_ENV_INIT) - check_library_exists("${GROMACS_LIBRARY};${GROMACS_DEP_LIBRARIES}" init_domdec_vsites "" FOUND_GROMACS_INIT_DOMDEC_VSITES) + check_library_exists("${GROMACS_LIBRARY}" init_domdec_vsites "" FOUND_GROMACS_INIT_DOMDEC_VSITES) if(FOUND_GROMACS_INIT_DOMDEC_VSITES) set(GMX_VERSION 50) endif(FOUND_GROMACS_INIT_DOMDEC_VSITES) - set(GROMACS_VERSION ${GMX_VERSION} CACHE STRING "Gromacs lib interface version") + set(GROMACS_VERSION ${GMX_VERSION}) + + #Only set GROMACS_DEFINITIONS if GROMACS_LIBRARY was found + if ("${GROMACS_LIBRARY}" MATCHES "lib[^/]*_d\\.[^.]*$") + list(APPEND GMX_DEFS "-DGMX_DOUBLE") + endif ("${GROMACS_LIBRARY}" MATCHES "lib[^/]*_d\\.[^.]*$") + if (PC_GROMACS_CFLAGS_OTHER) + foreach(DEF ${PC_GROMACS_CFLAGS_OTHER}) + if (${DEF} MATCHES "^-D") + list(APPEND GMX_DEFS ${DEF}) + endif (${DEF} MATCHES "^-D") + endforeach(DEF) + list(REMOVE_DUPLICATES GMX_DEFS) + endif (PC_GROMACS_CFLAGS_OTHER) + set(GROMACS_DEFINITIONS "${GMX_DEFS}") + else(GROMACS_LIBRARY) set(GMX_VERSION 45) endif (GROMACS_LIBRARY) @@ -105,10 +89,10 @@ find_path(GROMACS_INCLUDE_DIR gromacs/tpxio.h HINTS ${PC_GROMACS_INCLUDE_DIRS}) endif(${GMX_VERSION} EQUAL 40) elseif("${GROMACS_PKG}" MATCHES "libgromacs") - find_path(GROMACS_INCLUDE_DIR gromacs/legacyheaders/tpxio.h HINTS ${PC_GROMACS_INCLUDE_DIRS}) + find_path(GROMACS_INCLUDE_DIR gromacs/fileio/tpxio.h HINTS ${PC_GROMACS_INCLUDE_DIRS}) endif("${GROMACS_PKG}" MATCHES "libgmx") -set(GROMACS_LIBRARIES "${GROMACS_LIBRARY};${GROMACS_DEP_LIBRARIES}" ) +set(GROMACS_LIBRARIES "${GROMACS_LIBRARY}" ) set(GROMACS_INCLUDE_DIRS ${GROMACS_INCLUDE_DIR} ) include(FindPackageHandleStandardArgs) @@ -116,4 +100,4 @@ # if all listed variables are TRUE find_package_handle_standard_args(GROMACS DEFAULT_MSG GROMACS_LIBRARY GROMACS_INCLUDE_DIR) -mark_as_advanced(GROMACS_INCLUDE_DIR GROMACS_LIBRARY GROMACS_DEFINITIONS GROMACS_PKG GROMACS_VERSION GROMACS_DEP_LIBRARIES) +mark_as_advanced(GROMACS_INCLUDE_DIR GROMACS_LIBRARY GROMACS_PKG) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-csg-1.2.3/CMakeModules/FindVOTCA_TOOLS.cmake new/votca-csg-1.2.4/CMakeModules/FindVOTCA_TOOLS.cmake --- old/votca-csg-1.2.3/CMakeModules/FindVOTCA_TOOLS.cmake 2012-08-15 06:27:37.000000000 +0200 +++ new/votca-csg-1.2.4/CMakeModules/FindVOTCA_TOOLS.cmake 2014-08-31 23:55:07.000000000 +0200 @@ -54,7 +54,7 @@ include(CheckLibraryExists) check_library_exists("${VOTCA_TOOLS_LIBRARY};${VOTCA_TOOLS_DEP_LIBRARIES}" VotcaToolsFromC "" FOUND_VOTCA_TOOLS_VERSION) if(NOT FOUND_VOTCA_TOOLS_VERSION) - message(FATAL_ERROR "Could not find VotcaToolsFromC in ${VOTCA_TOOLS_LIBRARY};${VOTCA_TOOLS_DEP_LIBRARIES}, take look at the error message in ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log to find out what was going wrong. If you don't have pkg-config installed you will most likely have to set VOTCA_TOOLS_LIBRARY and VOTCA_TOOLS_DEP_LIBRARIES by hand, which set votca_tools lib it's depencies (i.e. -DVOTCA_TOOLS_LIBRARY='/path/to/libvotca_tools.so" -VOTCA_TOOLS_DEP_LIBRARIES="/path/to/libgsl.so;/path/to/libm.so') !") + message(FATAL_ERROR "Could not find VotcaToolsFromC in ${VOTCA_TOOLS_LIBRARY};${VOTCA_TOOLS_DEP_LIBRARIES}, take look at the error message in ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log to find out what was going wrong. If you don't have pkg-config installed you will most likely have to set VOTCA_TOOLS_LIBRARY and VOTCA_TOOLS_DEP_LIBRARIES by hand, which set votca_tools lib it's depencies (i.e. -DVOTCA_TOOLS_LIBRARY='/path/to/libvotca_tools.so' -DVOTCA_TOOLS_DEP_LIBRARIES='/path/to/libgsl.so;/path/to/libm.so') !") endif(NOT FOUND_VOTCA_TOOLS_VERSION) endif (VOTCA_TOOLS_FOUND) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-csg-1.2.3/ChangeLog new/votca-csg-1.2.4/ChangeLog --- old/votca-csg-1.2.3/ChangeLog 2012-08-15 06:27:39.000000000 +0200 +++ new/votca-csg-1.2.4/ChangeLog 2014-08-31 23:55:08.000000000 +0200 @@ -1,3 +1,12 @@ +Version 1.2.4 (released 31.08.14) + +* support for Gromacs 5.0 +* support for Boost 1.53 +* fixed use of nawk instead of gawk under MacOs +* fixed python shebang +* fixed linking issue under Fedora +* fixed thermforce calculation for xsplit case + Version 1.2.3 (released 14.08.12) * improved AIX support diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-csg-1.2.3/scripts/multi_g_rdf.in new/votca-csg-1.2.4/scripts/multi_g_rdf.in --- old/votca-csg-1.2.3/scripts/multi_g_rdf.in 2012-08-15 06:27:37.000000000 +0200 +++ new/votca-csg-1.2.4/scripts/multi_g_rdf.in 2014-08-31 23:55:07.000000000 +0200 @@ -98,7 +98,7 @@ case $1 in -[0-9]* | --[0-9]**) np=${1#-} - np=${1#-} + np=${np#-} [ -z "${np//[0-9]}" ] || die "$1 could not be convert to a number" shift ;; -b) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-csg-1.2.3/share/scripts/inverse/RDF_to_POT.pl new/votca-csg-1.2.4/share/scripts/inverse/RDF_to_POT.pl --- old/votca-csg-1.2.3/share/scripts/inverse/RDF_to_POT.pl 2012-08-15 06:27:37.000000000 +0200 +++ new/votca-csg-1.2.4/share/scripts/inverse/RDF_to_POT.pl 2014-08-31 23:55:07.000000000 +0200 @@ -76,6 +76,7 @@ last; } } +die "All data points from file '$infile' are invalid after Boltzmann inversion, please check if your distribution is a valid rdf.\n" if ($first_undef_bin==$#pot); #find i which is the cutoff my $i_cut=$#r; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-csg-1.2.3/share/scripts/inverse/calc_thermforce.sh new/votca-csg-1.2.4/share/scripts/inverse/calc_thermforce.sh --- old/votca-csg-1.2.3/share/scripts/inverse/calc_thermforce.sh 2012-08-15 06:27:37.000000000 +0200 +++ new/votca-csg-1.2.4/share/scripts/inverse/calc_thermforce.sh 2014-08-31 23:55:07.000000000 +0200 @@ -45,7 +45,7 @@ else outfile="${name}.sym.dens" adressc="$(get_simulation_setting adress_reference_coords "0")" - ref="$(echo "$adressc" | awk '{if (NF<1) exit 1; print "$1";}')" || die "${0##*/}: we need at least one number in adress_reference_coords, but got '$adressc'" + ref="$(echo "$adressc" | awk '{if (NF<1) exit 1; print $1;}')" || die "${0##*/}: we need at least one number in adress_reference_coords, but got '$adressc'" critical do_external density symmetrize --infile "$infile" --outfile "$outfile" --adressc "$ref" infile="${outfile}" fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-csg-1.2.3/share/scripts/inverse/density_symmetrize.py new/votca-csg-1.2.4/share/scripts/inverse/density_symmetrize.py --- old/votca-csg-1.2.3/share/scripts/inverse/density_symmetrize.py 2012-08-15 06:27:37.000000000 +0200 +++ new/votca-csg-1.2.4/share/scripts/inverse/density_symmetrize.py 2014-08-31 23:55:07.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Copyright 2009-2011 The VOTCA Development Team (http://www.votca.org) # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-csg-1.2.3/share/scripts/inverse/functions_common.sh new/votca-csg-1.2.4/share/scripts/inverse/functions_common.sh --- old/votca-csg-1.2.3/share/scripts/inverse/functions_common.sh 2012-08-15 06:27:37.000000000 +0200 +++ new/votca-csg-1.2.4/share/scripts/inverse/functions_common.sh 2014-08-31 23:55:07.000000000 +0200 @@ -273,7 +273,7 @@ num_check() { #checks if 1st argument is a number or calls die with error message (2nd argument) local res [[ -n $1 || -n $2 ]] || die "num_check: Missing argument" - res=$(awk -v x="$1" 'BEGIN{ print x+0==x; }') + res=$(awk -v x="$1" 'BEGIN{ print ( x+0==x ) }') [[ $res -eq 1 ]] && return 0 shift die "$*" @@ -519,8 +519,8 @@ [[ -n "$(type -p awk)" ]] || die "csg_calc: Could not find awk" #we use awk -v because then " 1 " or "1\n" is equal to 1 case "$2" in - "+"|"-"|'*'|"/"|"**") - res="$(awk -v x="$1" -v y="$3" "BEGIN{print x $2 y}")" || die "csg_calc: awk -v x='$1' -v y='$3' 'BEGIN{print x $2 y}' failed" + "+"|"-"|'*'|"/"|"^") + res="$(awk -v x="$1" -v y="$3" "BEGIN{print ( x $2 y ) }")" || die "csg_calc: awk -v x='$1' -v y='$3' 'BEGIN{print ( x $2 y ) }' failed" true;; '>'|'<' ) res="$(awk -v x="$1" -v y="$3" "BEGIN{print ( x $2 y )}")" || die "csg_calc: awk -v x='$1' -v y='$3' 'BEGIN{print ( x $2 y )}' failed" @@ -531,7 +531,7 @@ true;; "="|"==") #we expect that x and y are close together - res="$(awk -v x="$1" -v y="$3" "BEGIN{print ( sqrt(((x-y)/x)**2) < $err )}")" || die "csg_calc: awk -v x='$1' -v y='$3' 'BEGIN{print ( sqrt(((x-y)/x)**2) < $err )}' failed" + res="$(awk -v x="$1" -v y="$3" "BEGIN{print ( sqrt(((x-y)/x)^2) < $err )}")" || die "csg_calc: awk -v x='$1' -v y='$3' 'BEGIN{print ( sqrt(((x-y)/x)^2) < $err )}' failed" #awk return 1 for true and 0 for false, shell exit codes are the other way around ret="$((1-$res))" #return value matters diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-csg-1.2.3/share/scripts/inverse/linsolve.py new/votca-csg-1.2.4/share/scripts/inverse/linsolve.py --- old/votca-csg-1.2.3/share/scripts/inverse/linsolve.py 2012-08-15 06:27:37.000000000 +0200 +++ new/votca-csg-1.2.4/share/scripts/inverse/linsolve.py 2014-08-31 23:55:07.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 import numpy as np A = np.loadtxt('$name.gmc'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-csg-1.2.3/share/scripts/inverse/postadd_convergence.sh new/votca-csg-1.2.4/share/scripts/inverse/postadd_convergence.sh --- old/votca-csg-1.2.3/share/scripts/inverse/postadd_convergence.sh 2012-08-15 06:27:37.000000000 +0200 +++ new/votca-csg-1.2.4/share/scripts/inverse/postadd_convergence.sh 2014-08-31 23:55:07.000000000 +0200 @@ -71,7 +71,7 @@ critical paste $tmp1 $tmp3 > $tmp4 critical awk '{if ($4!=$1){print "x column differs in line",NR;exit 1;}}' $tmp4 echo "Calc convergence for ${name} with weight $weight" - critical awk -v bin=$step -v w=$weight -v dist=$dist '{sum+=($5-$2)**2;}END{print dist,sqrt(sum*bin*w);}' $tmp4 >> $tmp + critical awk -v bin=$step -v w=$weight -v dist=$dist '{sum+=($5-$2)^2;}END{print dist,sqrt(sum*bin*w);}' $tmp4 >> $tmp done critical awk '{sum+=$2;}END{print sum;}' $tmp > ${name}.conv diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-csg-1.2.3/share/scripts/inverse/solve_numpy.sh new/votca-csg-1.2.4/share/scripts/inverse/solve_numpy.sh --- old/votca-csg-1.2.3/share/scripts/inverse/solve_numpy.sh 2012-08-15 06:27:37.000000000 +0200 +++ new/votca-csg-1.2.4/share/scripts/inverse/solve_numpy.sh 2014-08-31 23:55:07.000000000 +0200 @@ -33,7 +33,7 @@ cat_external solve numpy | sed -e "s/\$name_out/$2/" -e "s/\$name/$1/" > solve_$1.sh || die "${0##*/}: sed failed" #this check is not sufficient for numpy! check for numpy package! -py="$(csg_get_property cg.inverse.imc.numpy.bin "python")" +py="$(csg_get_property cg.inverse.imc.numpy.bin "python2")" [ -n "$(type -p $py)" ] || die "${0##*/}: python binary '$py' not found" critical $py solve_$1.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-csg-1.2.3/share/scripts/inverse/table_getsubset.py new/votca-csg-1.2.4/share/scripts/inverse/table_getsubset.py --- old/votca-csg-1.2.3/share/scripts/inverse/table_getsubset.py 2012-08-15 06:27:37.000000000 +0200 +++ new/votca-csg-1.2.4/share/scripts/inverse/table_getsubset.py 2014-08-31 23:55:07.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Copyright 2009-2011 The VOTCA Development Team (http://www.votca.org) # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-csg-1.2.3/share/scripts/inverse/table_smooth_borders.py new/votca-csg-1.2.4/share/scripts/inverse/table_smooth_borders.py --- old/votca-csg-1.2.3/share/scripts/inverse/table_smooth_borders.py 2012-08-15 06:27:37.000000000 +0200 +++ new/votca-csg-1.2.4/share/scripts/inverse/table_smooth_borders.py 2014-08-31 23:55:07.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Copyright 2009-2011 The VOTCA Development Team (http://www.votca.org) # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-csg-1.2.3/src/csg_boltzmann/tabulatedpotential.cc new/votca-csg-1.2.4/src/csg_boltzmann/tabulatedpotential.cc --- old/votca-csg-1.2.3/src/csg_boltzmann/tabulatedpotential.cc 2012-08-15 06:27:38.000000000 +0200 +++ new/votca-csg-1.2.4/src/csg_boltzmann/tabulatedpotential.cc 2014-08-31 23:55:07.000000000 +0200 @@ -99,7 +99,7 @@ if(args.size() == 1) { cout << cmd << " set <option> <value>\n" << "set option for this command. Use \"" << cmd << " set\"" - " for a list of availale options. To get telp on a specific option use e.g.\n" + " for a list of available options. To get help on a specific option use e.g.\n" << cmd << " set periodic\n"; return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-csg-1.2.3/src/libcsg/CMakeLists.txt new/votca-csg-1.2.4/src/libcsg/CMakeLists.txt --- old/votca-csg-1.2.3/src/libcsg/CMakeLists.txt 2012-08-15 06:27:38.000000000 +0200 +++ new/votca-csg-1.2.4/src/libcsg/CMakeLists.txt 2014-08-31 23:55:07.000000000 +0200 @@ -49,7 +49,7 @@ add_library(votca_csg ${VOTCA_SOURCES} ${GMX_SOURCES} ${IO_SOURCES}) add_dependencies(votca_csg hgversion) set_target_properties(votca_csg PROPERTIES SOVERSION ${SOVERSION}) -target_link_libraries(votca_csg ${VOTCA_TOOLS_LIBRARIES} ${GROMACS_LIBRARIES} ${BOOST_LIBRARIES}) +target_link_libraries(votca_csg ${VOTCA_TOOLS_LIBRARIES} ${GROMACS_LIBRARIES} ${BOOST_LIBRARIES} ${THREAD_LIBRARIES}) install(TARGETS votca_csg LIBRARY DESTINATION ${LIB} ARCHIVE DESTINATION ${LIB}) configure_file(libvotca_csg.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libvotca_csg.pc @ONLY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-csg-1.2.3/src/libcsg/libvotca_csg.pc.in new/votca-csg-1.2.4/src/libcsg/libvotca_csg.pc.in --- old/votca-csg-1.2.3/src/libcsg/libvotca_csg.pc.in 2012-08-15 06:27:38.000000000 +0200 +++ new/votca-csg-1.2.4/src/libcsg/libvotca_csg.pc.in 2014-08-31 23:55:07.000000000 +0200 @@ -7,6 +7,6 @@ URL: http://www.votca.org Version: @VERSION@ Requires: libvotca_tools @GROMACS_PKG@ @BOOST_PKG@ -Libs: -L${libdir} -lvotca_csg @BOOST_LIBS_PKG@ +Libs: -L${libdir} -lvotca_csg @BOOST_LIBS_PKG@ @THREAD_LIBRARIES@ Libs.private: -lm Cflags: -I${includedir} @BOOST_CFLAGS_PKG@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-csg-1.2.3/src/libcsg/modules/io/gmxtopologyreader.cc new/votca-csg-1.2.4/src/libcsg/modules/io/gmxtopologyreader.cc --- old/votca-csg-1.2.3/src/libcsg/modules/io/gmxtopologyreader.cc 2012-08-15 06:27:38.000000000 +0200 +++ new/votca-csg-1.2.4/src/libcsg/modules/io/gmxtopologyreader.cc 2014-08-31 23:55:07.000000000 +0200 @@ -23,13 +23,7 @@ #include "gmxtopologyreader.h" #if GMX == 50 - #include <gromacs/legacyheaders/statutil.h> - #include <gromacs/legacyheaders/typedefs.h> - #include <gromacs/legacyheaders/smalloc.h> - #include <gromacs/legacyheaders/vec.h> - #include <gromacs/legacyheaders/copyrite.h> - #include <gromacs/legacyheaders/statutil.h> - #include <gromacs/legacyheaders/tpxio.h> + #include <gromacs/fileio/tpxio.h> #elif GMX == 45 #include <gromacs/statutil.h> #include <gromacs/typedefs.h> @@ -64,7 +58,6 @@ int natoms; // cleanup topology to store new data top.Cleanup(); - set_program_name("VOTCA"); #if GMX == 50 t_inputrec ir; @@ -72,10 +65,14 @@ (void)read_tpx((char *)file.c_str(),&ir,gbox,&natoms,NULL,NULL,NULL,&mtop); #elif GMX == 45 + set_program_name("VOTCA"); + t_inputrec ir; ::matrix gbox; (void)read_tpx((char *)file.c_str(),&ir,gbox,&natoms,NULL,NULL,NULL,&mtop); #elif GMX == 40 + set_program_name("VOTCA"); + int sss; // wtf is this ::real ttt,lll; // wtf is this (void)read_tpx((char *)file.c_str(),&sss,&ttt,&lll,NULL,NULL,&natoms,NULL,NULL,NULL,&mtop); @@ -152,6 +149,14 @@ } } +#if GMX != 40 + matrix m; + for(int i=0; i<3; i++) + for(int j=0; j<3; j++) + m[i][j] = gbox[j][i]; + top.setBox(m); +#endif + return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-csg-1.2.3/src/libcsg/modules/io/gmxtrajectoryreader.cc new/votca-csg-1.2.4/src/libcsg/modules/io/gmxtrajectoryreader.cc --- old/votca-csg-1.2.3/src/libcsg/modules/io/gmxtrajectoryreader.cc 2012-08-15 06:27:38.000000000 +0200 +++ new/votca-csg-1.2.4/src/libcsg/modules/io/gmxtrajectoryreader.cc 2014-08-31 23:55:07.000000000 +0200 @@ -37,20 +37,20 @@ bool GMXTrajectoryReader::FirstFrame(Topology &conf) { - set_program_name("VOTCA"); - #if GMX == 50 output_env_t oenv; // _snew("oenv", oenv, 1); - oenv = (output_env_t)malloc(sizeof(*oenv)); - output_env_init_default (oenv); + //oenv = (output_env_t)malloc(sizeof(*oenv)); + output_env_init_default (&oenv); if(!read_first_frame(oenv, &_gmx_status,(char*)_filename.c_str(),&_gmx_frame,TRX_READ_X | TRX_READ_V | TRX_READ_F)) throw std::runtime_error(string("cannot open ") + _filename); //sfree(oenv); free(oenv); #elif GMX == 45 + set_program_name("VOTCA"); + output_env_t oenv; // _snew("oenv", oenv, 1); oenv = (output_env_t)malloc(sizeof(*oenv)); @@ -61,6 +61,8 @@ //sfree(oenv); free(oenv); #elif GMX == 40 + set_program_name("VOTCA"); + if(!read_first_frame(&_gmx_status,(char*)_filename.c_str(),&_gmx_frame,TRX_READ_X | TRX_READ_V | TRX_READ_F)) throw std::runtime_error(string("cannot open ") + _filename); #else @@ -102,8 +104,8 @@ #if GMX == 50 output_env_t oenv; //_snew("oenv", oenv, 1); - oenv = (output_env_t)malloc(sizeof(*oenv)); - output_env_init_default (oenv); + //oenv = (output_env_t)malloc(sizeof(*oenv)); + output_env_init_default (&oenv); if(!read_next_frame(oenv, _gmx_status,&_gmx_frame)) return false; //sfree(oenv); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-csg-1.2.3/src/libcsg/modules/io/gmxtrajectoryreader.h new/votca-csg-1.2.4/src/libcsg/modules/io/gmxtrajectoryreader.h --- old/votca-csg-1.2.3/src/libcsg/modules/io/gmxtrajectoryreader.h 2012-08-15 06:27:38.000000000 +0200 +++ new/votca-csg-1.2.4/src/libcsg/modules/io/gmxtrajectoryreader.h 2014-08-31 23:55:07.000000000 +0200 @@ -27,13 +27,7 @@ #include "gmx_version_check.h" #if GMX == 50 - #include <gromacs/legacyheaders/statutil.h> - #include <gromacs/legacyheaders/typedefs.h> - #include <gromacs/legacyheaders/smalloc.h> - #include <gromacs/legacyheaders/vec.h> - #include <gromacs/legacyheaders/copyrite.h> - #include <gromacs/legacyheaders/statutil.h> - #include <gromacs/legacyheaders/tpxio.h> + #include <gromacs/fileio/trxio.h> #elif GMX == 45 #include <gromacs/statutil.h> #include <gromacs/typedefs.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-csg-1.2.3/src/libcsg/modules/io/gmxtrajectorywriter.cc new/votca-csg-1.2.4/src/libcsg/modules/io/gmxtrajectorywriter.cc --- old/votca-csg-1.2.3/src/libcsg/modules/io/gmxtrajectorywriter.cc 2012-08-15 06:27:38.000000000 +0200 +++ new/votca-csg-1.2.4/src/libcsg/modules/io/gmxtrajectorywriter.cc 2014-08-31 23:55:07.000000000 +0200 @@ -23,7 +23,9 @@ void GMXTrajectoryWriter::Open(string file, bool bAppend) { +#if GMX != 50 set_program_name("VOTCA"); +#endif //char c[1] = bAppend ? "a" : "w"; _file = open_trx((char *)file.c_str(), "w"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-csg-1.2.3/src/libcsg/modules/io/gmxtrajectorywriter.h new/votca-csg-1.2.4/src/libcsg/modules/io/gmxtrajectorywriter.h --- old/votca-csg-1.2.3/src/libcsg/modules/io/gmxtrajectorywriter.h 2012-08-15 06:27:38.000000000 +0200 +++ new/votca-csg-1.2.4/src/libcsg/modules/io/gmxtrajectorywriter.h 2014-08-31 23:55:07.000000000 +0200 @@ -27,13 +27,7 @@ #include "gmx_version_check.h" #if GMX == 50 - #include <gromacs/legacyheaders/statutil.h> - #include <gromacs/legacyheaders/typedefs.h> - #include <gromacs/legacyheaders/smalloc.h> - #include <gromacs/legacyheaders/vec.h> - #include <gromacs/legacyheaders/copyrite.h> - #include <gromacs/legacyheaders/statutil.h> - #include <gromacs/legacyheaders/tpxio.h> + #include <gromacs/fileio/trxio.h> #elif GMX == 45 #include <gromacs/statutil.h> #include <gromacs/typedefs.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-csg-1.2.3/src/libcsg/modules/io/pdbtopologyreader.cc new/votca-csg-1.2.4/src/libcsg/modules/io/pdbtopologyreader.cc --- old/votca-csg-1.2.3/src/libcsg/modules/io/pdbtopologyreader.cc 2012-08-15 06:27:38.000000000 +0200 +++ new/votca-csg-1.2.4/src/libcsg/modules/io/pdbtopologyreader.cc 2014-08-31 23:55:07.000000000 +0200 @@ -23,14 +23,9 @@ #include "pdbtopologyreader.h" #if GMX == 50 - #include <gromacs/legacyheaders/statutil.h> - #include <gromacs/legacyheaders/typedefs.h> - #include <gromacs/legacyheaders/smalloc.h> - #include <gromacs/legacyheaders/confio.h> - #include <gromacs/legacyheaders/vec.h> - #include <gromacs/legacyheaders/copyrite.h> - #include <gromacs/legacyheaders/statutil.h> - #include <gromacs/legacyheaders/tpxio.h> + #include <gromacs/fileio/trxio.h> + #include <gromacs/fileio/confio.h> + #include <gromacs/utility/smalloc.h> #elif GMX == 45 #include <gromacs/statutil.h> #include <gromacs/typedefs.h> @@ -70,7 +65,9 @@ ::matrix box; int ePBC; t_atoms atoms; +#if GMX != 50 set_program_name("VOTCA"); +#endif //snew(atoms,1); get_stx_coordnum((char*)file.c_str(),&(atoms.nr)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-csg-1.2.3/src/libcsg/modules/io/xyzwriter.cc new/votca-csg-1.2.4/src/libcsg/modules/io/xyzwriter.cc --- old/votca-csg-1.2.3/src/libcsg/modules/io/xyzwriter.cc 2012-08-15 06:27:38.000000000 +0200 +++ new/votca-csg-1.2.4/src/libcsg/modules/io/xyzwriter.cc 2014-08-31 23:55:07.000000000 +0200 @@ -37,7 +37,7 @@ void XYZWriter::Write(Topology *conf) { Topology *top = conf; - fprintf(_out, "%d\n", top->Beads().size()); + fprintf(_out, "%lu\n", top->Beads().size()); fprintf(_out, "frame: %d time: %f\n", top->getStep()+1, top->getTime()); for(BeadContainer::iterator iter=conf->Beads().begin(); ++++++ votca-csg-manual-1.2.3.pdf -> votca-csg-manual-1.2.4.pdf ++++++ (binary differes) ++++++ votca-csg-tutorials-1.2.3.tar.gz -> votca-csg-tutorials-1.2.4.tar.gz ++++++ ++++ 8034 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 python-plaso for openSUSE:Factory
by root＠hilbert.suse.de 07 Sep '14

07 Sep '14

Hello community, here is the log from the commit of package python-plaso for openSUSE:Factory checked in at 2014-09-07 11:10:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-plaso (Old) and /work/SRC/openSUSE:Factory/.python-plaso.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-plaso" Changes: -------- --- /work/SRC/openSUSE:Factory/python-plaso/python-plaso.changes 2014-06-04 18:39:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-plaso.new/python-plaso.changes 2014-09-07 11:10:11.000000000 +0200 @@ -1,0 +2,23 @@ +Sat Aug 23 21:37:25 UTC 2014 - Greg.Freemyer(a)gmail.com + +- update to v1.1.0 + * This is a major update + * See the announcement at http://blog.kiddaland.net/2014/06/what-is-one-to-say-about-june-time-of.html + * Highlights + ** the ability to read the storage media image formats EWF, QCOW, VHD and VMDK, besides RAW; + ** improved existing parsers and plugins, e.g. multi volume support in the Windows Prefetch parser; + ** various additional parsers and plugins; + ** new features. +- change Requires to use upstream naming where we can +- change Requires to use recent version of core python modules +- correct Requires: py* lines to have the 0~ at the start of the version + * For normal symbols, the 0~ is required NOT to be present, but is required on these +- Add all remaining dependencies that plaso v1.1.0 can leverage at run time + * add Requires: pyesedb since it is now in OBS + * add Requires: pyqcow since it is now in OBS + * add Requires: pyvmdk since it is now in OBS + * add Requires: pyvhdi since it is now in OBS + * Add Requires: python-bencode since it is now in OBS +- remove %attr(755...) line and instead use sed to remove #!/usr/bin/python from *py files + +------------------------------------------------------------------- Old: ---- plaso_source_1.0.2.tar.gz New: ---- plaso-1.1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-plaso.spec ++++++ --- /var/tmp/diff_new_pack.F5UkHe/_old 2014-09-07 11:10:13.000000000 +0200 +++ /var/tmp/diff_new_pack.F5UkHe/_new 2014-09-07 11:10:13.000000000 +0200 @@ -17,34 +17,47 @@ Name: python-plaso -Version: 1.0.2 +Version: 1.1.0 Release: 0 Summary: Plaso is a library for working with forensic timelines License: Apache-2.0 Group: Development/Libraries/Python Url: http://plaso.kiddaland.net/ -#DL-URL: https://googledrive.com/host/0B30H7z4S52FleW5vUHBnblJfcjg/1.0.2/final/plaso… -Source0: plaso_source_%{version}.tar.gz +#DL-URL: https://e366e647f8637dd31e0a13f75e5469341a9ab0ee.googledrive.com/host/0B30H… +Source0: plaso-%{version}.tar.gz BuildRequires: fdupes BuildRequires: pkg-config BuildRequires: python-devel BuildRequires: python-setuptools Requires: OleFileIO_PL -Requires: python-binplist -Requires: python-construct +Requires: libtsk10 >= 4.1.2 +Requires: python-binplist >= 0.1.4 +Requires: python-construct >= 2.5.2 Requires: python-dateutil +Requires: python-dfVFS Requires: python-dpkt Requires: python-hachoir-core Requires: python-hachoir-metadata Requires: python-hachoir-parser -Requires: python-libevt -Requires: python-libevtx -Requires: python-liblnk -Requires: python-libmsiecf -Requires: python-libolecf -Requires: python-libregf -Requires: python-libvshadow +# These are core libraries. Make sure current versions are used +Requires: pyevt >= 0~20140731 +Requires: pyevtx >= 0~20140731 +Requires: pyewf >= 0~20140603 +Requires: pylnk >= 0~20140731 +Requires: pymsiecf >= 0~20140731 +Requires: pyolecf >= 0~20140801 +Requires: pyregf >= 0~20140803 +Requires: pyvshadow >= 0~20140731 + +Requires: pyesedb +Requires: pyqcow +Requires: pysmdev +Requires: pyvhdi +Requires: pyvmdk + +Requires: python-bencode Requires: python-protobuf +Requires: python-psutil Requires: python-pyparsing Requires: python-tsk Requires: python-tz @@ -58,7 +71,12 @@ Recommends: libolecf-tools Recommends: libregf-tools Recommends: libvshadow-tools -Recommends: sleuthkit +Recommends: libsmdev-tools +Recommends: libesedb-tools +Recommends: libvhdi-tools +Recommends: libvmdk-tools +Recommends: sleuthkit >= 4.1.2 + Provides: plaso BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -67,7 +85,8 @@ Plaso (plaso langar að safna öllu) is the Python based back-end engine used by tools such as log2timeline for automatic creation of a super timelines. The goal of log2timeline (and thus plaso) is to provide a single tool that can parse various log files and forensic artifacts from computer and related systems, such as network equipment to produce a single correlated timeline. This timeline can then be easily analysed by forensic investigators/analysts, speeding up investigations by correlating the vast amount of information found on an average computer system. %prep -%setup -q -n plaso +%setup -q -n plaso-%version +find plaso -name \*.py | xargs sed -i "/#!\/usr\/bin\/python/d" %build CFLAGS="%{optflags}" python setup.py build @@ -78,12 +97,20 @@ %files %defattr(-,root,root) -%doc ACKNOWLEDGEMENT AUTHORS LICENSE.TXT -%{python_sitelib}/plaso-1.0.2alpha-py2.7.egg-info -%defattr(755,root,root) +%doc ACKNOWLEDGEMENTS AUTHORS LICENSE.TXT +%{python_sitelib}/plaso-%{version}-py2.7.egg-info +%dir %{python_sitelib}/tools +%{python_sitelib}/tools/image_export.py +%{python_sitelib}/tools/image_export.pyc +%{python_sitelib}/tools/plaso_extract_search_history.py +%{python_sitelib}/tools/plaso_extract_search_history.pyc +%{python_sitelib}/tools/plaso_process_info.py +%{python_sitelib}/tools/plaso_process_info.pyc %{python_sitelib}/plaso %exclude %{python_sitelib}/test_data/__init__.py %exclude %{python_sitelib}/test_data/__init__.pyc +%exclude %{python_sitelib}/tools/__init__.py +%exclude %{python_sitelib}/tools/__init__.pyc %{_bindir}/image_export.py %{_bindir}/log2timeline.py %{_bindir}/pinfo.py -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2 for openSUSE:Factory
by root＠hilbert.suse.de 07 Sep '14

07 Sep '14

Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2014-09-07 11:10:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2014-09-03 21:23:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2014-09-07 11:10:08.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Sep 5 14:32:23 UTC 2014 - lslezak(a)suse.cz + +- do not write /etc/sysconfig/kernel:INITRD_MODULES, it has been + dropped (bnc#895084) +- 3.1.105 + +------------------------------------------------------------------- +Thu Sep 4 12:32:06 UTC 2014 - mvidner(a)suse.com + +- Use a more flexible rubygem requirement syntax (bnc#895069) +- 3.1.104 + +------------------------------------------------------------------- Old: ---- yast2-3.1.103.tar.bz2 New: ---- yast2-3.1.105.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.J0mcT1/_old 2014-09-07 11:10:09.000000000 +0200 +++ /var/tmp/diff_new_pack.J0mcT1/_new 2014-09-07 11:10:09.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.103 +Version: 3.1.105 Release: 0 Url: https://github.com/yast/yast-yast2 @@ -38,13 +38,12 @@ # Needed for tests BuildRequires: grep -BuildRequires: rubygem-rspec # for symlinking yardoc duplicates BuildRequires: fdupes # For running RSpec tests during build -BuildRequires: rubygem-rspec +BuildRequires: rubygem(rspec) # pre-requires for filling the sysconfig template (sysconfig.yast2) PreReq: %fillup_prereq ++++++ yast2-3.1.103.tar.bz2 -> yast2-3.1.105.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.103/library/system/src/modules/Initrd.rb new/yast2-3.1.105/library/system/src/modules/Initrd.rb --- old/yast2-3.1.103/library/system/src/modules/Initrd.rb 2014-09-01 14:52:08.000000000 +0200 +++ new/yast2-3.1.105/library/system/src/modules/Initrd.rb 2014-09-06 07:47:23.000000000 +0200 @@ -39,6 +39,8 @@ module Yast class InitrdClass < Module + include Yast::Logger + def main Yast.import "UI" @@ -138,7 +140,7 @@ :from => "list", :to => "list <string>" ) - end + end # currently no disk controller modules are known to fail in initrd (bnc#719696), list removed end deep_copy(@modules_to_skip) @@ -195,6 +197,9 @@ # @param [String] modname name of module # @param [String] modargs arguments to be passes to module def AddModule(modname, modargs) + log.warn "Initrd.AddModule() is deprecated, do not use (sysconfig.kernel.INITRD_MODULES " \ + "is not written anymore, see bnc#895084)" + if Stage.initial && Builtins.size(@modules) == 0 tmp_mods = Convert.to_string( SCR.Read(path(".etc.install_inf.InitrdModules")) @@ -372,10 +377,12 @@ path(".target.bash"), "/usr/bin/touch /etc/sysconfig/bootloader" ) + + # TODO FIXME: the modules are not written, remove them completely, + # for now just log them without any change mods = Builtins.mergestring(ListModules(), " ") - Builtins.y2milestone("Writing modules %1", mods) - SCR.Write(path(".sysconfig.kernel.INITRD_MODULES"), mods) - SCR.Write(path(".sysconfig.kernel"), nil) + log.warn "Ignoring configured kernel modules: #{mods}" unless mods.empty? + # recreate initrd param = "" if @splash != "" && @splash != nil && diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.103/library/system/testsuite/tests/initrd.out new/yast2-3.1.105/library/system/testsuite/tests/initrd.out --- old/yast2-3.1.103/library/system/testsuite/tests/initrd.out 2014-09-01 14:52:08.000000000 +0200 +++ new/yast2-3.1.105/library/system/testsuite/tests/initrd.out 2014-09-06 07:47:23.000000000 +0200 @@ -10,6 +10,7 @@ Dump Reseting again Return nil Dump Adding ne2k +Log Initrd.AddModule() is deprecated, do not use (sysconfig.kernel.INITRD_MODULES is not written anymore, see bnc#895084) Read .target.size "/etc/sysconfig/kernel" 0 Read .sysconfig.kernel.INITRD_MODULES "reiserfs lvmmod" Return nil @@ -23,8 +24,7 @@ Read .target.size "/etc/sysconfig/kernel" 0 Read .sysconfig.kernel.INITRD_MODULES "reiserfs lvmmod" Execute .target.bash "/usr/bin/touch /etc/sysconfig/bootloader" 0 -Write .sysconfig.kernel.INITRD_MODULES "reiserfs ne2k" true -Write .sysconfig.kernel nil true +Log Ignoring configured kernel modules: reiserfs ne2k Execute .target.bash "/sbin/mkinitrd >> /var/log/YaST2/y2logmkinitrd 2>&1" 0 Return true Dump Importing with filtered module @@ -35,8 +35,7 @@ Read .target.size "/etc/sysconfig/kernel" 0 Read .sysconfig.kernel.INITRD_MODULES "reiserfs lvmmod" Execute .target.bash "/usr/bin/touch /etc/sysconfig/bootloader" 0 -Write .sysconfig.kernel.INITRD_MODULES "ne2k xfs_dmapi xfs_support lvmmod" true -Write .sysconfig.kernel nil true +Log Ignoring configured kernel modules: ne2k xfs_dmapi xfs_support lvmmod Execute .target.bash "/sbin/mkinitrd >> /var/log/YaST2/y2logmkinitrd 2>&1" 0 Return true Dump Setting Mode::Update @@ -49,8 +48,7 @@ Read .target.size "/etc/sysconfig/kernel" 0 Read .sysconfig.kernel.INITRD_MODULES "reiserfs lvmmod" Execute .target.bash "/usr/bin/touch /etc/sysconfig/bootloader" 0 -Write .sysconfig.kernel.INITRD_MODULES "ne2k lvmmod" true -Write .sysconfig.kernel nil true +Log Ignoring configured kernel modules: ne2k lvmmod Execute .target.bash "/sbin/mkinitrd >> /var/log/YaST2/y2logmkinitrd 2>&1" 0 Return true Dump Resetting for installation test @@ -58,8 +56,11 @@ Return nil Return nil Dump Testing keeping installation order +Log Initrd.AddModule() is deprecated, do not use (sysconfig.kernel.INITRD_MODULES is not written anymore, see bnc#895084) Read .etc.install_inf.InitrdModules "driver1 driver2 driver3" Return nil +Log Initrd.AddModule() is deprecated, do not use (sysconfig.kernel.INITRD_MODULES is not written anymore, see bnc#895084) Return nil +Log Initrd.AddModule() is deprecated, do not use (sysconfig.kernel.INITRD_MODULES is not written anymore, see bnc#895084) Return nil Return ["driver2", "driver3", "ne2k"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.103/package/yast2.changes new/yast2-3.1.105/package/yast2.changes --- old/yast2-3.1.103/package/yast2.changes 2014-09-01 14:52:08.000000000 +0200 +++ new/yast2-3.1.105/package/yast2.changes 2014-09-06 07:47:23.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Fri Sep 5 14:32:23 UTC 2014 - lslezak(a)suse.cz + +- do not write /etc/sysconfig/kernel:INITRD_MODULES, it has been + dropped (bnc#895084) +- 3.1.105 + +------------------------------------------------------------------- +Thu Sep 4 12:32:06 UTC 2014 - mvidner(a)suse.com + +- Use a more flexible rubygem requirement syntax (bnc#895069) +- 3.1.104 + +------------------------------------------------------------------- Thu Aug 28 11:17:16 UTC 2014 - jreidinger(a)suse.com - fix using changed root in netd agent so it can be used in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.103/package/yast2.spec new/yast2-3.1.105/package/yast2.spec --- old/yast2-3.1.103/package/yast2.spec 2014-09-01 14:52:08.000000000 +0200 +++ new/yast2-3.1.105/package/yast2.spec 2014-09-06 07:47:23.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.103 +Version: 3.1.105 Release: 0 URL: https://github.com/yast/yast-yast2 @@ -34,13 +34,13 @@ BuildRequires: yast2-core >= 2.18.12 yast2-pkg-bindings >= 2.20.3 yast2-ycp-ui-bindings >= 2.18.4 # Needed for tests -BuildRequires: rubygem-rspec grep +BuildRequires: grep # for symlinking yardoc duplicates BuildRequires: fdupes # For running RSpec tests during build -BuildRequires: rubygem-rspec +BuildRequires: rubygem(rspec) # pre-requires for filling the sysconfig template (sysconfig.yast2) PreReq: %fillup_prereq -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-packager for openSUSE:Factory
by root＠hilbert.suse.de 07 Sep '14

07 Sep '14

Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at 2014-09-07 11:10:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old) and /work/SRC/openSUSE:Factory/.yast2-packager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-packager" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes 2014-09-03 21:23:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-packager.new/yast2-packager.changes 2014-09-07 11:10:06.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Sep 5 14:53:10 UTC 2014 - lslezak(a)suse.cz + +- /etc/sysconfig/kernel:INITRD_MODULES has been dropped, do not + write Xen modules there (bnc#895084) +- 3.1.46 + +------------------------------------------------------------------- +Thu Sep 4 11:03:03 UTC 2014 - jreidinger(a)suse.com + +- use new rubygem dependency syntax (bnc#895069) +- 3.1.45 + +------------------------------------------------------------------- Old: ---- yast2-packager-3.1.44.tar.bz2 New: ---- yast2-packager-3.1.46.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.Tgz5tr/_old 2014-09-07 11:10:07.000000000 +0200 +++ /var/tmp/diff_new_pack.Tgz5tr/_new 2014-09-07 11:10:07.000000000 +0200 @@ -17,19 +17,19 @@ Name: yast2-packager -Version: 3.1.44 +Version: 3.1.46 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 Url: https://github.com/kobliha/yast-packager -BuildRequires: rubygem-rspec BuildRequires: update-desktop-files BuildRequires: yast2-country-data BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2-testsuite BuildRequires: yast2-xml +BuildRequires: rubygem(rspec) # HwDetection BuildRequires: yast2 >= 3.1.19 ++++++ yast2-packager-3.1.44.tar.bz2 -> yast2-packager-3.1.46.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.44/package/yast2-packager.changes new/yast2-packager-3.1.46/package/yast2-packager.changes --- old/yast2-packager-3.1.44/package/yast2-packager.changes 2014-09-03 14:04:10.000000000 +0200 +++ new/yast2-packager-3.1.46/package/yast2-packager.changes 2014-09-05 17:30:41.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Fri Sep 5 14:53:10 UTC 2014 - lslezak(a)suse.cz + +- /etc/sysconfig/kernel:INITRD_MODULES has been dropped, do not + write Xen modules there (bnc#895084) +- 3.1.46 + +------------------------------------------------------------------- +Thu Sep 4 11:03:03 UTC 2014 - jreidinger(a)suse.com + +- use new rubygem dependency syntax (bnc#895069) +- 3.1.45 + +------------------------------------------------------------------- Tue Sep 2 11:59:32 UTC 2014 - ancor(a)suse.com - Use DM device for encrypted partitions during test mount diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.44/package/yast2-packager.spec new/yast2-packager-3.1.46/package/yast2-packager.spec --- old/yast2-packager-3.1.44/package/yast2-packager.spec 2014-09-03 14:04:10.000000000 +0200 +++ new/yast2-packager-3.1.46/package/yast2-packager.spec 2014-09-05 17:30:41.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.44 +Version: 3.1.46 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -28,7 +28,7 @@ License: GPL-2.0+ BuildRequires: yast2-country-data yast2-xml update-desktop-files yast2-testsuite BuildRequires: yast2-devtools >= 3.1.10 -BuildRequires: rubygem-rspec +BuildRequires: rubygem(rspec) # HwDetection BuildRequires: yast2 >= 3.1.19 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.44/src/clients/inst_kickoff.rb new/yast2-packager-3.1.46/src/clients/inst_kickoff.rb --- old/yast2-packager-3.1.44/src/clients/inst_kickoff.rb 2014-09-03 14:04:10.000000000 +0200 +++ new/yast2-packager-3.1.46/src/clients/inst_kickoff.rb 2014-09-05 17:30:41.000000000 +0200 @@ -24,7 +24,6 @@ Yast.import "Popup" Yast.import "Directory" Yast.import "ModuleLoading" - Yast.import "Initrd" Yast.import "Kernel" Yast.import "Arch" Yast.import "FileUtils" @@ -244,37 +243,9 @@ end end - # add Xen and HyperV PV drivers to initrd - XenPVToInitrd() - :next end - # add xen paravirtualized drivers to initrd if thery are selected for installation - def XenPVToInitrd - # is any xen-kmp-* package selected? - if Pkg.IsSelected("xen-kmp-default") || Pkg.IsSelected("xen-kmp-smp") || - Pkg.IsSelected("xen-kmp-pae") || - Pkg.IsSelected("xen-kmp-bigsmp") || - Pkg.IsSelected("xen-kmp-kdump") - # add disk driver - Initrd.AddModule("xen-vbd", "") - # add network driver - Initrd.AddModule("xen-vnif", "") - - Builtins.y2milestone( - "Added Xen PV drivers to initrd, configured drivers: %1", - Initrd.ListModules - ) - else - Builtins.y2milestone( - "No xen-kmp-* package is selected for installation, skipping XEN PV driver installation" - ) - end - - nil - end - # Write a fake mtab to the target system since some %post scripts might # need it. def fake_mtab -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-devtools for openSUSE:Factory
by root＠hilbert.suse.de 07 Sep '14

07 Sep '14

Hello community, here is the log from the commit of package yast2-devtools for openSUSE:Factory checked in at 2014-09-07 11:10:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-devtools (Old) and /work/SRC/openSUSE:Factory/.yast2-devtools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-devtools" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-devtools/yast2-devtools.changes 2014-06-18 10:59:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-devtools.new/yast2-devtools.changes 2014-09-07 11:10:05.000000000 +0200 @@ -1,0 +2,30 @@ +Fri Sep 5 12:51:57 UTC 2014 - mvidner(a)suse.com + +- Merged git and IBS +- 3.1.24 + +------------------------------------------------------------------- +Fri Sep 5 07:02:54 UTC 2014 - jreidinger(a)suse.com + +- create_maintenance_branch: fix build target for SLE-12 branch +- 3.1.23 + +------------------------------------------------------------------- +Thu Sep 4 13:19:11 UTC 2014 - jreidinger(a)suse.com + +- add tool for easy creation of maintenance branches to ytools +- 3.1.22 + +------------------------------------------------------------------- +Thu Sep 4 12:18:27 UTC 2014 - mvidner(a)suse.com + +- Use a more flexible rubygem requirement syntax (bnc#895069) +- 3.1.21 + +------------------------------------------------------------------- +Fri Jul 18 14:35:20 UTC 2014 - mrueckert(a)suse.de + +- switch to rubygem() based buildrequires so we can easily switch + the ruby version. + +------------------------------------------------------------------- @@ -2037 +2067 @@ -Thu Sep 5 12:07:50 CEST 2002 +Thu Sep 5 12:07:50 CEST 2002 - ke(a)suse.de Old: ---- yast2-devtools-3.1.20.tar.bz2 New: ---- yast2-devtools-3.1.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-devtools.spec ++++++ --- /var/tmp/diff_new_pack.6dwd3w/_old 2014-09-07 11:10:06.000000000 +0200 +++ /var/tmp/diff_new_pack.6dwd3w/_new 2014-09-07 11:10:06.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-devtools -Version: 3.1.20 +Version: 3.1.24 Release: 0 Url: http://github.com/yast/yast-devtools @@ -56,11 +56,11 @@ Requires: gettext-tools Requires: pkgconfig >= 0.16 # for building Ruby autodocs -Requires: rubygem-yard +Requires: rubygem(yard) %if 0%{?suse_version} <= 1230 # extra package for yard Markdown formatting in openSUSE <= 12.3 -Requires: rubygem-redcarpet +Requires: rubygem(redcarpet) %endif Recommends: cmake @@ -70,7 +70,7 @@ Recommends: libtool # for extracting translatable strings from *.rb files using "make pot" command # weak dependency, "make pot" is usually not needed -Suggests: rubygem-gettext +Suggests: rubygem(gettext) %description -n yast2-buildtools Scripts and templates required for rebuilding the existing YaST2 @@ -134,6 +134,7 @@ %{_datadir}/YaST2/clients/ycp2yml.rb %{_datadir}/YaST2/data/devtools/bin/check-textdomain %{_datadir}/YaST2/data/devtools/bin/check_icons +%{_datadir}/YaST2/data/devtools/bin/create_maintenance_branch %{_datadir}/YaST2/data/devtools/bin/find-unused-published %{_datadir}/YaST2/data/devtools/bin/get-lib %{_datadir}/YaST2/data/devtools/bin/pot-spellcheck ++++++ yast2-devtools-3.1.20.tar.bz2 -> yast2-devtools-3.1.24.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.20/.travis.yml new/yast2-devtools-3.1.24/.travis.yml --- old/yast2-devtools-3.1.20/.travis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-devtools-3.1.24/.travis.yml 2014-09-05 15:04:22.000000000 +0200 @@ -0,0 +1,13 @@ +language: cpp +compiler: + - gcc +# install additional packages +# http://docs.travis-ci.com/user/installing-dependencies/ +before_install: + - sudo apt-get update -qq + - sudo apt-get install -y docbook-xsl xsltproc +script: + - make -f Makefile.cvs + - make + - sudo make install + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.20/README.md new/yast2-devtools-3.1.24/README.md --- old/yast2-devtools-3.1.20/README.md 2014-06-06 14:49:28.000000000 +0200 +++ new/yast2-devtools-3.1.24/README.md 2014-09-05 15:04:22.000000000 +0200 @@ -1,3 +1,8 @@ +## Yast Development Tools + +[![Build Status](https://travis-ci.org/yast/yast-devtools.png?branch=master)](https:… + + ## Directory Structure ### [ytools](ytools) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.20/package/yast2-devtools.changes new/yast2-devtools-3.1.24/package/yast2-devtools.changes --- old/yast2-devtools-3.1.20/package/yast2-devtools.changes 2014-06-06 14:49:28.000000000 +0200 +++ new/yast2-devtools-3.1.24/package/yast2-devtools.changes 2014-09-05 15:04:22.000000000 +0200 @@ -1,4 +1,34 @@ ------------------------------------------------------------------- +Fri Sep 5 12:51:57 UTC 2014 - mvidner(a)suse.com + +- Merged git and IBS +- 3.1.24 + +------------------------------------------------------------------- +Fri Sep 5 07:02:54 UTC 2014 - jreidinger(a)suse.com + +- create_maintenance_branch: fix build target for SLE-12 branch +- 3.1.23 + +------------------------------------------------------------------- +Thu Sep 4 13:19:11 UTC 2014 - jreidinger(a)suse.com + +- add tool for easy creation of maintenance branches to ytools +- 3.1.22 + +------------------------------------------------------------------- +Thu Sep 4 12:18:27 UTC 2014 - mvidner(a)suse.com + +- Use a more flexible rubygem requirement syntax (bnc#895069) +- 3.1.21 + +------------------------------------------------------------------- +Fri Jul 18 14:35:20 UTC 2014 - mrueckert(a)suse.de + +- switch to rubygem() based buildrequires so we can easily switch + the ruby version. + +------------------------------------------------------------------- Fri Jun 6 14:32:01 CEST 2014 - locilka(a)suse.com - gettextdomains: added support for single quotes around @@ -2034,7 +2064,7 @@ - Update to version 2.6.11. ------------------------------------------------------------------- -Thu Sep 5 12:07:50 CEST 2002 +Thu Sep 5 12:07:50 CEST 2002 - ke(a)suse.de - devtools/devtools/admin/all-packages: add yast2-trans-da. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.20/package/yast2-devtools.spec new/yast2-devtools-3.1.24/package/yast2-devtools.spec --- old/yast2-devtools-3.1.20/package/yast2-devtools.spec 2014-06-06 14:49:28.000000000 +0200 +++ new/yast2-devtools-3.1.24/package/yast2-devtools.spec 2014-09-05 15:04:22.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-devtools -Version: 3.1.20 +Version: 3.1.24 Release: 0 Url: http://github.com/yast/yast-devtools @@ -55,11 +55,11 @@ Requires: gettext-tools Requires: pkgconfig >= 0.16 # for building Ruby autodocs -Requires: rubygem-yard +Requires: rubygem(yard) %if 0%{?suse_version} <= 1230 # extra package for yard Markdown formatting in openSUSE <= 12.3 -Requires: rubygem-redcarpet +Requires: rubygem(redcarpet) %endif Recommends: cmake @@ -69,7 +69,7 @@ Recommends: libtool # for extracting translatable strings from *.rb files using "make pot" command # weak dependency, "make pot" is usually not needed -Suggests: rubygem-gettext +Suggests: rubygem(gettext) %description -n yast2-buildtools @@ -134,6 +134,7 @@ %{_datadir}/YaST2/clients/ycp2yml.rb %{_datadir}/YaST2/data/devtools/bin/check-textdomain %{_datadir}/YaST2/data/devtools/bin/check_icons +%{_datadir}/YaST2/data/devtools/bin/create_maintenance_branch %{_datadir}/YaST2/data/devtools/bin/find-unused-published %{_datadir}/YaST2/data/devtools/bin/get-lib %{_datadir}/YaST2/data/devtools/bin/pot-spellcheck diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.20/ytools/yast2/Makefile.am new/yast2-devtools-3.1.24/ytools/yast2/Makefile.am --- old/yast2-devtools-3.1.20/ytools/yast2/Makefile.am 2014-06-06 14:49:28.000000000 +0200 +++ new/yast2-devtools-3.1.24/ytools/yast2/Makefile.am 2014-09-05 15:04:22.000000000 +0200 @@ -4,7 +4,7 @@ # bnc#396315 pkgdatadir = @YAST2DEVTOOLS@/bin -pkgdata_SCRIPTS = ycp_puttext +pkgdata_SCRIPTS = ycp_puttext create_maintenance_branch install-data-local: ln -snf $(pkgdatadir)/ycp_puttext $(DESTDIR)$(ybindir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.20/ytools/yast2/create_maintenance_branch new/yast2-devtools-3.1.24/ytools/yast2/create_maintenance_branch --- old/yast2-devtools-3.1.20/ytools/yast2/create_maintenance_branch 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-devtools-3.1.24/ytools/yast2/create_maintenance_branch 2014-09-05 15:04:22.000000000 +0200 @@ -0,0 +1,91 @@ +#!/usr/bin/env ruby + +# - Create maintenance branch BRANCH_NAME +# - Edit Rakefile to build and submit to corresponding projects +# - Commit and push + +# constants for tuning script to create desired branch +BRANCH_NAME="SLE-12-GA" +USE_IBS=true +DEVEL_PROJECT="Devel:YaST:SLE-12" +TARGET_PROJECT="SUSE:SLE-12:GA" +BUILD_TARGET="SLE_12" + +# start of non-configuration part +CONF_OPTIONS = { + "obs_project" => DEVEL_PROJECT, + "obs_sr_project" => TARGET_PROJECT, + "obs_target" => BUILD_TARGET, + "obs_api" => USE_IBS ? "https://api.suse.de/" : "https://api.opensuse.org" +} + +require "cheetah" + +# by default pass output of commands to stdout and stderr +Cheetah.default_options = { :stdout => STDOUT, :stderr => STDERR } + +def check_real_upstream + res = Cheetah.run "git", "remote", "-v", :stdout => :capture + if res.grep(/origin\s*git@github.com:yast/).empty? + raise "This script can work only on upstream clone, where upstream remote is marked as origin" + end +end + +def already_exists? + res = Cheetah.run "git", "branch", "-r", :stdout => :capture + res = res.lines + return !res.grep(/origin\/#{BRANCH_NAME}/).empty? +end + +def modify_rakefile + raise "Cannot find Rakefile in pwd" unless File.exist?("Rakefile") + + lines = File.readlines("Rakefile") + conf_line = lines.grep(/Yast::Tasks.configuration do/).first + if conf_line + conf_var = conf_line[/do \|\s*(\S+)\s*\|/, 1] + line_index = lines.index(conf_line) + else + line_index = 2 + conf_var = "conf" + conf_line = "Yast::Tasks.configuration do |#{conf_var}|\n" + lines.insert(line_index, conf_line, "end\n") + end + + CONF_OPTIONS.each do |key, value| + config_line = lines.grep(/#{conf_var}\.#{key}\s*=/).first + new_line = " #{conf_var}.#{key} = #{value.inspect}\n" + if config_line + lines[lines.index[config_line]] = new_line + else + lines.insert(line_index + 1, new_line) + end + end + + File.write("Rakefile", lines.join("")) +end + +check_real_upstream + +if already_exists? + puts "already exists, skipping" + exit 0 +end + +#switch to master branch +Cheetah.run "git", "checkout", "master" + +#create new branch ( ensure we use the latest non modified pushed version ) +Cheetah.run "git", "fetch", "origin" +Cheetah.run "git", "branch", BRANCH_NAME, "origin/master" +Cheetah.run "git", "checkout", BRANCH_NAME + +modify_rakefile + +commit_msg = "adapt Rakefile to submit to correct build service project in maintenance branch #{BRANCH_NAME}" + +Cheetah.run "git", "commit", "-m", commit_msg, "Rakefile" + +Cheetah.run "git", "push", "--set-upstream", "origin", BRANCH_NAME + +puts "Maintenance branch properly created" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-iscsi-client for openSUSE:Factory
by root＠hilbert.suse.de 07 Sep '14

07 Sep '14

Hello community, here is the log from the commit of package yast2-iscsi-client for openSUSE:Factory checked in at 2014-09-07 11:09:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-iscsi-client (Old) and /work/SRC/openSUSE:Factory/.yast2-iscsi-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-iscsi-client" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-iscsi-client/yast2-iscsi-client.changes 2014-08-20 17:53:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-iscsi-client.new/yast2-iscsi-client.changes 2014-09-07 11:10:03.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Sep 4 12:21:49 UTC 2014 - mvidner(a)suse.com + +- Use a more flexible rubygem requirement syntax (bnc#895069) +- 3.1.16 + +------------------------------------------------------------------- Old: ---- yast2-iscsi-client-3.1.15.tar.bz2 New: ---- yast2-iscsi-client-3.1.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-iscsi-client.spec ++++++ --- /var/tmp/diff_new_pack.fLFWRk/_old 2014-09-07 11:10:04.000000000 +0200 +++ /var/tmp/diff_new_pack.fLFWRk/_new 2014-09-07 11:10:04.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-iscsi-client -Version: 3.1.15 +Version: 3.1.16 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -30,7 +30,6 @@ BuildRequires: libxslt BuildRequires: perl-XML-Writer BuildRequires: popt-devel -BuildRequires: rubygem-rspec BuildRequires: sgml-skel BuildRequires: update-desktop-files BuildRequires: yast2 >= 2.23.15 @@ -39,6 +38,7 @@ BuildRequires: yast2-packager BuildRequires: yast2-perl-bindings BuildRequires: yast2-testsuite +BuildRequires: rubygem(rspec) Requires: yast2-packager ++++++ yast2-iscsi-client-3.1.15.tar.bz2 -> yast2-iscsi-client-3.1.16.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.15/package/yast2-iscsi-client.changes new/yast2-iscsi-client-3.1.16/package/yast2-iscsi-client.changes --- old/yast2-iscsi-client-3.1.15/package/yast2-iscsi-client.changes 2014-08-18 16:28:12.000000000 +0200 +++ new/yast2-iscsi-client-3.1.16/package/yast2-iscsi-client.changes 2014-09-04 16:37:23.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Sep 4 12:21:49 UTC 2014 - mvidner(a)suse.com + +- Use a more flexible rubygem requirement syntax (bnc#895069) +- 3.1.16 + +------------------------------------------------------------------- Mon Aug 18 16:08:27 CEST 2014 - locilka(a)suse.com - Updating the node DB while using authentication (bnc#889967 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.15/package/yast2-iscsi-client.spec new/yast2-iscsi-client-3.1.16/package/yast2-iscsi-client.spec --- old/yast2-iscsi-client-3.1.15/package/yast2-iscsi-client.spec 2014-08-18 16:28:12.000000000 +0200 +++ new/yast2-iscsi-client-3.1.16/package/yast2-iscsi-client.spec 2014-09-04 16:37:23.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-iscsi-client -Version: 3.1.15 +Version: 3.1.16 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -29,7 +29,7 @@ BuildRequires: yast2 >= 2.23.15 BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite libicu-devel yast2-packager BuildRequires: yast2-devtools >= 3.1.10 -BuildRequires: rubygem-rspec +BuildRequires: rubygem(rspec) Requires: yast2-packager -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-nfs-client for openSUSE:Factory
by root＠hilbert.suse.de 07 Sep '14

07 Sep '14

Hello community, here is the log from the commit of package yast2-nfs-client for openSUSE:Factory checked in at 2014-09-07 11:09:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-nfs-client (Old) and /work/SRC/openSUSE:Factory/.yast2-nfs-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-nfs-client" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-nfs-client/yast2-nfs-client.changes 2014-08-07 08:07:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-nfs-client.new/yast2-nfs-client.changes 2014-09-07 11:10:01.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Sep 4 12:23:22 UTC 2014 - mvidner(a)suse.com + +- Use a more flexible rubygem requirement syntax (bnc#895069) +- 3.1.9 + +------------------------------------------------------------------- Old: ---- yast2-nfs-client-3.1.8.tar.bz2 New: ---- yast2-nfs-client-3.1.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-nfs-client.spec ++++++ --- /var/tmp/diff_new_pack.q4KOpG/_old 2014-09-07 11:10:03.000000000 +0200 +++ /var/tmp/diff_new_pack.q4KOpG/_new 2014-09-07 11:10:03.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-nfs-client -Version: 3.1.8 +Version: 3.1.9 Release: 0 Url: https://github.com/yast/yast-nfs-client @@ -38,7 +38,7 @@ # - "migration" # - "v4.1" v4.x BuildRequires: nfs-client < 1.3.1 -BuildRequires: rubygem-rspec +BuildRequires: rubygem(rspec) #ag_showexports moved to yast2 base # introduces extended IPv6 support. Requires: yast2 >= 2.23.6 ++++++ yast2-nfs-client-3.1.8.tar.bz2 -> yast2-nfs-client-3.1.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.8/package/yast2-nfs-client.changes new/yast2-nfs-client-3.1.9/package/yast2-nfs-client.changes --- old/yast2-nfs-client-3.1.8/package/yast2-nfs-client.changes 2014-08-06 15:11:42.000000000 +0200 +++ new/yast2-nfs-client-3.1.9/package/yast2-nfs-client.changes 2014-09-04 16:36:43.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Sep 4 12:23:22 UTC 2014 - mvidner(a)suse.com + +- Use a more flexible rubygem requirement syntax (bnc#895069) +- 3.1.9 + +------------------------------------------------------------------- Wed Aug 6 12:36:27 UTC 2014 - ancor(a)suse.com - Don't display 'NFS Settings' tab when called from partitioner diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.8/package/yast2-nfs-client.spec new/yast2-nfs-client-3.1.9/package/yast2-nfs-client.spec --- old/yast2-nfs-client-3.1.8/package/yast2-nfs-client.spec 2014-08-06 15:11:42.000000000 +0200 +++ new/yast2-nfs-client-3.1.9/package/yast2-nfs-client.spec 2014-09-04 16:36:43.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-nfs-client -Version: 3.1.8 +Version: 3.1.9 Release: 0 Url: https://github.com/yast/yast-nfs-client @@ -38,7 +38,7 @@ # - "migration" # - "v4.1" v4.x BuildRequires: nfs-client < 1.3.1 -BuildRequires: rubygem-rspec +BuildRequires: rubygem(rspec) #ag_showexports moved to yast2 base # introduces extended IPv6 support. Requires: yast2 >= 2.23.6 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-slp for openSUSE:Factory
by root＠hilbert.suse.de 07 Sep '14

07 Sep '14

Hello community, here is the log from the commit of package yast2-slp for openSUSE:Factory checked in at 2014-09-07 11:09:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-slp (Old) and /work/SRC/openSUSE:Factory/.yast2-slp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-slp" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-slp/yast2-slp.changes 2014-04-26 11:45:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-slp.new/yast2-slp.changes 2014-09-07 11:10:00.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Sep 4 12:30:59 UTC 2014 - mvidner(a)suse.com + +- Use a more flexible rubygem requirement syntax (bnc#895069) +- 3.1.7 + +------------------------------------------------------------------- Old: ---- yast2-slp-3.1.6.tar.bz2 New: ---- yast2-slp-3.1.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-slp.spec ++++++ --- /var/tmp/diff_new_pack.fjy9nE/_old 2014-09-07 11:10:01.000000000 +0200 +++ /var/tmp/diff_new_pack.fjy9nE/_new 2014-09-07 11:10:01.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-slp -Version: 3.1.6 +Version: 3.1.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -28,10 +28,10 @@ BuildRequires: libtool BuildRequires: openslp-devel BuildRequires: perl-XML-Writer -BuildRequires: rubygem-rspec BuildRequires: yast2 BuildRequires: yast2-core-devel BuildRequires: yast2-devtools >= 3.1.10 +BuildRequires: rubygem(rspec) %if 0%{?suse_version} < 1220 BuildRequires: libxcrypt-devel %endif ++++++ yast2-slp-3.1.6.tar.bz2 -> yast2-slp-3.1.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.1.6/MAINTAINER new/yast2-slp-3.1.7/MAINTAINER --- old/yast2-slp-3.1.6/MAINTAINER 2014-03-11 10:24:19.000000000 +0100 +++ new/yast2-slp-3.1.7/MAINTAINER 2014-09-04 16:35:53.000000000 +0200 @@ -1 +1 @@ -Jiri Suchomel <jsuchome(a)suse.cz> +YaST2 Maintainers <yast2-maintainers(a)suse.de> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.1.6/package/yast2-slp.changes new/yast2-slp-3.1.7/package/yast2-slp.changes --- old/yast2-slp-3.1.6/package/yast2-slp.changes 2014-04-16 16:27:35.000000000 +0200 +++ new/yast2-slp-3.1.7/package/yast2-slp.changes 2014-09-04 16:35:53.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Sep 4 12:30:59 UTC 2014 - mvidner(a)suse.com + +- Use a more flexible rubygem requirement syntax (bnc#895069) +- 3.1.7 + +------------------------------------------------------------------- Wed Apr 16 15:13:13 UTC 2014 - vmoravec(a)suse.com - Correct summary and description in spec file (bnc#868453) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.1.6/package/yast2-slp.spec new/yast2-slp-3.1.7/package/yast2-slp.spec --- old/yast2-slp-3.1.6/package/yast2-slp.spec 2014-04-16 16:27:35.000000000 +0200 +++ new/yast2-slp-3.1.7/package/yast2-slp.spec 2014-09-04 16:35:53.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-slp -Version: 3.1.6 +Version: 3.1.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -27,7 +27,7 @@ License: GPL-2.0+ BuildRequires: gcc-c++ openslp-devel doxygen perl-XML-Writer yast2-core-devel yast2 libtool BuildRequires: yast2-devtools >= 3.1.10 -BuildRequires: rubygem-rspec +BuildRequires: rubygem(rspec) %if 0%{?suse_version} < 1220 BuildRequires: libxcrypt-devel %endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-installation for openSUSE:Factory
by root＠hilbert.suse.de 07 Sep '14

07 Sep '14

Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2014-09-07 11:09:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2014-08-30 16:04:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2014-09-07 11:09:58.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Sep 4 12:21:25 UTC 2014 - mvidner(a)suse.com + +- Use a more flexible rubygem requirement syntax (bnc#895069) +- 3.1.115 + +------------------------------------------------------------------- +Wed Aug 28 15:31:55 UTC 2014 - ancor(a)suse.com + +- Enabled remote access on systems installed using VNC (bnc#893501) +- 3.1.114 + +------------------------------------------------------------------- Old: ---- yast2-installation-3.1.113.tar.bz2 New: ---- yast2-installation-3.1.115.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.VuWHWt/_old 2014-09-07 11:09:59.000000000 +0200 +++ /var/tmp/diff_new_pack.VuWHWt/_new 2014-09-07 11:09:59.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.113 +Version: 3.1.115 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,14 +35,17 @@ BuildRequires: docbook-xsl-stylesheets BuildRequires: libxslt -BuildRequires: rubygem-rspec BuildRequires: update-desktop-files BuildRequires: yast2-core-devel BuildRequires: yast2-devtools >= 3.1.10 +BuildRequires: rubygem(rspec) # Linuxrc.keys BuildRequires: yast2 >= 3.1.41 +# Yast::Remote +BuildRequires: yast2-network + # clone_system client Requires: autoyast2-installation >= 3.1.5 @@ -77,8 +80,10 @@ # Systemd default target and services Requires: yast2-services-manager +# Yast::Remote +Requires: yast2-network + # Only in inst-sys -# Requires: yast2-network # Requires: yast2-add-on # Requires: yast2-update ++++++ yast2-installation-3.1.113.tar.bz2 -> yast2-installation-3.1.115.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.113/package/yast2-installation.changes new/yast2-installation-3.1.115/package/yast2-installation.changes --- old/yast2-installation-3.1.113/package/yast2-installation.changes 2014-08-28 15:35:08.000000000 +0200 +++ new/yast2-installation-3.1.115/package/yast2-installation.changes 2014-09-04 16:34:13.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Thu Sep 4 12:21:25 UTC 2014 - mvidner(a)suse.com + +- Use a more flexible rubygem requirement syntax (bnc#895069) +- 3.1.115 + +------------------------------------------------------------------- +Wed Aug 28 15:31:55 UTC 2014 - ancor(a)suse.com + +- Enabled remote access on systems installed using VNC (bnc#893501) +- 3.1.114 + +------------------------------------------------------------------- Thu Aug 28 15:04:59 CEST 2014 - locilka(a)suse.com - Setting data for &product; macro (used in helps) as soon as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.113/package/yast2-installation.spec new/yast2-installation-3.1.115/package/yast2-installation.spec --- old/yast2-installation-3.1.113/package/yast2-installation.spec 2014-08-28 15:35:08.000000000 +0200 +++ new/yast2-installation-3.1.115/package/yast2-installation.spec 2014-09-04 16:34:13.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.113 +Version: 3.1.115 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,11 +35,14 @@ BuildRequires: docbook-xsl-stylesheets libxslt update-desktop-files yast2-core-devel BuildRequires: yast2-devtools >= 3.1.10 -BuildRequires: rubygem-rspec +BuildRequires: rubygem(rspec) # Linuxrc.keys BuildRequires: yast2 >= 3.1.41 +# Yast::Remote +BuildRequires: yast2-network + # clone_system client Requires: autoyast2-installation >= 3.1.5 @@ -74,8 +77,10 @@ # Systemd default target and services Requires: yast2-services-manager +# Yast::Remote +Requires: yast2-network + # Only in inst-sys -# Requires: yast2-network # Requires: yast2-add-on # Requires: yast2-update diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.113/src/Makefile.am new/yast2-installation-3.1.115/src/Makefile.am --- old/yast2-installation-3.1.113/src/Makefile.am 2014-08-28 15:35:08.000000000 +0200 +++ new/yast2-installation-3.1.115/src/Makefile.am 2014-09-04 16:34:13.000000000 +0200 @@ -62,6 +62,7 @@ clients/pre_umount_finish.rb \ clients/prep_shrink_finish.rb \ clients/proxy_finish.rb \ + clients/remote_finish.rb \ clients/save_config_finish.rb \ clients/save_hw_status_finish.rb \ clients/ssh_settings_finish.rb \ @@ -107,7 +108,8 @@ lib/installation/cio_ignore.rb \ lib/installation/clone_settings.rb \ lib/installation/minimal_installation.rb \ - lib/installation/prep_shrink.rb + lib/installation/prep_shrink.rb \ + lib/installation/remote_finish_client.rb EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(schemafiles_DATA) $(desktop_DATA) $(fillup_DATA) $(ylib_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.113/src/clients/inst_finish.rb new/yast2-installation-3.1.115/src/clients/inst_finish.rb --- old/yast2-installation-3.1.113/src/clients/inst_finish.rb 2014-08-28 15:35:08.000000000 +0200 +++ new/yast2-installation-3.1.115/src/clients/inst_finish.rb 2014-09-04 16:34:13.000000000 +0200 @@ -191,6 +191,7 @@ "firewall_stage1", "ntp-client", "ssh_settings", + "remote", "save_hw_status", "users", "autoinst_scripts2", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.113/src/clients/remote_finish.rb new/yast2-installation-3.1.115/src/clients/remote_finish.rb --- old/yast2-installation-3.1.113/src/clients/remote_finish.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.1.115/src/clients/remote_finish.rb 2014-09-04 16:34:13.000000000 +0200 @@ -0,0 +1,19 @@ +# encoding: utf-8 + +# ------------------------------------------------------------------------------ +# Copyright (c) 2014 SUSE Linux GmbH. All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of version 2 of the GNU General Public License as published by the +# Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, contact Novell, Inc. +# ------------------------------------------------------------------------------ +require "installation/remote_finish_client" + +Installation::RemoteFinishClient.new.run(*Yast::WFM.Args) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.113/src/lib/installation/remote_finish_client.rb new/yast2-installation-3.1.115/src/lib/installation/remote_finish_client.rb --- old/yast2-installation-3.1.113/src/lib/installation/remote_finish_client.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.1.115/src/lib/installation/remote_finish_client.rb 2014-09-04 16:34:13.000000000 +0200 @@ -0,0 +1,84 @@ +# encoding: utf-8 + +# ------------------------------------------------------------------------------ +# Copyright (c) 2014 SUSE Linux GmbH. All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of version 2 of the GNU General Public License as published by the +# Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, contact Novell, Inc. +# ------------------------------------------------------------------------------ + +require 'yast' + +module Installation + + # Step of base installation finish for remote administration (VNC) + class RemoteFinishClient + include Yast::Logger + include Yast::I18n + + def initialize + Yast.import "Linuxrc" + Yast.import "Remote" + textdomain "installation" + end + + # Executes the function passed as a first argument, to be called by + # WMF.CallFunction + def run(*args) + ret = nil + if args.empty? + func = "" + else + func = args.first.to_s + end + + log.info "starting remote_finish" + log.debug "func=#{func}" + + case func + when "Info" + ret = { + "steps" => 1, + "title" => title, + "when" => modes + } + when "Write" + enable_remote + else + log.error "unknown function: #{func}" + end + + log.debug "ret=#{ret}" + log.info "remote_finish finished" + ret + end + + # Text to display + # + # @return String + def title + _("Enabling remote administration...") + end + + # Modes in which #enable_remote should be called + # + # @return Array<Symbol> + def modes + Yast::Linuxrc.vnc ? [:installation, :autoinst] : [] + end + + # Enables remote access + def enable_remote + Yast::Remote.Enable + Yast::Remote.Write + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.113/test/Makefile.am new/yast2-installation-3.1.115/test/Makefile.am --- old/yast2-installation-3.1.113/test/Makefile.am 2014-08-28 15:35:08.000000000 +0200 +++ new/yast2-installation-3.1.115/test/Makefile.am 2014-09-04 16:34:13.000000000 +0200 @@ -1,7 +1,8 @@ TESTS = \ inst_functions_test.rb \ cio_ignore_test.rb \ - prep_shrink_test.rb + prep_shrink_test.rb \ + remote_finish_test.rb TEST_EXTENSIONS = .rb RB_LOG_COMPILER = rspec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.113/test/remote_finish_test.rb new/yast2-installation-3.1.115/test/remote_finish_test.rb --- old/yast2-installation-3.1.113/test/remote_finish_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.1.115/test/remote_finish_test.rb 2014-09-04 16:34:13.000000000 +0200 @@ -0,0 +1,62 @@ +#!/usr/bin/env rspec + +require_relative "./test_helper" +require "installation/remote_finish_client" + +module Yast + import "WFM" + import "Linuxrc" + + describe ::Installation::RemoteFinishClient do + + subject { ::Installation::RemoteFinishClient.new } + + describe "#run" do + it "can be called as a WFM client with 'Info'" do + allow(Linuxrc).to receive(:vnc) + result = Yast::WFM.CallFunction("remote_finish", ["Info"]) + expect(result).to be_a(Hash) + expect(result["steps"]).to eq(1) + end + + it "can be called as a WFM client with 'Write'" do + expect_any_instance_of(::Installation::RemoteFinishClient).to receive(:enable_remote) + expect(Yast::WFM.CallFunction("remote_finish", ["Write"])).to be_nil + end + end + + describe "#modes" do + let(:modes) { + subject.modes + } + + context "using VNC" do + before do + allow(Linuxrc).to receive(:vnc).and_return true + end + + it "configures remote access for installation and autoinst" do + expect(modes.sort).to eq([:autoinst, :installation]) + end + end + + context "not using VNC " do + before do + allow(Linuxrc).to receive(:vnc).and_return false + end + + it "does not configure remote access" do + expect(modes).to be_empty + end + end + end + + describe "#enable_remote" do + it "enables remote access" do + expect(Remote).to receive(:Write) + subject.enable_remote + expect(Remote.IsEnabled).to eql(true) + end + end + end +end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-fcoe-client for openSUSE:Factory
by root＠hilbert.suse.de 07 Sep '14

07 Sep '14

Hello community, here is the log from the commit of package yast2-fcoe-client for openSUSE:Factory checked in at 2014-09-07 11:09:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-fcoe-client (Old) and /work/SRC/openSUSE:Factory/.yast2-fcoe-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-fcoe-client" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-fcoe-client/yast2-fcoe-client.changes 2014-06-18 10:59:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-fcoe-client.new/yast2-fcoe-client.changes 2014-09-07 11:09:56.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Sep 4 12:20:35 UTC 2014 - mvidner(a)suse.com + +- Use a more flexible rubygem requirement syntax (bnc#895069) +- 3.1.11 + +------------------------------------------------------------------- Old: ---- yast2-fcoe-client-3.1.10.tar.bz2 New: ---- yast2-fcoe-client-3.1.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-fcoe-client.spec ++++++ --- /var/tmp/diff_new_pack.M6H09Y/_old 2014-09-07 11:09:57.000000000 +0200 +++ /var/tmp/diff_new_pack.M6H09Y/_new 2014-09-07 11:09:57.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-fcoe-client -Version: 3.1.10 +Version: 3.1.11 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -26,11 +26,11 @@ Requires: fcoe-utils Requires: yast2 >= 2.21.22 BuildRequires: perl-XML-Writer -BuildRequires: rubygem-rspec BuildRequires: update-desktop-files BuildRequires: yast2 BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2-testsuite +BuildRequires: rubygem(rspec) BuildArch: noarch ++++++ yast2-fcoe-client-3.1.10.tar.bz2 -> yast2-fcoe-client-3.1.11.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-3.1.10/package/yast2-fcoe-client.changes new/yast2-fcoe-client-3.1.11/package/yast2-fcoe-client.changes --- old/yast2-fcoe-client-3.1.10/package/yast2-fcoe-client.changes 2014-06-04 10:45:27.000000000 +0200 +++ new/yast2-fcoe-client-3.1.11/package/yast2-fcoe-client.changes 2014-09-04 16:33:39.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Sep 4 12:20:35 UTC 2014 - mvidner(a)suse.com + +- Use a more flexible rubygem requirement syntax (bnc#895069) +- 3.1.11 + +------------------------------------------------------------------- Tue Jun 3 14:52:59 CEST 2014 - gs(a)suse.de - Mark configuration values for translation (bnc #877911) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-3.1.10/package/yast2-fcoe-client.spec new/yast2-fcoe-client-3.1.11/package/yast2-fcoe-client.spec --- old/yast2-fcoe-client-3.1.10/package/yast2-fcoe-client.spec 2014-06-04 10:45:27.000000000 +0200 +++ new/yast2-fcoe-client-3.1.11/package/yast2-fcoe-client.spec 2014-09-04 16:33:39.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-fcoe-client -Version: 3.1.10 +Version: 3.1.11 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -29,7 +29,7 @@ Requires: fcoe-utils BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-testsuite BuildRequires: yast2-devtools >= 3.1.10 -BuildRequires: rubygem-rspec +BuildRequires: rubygem(rspec) BuildArchitectures: noarch -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0