July 2012 - openSUSE Commits - openSUSE Mailing Lists

commit kiwi for openSUSE:12.2
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package kiwi for openSUSE:12.2 checked in at 2012-07-01 15:07:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/kiwi (Old) and /work/SRC/openSUSE:12.2/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi", Maintainer is "ms(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.2/kiwi/kiwi.changes 2012-06-28 15:31:26.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.kiwi.new/kiwi.changes 2012-07-02 10:44:14.000000000 +0200 @@ -1,0 +2,30 @@ +Fri Jun 29 21:57:08 CEST 2012 - ms(a)suse.de + +- v5.03.27 released + +------------------------------------------------------------------- +Fri Jun 29 21:53:27 CEST 2012 - ms(a)suse.de + +- fixed hybrid persistent writing with kernel 3.x (bnc #769086) + +------------------------------------------------------------------- +Thu Jun 28 14:11:31 CEST 2012 - ms(a)suse.de + +- netboot: dhcpcd works with timeout 20s, kiwi used 40s, so one half + of the time it waited with no reason. This patch runs 'dhcpcd -T' + again after 22s, so the time is used effectively. It also helps in + situatios when the link needs more time to start, e.g with + wpa_supplicant and the first dhcp packets are lost. + +------------------------------------------------------------------- +Thu Jun 28 10:19:57 CEST 2012 - rjschwei(a)suse.de + +- fix the getPXEDeployConfiguration unit test on ppc and ppc64 + +------------------------------------------------------------------- +Wed Jun 27 15:37:22 CEST 2012 - ms(a)suse.de + +- zypper in 12.2 has been fixed now, so we can change back the + JeOS image template to the type="image" installation + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.E8Btdt/_old 2012-07-02 10:44:15.000000000 +0200 +++ /var/tmp/diff_new_pack.E8Btdt/_new 2012-07-02 10:44:15.000000000 +0200 @@ -21,7 +21,7 @@ Summary: OpenSuSE - KIWI Image System License: GPL-2.0 Group: System/Management -Version: 5.03.26 +Version: 5.03.27 Release: 0 # requirements to build packages BuildRequires: gcc-c++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2012-06-27 14:36:32.000000000 +0200 +++ new/kiwi/.revision 2012-06-27 14:36:32.000000000 +0200 @@ -1 +1 @@ -405fa428579c5ceaa954a420241f393263fde6e2 +de89ef19625bf365555c3b70e5da39972bda5354 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2012-06-27 14:36:32.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2012-06-29 21:57:48.000000000 +0200 @@ -50,7 +50,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "5.03.26"; + $data{Version} = "5.03.27"; $data{Publisher} = "SUSE LINUX Products GmbH"; $data{Preparer} = "KIWI - http://kiwi.berlios.de"; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2012-06-27 14:36:32.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2012-06-29 21:57:48.000000000 +0200 @@ -3266,7 +3266,17 @@ #====================================== # store hybrid write partition device #-------------------------------------- - export HYBRID_RW=$(ddn $biosBootDevice $HYBRID_PERSISTENT_PART) + # /.../ + # use a loop device here because kernel 3.x refuses + # to mount a partition if the disk itself was already + # mounted. In case of a hybrid iso the disk device + # e.g /dev/sda represents the iso and is therefore + # mounted in any case. The same trick is used in + # createHybridPersistent when creating the filesystem + # ---- + HYBRID_RW=$(ddn $biosBootDevice $HYBRID_PERSISTENT_PART) + HYBRID_RW=$(losetup -f --show $HYBRID_RW) + export HYBRID_RW } #====================================== # CDUmount @@ -3768,13 +3778,24 @@ #====================================== # wait for any preferred interface(s) #-------------------------------------- - for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20;do - for try_iface in $prefer_iface ; do - if [ -s /var/lib/dhcpcd/dhcpcd-$try_iface.info ] && - grep -q "^IPADDR=" /var/lib/dhcpcd/dhcpcd-$try_iface.info - then - break 2 - fi + for j in 1 2 ;do + for i in 1 2 3 4 5 6 7 8 9 10 11;do + for try_iface in $prefer_iface ; do + if [ -s /var/lib/dhcpcd/dhcpcd-$try_iface.info ] && + grep -q "^IPADDR=" /var/lib/dhcpcd/dhcpcd-$try_iface.info + then + break 3 + fi + done + sleep 2 + done + # /.../ + # we are behind the dhcpcd timeout 20s so the only thing + # we can do now is to try again + # ---- + for try_iface in $DHCPCD_STARTED; do + dhcpcd $opts -T $try_iface \ + > /var/lib/dhcpcd/dhcpcd-$try_iface.info & done sleep 2 done @@ -6650,11 +6671,13 @@ #====================================== # create filesystem on write partition #-------------------------------------- - if ! mkfs.$HYBRID_PERSISTENT_FS -L hybrid $(ddn $device $disknr);then + local loop_dev=$(losetup -f --show $(ddn $device $disknr)) + if ! mkfs.$HYBRID_PERSISTENT_FS -L hybrid $loop_dev;then Echo "Failed to create hybrid persistent filesystem" Echo "Persistent writing deactivated" unset kiwi_hybridpersistent fi + losetup -d $loop_dev } #====================================== # callPartitioner diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-12.2-JeOS/config.xml new/kiwi/template/ix86/suse-12.2-JeOS/config.xml --- old/kiwi/template/ix86/suse-12.2-JeOS/config.xml 2012-06-27 14:36:32.000000000 +0200 +++ new/kiwi/template/ix86/suse-12.2-JeOS/config.xml 2012-06-29 21:57:48.000000000 +0200 @@ -60,25 +60,19 @@ <repository type="yast2"> <source path="obs://12.2/repo/oss"/> </repository> - <packages type="bootstrap"> + <packages type="image"> <opensusePattern name="base"/> <opensuseProduct name="openSUSE"/> <package name="plymouth-branding-openSUSE" bootinclude="true"/> <package name="ifplugd"/> <package name="iputils"/> <package name="vim"/> - <package name="grub"/> <package name="grub2"/> <package name="syslinux"/> <package name="lvm2"/> <package name="plymouth"/> <package name="fontconfig"/> <package name="fonts-config"/> - <package name="zypper"/> - <package name="cracklib-dict-full"/> - <package name="ca-certificates"/> - <package name="timezone"/> - <package name="glibc-locale"/> </packages> <packages type="iso"> <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> @@ -89,14 +83,20 @@ <packages type="oem"> <package name="grub2-branding-openSUSE" bootinclude="true"/> </packages> - <packages type="bootstrap" profiles="xenFlavour"> + <packages type="image" profiles="xenFlavour"> <package name="kernel-xen" replaces="kernel-default"/> <package name="xen-tools" arch="x86_64" replaces=""/> <package name="xen" arch="x86_64" replaces=""/> </packages> - <packages type="bootstrap" profiles="vmxFlavour"> + <packages type="image" profiles="vmxFlavour"> <package name="kernel-default" replaces="kernel-xen"/> <package name="kernel-default" replaces="xen-tools"/> <package name="kernel-default" replaces="xen"/> </packages> + <packages type="bootstrap"> + <package name="filesystem"/> + <package name="glibc-locale"/> + <package name="cracklib-dict-full"/> + <package name="ca-certificates"/> + </packages> </image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiXML/pxeSettings/config.xml new/kiwi/tests/unit/data/kiwiXML/pxeSettings/config.xml --- old/kiwi/tests/unit/data/kiwiXML/pxeSettings/config.xml 2012-06-27 14:36:17.000000000 +0200 +++ new/kiwi/tests/unit/data/kiwiXML/pxeSettings/config.xml 2012-06-29 21:57:48.000000000 +0200 @@ -8,7 +8,7 @@ <preferences> <type image="pxe" filesystem="clicfs" boot="netboot/suse-12.1" installiso="true"> <pxedeploy server="192.168.100.2" blocksize="4096"> - <configuration arch="x86_64,i686,i586,armv7l,armv7hl,armv5te" dest="target" source="installSource"/> + <configuration arch="x86_64,i686,i586,armv7l,armv7hl,armv5te,ppc64,ppc" dest="target" source="installSource"/> <initrd>/pxeSetup/specialInitrd</initrd> <kernel>/pxeSetup/specialKernel</kernel> <partitions device="/dev/sda"> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gcc47 for openSUSE:12.2
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package gcc47 for openSUSE:12.2 checked in at 2012-07-01 20:59:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/gcc47 (Old) and /work/SRC/openSUSE:12.2/.gcc47.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gcc47", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.2/gcc47/cross-armv5el-gcc47-icecream-backend.changes 2012-06-26 15:37:28.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.gcc47.new/cross-armv5el-gcc47-icecream-backend.changes 2012-07-02 10:43:55.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 29 08:42:19 UTC 2012 - rguenther(a)suse.com + +- Adjust arm icecream cross for continued change of the canonical + target used in binutils. + +------------------------------------------------------------------- New Changes file: --- /dev/null 2012-06-28 07:48:42.835576985 +0200 +++ /work/SRC/openSUSE:12.2/.gcc47.new/cross-armv7hl-gcc47-icecream-backend.changes 2012-07-02 10:43:55.000000000 +0200 @@ -0,0 +1,172 @@ +------------------------------------------------------------------- +Fri Jun 29 08:42:19 UTC 2012 - rguenther(a)suse.com + +- Adjust arm icecream cross for continued change of the canonical + target used in binutils. + +------------------------------------------------------------------- +Tue Jun 26 08:03:03 UTC 2012 - rguenther(a)suse.com + +- Require a version of libquadmath0 at least as new as the + libgfortran3 library from the latter. [bnc#768785] + +------------------------------------------------------------------- +Fri Jun 22 11:03:09 UTC 2012 - adrian(a)suse.de + +- complete armv7hl switch + +------------------------------------------------------------------- +Wed Jun 20 15:13:58 UTC 2012 - aj(a)suse.de + +- Use new dynamic linker path /lib/ld-linux-armhf.so.3 for ARM v7. + +------------------------------------------------------------------- +Tue Jun 19 08:08:02 UTC 2012 - coolo(a)suse.com + +- do not build cross environments on architectures that + are not native + +------------------------------------------------------------------- +Thu Jun 15 13:08:54 UTC 2012 - rguenther(a)suse.com + +- Update to gcc-4_7-branch head (r188649). + * Includes GCC 4.7.1 release. + +------------------------------------------------------------------- +Wed Jun 6 08:54:04 UTC 2012 - rguenther(a)suse.com + +- Explicitely specify target tools used for building. + +------------------------------------------------------------------- +Mon Jun 4 11:10:00 UTC 2012 - rguenther(a)suse.com + +- Update to gcc-4_7-branch head (r188177). + +------------------------------------------------------------------- +Fri Jun 1 09:01:40 UTC 2012 - rguenther(a)suse.com + +- Fix typo in cross-icecream.spec.in. +- Also dump test-summary to the build log. + +------------------------------------------------------------------- +Wed May 30 14:13:54 UTC 2012 - rguenther(a)suse.com + +- Update patch for PR52080. + +------------------------------------------------------------------- +Mon May 7 09:35:56 UTC 2012 - rguenther(a)suse.com + +- Update to gcc-4_7-branch head (r187228). +- Add patch for PR52841. + +------------------------------------------------------------------- +Thu Apr 19 11:32:05 UTC 2012 - rguenther(a)suse.com + +- Fix canonicalized target names for crosses. +- Enable icecream backends, make their package name version specific. + +------------------------------------------------------------------- +Fri Apr 13 12:47:22 UTC 2012 - rguenther(a)suse.com + +- Update to gcc-4_7-branch head (r186417). +- Fix libstdc++.so-gdb.py autoload script. [bnc#750960] +- Drop to release checking. +- Fix build of cross targets with canonicalized name. + +------------------------------------------------------------------- +Thu Mar 22 12:06:49 UTC 2012 - rguenther(a)suse.com + +- Update to GCC 4.7.0 release. +- Update to gcc-4_7-branch head (r185687). + +------------------------------------------------------------------- +Tue Mar 20 11:53:04 UTC 2012 - rguenther(a)suse.com + +- Package the gdb python scripts. [bnc#750960] + +------------------------------------------------------------------- +Mon Mar 19 12:13:21 UTC 2012 - rguenther(a)suse.com + +- Change armv5 to use soft floating-point. + +------------------------------------------------------------------- +Tue Mar 13 12:59:26 UTC 2012 - rguenther(a)suse.com + +- Update to gcc-4_7-branch head (r185330). + +------------------------------------------------------------------- +Fri Mar 2 13:50:22 UTC 2012 - rguenther(a)suse.com + +- Update to GCC 4.7.0 release candidate. +- Fixup libstdc++v3 symbol baselines on powerpc. + +------------------------------------------------------------------- +Wed Feb 29 09:03:10 UTC 2012 - rguenther(a)suse.com + +- Fixup more SPDX license issues. + +------------------------------------------------------------------- +Tue Feb 28 13:10:03 UTC 2012 - rguenther(a)suse.com + +- Update to SVN trunk head (r184624). +- Merge changes from GCC 4.6 package. + +------------------------------------------------------------------- +Fri Feb 24 09:35:29 UTC 2012 - rguenther(a)suse.com + +- Update to SVN trunk head (r184541). + +------------------------------------------------------------------- +Tue Feb 21 13:05:10 UTC 2012 - rguenther(a)suse.com + +- Update to SVN trunk head (r184435). +- Merge changes from GCC 4.6 package. +- Add patches for PR49484 and PR52080. + +------------------------------------------------------------------- +Wed Feb 8 11:14:05 UTC 2012 - rguenther(a)suse.com + +- Update to SVN trunk head (r184004). + +------------------------------------------------------------------- +Tue Jan 31 10:35:44 UTC 2012 - rguenther(a)suse.com + +- Update to SVN trunk head (r183753). +- Merge changes from GCC 4.6 package. + +------------------------------------------------------------------- +Tue Jan 24 14:46:07 UTC 2012 - rguenther(a)suse.com + +- Drop AWT support from libgcj. [bnc#742935] + +------------------------------------------------------------------- +Wed Jan 18 14:48:06 UTC 2012 - rguenther(a)suse.com + +- Update to SVN trunk head (r183273). + +------------------------------------------------------------------- +Wed Jan 11 11:51:29 UTC 2012 - rguenther(a)suse.com + +- Update to SVN trunk head (r183092). +- Merge changes from GCC 4.6 package. + +------------------------------------------------------------------- +Wed Jan 4 13:36:37 UTC 2012 - rguenther(a)suse.com + +- Update to SVN trunk head (r182872). + +------------------------------------------------------------------- +Tue Dec 20 10:48:33 UTC 2011 - rguenther(a)suse.com + +- Update to SVN trunk head (r182525). + +------------------------------------------------------------------- +Sun Dec 18 11:10:32 UTC 2011 - adrian(a)suse.de + +- fix file list for arm architecture + +------------------------------------------------------------------- +Thu Nov 3 15:23:33 UTC 2011 - rguenther(a)suse.com + +- New package. + --- /work/SRC/openSUSE:12.2/gcc47/cross-hppa-gcc47-icecream-backend.changes 2012-06-26 15:37:28.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.gcc47.new/cross-hppa-gcc47-icecream-backend.changes 2012-07-02 10:43:55.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 29 08:42:19 UTC 2012 - rguenther(a)suse.com + +- Adjust arm icecream cross for continued change of the canonical + target used in binutils. + +------------------------------------------------------------------- cross-i386-gcc47-icecream-backend.changes: same change cross-ia64-gcc47-icecream-backend.changes: same change cross-ppc-gcc47-icecream-backend.changes: same change cross-ppc64-gcc47-icecream-backend.changes: same change cross-s390-gcc47-icecream-backend.changes: same change cross-s390x-gcc47-icecream-backend.changes: same change cross-x86_64-gcc47-icecream-backend.changes: same change gcc47-testresults.changes: same change gcc47.changes: same change libffi47.changes: same change libgcj47.changes: same change Old: ---- cross-armv7l-gcc47-icecream-backend.changes cross-armv7l-gcc47-icecream-backend.spec New: ---- cross-armv7hl-gcc47-icecream-backend.changes cross-armv7hl-gcc47-icecream-backend.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cross-armv5el-gcc47-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.TTIgYl/_old 2012-07-02 10:43:58.000000000 +0200 +++ /var/tmp/diff_new_pack.TTIgYl/_new 2012-07-02 10:43:58.000000000 +0200 @@ -36,6 +36,9 @@ %define binutils_target arm %endif %define canonical_target %(echo %{binutils_target} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") +%if %{binutils_target} == "arm" +%define canonical_target_abi gnueabi- +%endif Name: cross-armv5el-gcc47-icecream-backend BuildRequires: bison @@ -461,7 +464,7 @@ # But the assembler comes from the cross-binutils, and hence is _not_ # named funnily, not even on ppc, so there we need the original target -install -s -D %{_prefix}/bin/%{canonical_target}-suse-linux-as \ +install -s -D %{_prefix}/bin/%{canonical_target}-suse-linux-%{?canonical_target_abi:%canonical_target_abi}as \ $RPM_BUILD_ROOT/env/usr/bin/as install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-g++ \ $RPM_BUILD_ROOT/env/usr/bin/g++ ++++++ cross-armv7hl-gcc47-icecream-backend.spec ++++++ # # spec file for package cross-armv7hl-gcc47-icecream-backend # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define build_cp 1 %define build_ada 0 %define build_libjava 0 %define build_java 0 %define build_fortran 0 %define build_objc 0 %define build_objcp 0 %define build_nof 0 %define build_with_mudflap 0 %define gcc_target_arch armv7hl-suse-linux %define gcc_icecream 1 %define binutils_target armv7hl %if %{binutils_target} == "armv7l" || %{binutils_target} == "armv7hl" %define binutils_target arm %endif %if %{binutils_target} == "armv5el" %define binutils_target arm %endif %define canonical_target %(echo %{binutils_target} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") %if %{binutils_target} == "arm" %define canonical_target_abi gnueabi- %endif Name: cross-armv7hl-gcc47-icecream-backend BuildRequires: bison BuildRequires: cross-%{binutils_target}-binutils BuildRequires: flex BuildRequires: gettext-devel BuildRequires: glibc-devel-32bit BuildRequires: mpc-devel BuildRequires: mpfr-devel BuildRequires: perl BuildRequires: texinfo BuildRequires: zlib-devel %ifarch %ix86 x86_64 ppc ppc64 s390 s390x ia64 %sparc BuildRequires: cloog-devel BuildRequires: libelf-devel BuildRequires: ppl-devel %endif %ifarch ia64 BuildRequires: libunwind-devel %endif ExclusiveArch: ppc ppc64 %ix86 x86_64 ia64 %define _binary_payload w.ufdio # COMMON-BEGIN # COMMON-BEGIN %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ Version: 4.7.1_20120615 Release: 0 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) %define snapshot_date %(echo %version | sed 's/[34]\.[0-9]\.[0-6]//' | sed 's/_/-/') %define binsuffix -4.7 # COMMON-END # COMMON-BEGIN BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: gcc-%{gcc_version}%{snapshot_date}.tar.bz2 Source1: change_spec Source2: libgcj47-rpmlintrc Source3: gcc47-rpmlintrc Source4: ecj.jar Source5: README.First-for.SuSE.packagers Source6: baselibs.conf Patch1: gcc-dir-version.patch Patch2: gcc-sles-version.patch Patch3: gcc-noalias-warn.diff Patch6: suse-record-gcc-opts.diff Patch7: gcc-add-defaultsspec.diff Patch8: Wunprototyped-calls.diff Patch10: program-transform-name.diff Patch12: gcc4-ppc64-m32-m64-multilib-only.patch Patch23: libjava-no-multilib.diff Patch24: tls-no-direct.diff Patch28: pr33763.diff Patch30: gcc43-no-unwind-tables.diff Patch32: pr49484.diff Patch33: gcc-arm-linker.patch # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch Patch57: gcc41-ppc32-retaddr.patch # Some patches taken from Debian Patch60: gcc44-textdomain.patch Patch61: gcc44-rename-info-files.patch # Patches for SAP features Patch130: sap303956-uchar.diff # GCC-TESTSUITE-DELETE-BEGIN # LIBFFI-DELETE-BEGIN # LIBJAVA-DELETE-BEGIN Summary: The GNU C Compiler and Support Files License: GPL-3.0+ Group: Development/Languages/C and C++ %description Core package for the GNU Compiler Collection, including the C language frontend. Language frontends other than C are split to different sub-packages, namely gcc-ada, gcc-c++, gcc-fortran, gcc-java, gcc-objc and gcc-obj-c++. # COMMON-END # COMMON-BEGIN # Define the canonical target and host architecture # %gcc_target_arch is supposed to be the full target triple # %TARGET_ARCH is the canonicalized CPU part # %CONFIGURE_TARGET is the target triple used for --target= %if 0%{?gcc_target_arch:1} %define CONFIGURE_TARGET %{gcc_target_arch} %define TARGET_ARCH %(echo %{gcc_target_arch} | cut -d - -f 1 | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc" %define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "powerpc64" %define CONFIGURE_TARGET powerpc64-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "i586" %define CONFIGURE_TARGET i586-suse-linux %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv7l" %define CONFIGURE_TARGET armv7l-suse-linux-gnueabi %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv7hl" %define CONFIGURE_TARGET armv7hl-suse-linux-gnueabi %endif %if 0%{?gcc_icecream:1} && %{TARGET_ARCH} == "armv5el" %define CONFIGURE_TARGET armv5el-suse-linux-gnueabi %endif %else %define TARGET_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") %endif %define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac) %ifarch ppc %define GCCDIST powerpc64-suse-linux %else %ifarch %sparc %define GCCDIST sparc64-suse-linux %else %ifarch %arm %define GCCDIST %{HOST_ARCH}-suse-linux-gnueabi %else %define GCCDIST %{HOST_ARCH}-suse-linux %endif %endif %endif %define libsubdir %{_libdir}/gcc/%{GCCDIST}/%{gcc_dir_version} %define gxxinclude %{_prefix}/include/c++/%{gcc_dir_version} # COMMON-END # COMMON-BEGIN %prep %setup -q -n gcc-%{gcc_version}%{snapshot_date} %patch1 %patch2 %patch3 %patch6 %patch7 %patch8 %patch10 %if !%{build_nof} %patch12 %endif %patch23 %patch24 %patch28 %patch30 %patch32 %patch33 -p1 %patch51 %patch55 %patch57 %patch60 %patch61 %patch130 # We are configuring ppc as ppc64 but with switched multilibs. Adjust # the libstdc++ abi testsuite baseline files accordingly %ifarch ppc if [ -d libstdc++-v3/config/abi/post/powerpc64-linux-gnu ]; then mkdir -p libstdc++-v3/config/abi/post/powerpc64-linux-gnu/64 mv libstdc++-v3/config/abi/post/powerpc64-linux-gnu/baseline_symbols.txt \ libstdc++-v3/config/abi/post/powerpc64-linux-gnu/64/ mv libstdc++-v3/config/abi/post/powerpc64-linux-gnu/32/baseline_symbols.txt \ libstdc++-v3/config/abi/post/powerpc64-linux-gnu/ fi %endif %build # Avoid rebuilding of generated files contrib/gcc_update --touch # Avoid fucking up testsuite results with Java and indirect dispatch export SUSE_ASNEEDED=0 # Split version file into version used for directories (X.Y) and # version to report with --version (X.Y.Z). # See also gcc-dir-version.patch. # Also decrement the patchlevel version by one if test `cat gcc/DEV-PHASE` == "prerelease"; then ( cat gcc/BASE-VER | cut -d '.' -f 1-2 | tr -d '\n'; echo -n .; cat gcc/BASE-VER | cut -d '.' -f 3 | tr '0123456789' '0012345678' ) > gcc/FULL-VER else mv gcc/BASE-VER gcc/FULL-VER fi cat gcc/FULL-VER | cut -d '.' -f 1-2 > gcc/BASE-VER rm -rf obj-%{GCCDIST} mkdir obj-%{GCCDIST} cd obj-%{GCCDIST} RPM_OPT_FLAGS="$RPM_OPT_FLAGS -U_FORTIFY_SOURCE" RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-fno-rtti//g' -e 's/-fno-exceptions//g' -e 's/-Wmissing-format-attribute//g' -e 's/-fstack-protector//g' -e 's/-ffortify=.//g' -e 's/-Wall//g' -e 's/-m32//g' -e 's/-m64//g'` %ifarch %ix86 # -mcpu is superceded by -mtune but -mtune is not supported by # our bootstrap compiler. -mcpu gives a warning that stops # the build process, so remove it for now. Also remove all other # -march and -mtune flags. They are superseeded by proper # default compiler settings now. RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-mcpu=i.86//g' -e 's/-march=i.86//g' -e 's/-mtune=i.86//g'` %endif %ifarch s390 s390x RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-fsigned-char//g'` RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-O1/-O2/g'` %endif %if 0%{?gcc_target_arch:1} && 0%{!?gcc_icecream:1} # Kill all -march/tune/cpu because that screws building the target libs RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-m$arch\|tune\|cpu$=[^ ]*//g'` %endif # Replace 2 spaces by one finally RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/ / /g'` languages=c %if %{build_cp} languages=$languages,c++ %endif %if %{build_objc} languages=$languages,objc %endif %if %{build_fortran} languages=$languages,fortran %endif %if %{build_objcp} languages=$languages,obj-c++ %endif %if %{build_java} languages=$languages,java %endif %if %{build_ada} languages=$languages,ada %endif J=%{?jobs:%jobs} if test -z "$J"; then J=$(getconf _NPROCESSORS_CONF) JL=$(($J * 2)) else test 1 -gt "$J" && J=1 JL=$(($(getconf _NPROCESSORS_CONF)*2)) fi if test "$J" == "0"; then J=1 fi if test "$JL" == "0"; then JL=1 fi PARALLEL="-j$J -l$JL" # we don't want some miscompiles in the testsuite, or some fault in # the compiler to kill the machine. Hence we limit the amount of memory # by the physical RAM plus half of swap #MEM=$(free -m | awk '/^Mem:/ {print $2}') #SWAP=$(free -m | awk '/^Swap:/ {print $2}') #ulimit -v $(((MEM + SWAP/2)*1024)) # In general we want to ship release checking enabled compilers # and run BETA with checking enabled. #ENABLE_CHECKING="--enable-checking=yes" ENABLE_CHECKING="--enable-checking=release" # Work around tail/head -1 changes export _POSIX2_VERSION=199209 # configure tries to parse include/features.h to detect # if glibc supports SSP. When cross compiling we would need # to install a cross glibc, which we don't, or make the whole # thing point to the native glibc, which is in /, hence the # --with-sysroot=/ %if %{build_ada} # Using the host gnatmake like # CC="gcc%{hostsuffix}" GNATBIND="gnatbind%{hostsuffix}" # GNATMAKE="gnatmake%{hostsuffix}" # doesn't work due to PR33857, so an un-suffixed gnatmake has to be # available mkdir -p host-tools/bin cp -a /usr/bin/gnatmake%{hostsuffix} host-tools/bin/gnatmake cp -a /usr/bin/gnatlink%{hostsuffix} host-tools/bin/gnatlink cp -a /usr/bin/gnatbind%{hostsuffix} host-tools/bin/gnatbind cp -a /usr/bin/gcc%{hostsuffix} host-tools/bin/gcc ln -sf /usr/%{_lib} host-tools/%{_lib} export PATH="`pwd`/host-tools/bin:$PATH" %endif #%if 0%{?gcc_target_arch:1} && 0%{!?gcc_icecream:1} #%else # --enable-threads=posix \ #%endif # --enable-shared \ CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" XCFLAGS="$RPM_OPT_FLAGS" \ TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS" \ ../configure \ --prefix=%{_prefix} \ --infodir=%{_infodir} \ --mandir=%{_mandir} \ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ $ENABLE_CHECKING \ --with-gxx-include-dir=%{_prefix}/include/c++/%{gcc_dir_version} \ --enable-ssp \ --disable-libssp \ --disable-libitm \ --disable-plugin \ --with-bugurl="http://bugs.opensuse.org/" \ --with-pkgversion="SUSE Linux" \ %if !%{build_libjava} --disable-libgcj \ %else --with-java-home=%{_libdir}/jvm/java-1.5.0-gcj%{binsuffix}-1.5.0.0/jre \ --with-ecj-jar=%{libsubdir}/ecj.jar \ --disable-java-awt \ %if !%{biarch_libjava} --disable-libjava-multilib \ %endif %endif %if !%{build_with_mudflap} --disable-libmudflap \ %endif --with-slibdir=/%{_lib} \ --with-system-zlib \ --enable-__cxa_atexit \ --enable-libstdcxx-allocator=new \ --disable-libstdcxx-pch \ --enable-version-specific-runtime-libs \ %if 0%{suse_version} > 1100 --enable-linker-build-id \ %endif %if 0%{?gcc_target_arch:1} %if 0%{?gcc_icecream:1} --with-sysroot=/ \ --enable-linux-futex \ %endif %if 0%{?canonical_target:1} --with-build-time-tools=/usr/%{canonical_target}-suse-linux/bin \ %endif %if 0%{?build_static:1} --disable-shared \ %endif %if "%{TARGET_ARCH}" == "spu" --with-sysroot=/usr/spu \ --with-gxx-include-dir=%{_prefix}/spu/include/c++/%{gcc_dir_version} \ --with-newlib \ %endif --disable-nls \ --target=%{CONFIGURE_TARGET} \ %else --program-suffix=%{binsuffix} \ --enable-linux-futex \ %ifarch ia64 --with-system-libunwind \ %else --without-system-libunwind \ %endif %endif %if "%{TARGET_ARCH}" == "armv5tel" --with-arch=armv5te \ --with-float=soft \ --with-mode=arm \ --with-abi=aapcs-linux \ --disable-sjlj-exceptions \ %endif %if "%{TARGET_ARCH}" == "armv7l" || "%{TARGET_ARCH}" == "armv7hl" --with-arch=armv7-a \ --with-tune=cortex-a9 \ --with-float=hard \ --with-mode=thumb \ --with-abi=aapcs-linux \ --with-fpu=vfpv3-d16 \ --disable-sjlj-exceptions \ %endif %if "%{TARGET_ARCH}" == "powerpc" --with-cpu=default32 \ --enable-secureplt \ --with-long-double-128 \ %endif %if "%{TARGET_ARCH}" == "powerpc64" --with-cpu=power4 \ --enable-secureplt \ --with-long-double-128 \ %endif %if "%{TARGET_ARCH}" == "sparc64" --with-cpu=ultrasparc \ --with-long-double-128 \ %endif %if "%{TARGET_ARCH}" == "sparc" --with-cpu=v8 \ --with-long-double-128 \ %endif %if "%{TARGET_ARCH}" == "i586" --with-arch-32=i586 \ --with-tune=generic \ %endif %if "%{TARGET_ARCH}" == "x86_64" --with-arch-32=i586 \ --with-tune=generic \ %endif %if "%{TARGET_ARCH}" == "s390" --with-tune=z196 --with-arch=z10 \ --with-long-double-128 \ --enable-decimal-float \ %endif %if "%{TARGET_ARCH}" == "s390x" --with-tune=z196 --with-arch=z10 \ --with-long-double-128 \ --enable-decimal-float \ %endif --build=%{GCCDIST} # COMMON-END # COMMON-END make %{?jobs:-j%jobs} all-gcc TARGET-gcc="cc1 cc1plus gcc-cross g++ native" %install cd obj-%{GCCDIST} rm -rf $RPM_BUILD_ROOT make -C gcc DESTDIR=$RPM_BUILD_ROOT/inst install-driver install-common make DESTDIR=$RPM_BUILD_ROOT/inst maybe-install-lto-plugin # But the assembler comes from the cross-binutils, and hence is _not_ # named funnily, not even on ppc, so there we need the original target install -s -D %{_prefix}/bin/%{canonical_target}-suse-linux-%{?canonical_target_abi:%canonical_target_abi}as \ $RPM_BUILD_ROOT/env/usr/bin/as install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-g++ \ $RPM_BUILD_ROOT/env/usr/bin/g++ install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-gcc \ $RPM_BUILD_ROOT/env/usr/bin/gcc %define targetlibsubdir %{_libdir}/gcc/%{CONFIGURE_TARGET}/%{gcc_dir_version} for back in cc1 cc1plus; do install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/$back \ $RPM_BUILD_ROOT/env%{targetlibsubdir}/$back done if test -f $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so; then install -s -D $RPM_BUILD_ROOT/inst%{targetlibsubdir}/liblto_plugin.so \ $RPM_BUILD_ROOT/env%{targetlibsubdir}/liblto_plugin.so fi libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/* $RPM_BUILD_ROOT/env%{targetlibsubdir}/*; do \ ldd $bin | sed -n '\,^[^/]*$/[^ ]*$.*,{ s//\1/; p; }' ;\ done | sort -u ` for lib in $libs; do # Check wether the same library also exists in the parent directory, # and prefer that on the assumption that it is a more generic one. baselib=`echo "$lib" | sed 's,/[^/]*$/[^/]*$$,\1,'` test -f "$baselib" && lib=$baselib install -s -D $lib $RPM_BUILD_ROOT/env$lib done rm -rf $RPM_BUILD_ROOT/inst cd $RPM_BUILD_ROOT/env tar cvzf ../%{name}_%{_arch}.tar.gz * cd .. mkdir -p usr/share/icecream-envs mv %{name}_%{_arch}.tar.gz usr/share/icecream-envs rpm -q --changelog glibc > usr/share/icecream-envs/%{name}_%{_arch}.glibc rpm -q --changelog binutils > usr/share/icecream-envs/%{name}_%{_arch}.binutils rm -r env %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) /usr/share/icecream-envs %changelog ++++++ cross-hppa-gcc47-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.TTIgYl/_old 2012-07-02 10:43:58.000000000 +0200 +++ /var/tmp/diff_new_pack.TTIgYl/_new 2012-07-02 10:43:58.000000000 +0200 @@ -36,6 +36,9 @@ %define binutils_target arm %endif %define canonical_target %(echo %{binutils_target} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") +%if %{binutils_target} == "arm" +%define canonical_target_abi gnueabi- +%endif Name: cross-hppa-gcc47-icecream-backend BuildRequires: bison @@ -461,7 +464,7 @@ # But the assembler comes from the cross-binutils, and hence is _not_ # named funnily, not even on ppc, so there we need the original target -install -s -D %{_prefix}/bin/%{canonical_target}-suse-linux-as \ +install -s -D %{_prefix}/bin/%{canonical_target}-suse-linux-%{?canonical_target_abi:%canonical_target_abi}as \ $RPM_BUILD_ROOT/env/usr/bin/as install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-g++ \ $RPM_BUILD_ROOT/env/usr/bin/g++ cross-i386-gcc47-icecream-backend.spec: same change cross-ia64-gcc47-icecream-backend.spec: same change cross-ppc-gcc47-icecream-backend.spec: same change cross-ppc64-gcc47-icecream-backend.spec: same change cross-s390-gcc47-icecream-backend.spec: same change cross-s390x-gcc47-icecream-backend.spec: same change cross-x86_64-gcc47-icecream-backend.spec: same change gcc47.spec: same change libffi47.spec: same change libgcj47.spec: same change ++++++ change_spec ++++++ --- /var/tmp/diff_new_pack.TTIgYl/_old 2012-07-02 10:43:59.000000000 +0200 +++ /var/tmp/diff_new_pack.TTIgYl/_new 2012-07-02 10:43:59.000000000 +0200 @@ -113,7 +113,7 @@ # disabled: mips, sparc, alpha if test "$do_icecream" = 1 ; then - for arch in hppa i386 x86_64 s390 s390x ppc ppc64 ia64 armv7l armv5el; do + for arch in hppa i386 x86_64 s390 s390x ppc ppc64 ia64 armv7hl armv5el; do exclarch=`echo $arch | sed -e 's/i.86/%ix86/'` { sed -n -e '1,/COMMON-BEGIN/p' cross-icecream.spec.in sed -n -e '/COMMON-BEGIN/,/COMMON-END/p' $outfile ++++++ cross-icecream.spec.in ++++++ --- /var/tmp/diff_new_pack.TTIgYl/_old 2012-07-02 10:43:59.000000000 +0200 +++ /var/tmp/diff_new_pack.TTIgYl/_new 2012-07-02 10:43:59.000000000 +0200 @@ -28,6 +28,9 @@ %define binutils_target arm %endif %define canonical_target %(echo %{binutils_target} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;") +%if %{binutils_target} == "arm" +%define canonical_target_abi gnueabi- +%endif Name: cross-@cross_arch@-gcc@base_ver@-icecream-backend BuildRequires: bison flex gettext-devel glibc-devel-32bit mpfr-devel perl texinfo zlib-devel mpc-devel @@ -54,7 +57,7 @@ # But the assembler comes from the cross-binutils, and hence is _not_ # named funnily, not even on ppc, so there we need the original target -install -s -D %{_prefix}/bin/%{canonical_target}-suse-linux-as \ +install -s -D %{_prefix}/bin/%{canonical_target}-suse-linux-%{?canonical_target_abi:%canonical_target_abi}as \ $RPM_BUILD_ROOT/env/usr/bin/as install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/%{CONFIGURE_TARGET}-g++ \ $RPM_BUILD_ROOT/env/usr/bin/g++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit chromium for openSUSE:12.2
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package chromium for openSUSE:12.2 checked in at 2012-07-01 14:59:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/chromium (Old) and /work/SRC/openSUSE:12.2/.chromium.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "chromium", Maintainer is "PRusnak(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.2/chromium/chromium.changes 2012-06-25 15:16:42.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.chromium.new/chromium.changes 2012-07-02 10:43:29.000000000 +0200 @@ -1,0 +2,45 @@ +Fri Jun 29 08:52:58 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 22.0.1190 + * Security Fixes: + * CVE-2012-2815: Leak of iframe fragment id + * CVE-2012-2816: Prevent sandboxed processes interfering with + each other + * CVE-2012-2817: Use-after-free in table section handling + * CVE-2012-2818: Use-after-free in counter layout + * CVE-2012-2819: Crash in texture handling + * CVE-2012-2820: Out-of-bounds read in SVG filter handling + * CVE-2012-2821: Autofill display problem + * CVE-2012-2823: Use-after-free in SVG resource handling + * CVE-2012-2826: Out-of-bounds read in texture conversion + * CVE-2012-2829: Use-after-free in first-letter handling + * CVE-2012-2830: Wild pointer in array value setting + * CVE-2012-2831: Use-after-free in SVG reference handling + * CVE-2012-2834: Integer overflow in Matroska container + * CVE-2012-2825: Wild read in XSL handling + * CVE-2012-2807: Integer overflows in libxml + * Fix update-alternatives within the spec-file + +------------------------------------------------------------------- +Thu Jun 21 12:20:28 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 22.0.1183 + * Content settings for Cookies now also show protected storage + granted to hosted apps + * Chromoting client plugin correctly up-scales on when page-zoom + is >100%. + +------------------------------------------------------------------- +Tue Jun 19 13:06:52 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 21.0.1181 + * Bugfixes. + * Remove obsolete patch + * Do not execute update-alternatives when building + +------------------------------------------------------------------- +Fri Jun 15 12:19:24 UTC 2012 - coolo(a)suse.com + +- fix update-alternative usage to fix build + +------------------------------------------------------------------- Old: ---- chromium.21.0.1158.0.svn139751.tar.bz2 sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch New: ---- chromium.22.0.1190.0.svn144885.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chromium.spec ++++++ --- /var/tmp/diff_new_pack.Sn7piT/_old 2012-07-02 10:43:48.000000000 +0200 +++ /var/tmp/diff_new_pack.Sn7piT/_new 2012-07-02 10:43:48.000000000 +0200 @@ -16,11 +16,11 @@ # -%define v8_ver 3.11.7.0 -%define svn_revision 139751 +%define v8_ver 3.12.5.0 +%define svn_revision 144885 Name: chromium -Version: 21.0.1158.0 +Version: 22.0.1190.0 Release: 0 Summary: Google's opens source browser project License: BSD-3-Clause and LGPL-2.1+ @@ -80,8 +80,6 @@ Patch67: chromium_use_gold.patch # PATCH-FIX-OPENSUSE Fix build with GCC 4.7 Patch68: chromium-gcc47.patch -# Upstream Patches -Patch500: sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch %if 0%{?suse_version} > 1210 BuildRequires: libjpeg8-devel @@ -262,7 +260,6 @@ %patch66 -p1 %patch67 -p1 %patch68 -p1 -%patch500 -p1 echo "svn%{svn_revision}" > src/build/LASTCHANGE.in @@ -276,10 +273,6 @@ ## create make files -%if 0%{?suse_version} == 1140 -export LDFLAGS="-Wl,--reduce-memory-overheads" -%endif - PARSED_OPT_FLAGS=`echo \'%{optflags} -DUSE_SYSTEM_LIBEVENT -fPIC -fno-ipa-cp -fno-strict-aliasing \' | sed "s/ /',/g" | sed "s/',/', '/g"` for i in src/build/common.gypi; do sed -i "s|'-march=pentium4',||g" $i @@ -325,12 +318,17 @@ -Dtarget_arch=x64 \ %endif %if 0%{?suse_version} == 1140 +%ifnarch x86_64 -Dlinux_use_gold_flags=0 \ -Dlinux_use_gold_binary=0 \ %else -Dlinux_use_gold_flags=1 \ -Dlinux_use_gold_binary=1 \ %endif +%else +-Dlinux_use_gold_flags=1 \ +-Dlinux_use_gold_binary=1 \ +%endif -Djavascript_engine=v8 make -r %{?_smp_mflags} chrome V=1 BUILDTYPE=Release ++++++ chromium-6.0.406.0-system-gyp-v8.patch ++++++ --- /var/tmp/diff_new_pack.Sn7piT/_old 2012-07-02 10:43:48.000000000 +0200 +++ /var/tmp/diff_new_pack.Sn7piT/_new 2012-07-02 10:43:48.000000000 +0200 @@ -10,7 +10,7 @@ + 'linux/system.gyp:v8', '../webkit/support/webkit_support.gyp:*', '../webkit/webkit.gyp:*', - 'util/build_util.gyp:*', + 'temp_gyp/googleurl.gyp:*', Index: chromium/src/build/linux/system.gyp =================================================================== --- chromium.orig/src/build/linux/system.gyp @@ -52,16 +52,16 @@ =================================================================== --- chromium.orig/src/third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp +++ chromium/src/third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp -@@ -1066,7 +1066,7 @@ - '<(chromium_src_dir)/third_party/libwebp/libwebp.gyp:libwebp', +@@ -1114,7 +1114,7 @@ '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi', + '<(chromium_src_dir)/third_party/qcms/qcms.gyp:qcms', '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite', - '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8', + '<(chromium_src_dir)/build/linux/system.gyp:v8', '<(libjpeg_gyp_path):libjpeg', ], 'include_dirs': [ -@@ -1189,7 +1189,7 @@ +@@ -1245,7 +1245,7 @@ '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite', '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_glsl', '<(chromium_src_dir)/third_party/zlib/zlib.gyp:zlib', @@ -70,7 +70,7 @@ '<(libjpeg_gyp_path):libjpeg', ], 'export_dependent_settings': [ -@@ -1207,7 +1207,7 @@ +@@ -1265,7 +1265,7 @@ '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite', '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_glsl', '<(chromium_src_dir)/third_party/zlib/zlib.gyp:zlib', @@ -79,19 +79,19 @@ '<(libjpeg_gyp_path):libjpeg', ], # This is needed for mac because of webkit_system_interface. It'd be nice -@@ -1939,7 +1939,7 @@ - '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl', +@@ -2015,7 +2015,7 @@ '<(chromium_src_dir)/skia/skia.gyp:skia', '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi', + '<(chromium_src_dir)/third_party/qcms/qcms.gyp:qcms', - '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8', + '<(chromium_src_dir)/build/linux/system.gyp:v8', ], 'export_dependent_settings': [ 'webcore_bindings', -@@ -1947,7 +1947,7 @@ - '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl', +@@ -2024,7 +2024,7 @@ '<(chromium_src_dir)/skia/skia.gyp:skia', '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi', + '<(chromium_src_dir)/third_party/qcms/qcms.gyp:qcms', - '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8', + '<(chromium_src_dir)/build/linux/system.gyp:v8', ], ++++++ chromium-7.0.500.0-system-speex.patch ++++++ --- /var/tmp/diff_new_pack.Sn7piT/_old 2012-07-02 10:43:48.000000000 +0200 +++ /var/tmp/diff_new_pack.Sn7piT/_new 2012-07-02 10:43:48.000000000 +0200 @@ -46,12 +46,12 @@ =================================================================== --- chromium.orig/src/content/content_browser.gypi +++ chromium/src/content/content_browser.gypi -@@ -13,7 +13,7 @@ - '../ppapi/ppapi_internal.gyp:ppapi_proxy', - '../skia/skia.gyp:skia', - '../third_party/flac/flac.gyp:libflac', -- '../third_party/speex/speex.gyp:libspeex', -+ '../build/linux/system.gyp:speex', - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', - '../third_party/zlib/zlib.gyp:zlib', - '../ui/surface/surface.gyp:surface', +@@ -873,7 +873,7 @@ + }, { # OS!="android" + 'dependencies': [ + '../third_party/flac/flac.gyp:libflac', +- '../third_party/speex/speex.gyp:libspeex', ++ '../build/linux/system.gyp:speex', + ], + }], + ['OS=="mac"', { ++++++ chromium-gcc47.patch ++++++ --- /var/tmp/diff_new_pack.Sn7piT/_old 2012-07-02 10:43:48.000000000 +0200 +++ /var/tmp/diff_new_pack.Sn7piT/_new 2012-07-02 10:43:48.000000000 +0200 @@ -1,45 +1,10 @@ ---- chromium-17.0.963.46/src/chrome/browser/policy/policy_path_parser_linux.cc.gcc47 2012-02-17 15:26:32.086746278 -0500 -+++ chromium-17.0.963.46/src/chrome/browser/policy/policy_path_parser_linux.cc 2012-02-17 15:26:53.039544290 -0500 -@@ -3,6 +3,7 @@ - // found in the LICENSE file. +--- chromium/src/chrome/browser/memory_details_linux.cc 2012-06-07 08:28:54.414707511 +0200 ++++ chromium/src/chrome/browser/memory_details_linux.cc 2012-06-07 08:28:54.414707511 +0200 +@@ -6,6 +6,7 @@ - #include <pwd.h> + #include <map> + #include <set> +#include <unistd.h> - #include "chrome/browser/policy/policy_path_parser.h" - ---- chromium-17.0.963.46/src/ipc/ipc_channel.h.gcc47 2012-01-27 03:02:07.000000000 -0500 -+++ chromium-17.0.963.46/src/ipc/ipc_channel.h 2012-02-17 14:46:31.821010460 -0500 -@@ -9,6 +9,7 @@ - #include "base/process.h" - #include "ipc/ipc_channel_handle.h" - #include "ipc/ipc_message.h" -+#include <sys/types.h> - - namespace IPC { - ---- chromium-17.0.963.46/src/ipc/ipc_platform_file.cc.gcc47 2012-01-27 03:02:07.000000000 -0500 -+++ chromium-17.0.963.46/src/ipc/ipc_platform_file.cc 2012-02-17 14:46:31.824010435 -0500 -@@ -3,10 +3,7 @@ - // found in the LICENSE file. - - #include "ipc/ipc_platform_file.h" -- --#if defined(OS_ANDROID) - #include <unistd.h> --#endif - - namespace IPC { - ---- chromium/src/content/public/common/sandbox_init.cc 2012-05-13 21:49:38.095114828 +0200 -+++ chromium/src/content/public/common/sandbox_init.cc 2012-05-13 21:49:38.095114828 +0200 -@@ -4,9 +4,7 @@ - - #include "content/public/common/sandbox_init.h" - --#if defined(OS_ANDROID) - #include <unistd.h> --#endif - - namespace content { - + #include "base/bind.h" + #include "base/process_util.h" ++++++ chromium-sandbox-pie.patch ++++++ --- /var/tmp/diff_new_pack.Sn7piT/_old 2012-07-02 10:43:48.000000000 +0200 +++ /var/tmp/diff_new_pack.Sn7piT/_new 2012-07-02 10:43:48.000000000 +0200 @@ -1,14 +1,14 @@ ---- chromium/src/sandbox/sandbox.gyp 2011-11-15 19:35:11.119851877 +0100 -+++ chromium/src/sandbox/sandbox.gyp 2012-01-25 23:24:53.914568688 +0100 -@@ -163,7 +163,10 @@ - ], - 'cflags': [ - # For ULLONG_MAX -- '-std=gnu99', -+ '-std=gnu99 -fPIE', -+ ], -+ 'ldflags': [ -+ '-pie', - ], - 'include_dirs': [ - '..', +--- chromium/src/sandbox/sandbox_linux.gypi 2011-11-15 19:35:11.119851877 +0100 ++++ chromium/src/sandbox/sandbox_linux.gypi 2012-01-25 23:24:53.914568688 +0100 +@@ -80,7 +80,10 @@ + ], + 'cflags': [ + # For ULLONG_MAX +- '-std=gnu99', ++ '-std=gnu99 -fPIE', ++ ], ++ 'ldflags': [ ++ '-pie', + ], + 'include_dirs': [ + '..', ++++++ chromium-system-expat.patch ++++++ --- /var/tmp/diff_new_pack.Sn7piT/_old 2012-07-02 10:43:48.000000000 +0200 +++ /var/tmp/diff_new_pack.Sn7piT/_new 2012-07-02 10:43:48.000000000 +0200 @@ -1,16 +1,3 @@ -Index: chromium/src/chrome/browser/autofill/autofill_xml_parser.h -=================================================================== ---- chromium.orig/src/chrome/browser/autofill/autofill_xml_parser.h -+++ chromium/src/chrome/browser/autofill/autofill_xml_parser.h -@@ -13,7 +13,7 @@ - #include "base/compiler_specific.h" - #include "chrome/browser/autofill/field_types.h" - #include "chrome/browser/autofill/form_structure.h" --#include "third_party/expat/files/lib/expat.h" -+#include <expat.h> - #include "third_party/libjingle/source/talk/xmllite/xmlparser.h" - - // The base class that contains common functionality between Index: chromium/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h =================================================================== --- chromium.orig/src/third_party/libjingle/source/talk/xmllite/xmlbuilder.h ++++++ chromium.21.0.1158.0.svn139751.tar.bz2 -> chromium.22.0.1190.0.svn144885.tar.bz2 ++++++ /work/SRC/openSUSE:12.2/chromium/chromium.21.0.1158.0.svn139751.tar.bz2 /work/SRC/openSUSE:12.2/.chromium.new/chromium.22.0.1190.0.svn144885.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit alsa for openSUSE:12.2
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package alsa for openSUSE:12.2 checked in at 2012-07-01 20:58:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/alsa (Old) and /work/SRC/openSUSE:12.2/.alsa.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "alsa", Maintainer is "tiwai(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.2/alsa/alsa.changes 2012-06-26 17:44:46.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.alsa.new/alsa.changes 2012-07-02 10:42:56.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Jun 28 17:04:59 CEST 2012 - tiwai(a)suse.de + +- Use a special modprobe config for loading OSS and sequencer + modules automatically (bnc#768361,bnc#768352,bnc#757484, + bnc#767738) +- Remove the automatic module loading part from alsasound init + script since modprobe does it now +- Set LOAD_SEQUENCER=no and LOAD_OSS_EMUL_MODULES=no as default; + these were already disabled on 12.1 with systemd. + This is only for new installations. Users upgrading from old + distros aren't affected. + +------------------------------------------------------------------- New: ---- 50-alsa.conf install-snd-module ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa.spec ++++++ --- /var/tmp/diff_new_pack.B4H5DG/_old 2012-07-02 10:42:57.000000000 +0200 +++ /var/tmp/diff_new_pack.B4H5DG/_new 2012-07-02 10:42:57.000000000 +0200 @@ -50,6 +50,8 @@ Source32: all_notes_off.mid Source33: alsa-info.sh Source34: alsa-init.sh +Source40: 50-alsa.conf +Source41: install-snd-module # Patch: alsa-lib-git-fixes.diff Patch1: 0001-conf-pcm-Add-support-for-Echo3G-devices.-Thanks-to-u.patch Patch2: 0002-USB-Audio-Blacklist-iec958-for-some-USB-devices.patch @@ -202,6 +204,13 @@ install -c -m 0644 %{SOURCE8} $RPM_BUILD_ROOT/etc/udev/rules.d %endif # +# modprobe config and the module install script for loading OSS-emulation +# and sequencer modules automatically +mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d +install -c -m 0644 %{S:40} $RPM_BUILD_ROOT/etc/modprobe.d +mkdir -p $RPM_BUILD_ROOT/sbin +install -c -m 0755 %{S:41} $RPM_BUILD_ROOT/sbin +# # install template to update rc.config and sysconfig files: # (updating the actual files is done in the %post-script) # @@ -243,6 +252,8 @@ %defattr(-, root, root) %doc %{_docdir}/%{name} /etc/init.d/* +/etc/modprobe.d +/sbin/* %{_sbindir}/* %{_bindir}/* /usr/lib/all_notes_off.* ++++++ 50-alsa.conf ++++++ install snd /sbin/install-snd-module snd $CMDLINE_OPTS install snd-pcm /sbin/install-snd-module snd-pcm $CMDLINE_OPTS install snd-seq /sbin/install-snd-module snd-seq $CMDLINE_OPTS ++++++ alsasound ++++++ --- /var/tmp/diff_new_pack.B4H5DG/_old 2012-07-02 10:42:57.000000000 +0200 +++ /var/tmp/diff_new_pack.B4H5DG/_new 2012-07-02 10:42:57.000000000 +0200 @@ -61,21 +61,6 @@ asoundcfg=/var/lib/alsa/asound.state aconnect=/usr/bin/aconnect -# -# insert sequencer modules -# -load_sequencer() { - test "$LOAD_SEQUENCER" = "yes" && modprobe -q snd-seq - if [ x"$LOAD_SEQUENCER" = xyes -a -r /proc/asound/seq/drivers ]; then - OLDIFS="$IFS" - IFS="," - while read t x c; do - /sbin/modprobe $t - done < /proc/asound/seq/drivers - IFS="$OLDIFS" - fi -} - get_drivers() { /sbin/modprobe -c | \ grep -E "^[[:space:]]*alias[[:space:]]+snd-card-[[:digit:]]" | sort -u | \ @@ -109,21 +94,11 @@ # # rest of start action # -start_rest() { - load_sequencer - if [ x"$LOAD_OSS_EMUL_MODULES" = xyes ]; then - /sbin/modprobe snd-pcm-oss - test x"$LOAD_OSS_SEQ_MODULE" = xyes && /sbin/modprobe snd-seq-oss - fi -} # manual load and force to store the status start_all() { echo -n "Starting sound driver" - load_modules && start_rest - # hack - in case the mixer isn't restored - # this shouldn't be needed anymore since udev cares - # (sleep 1; $alsactl -F -f $asoundcfg restore >/dev/null 2>&1) + load_modules rc_status -r } @@ -196,7 +171,6 @@ $alsactl -F -f $asoundcfg restore >/dev/null 2>&1 ;; esac - start_rest else start_all fi ++++++ install-snd-module ++++++ #!/bin/sh /sbin/modprobe --ignore-install "$@" || exit $? . /etc/sysconfig/sound case "$1" in snd) /sbin/modprobe --quiet --use-blacklist snd-ioctl32 test "$LOAD_OSS_EMUL_MODULES" = "yes" && \ /sbin/modprobe --quiet --use-blacklist snd-mixer-oss test "$LOAD_SEQUENCER" = "yes" && \ /sbin/modprobe --quiet --use-blacklist snd-seq ;; snd-pcm|snd_pcm) test "$LOAD_OSS_EMUL_MODULES" = "yes" && \ /sbin/modprobe --quiet --use-blacklist snd-pcm-oss ;; snd-seq|snd_seq) if [ -r /proc/asound/seq/drivers ]; then OLDIFS="$IFS" IFS="," while read t x c; do /sbin/modprobe --quiet --use-blacklist $t done < /proc/asound/seq/drivers IFS="$OLDIFS" fi test "$LOAD_OSS_SEQ_MODULE" = "yes" && \ /sbin/modprobe --quiet --use-blacklist snd-seq-oss ;; esac exit 0 ++++++ sysconfig.sound ++++++ --- /var/tmp/diff_new_pack.B4H5DG/_old 2012-07-02 10:42:57.000000000 +0200 +++ /var/tmp/diff_new_pack.B4H5DG/_new 2012-07-02 10:42:57.000000000 +0200 @@ -8,7 +8,7 @@ # Sequencer modules are necessary only for handling MIDI devices. # If you don't need MIDI, leave here no. # -LOAD_SEQUENCER="yes" +LOAD_SEQUENCER="no" ## Type: string ## Default: "" @@ -23,12 +23,11 @@ ## Default: yes # # Load OSS-emulation modules at boot-up? (yes/no) -# OSS-emulation modules are needed If you use OSS applications +# OSS-emulation modules are needed if you use OSS applications # with ALSA drivers. This option specifies whether these modules are -# loaded at boot-time by alsasound init script. -# Safe to leave yes here. +# loaded at boot-time. # -LOAD_OSS_EMUL_MODULES="yes" +LOAD_OSS_EMUL_MODULES="no" ## Type: yesno ## Default: no -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xf86-input-synaptics for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package xf86-input-synaptics for openSUSE:Factory checked in at 2012-07-01 20:54:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-input-synaptics (Old) and /work/SRC/openSUSE:Factory/.xf86-input-synaptics.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xf86-input-synaptics", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-input-synaptics/xf86-input-synaptics.changes 2012-06-18 17:35:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-input-synaptics.new/xf86-input-synaptics.changes 2012-07-02 10:35:46.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 29 17:05:54 CEST 2012 - tiwai(a)suse.de + +- Fix double-tap LED behavior (bnc#768506) +- Enable tap-to-click as default (bnc#722457) + +------------------------------------------------------------------- New: ---- xf86-input-synaptics-default-tap.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-input-synaptics.spec ++++++ --- /var/tmp/diff_new_pack.uYl1w8/_old 2012-07-02 10:35:47.000000000 +0200 +++ /var/tmp/diff_new_pack.uYl1w8/_new 2012-07-02 10:35:47.000000000 +0200 @@ -28,6 +28,7 @@ Patch2: xf86-input-synaptics-xorg.conf.d_snippet.diff Patch3: xf86-input-synaptics-add-led-support.diff Patch4: xf86-input-synaptics-led-double-tap.diff +Patch5: xf86-input-synaptics-default-tap.diff BuildRequires: autoconf >= 2.60 BuildRequires: automake BuildRequires: libtool @@ -77,6 +78,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build autoreconf -fi ++++++ xf86-input-synaptics-default-tap.diff ++++++ --- conf/50-synaptics.conf | 4 ++++ 1 file changed, 4 insertions(+) --- a/conf/50-synaptics.conf +++ b/conf/50-synaptics.conf @@ -16,6 +16,10 @@ Section "InputClass" # http://who-t.blogspot.com/2010/11/how-to-ignore-configuration-errors.html MatchDevicePath "/dev/input/event*" Option "HorizScrollDelta" "0" +# enable tap-to-click as default (bnc#722457) + Option "TapButton1" "1" + Option "TapButton1" "2" + Option "TapButton1" "3" EndSection Section "InputClass" ++++++ xf86-input-synaptics-led-double-tap.diff ++++++ --- /var/tmp/diff_new_pack.uYl1w8/_old 2012-07-02 10:35:47.000000000 +0200 +++ /var/tmp/diff_new_pack.uYl1w8/_new 2012-07-02 10:35:47.000000000 +0200 @@ -8,10 +8,10 @@ include/synaptics-properties.h | 3 + man/synaptics.man | 17 ++++++ src/properties.c | 26 ++++++++++ - src/synaptics.c | 101 +++++++++++++++++++++++++++++++++++++++++ + src/synaptics.c | 102 +++++++++++++++++++++++++++++++++++++++++ src/synapticsstr.h | 7 ++ tools/synclient.c | 1 - 6 files changed, 155 insertions(+) + 6 files changed, 156 insertions(+) --- a/include/synaptics-properties.h +++ b/include/synaptics-properties.h @@ -75,7 +75,7 @@ /* only init product_id property if we actually know them */ if (priv->id_vendor || priv->id_product) { values[0] = priv->id_vendor; -@@ -658,6 +661,18 @@ SetProperty(DeviceIntPtr dev, Atom prope +@@ -661,6 +664,18 @@ SetProperty(DeviceIntPtr dev, Atom prope return BadValue; para->touchpad_off = off; @@ -94,7 +94,7 @@ } else if (property == prop_gestures) { BOOL *gestures; -@@ -851,3 +866,14 @@ SetProperty(DeviceIntPtr dev, Atom prope +@@ -857,3 +872,14 @@ SetProperty(DeviceIntPtr dev, Atom prope return Success; } @@ -138,7 +138,7 @@ return Success; } -@@ -1649,6 +1655,74 @@ is_inside_middlebutton_area(SynapticsPar +@@ -1652,6 +1658,75 @@ is_inside_middlebutton_area(SynapticsPar return is_inside_button_area(para, 1, x, y); } @@ -149,10 +149,11 @@ +in_led_toggle_area(InputInfoPtr pInfo, struct SynapticsHwState *hw) +{ + SynapticsPrivate *priv = (SynapticsPrivate *)pInfo->private; ++ SynapticsParameters *pars = &priv->synpara; + int click_led_x, click_led_y; + -+ click_led_x = (priv->maxx - priv->minx) * LED_TOGGLE_X_AREA + priv->minx; -+ click_led_y = (priv->maxy - priv->miny) * LED_TOGGLE_Y_AREA + priv->miny; ++ click_led_x = (pars->right_edge - pars->left_edge) * LED_TOGGLE_X_AREA + pars->left_edge; ++ click_led_y = (pars->bottom_edge - pars->top_edge) * LED_TOGGLE_Y_AREA + pars->bottom_edge; + return (hw->x < click_led_x && hw->y < click_led_y); +} + @@ -213,7 +214,7 @@ static CARD32 timerFunc(OsTimerPtr timer, CARD32 now, pointer arg) { -@@ -1665,6 +1739,15 @@ timerFunc(OsTimerPtr timer, CARD32 now, +@@ -1668,6 +1743,15 @@ timerFunc(OsTimerPtr timer, CARD32 now, SynapticsResetTouchHwState(hw, FALSE); delay = HandleState(pInfo, hw, hw->millis, TRUE); @@ -229,7 +230,7 @@ priv->timer_time = now; priv->timer = TimerSet(priv->timer, 0, delay, timerFunc, pInfo); -@@ -3269,6 +3352,15 @@ HandleState(InputInfoPtr pInfo, struct S +@@ -3274,6 +3358,15 @@ HandleState(InputInfoPtr pInfo, struct S /* If touchpad is switched off, we skip the whole thing and return delay */ if (para->touchpad_off == 1) { @@ -245,7 +246,7 @@ UpdateTouchState(pInfo, hw); return delay; } -@@ -3312,6 +3404,15 @@ HandleState(InputInfoPtr pInfo, struct S +@@ -3330,6 +3423,15 @@ HandleState(InputInfoPtr pInfo, struct S finger = priv->finger_state; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit v8 for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package v8 for openSUSE:Factory checked in at 2012-07-01 20:53:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/v8 (Old) and /work/SRC/openSUSE:Factory/.v8.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "v8", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/v8/v8.changes 2012-06-05 12:03:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.v8.new/v8.changes 2012-07-02 10:35:27.000000000 +0200 @@ -1,0 +2,52 @@ +Fri Jun 29 08:49:21 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 3.12.5.0 + * Fixed Chromium issues: + 115100, 129628, 131994, 132727, 132741, 132742, 133211 + * Fixed V8 issues: + 915, 1914, 2034, 2087, 2094, 2134, 2156, 2166, 2172, 2177, + 2179, 2185 + * Added --extra-code flag to mksnapshot to load JS code into the VM + before creating the snapshot. + * Support 'restart call frame' command in the debugger. + * Fixed lazy sweeping heuristics to prevent old-space expansion. + (issue 2194) + * Fixed sharing of literal boilerplates for optimized code. + (issue 2193) + * Removed -fomit-frame-pointer flag from Release builds to make + the stack walkable by TCMalloc (Chromium issue 133723). + * Expose more detailed memory statistics (issue 2201). + * Fixed Harmony Maps and WeakMaps for undefined values + (Chromium issue 132744). + +------------------------------------------------------------------- +Tue Jun 19 14:39:10 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 3.11.10.6 + * Implemented heap profiler memory usage reporting. + * Preserved error message during finally block in try..finally. + (Chromium issue 129171) + * Fixed EnsureCanContainElements to properly handle double values. + (issue 2170) + * Improved heuristics to keep objects in fast mode with inherited + constructors. + * Performance and stability improvements on all platforms. + * Implemented ES5-conformant semantics for inherited setters and + read-only properties. Currently behind --es5_readonly flag, + because it breaks WebKit bindings. + * Exposed last seen heap object id via v8 public api. + +------------------------------------------------------------------- +Thu Jun 7 06:34:28 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 3.11.8.0 + * Avoid overdeep recursion in regexp where a guarded expression + with a minimum repetition count is inside another quantifier. + (Chromium issue 129926) + * Fixed missing write barrier in store field stub. + (issues 2143, 1465, Chromium issue 129355) + * Proxies: Fixed receiver for setters inherited from proxies. + * Proxies: Fixed ToStringArray function so that it does not + reject some keys. (issue 1543) + +------------------------------------------------------------------- Old: ---- adjust-buildflags.diff buildfix.diff v8.3.11.7.0.tar.lzma New: ---- v8.3.12.5.0.tar.lzma ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ v8.spec ++++++ --- /var/tmp/diff_new_pack.HUfKmf/_old 2012-07-02 10:35:28.000000000 +0200 +++ /var/tmp/diff_new_pack.HUfKmf/_new 2012-07-02 10:35:28.000000000 +0200 @@ -17,18 +17,13 @@ Name: v8 -Version: 3.11.7.0 +Version: 3.12.5.0 Release: 0 Summary: JavaScript Engine License: BSD-3-Clause Group: System/Libraries Url: http://code.google.com/p/v8 Source0: %{name}.%{version}.tar.lzma -# PATCH-FIX-OPENSUSE buildfix.diff (Ensure that V8 builds correctly) -Patch0: buildfix.diff -%if %suse_version > 1140 -Patch1: adjust-buildflags.diff -%endif BuildRequires: gcc-c++ BuildRequires: lzma BuildRequires: readline-devel @@ -67,7 +62,7 @@ %description devel Development headers and libraries for v8. -%if %suse_version > 1140 +%if 0%{?suse_version} > 1140 || 0%{?fedora_version} %package private-headers-devel @@ -84,16 +79,10 @@ lzma -cd %{SOURCE0} | tar xf - %setup -D -T -n %{name} -#patch0 -p0 -%if %suse_version > 1140 -#patch1 -p0 -%endif # -fno-strict-aliasing is needed with gcc 4.4 to get past some ugly code -%if 0%{?suse_version} > 1110 PARSED_OPT_FLAGS=`echo \'%{optflags} \' | sed "s/ /',/g" | sed "s/',/', '/g"` sed -i "s|'-O3',|$PARSED_OPT_FLAGS '-fno-strict-aliasing',|g" SConstruct -%endif %build @@ -142,7 +131,7 @@ g++ %{optflags} -o d8 obj/release/d8.os -lv8 -lpthread -lreadline -L. %install -%if %suse_version > 1140 +%if 0%{?suse_version} > 1140 || 0%{?fedora_version} mkdir -p %{buildroot}%{_includedir}/v8/x64 %else mkdir -p %{buildroot}%{_includedir} @@ -150,7 +139,7 @@ mkdir -p %{buildroot}%{_libdir} install -p include/*.h %{buildroot}%{_includedir} -%if %suse_version > 1140 +%if 0%{?suse_version} > 1140 || 0%{?fedora_version} install -p src/*.h %{buildroot}%{_includedir}/v8 install -p src/x64/*.h %{buildroot}%{_includedir}/v8/x64 %endif @@ -170,12 +159,6 @@ chmod -x %{buildroot}%{_includedir}/v8*.h -%if 0%{?suse_version} < 1120 - -%clean -rm -rf %{buildroot} -%endif - %post -n libv8-3 -p /sbin/ldconfig %postun -n libv8-3 -p /sbin/ldconfig @@ -191,7 +174,7 @@ %{_includedir}/*.h %{_libdir}/*.so -%if %suse_version > 1140 +%if 0%{?suse_version} > 1140 || 0%{?fedora_version} %files private-headers-devel %defattr(644,root,root,-) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit scotty for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package scotty for openSUSE:Factory checked in at 2012-07-01 15:16:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scotty (Old) and /work/SRC/openSUSE:Factory/.scotty.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "scotty", Maintainer is "max(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/scotty/scotty.changes 2012-02-03 10:26:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.scotty.new/scotty.changes 2012-07-02 10:34:48.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 29 13:22:19 UTC 2012 - max(a)suse.com + +- Don't use deprecated RPM macros (bnc#764112). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scotty.spec ++++++ --- /var/tmp/diff_new_pack.7UUgaw/_old 2012-07-02 10:34:50.000000000 +0200 +++ /var/tmp/diff_new_pack.7UUgaw/_new 2012-07-02 10:34:50.000000000 +0200 @@ -15,20 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: scotty -BuildRequires: tk-devel xorg-x11-devel -License: MIT -Group: Development/Libraries/Tcl +BuildRequires: tk-devel +BuildRequires: xorg-x11-devel Url: http://wwwhome.cs.utwente.nl/~schoenw/scotty/ -Requires: tcl tk +Requires: tcl +Requires: tk PreReq: permissions -AutoReqProv: on Version: 2.1.11 -Release: 808 +Release: 0 Summary: Tcl Extensions for Network Management Applications +License: MIT +Group: Development/Libraries/Tcl Source: %{name}-%{version}.tar.bz2 Patch: %{name}-%{version}.dif Patch1: ntping.dif @@ -100,11 +99,11 @@ rm -rf %buildroot %post -%run_ldconfig -%run_permissions +/sbin/ldconfig +%set_permissions /usr/bin/ntping %postun -%run_ldconfig +/sbin/ldconfig %verifyscript %verify_permissions -e %{_bindir}/ntping -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit postfixadmin for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package postfixadmin for openSUSE:Factory checked in at 2012-07-01 15:15:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/postfixadmin (Old) and /work/SRC/openSUSE:Factory/.postfixadmin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "postfixadmin", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/postfixadmin/postfixadmin.changes 2012-02-20 16:17:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.postfixadmin.new/postfixadmin.changes 2012-07-02 10:33:52.000000000 +0200 @@ -1,0 +2,17 @@ +Thu Jun 28 20:21:09 UTC 2012 - opensuse(a)cboltz.de + +- fix footer link (upstream r1402) +- focus username field in login form (upstream r1404) +- change existing vacation user (< 2012-02-13) to group vacation + +------------------------------------------------------------------- +Sun Jun 3 23:44:44 UTC 2012 - opensuse(a)cboltz.de + +- add some %if for cross-distribution handling + +------------------------------------------------------------------- +Mon Feb 13 09:56:47 UTC 2012 - opensuse(a)cboltz.de + +- add vacation user to the vacation group (instead of the default "users") + +------------------------------------------------------------------- New: ---- postfixadmin-2.3.5-r1402-r1404-template-fixes.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postfixadmin.spec ++++++ --- /var/tmp/diff_new_pack.i8DUF8/_old 2012-07-02 10:33:53.000000000 +0200 +++ /var/tmp/diff_new_pack.i8DUF8/_new 2012-07-02 10:33:53.000000000 +0200 @@ -25,28 +25,34 @@ # fix encoding of domain/mailbox description in list-domain and list-virtual (upstream commit r1342) Patch: postfixadmin-2.3.5-r1342-description-encoding.diff +# fix footer link, focus username field in login form (upstream commit r1402 and r1404) +Patch1: postfixadmin-2.3.5-r1402-r1404-template-fixes.diff # Web interface #Requires: httpd, postfix, php, mysql-server Requires: /usr/sbin/sendmail Requires: mod_php_any Requires: php_any_db +%if 0%{?suse_version} Recommends: php-mysql +%endif Requires: php-spl # test/*, xmlrpc.php, squirrelmail plugin # big dependency, not needed by all users - therefore no hard Requirement +%if 0%{?suse_version} Recommends: php5-ZendFramework +%endif # vacation.pl Requires: perl(DBI) Requires: perl(Email::Valid) +Requires: perl(Getopt::Std) +Requires: perl(Log::Log4perl) Requires: perl(MIME::Base64) Requires: perl(MIME::EncWords) Requires: perl(Mail::Sender) Requires: perl(strict) -Requires: perl(Getopt::Std) -Requires: perl(Log::Log4perl) # create vacation user/group PreReq: pwdutils @@ -57,14 +63,14 @@ Requires: perl(Fcntl) Requires: perl(IO) Requires: perl(IO::File) -Requires: perl(Time::Local) Requires: perl(POSIX) +Requires: perl(Time::Local) # fetchmail.pl Requires: perl(File::Temp) Requires: perl(LockFile::Simple) Requires: perl(Sys::Syslog) -%if %{defined fedora_version} +%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} BuildRequires: httpd-devel %define serverroot %(/usr/sbin/apxs -q datadir 2>/dev/null || /usr/sbin/apxs -q PREFIX)/htdocs/ %else @@ -95,6 +101,7 @@ %prep %setup -q %patch -p0 +%patch1 -p0 %build echo "*** serverroot: %{serverroot} ***" @@ -134,7 +141,10 @@ %pre getent group vacation >/dev/null || groupadd vacation || : -getent passwd vacation >/dev/null || useradd -c "Virtual Vacation" -d %{_localstatedir}/spool/vacation -s /sbin/nologin -M -r vacation || : +getent passwd vacation >/dev/null || useradd -c "Virtual Vacation" -d %{_localstatedir}/spool/vacation -s /sbin/nologin -M -r -g vacation vacation || : +# fix group for vacation user (if created by older versions (< 2012-02-13) of this package, it was created with group users) +usermod -g vacation vacation || : + #if [ -z "`grep vacation /etc/postfix/master.cf 2>/dev/null`" ]; then #cat <<'EOF' >>/etc/postfix/master.cf ## Postfix Admin Vacation ++++++ postfixadmin-2.3.5-r1402-r1404-template-fixes.diff ++++++ This patch contains the changes from SVN r1402 and r1404 --- CHANGELOG.TXT 2012-06-28 22:13:11.000000000 +0200 +++ CHANGELOG.TXT 2012-06-28 22:13:15.000000000 +0200 @@ -8,12 +8,14 @@ # http://www.postfixadmin.com or http://postfixadmin.sf.net # # Last update: -# $Id: CHANGELOG.TXT 1342 2012-02-02 19:49:30Z christian_boltz $ +# $Id: CHANGELOG.TXT 1404 2012-06-26 18:57:11Z christian_boltz $ changes since the 2.3.5 release (postfixadmin-2.3 branch) ---------------------------------------------------------------- - display domain and mailbox description with correct encoding + - fix footer link + - focus username input field in login form Version 2.3.5 - 2012/01/16 - SVN r1335 (postfixadmin-2.3 branch) ---------------------------------------------------------------- --- templates/footer.php 2012-06-28 22:13:11.000000000 +0200 +++ templates/footer.php 2012-06-28 22:13:15.000000000 +0200 @@ -1,6 +1,6 @@ <?php if( !defined('POSTFIXADMIN') ) die( "This file cannot be used standalone." ); ?> <div id="footer"> -<a target="_blank" href="http://postfixadmin.com/">Postfix Admin <?php print $version; ?></a> +<a target="_blank" href="http://postfixadmin.sf.net/">Postfix Admin <?php print $version; ?></a>    |    <?php if(isset($_SESSION['sessid']['username'])) { --- templates/login.php 2012-06-28 22:13:11.000000000 +0200 +++ templates/login.php 2012-06-28 22:13:15.000000000 +0200 @@ -30,7 +30,7 @@ </table> </form> -<script tyle="text/javascript"> </script> --- templates/users_login.php 2012-06-28 22:13:11.000000000 +0200 +++ templates/users_login.php 2012-06-28 22:13:15.000000000 +0200 @@ -26,4 +26,9 @@ </tr> </table> </form> +<script type="text/javascript"> +</script> + </div> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Bootloader for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package perl-Bootloader for openSUSE:Factory checked in at 2012-07-01 15:15:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Bootloader (Old) and /work/SRC/openSUSE:Factory/.perl-Bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Bootloader", Maintainer is "snwint(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Bootloader/perl-Bootloader.changes 2012-06-06 10:34:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Bootloader.new/perl-Bootloader.changes 2012-07-02 10:32:26.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jun 29 16:20:02 CEST 2012 - snwint(a)suse.de + +- mchang: fix error caused by grub.cfg missing (bnc#769350) +- make dependency on Pod::Usage optional (bnc#760464) +- 0.6.5 + +------------------------------------------------------------------- Old: ---- perl-Bootloader-0.6.4.tar.bz2 New: ---- perl-Bootloader-0.6.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.4Dd92c/_old 2012-07-02 10:32:27.000000000 +0200 +++ /var/tmp/diff_new_pack.4Dd92c/_new 2012-07-02 10:32:27.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-Bootloader -Version: 0.6.4 +Version: 0.6.5 Release: 0 Requires: perl-base = %{perl_version} Requires: e2fsprogs ++++++ perl-Bootloader-0.6.4.tar.bz2 -> perl-Bootloader-0.6.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.6.4/perl-Bootloader.changes new/perl-Bootloader-0.6.5/perl-Bootloader.changes --- old/perl-Bootloader-0.6.4/perl-Bootloader.changes 2012-06-04 15:47:41.000000000 +0200 +++ new/perl-Bootloader-0.6.5/perl-Bootloader.changes 2012-06-29 16:21:41.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jun 29 16:20:02 CEST 2012 - snwint(a)suse.de + +- mchang: fix error caused by grub.cfg missing (bnc#769350) +- make dependency on Pod::Usage optional (bnc#760464) +- 0.6.5 + +------------------------------------------------------------------- Mon Jun 4 15:40:15 CEST 2012 - mchang(a)suse.com - support console related global options gfxterm, serial, gfxbackground and gfxmode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.6.4/src/Core/GRUB2.pm new/perl-Bootloader-0.6.5/src/Core/GRUB2.pm --- old/perl-Bootloader-0.6.4/src/Core/GRUB2.pm 2012-06-04 15:47:41.000000000 +0200 +++ new/perl-Bootloader-0.6.5/src/Core/GRUB2.pm 2012-06-29 16:21:41.000000000 +0200 @@ -314,11 +314,15 @@ # list<string> ListFiles () sub ListFiles { my $self = shift; + my @ret = ( Bootloader::Path::Grub2_devicemap(), + Bootloader::Path::Grub2_installdevice(), + Bootloader::Path::Grub2_defaultconf() ); - return [ Bootloader::Path::Grub2_devicemap(), - Bootloader::Path::Grub2_installdevice(), - Bootloader::Path::Grub2_defaultconf(), - Bootloader::Path::Grub2_conf() ]; + if (-e Bootloader::Path::Grub2_conf()) { + push @ret, Bootloader::Path::Grub2_conf(); + } + + return \@ret; } =item diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.6.4/src/Core/GRUB2EFI.pm new/perl-Bootloader-0.6.5/src/Core/GRUB2EFI.pm --- old/perl-Bootloader-0.6.4/src/Core/GRUB2EFI.pm 2012-06-04 15:47:41.000000000 +0200 +++ new/perl-Bootloader-0.6.5/src/Core/GRUB2EFI.pm 2012-06-29 16:21:41.000000000 +0200 @@ -86,9 +86,13 @@ # list<string> ListFiles () sub ListFiles { my $self = shift; + my @ret = (Bootloader::Path::Grub2_defaultconf()); - return [ Bootloader::Path::Grub2_defaultconf(), - Bootloader::Path::Grub2_eficonf() ]; + if (-e Bootloader::Path::Grub2_eficonf()) { + push @ret, Bootloader::Path::Grub2_eficonf(); + } + + return \@ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.6.4/update-bootloader new/perl-Bootloader-0.6.5/update-bootloader --- old/perl-Bootloader-0.6.4/update-bootloader 2012-06-04 15:47:41.000000000 +0200 +++ new/perl-Bootloader-0.6.5/update-bootloader 2012-06-29 16:21:41.000000000 +0200 @@ -2,12 +2,20 @@ use POSIX; use Getopt::Long; -use Pod::Usage; use Bootloader::Tools; use Bootloader::Path; use Bootloader::MBRTools; use strict; +# keep Pod::Usage optional (bnc #760464) +eval "use Pod::Usage"; + +if(!exists $::{pod2usage}) { + sub pod2usage { + die "usage: update-bootloader [operation] [options]\n"; + } +} + my %oper; my ($opt_default, $opt_force, $opt_force_default, $opt_help, $opt_man, $opt_previous, $opt_xen) = (0,0,0,0,0,0,0); @@ -184,13 +192,13 @@ pod2usage(1) if $opt_help; pod2usage(-exitstatus => 0, -verbose => 2) if $opt_man; -pod2usage("Specify exactly one operation, either 'add', 'remove' or 'refresh'") +die("Specify exactly one operation, either 'add', 'remove' or 'refresh'\n") unless scalar keys(%oper) == 1; -pod2usage("Option 'default' is only allowed for operation 'add'") +die("Option 'default' is only allowed for operation 'add'\n") if ($opt_default and not defined $oper{add}); -pod2usage("Option 'force-default' is only allowed for operation 'add'") +die("Option 'force-default' is only allowed for operation 'add'\n") if ($opt_force_default and not defined $oper{add}); if (defined $oper{"examinembr"}) { @@ -379,10 +387,10 @@ if (defined $oper{add}) { open (LOG, ">>$logname"); print LOG ("update-bootloader: now executing operation add\n"); - print LOG ("update-bootloader: changed opt name is $opt_name \n"); + print LOG ("update-bootloader: changed opt name is $opt_name\n"); close LOG; - pod2usage("Please specify name and kernel image for new section") + die("Please specify name and kernel image for new section\n") unless $opt_name and $opt_image; my @params = ( @@ -391,7 +399,7 @@ ); if (CountSections(@params) != 0) { if (not $opt_force) { - pod2usage("There are already sections with image '$opt_image'"); + die("There are already sections with image '$opt_image'\n"); } open (LOG, ">>$logname"); print LOG ("update-bootloader: section already exist. Skip add.\n"); @@ -496,7 +504,7 @@ print LOG ("update-bootloader: found $num sections, no opt_force: not removing\n"); close LOG; - pod2usage("There is more than one section with image '$opt_image'"); + die("There is more than one section with image '$opt_image'\n"); } else { open (LOG, ">>$logname"); print LOG ("update-bootloader: calling Tools::RemoveSections\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.6.4/version new/perl-Bootloader-0.6.5/version --- old/perl-Bootloader-0.6.4/version 2012-06-04 15:47:41.000000000 +0200 +++ new/perl-Bootloader-0.6.5/version 2012-06-29 16:21:41.000000000 +0200 @@ -1 +1 @@ -0.6.4 +0.6.5 ++++++ update-bootloader ++++++ --- /var/tmp/diff_new_pack.4Dd92c/_old 2012-07-02 10:32:27.000000000 +0200 +++ /var/tmp/diff_new_pack.4Dd92c/_new 2012-07-02 10:32:27.000000000 +0200 @@ -2,12 +2,20 @@ use POSIX; use Getopt::Long; -use Pod::Usage; use Bootloader::Tools; use Bootloader::Path; use Bootloader::MBRTools; use strict; +# keep Pod::Usage optional (bnc #760464) +eval "use Pod::Usage"; + +if(!exists $::{pod2usage}) { + sub pod2usage { + die "usage: update-bootloader [operation] [options]\n"; + } +} + my %oper; my ($opt_default, $opt_force, $opt_force_default, $opt_help, $opt_man, $opt_previous, $opt_xen) = (0,0,0,0,0,0,0); @@ -184,13 +192,13 @@ pod2usage(1) if $opt_help; pod2usage(-exitstatus => 0, -verbose => 2) if $opt_man; -pod2usage("Specify exactly one operation, either 'add', 'remove' or 'refresh'") +die("Specify exactly one operation, either 'add', 'remove' or 'refresh'\n") unless scalar keys(%oper) == 1; -pod2usage("Option 'default' is only allowed for operation 'add'") +die("Option 'default' is only allowed for operation 'add'\n") if ($opt_default and not defined $oper{add}); -pod2usage("Option 'force-default' is only allowed for operation 'add'") +die("Option 'force-default' is only allowed for operation 'add'\n") if ($opt_force_default and not defined $oper{add}); if (defined $oper{"examinembr"}) { @@ -379,10 +387,10 @@ if (defined $oper{add}) { open (LOG, ">>$logname"); print LOG ("update-bootloader: now executing operation add\n"); - print LOG ("update-bootloader: changed opt name is $opt_name \n"); + print LOG ("update-bootloader: changed opt name is $opt_name\n"); close LOG; - pod2usage("Please specify name and kernel image for new section") + die("Please specify name and kernel image for new section\n") unless $opt_name and $opt_image; my @params = ( @@ -391,7 +399,7 @@ ); if (CountSections(@params) != 0) { if (not $opt_force) { - pod2usage("There are already sections with image '$opt_image'"); + die("There are already sections with image '$opt_image'\n"); } open (LOG, ">>$logname"); print LOG ("update-bootloader: section already exist. Skip add.\n"); @@ -496,7 +504,7 @@ print LOG ("update-bootloader: found $num sections, no opt_force: not removing\n"); close LOG; - pod2usage("There is more than one section with image '$opt_image'"); + die("There is more than one section with image '$opt_image'\n"); } else { open (LOG, ">>$logname"); print LOG ("update-bootloader: calling Tools::RemoveSections\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 pcp for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package pcp for openSUSE:Factory checked in at 2012-07-01 15:14:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcp (Old) and /work/SRC/openSUSE:Factory/.pcp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pcp", Maintainer is "rw(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/pcp/pcp.changes 2012-02-21 12:22:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pcp.new/pcp.changes 2012-07-02 10:32:18.000000000 +0200 @@ -1,0 +2,96 @@ +Mon Jun 18 11:01:29 UTC 2012 - ddiss(a)suse.com + +- Remove invalid cpan/PMDA manifest entry. + +------------------------------------------------------------------- +Fri Jun 15 14:59:26 UTC 2012 - ddiss(a)suse.com + +- Update to pcp-3.6.4. + + Fix build on s390x platform (thanks to Dan Horak) + + Rethink order of PATH setting for pcp start scripts, to ensure + binaries from other packages with names that conflict with pcp + binaries are not found ahead of the same-named pcp binary. + +------------------------------------------------------------------- +Wed Jun 6 12:49:13 UTC 2012 - ddiss(a)suse.com + +- Use upstream spec file + +- Update to pcp-3.6.3. + + Revert initial attempt at getting configure --prefix option to + make sense for local developer PCP installations + + Fix RPM changelog typo in in-tree spec file + + Further work on Debian/kFreeBSD port (thanks to Robert Millan) + +- Update to pcp-3.6.2. + + Fix Debian builds on FreeBSD (missing header files) + + Resolve Debian startup script (compat) lintian issue + + Resolve FreeBSD kernel PMDA build issue with PCP not installed + in the build root already. + +- Update to pcp-3.6.1. + + Resolve final Mac OS X pthreads build issues + + Debian packaging improvements for split pmlogger/pmcd scripts, + perl module pieces, and other lintian reported issues + + Update the startup script dependencies for /var use + + Support --prefix=... and --exec-prefix=... configure options + + Relaxed the "are you running as root?" test in startup scripts + + Win32 build updates and improvements + + Cache /proc/stat file handle in Linux kernel agent to reduce + syscalls on the most commonly fetched metric subtree + +- Update to pcp-3.6.0. + + Thread-safe libpcp, including additional re-entrant and thread-safe + variants for some routines + + Retire all asynchronous routines from libpcp + + Retire all V1 protocols and services (archive format, PMAPI and + PMDA_INTERFACE) + + PMNS moves to ASCII only (no binary PMNS) + + Rework "init" scripts, splitting pcp into pmcd and pmlogger + + Update elasticsearch PMDA to 0.19+, new transport and shard metrics + + Updates to PMDA new event queueing interfaces for agents wishing to + export that class of performance data. + + First round of Coverity cleanup fixes incorporated. + + Initial version of the SNMP PMDA, thanks to Hamish Coleman. + + Updates to postgres PMDA to export additional recovery metrics. + +- Update to pcp-3.5.11. + + Update FSF contact address in copyright notices to keep + rpmlint happy. + + Fix instance domain checks in elasticsearch PMDA. + + Make KVM PMDA to run as root once more (permissions issues). + + Integration of pmlogger_daily with pmlogrewrite. + + Fix pmlogger_merge corner case for empty archives. + +- Update to pcp-3.5.10. + + Support new 0.18+ elasticsearch metrics. + + Fix handling of elasticsearch version metric cluster. + + Fix trace PMDA build issues. + + Fix some Win32 build issues. + + Run with reduced privileges for more of the perl PMDAs. + + Name Solaris load average metric consistently. + + Small metric documentation tweaks for Solaris PMDA. + +- Update to pcp-3.5.9. + + Add rc script support for condrestart, and condrestart the pcp, + pmie and pmproxy services after an RPM install or upgrade. + + Fix a bug where hinv.ndisk is incorrect if CLUSTER_PARTITIONS + hasn't yet been refreshed immediately following a restart. + + Implementation of client event queueing logic for all PMDAs to + share (all PMDAs wishing to support event metrics, that is). + + New manual pages for new PMDA event queueing interfaces. + + PostgreSQL PMDA, supporting versions 9.0 and 9.1 (at least). + + Reserved ID 111 for Samba Clustered Trivial Database PMDA. + + Add perl interface to allow PMDAs to drop priveleges + + Add an elasticsearch version metric. + + Correct perl module type detection logic for 32/64-bit systems. + + Small pmlogconf source and man page fixes. + + Rework flex usage to resolve build warnings. + + Make Darwin CPU metrics 64 bit. + + Add (long) opaque key support to libpcp_pmda. + + Add pmdaCacheStoreInst() routine to libpcp_pmda. + + Added mssql PMDA for SQL server Dynamic Management View stats. + + Add pmlogrewrite(1) to rewrite archives (fix inconsistencies). + + Fix a cgroup option parsing error on consecutive fetch calls. + +------------------------------------------------------------------- Old: ---- pcp-3.5.8-1.src.tar.gz New: ---- configure_append_pcp_subdir.patch fix_configure_path_tests.patch fix_cpan_pmda_manifest.patch pcp-3.6.4-1.src.tar.gz pcp_legacy_init_lsb.patch remove_cpan_rpaths.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcp.spec ++++++ --- /var/tmp/diff_new_pack.Odak5z/_old 2012-07-02 10:32:20.000000000 +0200 +++ /var/tmp/diff_new_pack.Odak5z/_new 2012-07-02 10:32:20.000000000 +0200 @@ -16,32 +16,64 @@ # -Name: pcp -Version: 3.5.8 -Release: 0 -%define pcp_release 1 Summary: System-level performance monitoring and performance management -License: GPL-2.0 -Group: System/Monitoring -Url: http://oss.sgi.com/projects/pcp -Source: %{name}-%{version}-%{pcp_release}.src.tar.gz -Requires: libpcp3 = %{version} -Requires: bash gawk sed grep fileutils findutils + +Name: pcp +Version: 3.6.4 +Release: 1 +%define buildversion 1 + %if "%{_vendor}" == "suse" -Requires: sysconfig cpp +%define pcp_gr System/Monitoring +%define lib_pkg libpcp3 +%define lib_pkg_conflict pcp-libs +%define lib_gr System/Libraries +%define lib_devel_pkg libpcp-devel +%define lib_devel_pkg_conflict pcp-libs-devel +%define lib_devel_gr Development/Libraries/Other +%define license_gplv2 GPL-2.0 +%define license_lgplv2 LGPL-2.0 +%define license_lgplv2plus LGPL-2.1+ %else -Requires: initscripts +%define pcp_gr Applications/System +%define lib_pkg pcp-libs +%define lib_pkg_conflict libpcp3 +%define lib_gr Applications/System +%define lib_devel_pkg pcp-libs-devel +%define lib_devel_pkg_conflict libpcp-devel +%define lib_devel_gr Applications/System +%define license_gplv2 GPLv2 +%define license_lgplv2 LGPLv2 +%define license_lgplv2plus LGPLv2+ %endif + +License: %{license_gplv2} +Url: http://oss.sgi.com/projects/pcp +Group: %{pcp_gr} +Source0: ftp://oss.sgi.com/projects/pcp/download/pcp-%{version}-%{buildversion}.src.… + BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf -BuildRequires: bison -BuildRequires: flex -BuildRequires: ncurses-devel -BuildRequires: procps -BuildRequires: readline-devel +BuildRequires: autoconf bison flex ncurses-devel procps readline-devel BuildRequires: perl(ExtUtils::MakeMaker) Patch6: pcp-xenbuild.patch Patch9: static_lib_perms.diff +Patch10: pcp_legacy_init_lsb.patch +Patch11: fix_configure_path_tests.patch +Patch12: configure_append_pcp_subdir.patch +Patch13: remove_cpan_rpaths.patch +Patch14: fix_cpan_pmda_manifest.patch + +%if "%{_vendor}" == "suse" +Requires: sysconfig cpp +%else +Requires: initscripts +BuildRequires: initscripts +%if (0%{?fedora} > 0) +AutoReq: no +%endif +%endif +Requires: bash gawk sed grep fileutils findutils +Requires: %{lib_pkg} = %{version} %define _pmdasdir %{_localstatedir}/lib/pcp/pmdas @@ -54,41 +86,49 @@ applications to easily retrieve and process any subset of that data. # -# libpcp +# pcp-libs # -%package -n libpcp3 + +%package -n %{lib_pkg} +License: %{license_lgplv2} +Group: %{lib_gr} Summary: Performance Co-Pilot run-time libraries -License: LGPL-2.1+ -Group: System/Libraries Url: http://oss.sgi.com/projects/pcp/ -Obsoletes: pcp < 3.0 +Conflicts: %{lib_pkg_conflict} AutoReq: no -%description -n libpcp3 +%description -n %{lib_pkg} Performance Co-Pilot (PCP) run-time libraries # -# libpcp-devel +# pcp-libs-devel # -%package -n libpcp-devel +%package -n %{lib_devel_pkg} +License: %{license_gplv2} +Group: %{lib_devel_gr} Summary: Performance Co-Pilot (PCP) development headers and documentation -License: GPL-2.0 -Group: Development/Libraries/Other Url: http://oss.sgi.com/projects/pcp/ -Requires: libpcp3 = %{version} +Requires: %{lib_pkg} = %{version} +Conflicts: %{lib_devel_pkg_conflict} +%if (0%{?fedora} > 0) +AutoReq: no +%endif -%description -n libpcp-devel +%description -n %{lib_devel_pkg} Performance Co-Pilot (PCP) headers, documentation and tools for development. # # perl-PCP-PMDA. This is the PCP agent perl binding. # %package -n perl-PCP-PMDA +License: %{license_gplv2} +Group: %{pcp_gr} Summary: Performance Co-Pilot (PCP) Perl bindings and documentation -License: GPL-2.0 -Group: System/Monitoring Url: http://oss.sgi.com/projects/pcp/ -Requires: pcp >= %{version} perl-base +Requires: pcp >= %{version} +%if "%{_vendor}" == "suse" +Requires: perl-base +%endif %description -n perl-PCP-PMDA The PCP::PMDA Perl module contains the language bindings for @@ -101,11 +141,14 @@ # perl-PCP-MMV # %package -n perl-PCP-MMV +License: %{license_gplv2} +Group: %{pcp_gr} Summary: Performance Co-Pilot (PCP) Perl bindings for PCP Memory Mapped Values -License: GPL-2.0 -Group: System/Monitoring Url: http://oss.sgi.com/projects/pcp/ -Requires: pcp >= %{version} perl-base +Requires: pcp >= %{version} +%if "%{_vendor}" == "suse" +Requires: perl-base +%endif %description -n perl-PCP-MMV The PCP::MMV module contains the Perl language bindings for @@ -119,26 +162,32 @@ # perl-PCP-LogImport # %package -n perl-PCP-LogImport -Summary: Performance Co-Pilot Perl bindings for importing external data -License: GPL-2.0 -Group: System/Monitoring +License: %{license_gplv2} +Group: %{pcp_gr} +Summary: Performance Co-Pilot Perl bindings for importing external archive data Url: http://oss.sgi.com/projects/pcp/ -Requires: pcp >= %{version} perl-base +Requires: pcp >= %{version} +%if "%{_vendor}" == "suse" +Requires: perl-base +%endif %description -n perl-PCP-LogImport The PCP::LogImport module contains the Perl language bindings for importing data in various 3rd party formats into PCP archives so they can be replayed with standard PCP monitoring tools. -# + # # perl-PCP-LogSummary # %package -n perl-PCP-LogSummary +License: %{license_gplv2} +Group: %{pcp_gr} Summary: Performance Co-Pilot Perl bindings for processing pmlogsummary output -License: GPL-2.0 -Group: System/Monitoring Url: http://oss.sgi.com/projects/pcp/ -Requires: pcp >= %{version} perl-base +Requires: pcp >= %{version} +%if "%{_vendor}" == "suse" +Requires: perl-base +%endif %description -n perl-PCP-LogSummary The PCP::LogSummary module provides a Perl module for using the @@ -152,11 +201,11 @@ # pcp-import-sar2pcp # %package import-sar2pcp +License: %{license_lgplv2plus} +Group: %{pcp_gr} Summary: Performance Co-Pilot tools for importing sar data into PCP archive logs -License: LGPL-2.1+ -Group: System/Monitoring Url: http://oss.sgi.com/projects/pcp/ -Requires: libpcp3 >= %{version} perl-PCP-LogImport >= %{version} sysstat +Requires: %{lib_pkg} >= %{version} perl-PCP-LogImport >= %{version} sysstat %description import-sar2pcp Performance Co-Pilot (PCP) front-end tools for importing sar data @@ -166,11 +215,11 @@ # pcp-import-iostat2pcp # %package import-iostat2pcp +License: %{license_lgplv2plus} +Group: %{pcp_gr} Summary: Performance Co-Pilot tools for importing iostat data into PCP archive logs -License: LGPL-2.1+ -Group: System/Monitoring Url: http://oss.sgi.com/projects/pcp/ -Requires: libpcp3 >= %{version} perl-PCP-LogImport >= %{version} sysstat +Requires: %{lib_pkg} >= %{version} perl-PCP-LogImport >= %{version} sysstat %description import-iostat2pcp Performance Co-Pilot (PCP) front-end tools for importing iostat data @@ -180,11 +229,11 @@ # pcp-import-sheet2pcp # %package import-sheet2pcp +License: %{license_lgplv2plus} +Group: %{pcp_gr} Summary: Performance Co-Pilot tools for importing spreadsheet data into PCP archive logs -License: LGPL-2.1+ -Group: System/Monitoring Url: http://oss.sgi.com/projects/pcp/ -Requires: libpcp3 >= %{version} perl-PCP-LogImport >= %{version} sysstat +Requires: %{lib_pkg} >= %{version} perl-PCP-LogImport >= %{version} sysstat %description import-sheet2pcp Performance Co-Pilot (PCP) front-end tools for importing spreadsheet data @@ -194,11 +243,11 @@ # pcp-import-mrtg2pcp # %package import-mrtg2pcp +License: %{license_lgplv2plus} +Group: %{pcp_gr} Summary: Performance Co-Pilot tools for importing MTRG data into PCP archive logs -License: LGPL-2.1+ -Group: System/Monitoring Url: http://oss.sgi.com/projects/pcp/ -Requires: libpcp3 >= %{version} perl-PCP-LogImport >= %{version} +Requires: %{lib_pkg} >= %{version} perl-PCP-LogImport >= %{version} %description import-mrtg2pcp Performance Co-Pilot (PCP) front-end tools for importing MTRG data @@ -208,72 +257,132 @@ %setup -q %patch6 %patch9 +%patch10 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 autoconf -./configure --bindir=%{_bindir} \ - --libdir=%{_libdir} \ - --libexecdir=%{_libexecdir} && touch config.done +%configure --localstatedir=/var/lib %clean -[ ! -z "$DIST_ROOT" ] && rm -rf $DIST_ROOT rm -Rf $RPM_BUILD_ROOT %build make default_pcp %install -BACKDIR=`pwd`; -DIST_ROOT=$RPM_BUILD_ROOT -export DIST_ROOT +rm -Rf $RPM_BUILD_ROOT +export DIST_ROOT=$RPM_BUILD_ROOT make install_pcp # Fix stuff we do/don't want to ship rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a +mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/run/pcp + +%if "%{_vendor}" == "suse" +# add /etc/init.d/X symlinks at /usr/sbin/rcX +%__install -d -m 0755 ${RPM_BUILD_ROOT}/%{_sbindir} +for script in pcp pmie pmproxy pmlogger pmcd; do + ln -s "%{_sysconfdir}/init.d/${script}" "${RPM_BUILD_ROOT}/%{_sbindir}/rc${script}" +done +%else +# default chkconfig off for Fedora and RHEL +for f in $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/{pcp,pmie,pmproxy}; do + sed -i -e '/^# chkconfig/s/:.*$/: - 95 05/' -e '/^# Default-Start:/s/:.*$/:/' $f +done +%endif # list of PMDAs in the base pkg -ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} | grep -vE 'simple|sample|trivial|txmon' |\ +ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} | egrep -v 'simple|sample|trivial|txmon' |\ sed -e 's#^#'%{_pmdasdir}'\/#' >base_pmdas.list # bin and man1 files except those split out into sub packages +# man pages are transparently compressed so append a '*' suffix ls -1 $RPM_BUILD_ROOT/%{_bindir} | grep -v '2pcp' |\ sed -e 's#^#'%{_bindir}'\/#' >base_binfiles.list ls -1 $RPM_BUILD_ROOT/%{_mandir}/man1 | grep -v '2pcp' |\ -sed -e 's#^#'%{_mandir}'\/man1\/#' >base_man1files.list +sed -e 's#^#'%{_mandir}'\/man1\/#' |\ +sed -e 's#$#*#' >base_man1files.list cat base_pmdas.list base_binfiles.list base_man1files.list > base_specialfiles.list -# add /etc/init.d/X symlinks at /usr/sbin/rcX -%__install -d -m 0755 ${RPM_BUILD_ROOT}/%{_sbindir} -for script in pcp pmie pmproxy; do - ln -s "%{_sysconfdir}/init.d/${script}" "${RPM_BUILD_ROOT}/%{_sbindir}/rc${script}" -done - -%post -/sbin/ldconfig +%if "%{_vendor}" == "suse" %preun -%{?stop_on_removal:%{stop_on_removal pcp pmproxy pmie}} +%{?stop_on_removal:%{stop_on_removal pmlogger pmie pmproxy pmcd}} %postun /sbin/ldconfig %{?restart_on_update:%{restart_on_update pcp pmproxy pmie}} %{?insserv_cleanup:%{insserv_cleanup}} -%post -n libpcp3 -p /sbin/ldconfig +%post +/sbin/ldconfig -%postun -n libpcp3 -p /sbin/ldconfig +%else + +%preun +if [ "$1" -eq 0 ] +then + # + # Stop daemons before erasing the package + # + /sbin/service pmlogger stop >/dev/null 2>&1 + /sbin/service pmie stop >/dev/null 2>&1 + /sbin/service pmproxy stop >/dev/null 2>&1 + /sbin/service pcp stop >/dev/null 2>&1 + /sbin/service pmcd stop >/dev/null 2>&1 + + /sbin/chkconfig --del pcp >/dev/null 2>&1 + /sbin/chkconfig --del pmcd >/dev/null 2>&1 + /sbin/chkconfig --del pmlogger >/dev/null 2>&1 + /sbin/chkconfig --del pmie >/dev/null 2>&1 + /sbin/chkconfig --del pmproxy >/dev/null 2>&1 +fi + +%post +/sbin/chkconfig --add pmcd >/dev/null 2>&1 +/sbin/service pmcd condrestart +/sbin/chkconfig --add pmlogger >/dev/null 2>&1 +/sbin/service pmlogger condrestart +/sbin/chkconfig --add pmie >/dev/null 2>&1 +/sbin/service pmie condrestart +/sbin/chkconfig --add pmproxy >/dev/null 2>&1 +/sbin/service pmproxy condrestart + +%endif + +%post -n %{lib_pkg} -p /sbin/ldconfig + +%postun -n %{lib_pkg} -p /sbin/ldconfig %files -f base_specialfiles.list +# +# Note: there are some headers (e.g. domain.h) and in a few cases some +# C source files that rpmlint complains about. These are not devel files, +# but rather they are (slightly obscure) PMDA config files. +# %defattr(-,root,root) +# pcp_doc_dir should be derived from a configure option, currently it's not +%{_datadir}/doc/packages/pcp-%{version} +%if "%{_vendor}" == "suse" +%{_sbindir}/rc* +%endif + +%ghost %dir %{_localstatedir}/run/pcp %dir %{_pmdasdir} %dir %{_datadir}/pcp %dir %{_localstatedir}/lib/pcp %dir %{_localstatedir}/lib/pcp/config -%doc %{_datadir}/doc/packages/pcp-%{version} + %{_libexecdir}/pcp %{_datadir}/pcp/lib %{_localstatedir}/log/pcp %{_localstatedir}/lib/pcp/pmns %{_initrddir}/pcp +%{_initrddir}/pmcd +%{_initrddir}/pmlogger %{_initrddir}/pmie %{_initrddir}/pmproxy %{_mandir}/man4/* @@ -290,12 +399,10 @@ %config(noreplace) %{_localstatedir}/lib/pcp/config/pmlogger/crontab %config(noreplace) %{_localstatedir}/lib/pcp/config/pmproxy/pmproxy.options %{_localstatedir}/lib/pcp/config/* -/usr/sbin/rcpcp -/usr/sbin/rcpmie -/usr/sbin/rcpmproxy -%files -n libpcp3 +%files -n %{lib_pkg} %defattr(-,root,root) + %dir %{_includedir}/pcp %{_includedir}/pcp/builddefs %{_includedir}/pcp/buildrules @@ -307,8 +414,9 @@ %{_libdir}/libpcp_trace.so.2 %{_libdir}/libpcp_import.so.1 -%files -n libpcp-devel +%files -n %{lib_devel_pkg} %defattr(-,root,root) + %{_libdir}/libpcp.so %{_libdir}/libpcp.so.2 %{_libdir}/libpcp_gui.so @@ -322,6 +430,9 @@ %{_mandir}/man3/*.3.gz %{_datadir}/pcp/demos %{_datadir}/pcp/examples + +# PMDAs that ship src and are not for production use +# straight out-of-the-box, for devel or QA use only. %{_localstatedir}/lib/pcp/pmdas/simple %{_localstatedir}/lib/pcp/pmdas/sample %{_localstatedir}/lib/pcp/pmdas/trivial @@ -347,40 +458,34 @@ %{_bindir}/mrtg2pcp %{_mandir}/man1/mrtg2pcp.1.gz -%files -n perl-PCP-PMDA +%files -n perl-PCP-PMDA -f perl-pcp-pmda.list +%defattr(-,root,root) +%if "%{_vendor}" == "suse" +%dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/PCP +%dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP +%dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP/PMDA +%endif + +%files -n perl-PCP-MMV -f perl-pcp-mmv.list %defattr(-,root,root) -%dir /usr/lib/perl5/vendor_perl/*/*-linux-thread-multi*/PCP -%dir /usr/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP -%dir /usr/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP/PMDA -/usr/lib/perl5/vendor_perl/*/*-linux-thread-multi*/PCP/PMDA.pm -/usr/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP/PMDA/PMDA.so -/usr/share/man/man3/PCP::PMDA.3pm.gz - -%files -n perl-PCP-MMV -%defattr(-,root,root) -%dir /usr/lib/perl5/vendor_perl/*/*-linux-thread-multi*/PCP -%dir /usr/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP -%dir /usr/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP/MMV -/usr/lib/perl5/vendor_perl/*/*-linux-thread-multi*/PCP/MMV.pm -/usr/lib/perl5/vendor_perl/*/*-linux-thread-multi*/PCP/server.pl -/usr/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP/MMV/MMV.so -/usr/share/man/man3/PCP::MMV.3pm.gz - -%files -n perl-PCP-LogImport -%defattr(-,root,root) -%dir /usr/lib/perl5/vendor_perl/*/*-linux-thread-multi*/PCP -%dir /usr/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP -%dir /usr/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP/LogImport -/usr/lib/perl5/vendor_perl/*/*-linux-thread-multi*/PCP/LogImport.pm -/usr/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP/LogImport/LogImport.so -/usr/share/man/man3/PCP::LogImport.3pm.gz - -%files -n perl-PCP-LogSummary -%defattr(-,root,root) -%dir /usr/lib/perl5/vendor_perl/*/PCP -/usr/lib/perl5/vendor_perl/*/PCP/LogSummary.pm -/usr/lib/perl5/vendor_perl/*/PCP/exceldemo.pl -/usr/lib/perl5/vendor_perl/*/PCP/extract.pl -/usr/share/man/man3/PCP::LogSummary.3pm.gz +%if "%{_vendor}" == "suse" +%dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/PCP +%dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP +%dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP/MMV +%endif + +%files -n perl-PCP-LogImport -f perl-pcp-logimport.list +%defattr(-,root,root) +%if "%{_vendor}" == "suse" +%dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/PCP +%dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP +%dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP/LogImport +%endif + +%files -n perl-PCP-LogSummary -f perl-pcp-logsummary.list +%defattr(-,root,root) +%if "%{_vendor}" == "suse" +%dir %{_prefix}/lib/perl5/vendor_perl/*/PCP +%endif %changelog ++++++ configure_append_pcp_subdir.patch ++++++ >From 8ae41f7080de22383990ef477d28f148dfa403a7 Mon Sep 17 00:00:00 2001 From: David Disseldorp <ddiss(a)samba.org> Date: Tue, 5 Jun 2012 17:01:28 +0200 Subject: [PATCH] build: append pcp sub-directory suffix With the fix to correctly handle a --Xdir= configure arguments, a number of PCP specific paths need a pcp/ suffix to match default (no --Xdir=) paths. --- configure.in | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/configure.in b/configure.in index 6b83469..e25a7cc 100644 --- a/configure.in +++ b/configure.in @@ -1553,6 +1553,8 @@ then else pcp_share_dir=/usr/pcp fi +else + pcp_share_dir=`eval echo $pcp_share_dir/pcp` fi AC_SUBST(pcp_share_dir) @@ -1598,6 +1600,8 @@ then else pcp_var_dir=/usr fi +else + pcp_var_dir=`eval echo $pcp_var_dir/pcp` fi AC_SUBST(pcp_var_dir) @@ -1852,6 +1856,8 @@ then else pcp_inc_dir=/usr/include/pcp fi +else + pcp_inc_dir=`eval echo $pcp_inc_dir/pcp` fi AC_SUBST(pcp_inc_dir) -- 1.7.1 ++++++ fix_configure_path_tests.patch ++++++ >From 70b76abe42aca1c968feb3bfe20b74c61cf05db6 Mon Sep 17 00:00:00 2001 From: David Disseldorp <ddiss(a)suse.de> Date: Mon, 21 Nov 2011 18:40:36 +0100 Subject: [PATCH] build: fix configure path tests This commit fixes pcp_(share|binadm|var|lib|man)_dir configure tests: if test -z "`echo $pcp_share_dir | sed 's;/.*\$;;'`" Currently all tests evaluate to true when absolute paths are supplied, as sed replaces from the leading '/', rather than the end which appears to be the intended purpose. --- configure.in | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure.in b/configure.in index 46e3f27..6b83469 100644 --- a/configure.in +++ b/configure.in @@ -1539,7 +1539,7 @@ AC_SUBST(pcp_etc_dir) dnl shared PCP files (shareable for diskless) pcp_share_dir=`eval echo $datadir` pcp_share_dir=`eval echo $pcp_share_dir` -if test -z "`echo $pcp_share_dir | sed 's;/.*\$;;'`" +if test -z "`echo $pcp_share_dir | sed 's;/\s*\$;;'`" then if test $target_os = mingw then @@ -1559,7 +1559,7 @@ AC_SUBST(pcp_share_dir) dnl private PCP executables pcp_binadm_dir=`eval echo $libexecdir` pcp_binadm_dir=`eval echo $pcp_binadm_dir` -if test -z "`echo $pcp_binadm_dir | sed 's;/.*\$;;'`" +if test -z "`echo $pcp_binadm_dir | sed 's;/\s*\$;;'`" then if test $target_distro = debian then @@ -1581,7 +1581,7 @@ AC_SUBST(pcp_binadm_dir) dnl non-shared (i.e. system local) PCP files pcp_var_dir=`eval echo $localstatedir` pcp_var_dir=`eval echo $pcp_var_dir` -if test -z "`echo $pcp_var_dir | sed 's;/.*\$;;'`" +if test -z "`echo $pcp_var_dir | sed 's;/\s*\$;;'`" then if test $target_os = mingw then @@ -1654,7 +1654,7 @@ then else pcp_lib_dir=`eval echo $libdir` pcp_lib_dir=`eval echo $pcp_lib_dir` - if test -z "`echo $pcp_lib_dir | sed 's;/.*\$;;'`" + if test -z "`echo $pcp_lib_dir | sed 's;/\s*\$;;'`" then if test -d /usr/lib then @@ -1716,7 +1716,7 @@ need_old_tbl_header=false man_header= pcp_man_dir=`eval echo $mandir` pcp_man_dir=`eval echo $pcp_man_dir` -if test -z "`echo $pcp_man_dir | sed 's;/.*\$;;'`" +if test -z "`echo $pcp_man_dir | sed 's;/\s*\$;;'`" then dnl some low risk defaults if test $target_os = mingw @@ -1827,7 +1827,7 @@ AC_SUBST(need_old_tbl_header) dnl public binaries pcp_bin_dir=`eval echo $bindir` pcp_bin_dir=`eval echo $pcp_bin_dir` -if test -z "`echo $pcp_bin_dir | sed 's;/.*\$;;'`" +if test -z "`echo $pcp_bin_dir | sed 's;/\s*\$;;'`" then if test $target_os = mingw then @@ -1844,7 +1844,7 @@ AC_SUBST(pcp_bin_dir) dnl include files pcp_inc_dir=`eval echo $includedir` pcp_inc_dir=`eval echo $pcp_inc_dir` -if test -z "`echo $pcp_inc_dir | sed 's;/.*\$;;'`" +if test -z "`echo $pcp_inc_dir | sed 's;/\s*\$;;'`" then if test $target_os = mingw then -- 1.7.1 ++++++ fix_cpan_pmda_manifest.patch ++++++ Index: pcp-3.6.4/src/cpan/PMDA/MANIFEST =================================================================== --- pcp-3.6.4.orig/src/cpan/PMDA/MANIFEST +++ pcp-3.6.4/src/cpan/PMDA/MANIFEST @@ -9,4 +9,3 @@ local.h local.c test.pl typemap -META.yml Module meta-data (added by MakeMaker) Index: pcp-3.6.4/src/cpan/LogImport/MANIFEST =================================================================== --- pcp-3.6.4.orig/src/cpan/LogImport/MANIFEST +++ pcp-3.6.4/src/cpan/LogImport/MANIFEST @@ -5,4 +5,3 @@ MANIFEST LogImport.pm LogImport.xs typemap -META.yml Module meta-data (added by MakeMaker) Index: pcp-3.6.4/src/cpan/LogSummary/MANIFEST =================================================================== --- pcp-3.6.4.orig/src/cpan/LogSummary/MANIFEST +++ pcp-3.6.4/src/cpan/LogSummary/MANIFEST @@ -18,4 +18,3 @@ t/db/20081125.0 t/db/20081126.index t/db/20081126.meta t/db/20081126.0 -META.yml Module meta-data (added by MakeMaker) Index: pcp-3.6.4/src/cpan/MMV/MANIFEST =================================================================== --- pcp-3.6.4.orig/src/cpan/MMV/MANIFEST +++ pcp-3.6.4/src/cpan/MMV/MANIFEST @@ -7,4 +7,3 @@ MMV.xs server.pl test.pl typemap -META.yml Module meta-data (added by MakeMaker) ++++++ pcp-3.5.8-1.src.tar.gz -> pcp-3.6.4-1.src.tar.gz ++++++ ++++ 66759 lines of diff (skipped) ++++++ pcp_legacy_init_lsb.patch ++++++ Index: src/pmcd/rc_pcp =================================================================== --- src/pmcd/rc_pcp.orig +++ src/pmcd/rc_pcp @@ -31,12 +31,12 @@ # e.g. SuSE, where chkconfig is a perl script. ### BEGIN INIT INFO # Provides: pcp -# Required-Start: -# Should-Start: -# Required-Stop: -# Should-Stop: -# Default-Start: -# Default-Stop: +# Required-Start: $local_fs +# Should-Start: $network $remote_fs $syslog $time +# Required-Stop: $local_fs +# Should-Stop: $network $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 # Short-Description: Legacy control for PCP daemons # Description: Legacy init script wrapper for the Performance Co-Pilot (PCP) daemons ### END INIT INFO @@ -53,6 +53,8 @@ _usage() echo "Usage: $pmprog [-v] {start|restart|condrestart|stop|status|reload|force-reload}" } +echo "The pcp init script is depricated, pmcd and pmlogger should be used instead" + case "$1" in 'start'|'restart'|'condrestart'|'reload'|'force-reload') ++++++ remove_cpan_rpaths.patch ++++++ Index: pcp-3.6.3/src/cpan/PMDA/Makefile.PL =================================================================== --- pcp-3.6.3.orig/src/cpan/PMDA/Makefile.PL +++ pcp-3.6.3/src/cpan/PMDA/Makefile.PL @@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") { else { $ldfrom = "local.o PMDA.o"; $inc = "-I$ENV{PCP_TOPDIR}/src/include/pcp -I/usr/include/pcp"; - $libs = ["-L$ENV{PCP_TOPDIR}/src/libpcp_pmda/src -L$ENV{PCP_TOPDIR}/src/libpcp/src -lpcp_pmda -lpcp"]; + $libs = ["-lpcp_pmda -lpcp"]; } if ($ENV{TARGET_OS} eq "darwin") { # standard ones, minus -arch ppc Index: pcp-3.6.3/src/cpan/LogImport/Makefile.PL =================================================================== --- pcp-3.6.3.orig/src/cpan/LogImport/Makefile.PL +++ pcp-3.6.3/src/cpan/LogImport/Makefile.PL @@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") { else { $ldfrom = "LogImport.o", $inc = "-I$ENV{PCP_TOPDIR}/src/include/pcp -I/usr/include/pcp"; - $libs = ["-L$ENV{PCP_TOPDIR}/src/libpcp/src -L$ENV{PCP_TOPDIR}/src/libpcp_import/src -lpcp_import -lpcp"]; + $libs = ["-lpcp_import -lpcp"]; } if ($ENV{TARGET_OS} eq "darwin") { # standard ones, minus -arch ppc Index: pcp-3.6.3/src/cpan/MMV/Makefile.PL =================================================================== --- pcp-3.6.3.orig/src/cpan/MMV/Makefile.PL +++ pcp-3.6.3/src/cpan/MMV/Makefile.PL @@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") { else { $ldfrom = "MMV.o"; $inc = "-I$ENV{PCP_TOPDIR}/src/include/pcp -I/usr/include/pcp"; - $libs = ["-L$ENV{PCP_TOPDIR}/src/libpcp_mmv/src -L$ENV{PCP_TOPDIR}/src/libpcp/src -lpcp_mmv -lpcp"]; + $libs = ["-lpcp_mmv -lpcp"]; } if ($ENV{TARGET_OS} eq "darwin") { # standard ones, minus -arch ppc -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0