November 2009 - openSUSE Commits - openSUSE Mailing Lists

commit cyrus-sasl for openSUSE:Factory
by root＠Hilbert.suse.de 27 Nov '09

27 Nov '09

Hello community, here is the log from the commit of package cyrus-sasl for openSUSE:Factory checked in at Fri Nov 27 12:40:35 CET 2009. -------- --- cyrus-sasl/cyrus-sasl.changes 2009-07-20 16:20:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/cyrus-sasl/cyrus-sasl.changes 2009-11-23 12:00:20.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 23 10:57:47 UTC 2009 - rhafer(a)novell.com + +- Fixed linker arguments for ldap- and sql-auxprop plugins + (bnc#555568) + +------------------------------------------------------------------- cyrus-sasl-saslauthd.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cyrus-sasl-saslauthd.spec ++++++ --- /var/tmp/diff_new_pack.982ZTR/_old 2009-11-27 12:37:03.000000000 +0100 +++ /var/tmp/diff_new_pack.982ZTR/_new 2009-11-27 12:37:03.000000000 +0100 @@ -20,7 +20,7 @@ Name: cyrus-sasl-saslauthd BuildRequires: db-devel krb5-devel mysql-devel openldap2-devel opie pam-devel postgresql-devel -License: BSD 4-clause (or similar) +License: BSD4c(or similar) Group: Productivity/Networking/Other Url: http://asg.web.cmu.edu/sasl/ AutoReqProv: on @@ -28,7 +28,7 @@ Provides: cyrus-sasl2:/usr/sbin/saslauthd Summary: The SASL Authentication Server Version: 2.1.23 -Release: 2 +Release: 3 Source: cyrus-sasl-%{version}.tar.bz2 Source1: cyrus-sasl-rc.tar.bz2 Patch: cyrus-sasl.dif @@ -50,7 +50,7 @@ <tech-transfer> tech-transfer(a)andrew.cmu.edu %package -n cyrus-sasl-ldap-auxprop -License: BSD 4-clause (or similar) +License: BSD4c(or similar) Summary: The cyrus-sasl LDAP auxprop plugin AutoReqProv: on Group: Productivity/Networking/Other @@ -67,7 +67,7 @@ <tech-transfer> tech-transfer(a)andrew.cmu.edu %package -n cyrus-sasl-sqlauxprop -License: BSD 4-clause (or similar) +License: BSD4c(or similar) Summary: cyrus-sasl SQL auxprop plugin AutoReqProv: on Group: Development/Libraries/C and C++ ++++++ cyrus-sasl.spec ++++++ --- /var/tmp/diff_new_pack.982ZTR/_old 2009-11-27 12:37:03.000000000 +0100 +++ /var/tmp/diff_new_pack.982ZTR/_new 2009-11-27 12:37:03.000000000 +0100 @@ -20,11 +20,11 @@ Name: cyrus-sasl Version: 2.1.23 -Release: 2 +Release: 3 BuildRequires: db-devel krb5-mini-devel openssl-devel opie pam-devel Obsoletes: cyrus-sasl2 <= %{version} Provides: cyrus-sasl2 = %{version} -License: BSD 4-clause (or similar) +License: BSD4c(or similar) Group: Productivity/Networking/Other Url: http://asg.web.cmu.edu/sasl/ AutoReqProv: on @@ -47,7 +47,7 @@ # %package gssapi -License: BSD 4-clause (or similar) +License: BSD4c(or similar) Obsoletes: cyrus-sasl2-gssapi <= %{version} Provides: cyrus-sasl2-gssapi = %{version} Summary: cyrus-sasl plugin for the GSSAPI mechanism @@ -57,7 +57,7 @@ # %package crammd5 -License: BSD 4-clause (or similar) +License: BSD4c(or similar) Summary: cyrus-sasl plugin for the CRAMMD5 mechanism AutoReqProv: on Group: Development/Libraries/C and C++ @@ -69,7 +69,7 @@ # %package digestmd5 -License: BSD 4-clause (or similar) +License: BSD4c(or similar) Summary: cyrus-sasl plugin for the DIGESTMD5 mechanism AutoReqProv: on Group: Development/Libraries/C and C++ @@ -81,7 +81,7 @@ # %package otp -License: BSD 4-clause (or similar) +License: BSD4c(or similar) Summary: cyrus-sasl plugin for the OTP mechanism AutoReqProv: on Group: Development/Libraries/C and C++ @@ -93,7 +93,7 @@ # %package plain -License: BSD 4-clause (or similar) +License: BSD4c(or similar) Summary: cyrus-sasl plugin for the PLAIN mechanism AutoReqProv: on Group: Development/Libraries/C and C++ @@ -105,7 +105,7 @@ # %package ntlm -License: BSD 4-clause (or similar) +License: BSD4c(or similar) Summary: Implementation of Cyrus SASL API AutoReqProv: on Group: Productivity/Networking/Other @@ -113,7 +113,7 @@ # %package devel -License: BSD 4-clause (or similar) +License: BSD4c(or similar) Obsoletes: cyrus-sasl2-devel <= %{version} Provides: cyrus-sasl2-devel = %{version} # bug437293 ++++++ cyrus-sasl.dif ++++++ --- /var/tmp/diff_new_pack.982ZTR/_old 2009-11-27 12:37:03.000000000 +0100 +++ /var/tmp/diff_new_pack.982ZTR/_new 2009-11-27 12:37:03.000000000 +0100 @@ -65,7 +65,7 @@ COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@ -@@ -82,73 +69,59 @@ EXTRA_LTLIBRARIES = libplain.la libanony +@@ -82,73 +69,61 @@ EXTRA_LTLIBRARIES = libplain.la libanony libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la libplain_la_SOURCES = plain.c plain_init.c $(common_sources) @@ -131,11 +131,13 @@ libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources) -libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version) ++libldapdb_la_LDFLAGS = $(LIB_LDAP) $(AM_LDFLAGS) libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS) libldapdb_la_LIBADD = $(COMPAT_OBJS) libsql_la_SOURCES = sql.c sql_init.c $(common_sources) -libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) ++libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) $(AM_LDFLAGS) libsql_la_DEPENDENCIES = $(COMPAT_OBJS) libsql_la_LIBADD = $(COMPAT_OBJS) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit binutils for openSUSE:Factory
by root＠Hilbert.suse.de 27 Nov '09

27 Nov '09

Hello community, here is the log from the commit of package binutils for openSUSE:Factory checked in at Fri Nov 27 12:33:02 CET 2009. -------- --- binutils/binutils.changes 2009-10-07 15:09:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/binutils/binutils.changes 2009-11-23 14:15:47.000000000 +0100 @@ -1,0 +2,18 @@ +Wed Nov 4 15:44:30 CET 2009 - matz(a)suse.de + +- Copy from SLE11 SP1. Compared to that add --as-needed by default + patch again. + +------------------------------------------------------------------- +Mon Oct 19 11:15:51 CEST 2009 - rguenther(a)suse.de + +- Update to binutils 2.20 snapshot. + * disable patches that no longer apply + * disable make check handling everywhere + +------------------------------------------------------------------- +Mon Oct 12 15:11:44 CEST 2009 - rguenther(a)suse.de + +- enable gold plugins, fix build on older distros. + +------------------------------------------------------------------- cross-alpha-binutils.changes: same change cross-arm-binutils.changes: same change cross-avr-binutils.changes: same change cross-hppa64-binutils.changes: same change cross-hppa-binutils.changes: same change cross-i386-binutils.changes: same change cross-ia64-binutils.changes: same change cross-mips-binutils.changes: same change cross-ppc64-binutils.changes: same change cross-ppc-binutils.changes: same change cross-s390-binutils.changes: same change cross-s390x-binutils.changes: same change cross-sh4-binutils.changes: same change cross-sparc-binutils.changes: same change cross-spu-binutils.changes: same change cross-x86_64-binutils.changes: same change calling whatdependson for head-i586 Old: ---- binutils-2.19.51.tar.bz2 gold-basename.diff lto-discard.diff New: ---- binutils-2.20.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ binutils.spec ++++++ --- /var/tmp/diff_new_pack.zCAZQg/_old 2009-11-27 12:28:54.000000000 +0100 +++ /var/tmp/diff_new_pack.zCAZQg/_new 2009-11-27 12:28:54.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package binutils (Version 2.19.51) +# spec file for package binutils (Version 2.20.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,9 +18,14 @@ Name: binutils -BuildRequires: bison dejagnu flex gcc-c++ zlib-devel-static -Version: 2.19.51 -Release: 11 +BuildRequires: bison dejagnu flex gcc-c++ +%if 0%{suse_version} > 1110 +BuildRequires: zlib-devel-static +%else +BuildRequires: zlib-devel +%endif +Version: 2.20.0 +Release: 1 # # RUN_TESTS %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?) @@ -33,6 +38,7 @@ %ifarch alpha armv4l hppa mips sh4 sparc sparc64 %define make_check_handling true %else +# XXX check again %define make_check_handling false %endif # let make check fail anyway if RUN_TESTS was requested @@ -50,7 +56,7 @@ # # Url: http://www.gnu.org/software/binutils/ -License: GFDL v1.1 ; GFDL v1.2 ; GPL v2 or later ; GPL v3 or later ; LGPL v2.0 or later ; LGPL v2.1 or later ; LGPL v3 or later +License: GFDLv1.1 ; GFDLv1.2 ; GPLv2+ ; GPLv3+ ; LGPLv2.0+ ; LGPLv2.1+ ; LGPLv3+ Group: Development/Tools/Building PreReq: %{install_info_prereq} AutoReqProv: on @@ -75,9 +81,7 @@ Patch10: enable-targets.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff -Patch13: gold-basename.diff Patch14: binutils-build-as-needed.diff -Patch15: lto-discard.diff Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -127,7 +131,7 @@ Jim Kingdon <kingdon(a)cygnus.com> Jim Wilson <wilson(a)redhat.com> John Gilmore <gnu(a)cygnus.com> - J�rn Rennecke <amylaar(a)redhat.com> + Joern Rennecke <amylaar(a)redhat.com> K. Richard Pixley <rich(a)cygnus.com> Ken Raeburn <raeburn(a)cygnus.com> Kung Hsu <kung(a)cygnus.com> @@ -152,7 +156,7 @@ Ulf Carlsson <ulfc(a)calypso.engr.sgi.com> %package gold -License: GPL v3 or later +License: GPLv3+ Summary: The gold linker AutoReqProv: on Requires: binutils = %{version}-%{release} @@ -194,7 +198,7 @@ Andrew Chatham %package devel -License: GPL v2 or later ; GPL v3 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: GNU binutils (BFD development files) AutoReqProv: on Requires: binutils = %{version}-%{release}, zlib-devel @@ -241,7 +245,7 @@ Jim Kingdon <kingdon(a)cygnus.com> Jim Wilson <wilson(a)redhat.com> John Gilmore <gnu(a)cygnus.com> - J�rn Rennecke <amylaar(a)redhat.com> + Joern Rennecke <amylaar(a)redhat.com> K. Richard Pixley <rich(a)cygnus.com> Ken Raeburn <raeburn(a)cygnus.com> Kung Hsu <kung(a)cygnus.com> @@ -286,9 +290,7 @@ %patch10 %patch11 %patch12 -%patch13 %patch14 -%patch15 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 @@ -340,7 +342,6 @@ --with-pkgversion="GNU Binutils; %{DIST}" \\\ --with-separate-debug-dir=%{_prefix}/lib/debug \\\ --with-pic --build=%{HOST} \\\ - --disable-ld-targets \\\ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} %define extra_ld_targets \\\ ${EXTRA_LD_TARGETS:+--enable-ld-targets="${EXTRA_LD_TARGETS#,}"} @@ -356,8 +357,8 @@ %ifarch %gold_archs mkdir ../build-dir2 cd ../build-dir2 -../configure %common_flags %extra_gold_targets \ - --enable-shared --enable-gold --program-prefix=go +../configure --disable-ld-targets %common_flags %extra_gold_targets \ + --enable-shared --enable-gold --program-prefix=go --enable-plugins make %{?jobs:-j%jobs} %endif mkdir ../build-dir3 ++++++ cross-alpha-binutils.spec ++++++ --- /var/tmp/diff_new_pack.zCAZQg/_old 2009-11-27 12:28:54.000000000 +0100 +++ /var/tmp/diff_new_pack.zCAZQg/_new 2009-11-27 12:28:54.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cross-alpha-binutils (Version 2.19.51) +# spec file for package cross-alpha-binutils (Version 2.20.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,9 +18,14 @@ Name: cross-alpha-binutils -BuildRequires: bison dejagnu flex gcc-c++ zlib-devel-static -Version: 2.19.51 -Release: 11 +BuildRequires: bison dejagnu flex gcc-c++ +%if 0%{suse_version} > 1110 +BuildRequires: zlib-devel-static +%else +BuildRequires: zlib-devel +%endif +Version: 2.20.0 +Release: 1 # # RUN_TESTS %define run_tests %(test ! -f %_sourcedir/RUN_TESTS ; echo $?) @@ -33,6 +38,7 @@ %ifarch alpha armv4l hppa mips sh4 sparc sparc64 %define make_check_handling true %else +# XXX check again %define make_check_handling false %endif # let make check fail anyway if RUN_TESTS was requested @@ -50,7 +56,7 @@ # # Url: http://www.gnu.org/software/binutils/ -License: GFDL v1.1 ; GFDL v1.2 ; GPL v2 or later ; GPL v3 or later ; LGPL v2.0 or later ; LGPL v2.1 or later ; LGPL v3 or later +License: GFDLv1.1 ; GFDLv1.2 ; GPLv2+ ; GPLv3+ ; LGPLv2.0+ ; LGPLv2.1+ ; LGPLv3+ Group: Development/Tools/Building PreReq: %{install_info_prereq} AutoReqProv: on @@ -75,9 +81,7 @@ Patch10: enable-targets.diff Patch11: use-hashtype-both-by-default.diff Patch12: s390-pic-dso.diff -Patch13: gold-basename.diff Patch14: binutils-build-as-needed.diff -Patch15: lto-discard.diff Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -127,7 +131,7 @@ Jim Kingdon <kingdon(a)cygnus.com> Jim Wilson <wilson(a)redhat.com> John Gilmore <gnu(a)cygnus.com> - J�rn Rennecke <amylaar(a)redhat.com> + Joern Rennecke <amylaar(a)redhat.com> K. Richard Pixley <rich(a)cygnus.com> Ken Raeburn <raeburn(a)cygnus.com> Kung Hsu <kung(a)cygnus.com> @@ -213,7 +217,7 @@ Jim Kingdon <kingdon(a)cygnus.com> Jim Wilson <wilson(a)redhat.com> John Gilmore <gnu(a)cygnus.com> - J�rn Rennecke <amylaar(a)redhat.com> + Joern Rennecke <amylaar(a)redhat.com> K. Richard Pixley <rich(a)cygnus.com> Ken Raeburn <raeburn(a)cygnus.com> Kung Hsu <kung(a)cygnus.com> @@ -258,9 +262,7 @@ %patch10 %patch11 %patch12 -%patch13 %patch14 -%patch15 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 @@ -312,7 +314,6 @@ --with-pkgversion="GNU Binutils; %{DIST}" \\\ --with-separate-debug-dir=%{_prefix}/lib/debug \\\ --with-pic --build=%{HOST} \\\ - --disable-ld-targets \\\ ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"} %define extra_ld_targets \\\ ${EXTRA_LD_TARGETS:+--enable-ld-targets="${EXTRA_LD_TARGETS#,}"} cross-arm-binutils.spec: same change cross-avr-binutils.spec: same change cross-hppa64-binutils.spec: same change cross-hppa-binutils.spec: same change cross-i386-binutils.spec: same change cross-ia64-binutils.spec: same change cross-mips-binutils.spec: same change cross-ppc64-binutils.spec: same change cross-ppc-binutils.spec: same change cross-s390-binutils.spec: same change cross-s390x-binutils.spec: same change cross-sh4-binutils.spec: same change cross-sparc-binutils.spec: same change cross-spu-binutils.spec: same change cross-x86_64-binutils.spec: same change ++++++ binutils-2.19.51.tar.bz2 -> binutils-2.20.0.tar.bz2 ++++++ binutils/binutils-2.19.51.tar.bz2 /mounts/work_src_done/STABLE/binutils/binutils-2.20.0.tar.bz2 differ: byte 11, line 1 ++++++ binutils-build-as-needed.diff ++++++ --- /var/tmp/diff_new_pack.zCAZQg/_old 2009-11-27 12:28:55.000000000 +0100 +++ /var/tmp/diff_new_pack.zCAZQg/_new 2009-11-27 12:28:55.000000000 +0100 @@ -1,7 +1,7 @@ Index: ld/ldmain.c =================================================================== ---- ld/ldmain.c.orig 2009-06-09 14:34:35.000000000 +0200 -+++ ld/ldmain.c 2009-06-09 14:47:37.000000000 +0200 +--- ld/ldmain.c.orig 2009-11-23 14:03:09.000000000 +0100 ++++ ld/ldmain.c 2009-11-23 14:03:10.000000000 +0100 @@ -277,6 +277,8 @@ main (int argc, char **argv) link_info.pei386_auto_import = -1; link_info.spare_dynamic_tags = 5; ++++++ binutils-skip-rpaths.patch ++++++ --- /var/tmp/diff_new_pack.zCAZQg/_old 2009-11-27 12:28:55.000000000 +0100 +++ /var/tmp/diff_new_pack.zCAZQg/_new 2009-11-27 12:28:55.000000000 +0100 @@ -1,6 +1,8 @@ ---- ld/emultempl/elf32.em -+++ ld/emultempl/elf32.em -@@ -1377,15 +1377,46 @@ if test x"$LDEMUL_BEFORE_ALLOCATION" != +Index: ld/emultempl/elf32.em +=================================================================== +--- ld/emultempl/elf32.em.orig 2009-11-23 14:02:48.000000000 +0100 ++++ ld/emultempl/elf32.em 2009-11-23 14:03:07.000000000 +0100 +@@ -1394,15 +1394,46 @@ if test x"$LDEMUL_BEFORE_ALLOCATION" != else ELF_INTERPRETER_SET_DEFAULT= fi @@ -48,7 +50,7 @@ asection *sinterp; if (link_info.hash->type == bfd_link_elf_hash_table) -@@ -1400,7 +1431,66 @@ gld${EMULATION_NAME}_before_allocation ( +@@ -1417,7 +1448,66 @@ gld${EMULATION_NAME}_before_allocation ( by dynamic linking. */ rpath = command_line.rpath; if (rpath == NULL) @@ -114,5 +116,5 @@ + } + if (! (bfd_elf_size_dynamic_sections - (output_bfd, command_line.soname, rpath, + (link_info.output_bfd, command_line.soname, rpath, command_line.filter_shlib, ++++++ enable-targets.diff ++++++ --- /var/tmp/diff_new_pack.zCAZQg/_old 2009-11-27 12:28:55.000000000 +0100 +++ /var/tmp/diff_new_pack.zCAZQg/_new 2009-11-27 12:28:55.000000000 +0100 @@ -1,25 +1,32 @@ ---- gold/configure -+++ gold/configure -@@ -867,6 +867,7 @@ Optional Features: - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] +Index: gold/configure +=================================================================== +--- gold/configure.orig 2009-11-23 14:02:48.000000000 +0100 ++++ gold/configure 2009-11-23 14:03:09.000000000 +0100 +@@ -762,6 +762,7 @@ with_sysroot + enable_threads + enable_plugins + enable_targets ++enable_ld_targets + enable_dependency_tracking + enable_nls + enable_werror +@@ -1406,6 +1407,7 @@ Optional Features: --enable-threads multi-threaded linking + --enable-plugins linker plugins --enable-targets alternative target configurations + --enable-ld-targets alternative target configurations --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --disable-nls do not use Native Language Support -@@ -1981,9 +1982,31 @@ else +@@ -3297,9 +3299,29 @@ else + fi - fi; -+# Check whether --enable-ld-targets or --disable-ld-targets was given. -+if test "${enable_ld_targets+set}" = set; then -+ enableval="$enable_ld_targets" -+ case "${enableval}" in ++# Check whether --enable-ld-targets was given. ++if test "${enable_ld_targets+set}" = set; then : ++ enableval=$enable_ld_targets; case "${enableval}" in + yes | "") -+ { { echo "$as_me:$LINENO: error: --enable-ld-targets option must specify target names or 'all'" >&5 -+echo "$as_me: error: --enable-ld-targets option must specify target names or 'all'" >&2;} -+ { (exit 1); exit 1; }; } ++ as_fn_error "--enable-ld-targets option must specify target names or 'all'" "$LINENO" 5 + ;; + no) + enable_ld_targets= @@ -32,7 +39,8 @@ + # For now, enable all targets by default + enable_ld_targets=$enable_targets + -+fi; ++fi ++ + # Canonicalize the enabled targets. -if test -n "$enable_targets"; then @@ -42,9 +50,11 @@ result=`$ac_config_sub $targ 2>/dev/null` if test -n "$result"; then canon_targets="$canon_targets $result" ---- gold/configure.ac -+++ gold/configure.ac -@@ -70,9 +70,26 @@ esac], +Index: gold/configure.ac +=================================================================== +--- gold/configure.ac.orig 2009-11-23 14:02:48.000000000 +0100 ++++ gold/configure.ac 2009-11-23 14:03:09.000000000 +0100 +@@ -84,9 +84,26 @@ esac], enable_targets=all ]) @@ -73,37 +83,19 @@ result=`$ac_config_sub $targ 2>/dev/null` if test -n "$result"; then canon_targets="$canon_targets $result" ---- ld/configure -+++ ld/configure -@@ -1003,6 +1003,7 @@ Optional Features: - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors +Index: ld/configure +=================================================================== +--- ld/configure.orig 2009-11-23 14:02:48.000000000 +0100 ++++ ld/configure 2009-11-23 14:03:09.000000000 +0100 +@@ -1547,6 +1547,7 @@ Optional Features: + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer --enable-targets alternative target configurations + --enable-ld-targets alternative target configurations --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) --enable-got=<type> GOT handling scheme (target, single, negative, multigot) -@@ -3283,6 +3284,19 @@ echo "$as_me: error: enable-targets opti - no) enable_targets= ;; - *) enable_targets=$enableval ;; - esac -+fi; # Check whether --enable-ld-targets or --disable-ld-targets was given. -+if test "${enable_ld_targets+set}" = set; then -+ enableval="$enable_ld_targets" -+ case "${enableval}" in -+ yes | "") { { echo "$as_me:$LINENO: error: enable-ld-targets option must specify target names or 'all'" >&5 -+echo "$as_me: error: enable-ld-targets option must specify target names or 'all'" >&2;} -+ { (exit 1); exit 1; }; } -+ ;; -+ no) enable_ld_targets= ;; -+ *) enable_ld_targets=$enableval ;; -+esac -+else -+ enable_ld_targets=$enable_targets - fi; # Check whether --enable-64-bit-bfd or --disable-64-bit-bfd was given. - if test "${enable_64_bit_bfd+set}" = set; then - enableval="$enable_64_bit_bfd" -@@ -12958,7 +12972,7 @@ all_libpath= +@@ -12818,7 +12819,7 @@ all_libpath= rm -f tdirs @@ -112,9 +104,11 @@ do if test "$targ_alias" = "all"; then all_targets=true ---- ld/configure.in -+++ ld/configure.in -@@ -21,6 +21,14 @@ AC_ARG_ENABLE(targets, +Index: ld/configure.in +=================================================================== +--- ld/configure.in.orig 2009-11-23 14:02:48.000000000 +0100 ++++ ld/configure.in 2009-11-23 14:03:09.000000000 +0100 +@@ -22,6 +22,14 @@ AC_ARG_ENABLE(targets, no) enable_targets= ;; *) enable_targets=$enableval ;; esac])dnl @@ -129,7 +123,7 @@ AC_ARG_ENABLE(64-bit-bfd, [ --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)], [case "${enableval}" in -@@ -187,7 +195,7 @@ dnl not permit literal newlines in an AC +@@ -190,7 +198,7 @@ dnl not permit literal newlines in an AC dnl file. rm -f tdirs ++++++ ld-dtags.diff ++++++ --- /var/tmp/diff_new_pack.zCAZQg/_old 2009-11-27 12:28:55.000000000 +0100 +++ /var/tmp/diff_new_pack.zCAZQg/_new 2009-11-27 12:28:55.000000000 +0100 @@ -1,6 +1,8 @@ ---- binutils-2.17.50/ld/ld.texinfo -+++ binutils-2.17.50/ld/ld.texinfo -@@ -1941,7 +1941,7 @@ +Index: binutils-2.20.0/ld/ld.texinfo +=================================================================== +--- binutils-2.20.0.orig/ld/ld.texinfo 2009-11-23 14:02:48.000000000 +0100 ++++ binutils-2.20.0/ld/ld.texinfo 2009-11-23 14:03:08.000000000 +0100 +@@ -2026,7 +2026,7 @@ This linker can create the new dynamic t systems may not understand them. If you specify @option{--enable-new-dtags}, the dynamic tags will be created as needed. If you specify @option{--disable-new-dtags}, no new dynamic tags will be @@ -9,13 +11,15 @@ those options are only available for ELF systems. @kindex --hash-size=@var{number} ---- binutils-2.17.50/ld/ldmain.c -+++ binutils-2.17.50/ld/ldmain.c -@@ -263,6 +263,7 @@ +Index: binutils-2.20.0/ld/ldmain.c +=================================================================== +--- binutils-2.20.0.orig/ld/ldmain.c 2009-11-23 14:02:48.000000000 +0100 ++++ binutils-2.20.0/ld/ldmain.c 2009-11-23 14:03:08.000000000 +0100 +@@ -262,6 +262,7 @@ main (int argc, char **argv) link_info.allow_undefined_version = TRUE; link_info.keep_memory = TRUE; + link_info.new_dtags = TRUE; link_info.combreloc = TRUE; link_info.strip_discarded = TRUE; - link_info.callbacks = &link_callbacks; + link_info.emit_hash = TRUE; ++++++ ld-relro.diff ++++++ --- /var/tmp/diff_new_pack.zCAZQg/_old 2009-11-27 12:28:55.000000000 +0100 +++ /var/tmp/diff_new_pack.zCAZQg/_new 2009-11-27 12:28:55.000000000 +0100 @@ -1,6 +1,8 @@ ---- ld/lexsup.c -+++ ld/lexsup.c -@@ -643,6 +643,9 @@ +Index: ld/lexsup.c +=================================================================== +--- ld/lexsup.c.orig 2009-11-23 14:02:48.000000000 +0100 ++++ ld/lexsup.c 2009-11-23 14:03:09.000000000 +0100 +@@ -687,6 +687,9 @@ parse_args (unsigned argc, char **argv) } } @@ -10,9 +12,11 @@ last_optind = -1; while (1) { ---- ld/testsuite/config/default.exp -+++ ld/testsuite/config/default.exp -@@ -20,7 +20,7 @@ +Index: ld/testsuite/config/default.exp +=================================================================== +--- ld/testsuite/config/default.exp.orig 2009-11-23 14:02:48.000000000 +0100 ++++ ld/testsuite/config/default.exp 2009-11-23 14:03:09.000000000 +0100 +@@ -23,7 +23,7 @@ # if ![info exists ld] then { @@ -21,7 +25,7 @@ } if ![info exists as] then { -@@ -67,7 +67,7 @@ +@@ -68,7 +68,7 @@ if {![file isdirectory tmpdir/ld]} then catch "exec mkdir tmpdir/ld" status catch "exec ln -s ../../ld-new tmpdir/ld/ld" status } @@ -30,7 +34,7 @@ # load the linker path if {[file exists tmpdir/libpath.exp]} { -@@ -261,7 +261,7 @@ +@@ -270,7 +270,7 @@ if ![info exists READELFFLAGS] then { } if ![info exists LD] then { @@ -39,9 +43,11 @@ } if ![info exists LDFLAGS] then { ---- ld/testsuite/ld-bootstrap/bootstrap.exp -+++ ld/testsuite/ld-bootstrap/bootstrap.exp -@@ -53,7 +53,12 @@ +Index: ld/testsuite/ld-bootstrap/bootstrap.exp +=================================================================== +--- ld/testsuite/ld-bootstrap/bootstrap.exp.orig 2009-11-23 14:02:48.000000000 +0100 ++++ ld/testsuite/ld-bootstrap/bootstrap.exp 2009-11-23 14:03:09.000000000 +0100 +@@ -56,7 +56,12 @@ foreach flags {"" "strip" "--static" "-- # This test can only be run if we have the ld build directory, # since we need the object files. ++++++ s390-biarch.diff ++++++ --- /var/tmp/diff_new_pack.zCAZQg/_old 2009-11-27 12:28:55.000000000 +0100 +++ /var/tmp/diff_new_pack.zCAZQg/_new 2009-11-27 12:28:55.000000000 +0100 @@ -1,6 +1,8 @@ ---- ld/emulparams/elf_s390.sh -+++ ld/emulparams/elf_s390.sh -@@ -11,3 +11,18 @@ +Index: ld/emulparams/elf_s390.sh +=================================================================== +--- ld/emulparams/elf_s390.sh.orig 2009-11-23 14:02:48.000000000 +0100 ++++ ld/emulparams/elf_s390.sh 2009-11-23 14:03:08.000000000 +0100 +@@ -11,3 +11,18 @@ TEMPLATE_NAME=elf32 GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes NO_SMALL_DATA=yes ++++++ s390-pic-dso.diff ++++++ --- /var/tmp/diff_new_pack.zCAZQg/_old 2009-11-27 12:28:55.000000000 +0100 +++ /var/tmp/diff_new_pack.zCAZQg/_new 2009-11-27 12:28:55.000000000 +0100 @@ -1,6 +1,8 @@ ---- bfd/elf32-s390.c -+++ bfd/elf32-s390.c -@@ -2546,13 +2546,34 @@ elf_s390_relocate_section (output_bfd, i +Index: bfd/elf32-s390.c +=================================================================== +--- bfd/elf32-s390.c.orig 2009-11-23 14:02:48.000000000 +0100 ++++ bfd/elf32-s390.c 2009-11-23 14:03:09.000000000 +0100 +@@ -2509,13 +2509,34 @@ elf_s390_relocate_section (output_bfd, i unresolved_reloc = FALSE; break; @@ -38,9 +40,11 @@ if ((input_section->flags & SEC_ALLOC) == 0) break; ---- bfd/elf64-s390.c -+++ bfd/elf64-s390.c -@@ -2525,15 +2525,36 @@ elf_s390_relocate_section (output_bfd, i +Index: bfd/elf64-s390.c +=================================================================== +--- bfd/elf64-s390.c.orig 2009-11-23 14:02:48.000000000 +0100 ++++ bfd/elf64-s390.c 2009-11-23 14:03:09.000000000 +0100 +@@ -2486,15 +2486,36 @@ elf_s390_relocate_section (output_bfd, i unresolved_reloc = FALSE; break; @@ -81,8 +85,10 @@ if ((input_section->flags & SEC_ALLOC) == 0) break; ---- ld/testsuite/ld-elfvers/vers.exp -+++ ld/testsuite/ld-elfvers/vers.exp +Index: ld/testsuite/ld-elfvers/vers.exp +=================================================================== +--- ld/testsuite/ld-elfvers/vers.exp.orig 2009-11-23 14:02:48.000000000 +0100 ++++ ld/testsuite/ld-elfvers/vers.exp 2009-11-23 14:03:09.000000000 +0100 @@ -97,6 +97,7 @@ if [istarget mips*-*-*] { case $target_triplet in { @@ -103,9 +109,11 @@ set pic "yes" } else { set pic "no" ---- ld/testsuite/ld-elfvsb/elfvsb.exp -+++ ld/testsuite/ld-elfvsb/elfvsb.exp -@@ -268,6 +268,7 @@ proc visibility_run {visibility} { +Index: ld/testsuite/ld-elfvsb/elfvsb.exp +=================================================================== +--- ld/testsuite/ld-elfvsb/elfvsb.exp.orig 2009-11-23 14:02:48.000000000 +0100 ++++ ld/testsuite/ld-elfvsb/elfvsb.exp 2009-11-23 14:03:09.000000000 +0100 +@@ -269,6 +269,7 @@ proc visibility_run {visibility} { setup_xfail "sparc*-*-linux*" } } @@ -113,7 +121,7 @@ setup_xfail "x86_64-*-linux*" if { ![istarget hppa*64*-*-linux*] } { setup_xfail "hppa*-*-linux*" -@@ -306,6 +307,7 @@ proc visibility_run {visibility} { +@@ -307,6 +308,7 @@ proc visibility_run {visibility} { setup_xfail "alpha*-*-linux*" setup_xfail "mips*-*-linux*" } @@ -121,7 +129,7 @@ setup_xfail "x86_64-*-linux*" if { ![istarget hppa*64*-*-linux*] } { setup_xfail "hppa*-*-linux*" -@@ -372,6 +374,7 @@ proc visibility_run {visibility} { +@@ -373,6 +375,7 @@ proc visibility_run {visibility} { setup_xfail "sparc*-*-linux*" } } @@ -129,8 +137,10 @@ setup_xfail "x86_64-*-linux*" if { ![istarget hppa*64*-*-linux*] } { setup_xfail "hppa*-*-linux*" ---- ld/testsuite/ld-shared/shared.exp -+++ ld/testsuite/ld-shared/shared.exp +Index: ld/testsuite/ld-shared/shared.exp +=================================================================== +--- ld/testsuite/ld-shared/shared.exp.orig 2009-11-23 14:02:48.000000000 +0100 ++++ ld/testsuite/ld-shared/shared.exp 2009-11-23 14:03:09.000000000 +0100 @@ -211,7 +211,7 @@ if ![ld_compile "$CC $CFLAGS $SHCFLAG" $ setup_xfail "sparc*-*-linux*" } ++++++ s390-pic.patch ++++++ --- /var/tmp/diff_new_pack.zCAZQg/_old 2009-11-27 12:28:55.000000000 +0100 +++ /var/tmp/diff_new_pack.zCAZQg/_new 2009-11-27 12:28:55.000000000 +0100 @@ -1,6 +1,8 @@ ---- libiberty/configure -+++ libiberty/configure -@@ -3726,7 +3726,7 @@ if [ "${shared}" = "yes" ]; then +Index: libiberty/configure +=================================================================== +--- libiberty/configure.orig 2009-11-23 14:02:49.000000000 +0100 ++++ libiberty/configure 2009-11-23 14:03:07.000000000 +0100 +@@ -4859,7 +4859,7 @@ if [ "${shared}" = "yes" ]; then *-fpic* ) PICFLAG=-fpic ;; * ) PICFLAG=-fPIC ;; esac ;; @@ -9,9 +11,11 @@ esac fi ---- libiberty/configure.ac -+++ libiberty/configure.ac -@@ -214,7 +214,7 @@ if [[ "${shared}" = "yes" ]]; then +Index: libiberty/configure.ac +=================================================================== +--- libiberty/configure.ac.orig 2009-11-23 14:02:49.000000000 +0100 ++++ libiberty/configure.ac 2009-11-23 14:03:07.000000000 +0100 +@@ -216,7 +216,7 @@ if [[ "${shared}" = "yes" ]]; then *-fpic* ) PICFLAG=-fpic ;; * ) PICFLAG=-fPIC ;; esac ;; ++++++ testsuite.diff ++++++ --- /var/tmp/diff_new_pack.zCAZQg/_old 2009-11-27 12:28:55.000000000 +0100 +++ /var/tmp/diff_new_pack.zCAZQg/_new 2009-11-27 12:28:55.000000000 +0100 @@ -1,18 +1,22 @@ ---- binutils/testsuite/binutils-all/windres/windres.exp -+++ binutils/testsuite/binutils-all/windres/windres.exp -@@ -46,6 +46,7 @@ +Index: binutils/testsuite/binutils-all/windres/windres.exp +=================================================================== +--- binutils/testsuite/binutils-all/windres/windres.exp.orig 2009-11-23 14:02:48.000000000 +0100 ++++ binutils/testsuite/binutils-all/windres/windres.exp 2009-11-23 14:03:09.000000000 +0100 +@@ -36,6 +36,7 @@ set wr "$WINDRES --include-dir $srcdir/$ + if [file exists "$srcdir/../../winsup/w32api/include"] { set wr "$wr --include-dir $srcdir/../../winsup/w32api/include" - set target_xfail "no" } else { + return send_log "\nWarning: Assuming windres can find the win32 headers\n\n" } ---- ld/testsuite/ld-srec/srec.exp -+++ ld/testsuite/ld-srec/srec.exp -@@ -17,6 +17,9 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. +Index: ld/testsuite/ld-srec/srec.exp +=================================================================== +--- ld/testsuite/ld-srec/srec.exp.orig 2009-11-23 14:02:48.000000000 +0100 ++++ ld/testsuite/ld-srec/srec.exp 2009-11-23 14:03:09.000000000 +0100 +@@ -20,6 +20,9 @@ + # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + # MA 02110-1301, USA. +# Too fragile. +return @@ -20,13 +24,16 @@ # Get the offset from an S-record line to the start of the data. proc srec_off { l } { ---- ld/testsuite/ld-undefined/undefined.exp -+++ ld/testsuite/ld-undefined/undefined.exp -@@ -127,6 +127,6 @@ +Index: ld/testsuite/ld-undefined/undefined.exp +=================================================================== +--- ld/testsuite/ld-undefined/undefined.exp.orig 2009-11-23 14:02:48.000000000 +0100 ++++ ld/testsuite/ld-undefined/undefined.exp 2009-11-23 14:03:09.000000000 +0100 +@@ -136,7 +136,7 @@ setup_xfail "sh64-*-*" # the function. Therefore the line number in the error message is 8 instead # of 9. On 64 bit s/390 this works because of the new brasl instruction that # doesn't need a literal pool entry. -setup_xfail s390-*-* +#setup_xfail s390-*-* - checkund $ml $testline + # See comments above for Xtensa. + setup_xfail xtensa*-*-linux* ++++++ unit-at-a-time.patch ++++++ --- /var/tmp/diff_new_pack.zCAZQg/_old 2009-11-27 12:28:55.000000000 +0100 +++ /var/tmp/diff_new_pack.zCAZQg/_new 2009-11-27 12:28:55.000000000 +0100 @@ -1,27 +1,15 @@ -Index: selective.exp +Index: ld/testsuite/ld-selective/selective.exp =================================================================== -RCS file: /cvs/src/src/ld/testsuite/ld-selective/selective.exp,v -retrieving revision 1.26 -diff -c -3 -p -r1.26 selective.exp -*** ld/testsuite/ld-selective/selective.exp 10 Aug 2002 12:48:52 -0000 1.26 ---- ld/testsuite/ld-selective/selective.exp 19 Aug 2003 08:00:20 -0000 -*************** set seltests { -*** 59,66 **** - {A::foo() B::foo() dropme1() dropme2()} {*-*-*}} - } - -! set cflags "-w -O -ffunction-sections -fdata-sections" -! set cxxflags "-fvtable-gc -fno-exceptions -fno-rtti" - set ldflags "--gc-sections -Bstatic" - - if [istarget sh64*-*-elf] { ---- 59,66 ---- - {A::foo() B::foo() dropme1() dropme2()} {*-*-*}} - } - -! set cflags "-w -O -ffunction-sections -fdata-sections -fno-unit-at-a-time" -! set cxxflags "-fvtable-gc -fno-exceptions -fno-rtti -fno-unit-at-a-time" - set ldflags "--gc-sections -Bstatic" - - if [istarget sh64*-*-elf] { - +--- ld/testsuite/ld-selective/selective.exp.orig 2009-11-23 14:02:48.000000000 +0100 ++++ ld/testsuite/ld-selective/selective.exp 2009-11-23 14:03:08.000000000 +0100 +@@ -59,8 +59,8 @@ set seltests { + {A::foo() B::foo() dropme1() dropme2()} {*-*-*}} + } + +-set cflags "-w -O -ffunction-sections -fdata-sections" +-set cxxflags "-fvtable-gc -fno-exceptions -fno-rtti" ++set cflags "-w -O -ffunction-sections -fdata-sections -fno-unit-at-a-time" ++set cxxflags "-fvtable-gc -fno-exceptions -fno-rtti -fno-unit-at-a-time" + set ldflags "--gc-sections -Bstatic" + + if [istarget mips*-*] { ++++++ use-hashtype-both-by-default.diff ++++++ --- /var/tmp/diff_new_pack.zCAZQg/_old 2009-11-27 12:28:55.000000000 +0100 +++ /var/tmp/diff_new_pack.zCAZQg/_new 2009-11-27 12:28:55.000000000 +0100 @@ -1,6 +1,8 @@ ---- ld/ldmain.c -+++ ld/ldmain.c -@@ -267,6 +267,7 @@ +Index: ld/ldmain.c +=================================================================== +--- ld/ldmain.c.orig 2009-11-23 14:03:08.000000000 +0100 ++++ ld/ldmain.c 2009-11-23 14:03:09.000000000 +0100 +@@ -266,6 +266,7 @@ main (int argc, char **argv) link_info.combreloc = TRUE; link_info.strip_discarded = TRUE; link_info.emit_hash = TRUE; @@ -8,9 +10,11 @@ link_info.callbacks = &link_callbacks; link_info.input_bfds_tail = &link_info.input_bfds; /* SVR4 linkers seem to set DT_INIT and DT_FINI based on magic _init ---- ld/testsuite/config/default.exp -+++ ld/testsuite/config/default.exp -@@ -20,7 +20,7 @@ +Index: ld/testsuite/config/default.exp +=================================================================== +--- ld/testsuite/config/default.exp.orig 2009-11-23 14:03:09.000000000 +0100 ++++ ld/testsuite/config/default.exp 2009-11-23 14:03:09.000000000 +0100 +@@ -23,7 +23,7 @@ # if ![info exists ld] then { @@ -19,7 +23,7 @@ } if ![info exists as] then { -@@ -67,7 +67,7 @@ +@@ -68,7 +68,7 @@ if {![file isdirectory tmpdir/ld]} then catch "exec mkdir tmpdir/ld" status catch "exec ln -s ../../ld-new tmpdir/ld/ld" status } @@ -28,7 +32,7 @@ # load the linker path if {[file exists tmpdir/libpath.exp]} { -@@ -261,7 +261,7 @@ +@@ -270,7 +270,7 @@ if ![info exists READELFFLAGS] then { } if ![info exists LD] then { ++++++ x86-64-biarch.patch ++++++ --- /var/tmp/diff_new_pack.zCAZQg/_old 2009-11-27 12:28:55.000000000 +0100 +++ /var/tmp/diff_new_pack.zCAZQg/_new 2009-11-27 12:28:55.000000000 +0100 @@ -1,8 +1,8 @@ Index: ld/emulparams/elf_i386.sh -================================================================================ ---- ld/emulparams/elf_i386.sh -+++ ld/emulparams/elf_i386.sh -@@ -12,3 +12,8 @@ +=================================================================== +--- ld/emulparams/elf_i386.sh.orig 2009-11-23 14:02:48.000000000 +0100 ++++ ld/emulparams/elf_i386.sh 2009-11-23 14:03:08.000000000 +0100 +@@ -12,4 +12,9 @@ GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes NO_SMALL_DATA=yes SEPARATE_GOTPLT=12 @@ -11,3 +11,4 @@ +case "$EMULATION_NAME" in + *64*) LIBPATH_SUFFIX=64 ;; +esac + IREL_IN_PLT= ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit zlib for openSUSE:Factory
by root＠Hilbert.suse.de 26 Nov '09

26 Nov '09

Hello community, here is the log from the commit of package zlib for openSUSE:Factory checked in at Fri Nov 27 00:53:59 CET 2009. -------- --- zlib/zlib.changes 2009-05-11 10:45:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/zlib/zlib.changes 2009-11-24 17:24:27.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 24 16:23:32 UTC 2009 - crrodriguez(a)opensuse.org + +- refresh patches with fuzz=0 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zlib.spec ++++++ --- /var/tmp/diff_new_pack.26ZoJJ/_old 2009-11-27 00:53:29.000000000 +0100 +++ /var/tmp/diff_new_pack.26ZoJJ/_new 2009-11-27 00:53:29.000000000 +0100 @@ -19,7 +19,7 @@ Name: zlib -License: zlib/libpng License; zlib license. See http://zlib.net/zlib_license.html +License: Zlib ; zlib license. See http://zlib.net/zlib_license.html Group: System/Libraries Provides: libz Obsoletes: libz @@ -30,7 +30,7 @@ %endif # Version: 1.2.3 -Release: 139 +Release: 140 Summary: Data Compression Library Source: zlib-%{version}.tar.bz2 Source1: LICENSE @@ -93,12 +93,12 @@ %prep %setup -q -%patch -p1 +%patch %patch1 %patch2 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 +%patch3 +%patch4 +%patch5 %build CFLAGS="$RPM_OPT_FLAGS" ./configure --shared ++++++ zlib-1.2.1-CFLAGS.dif ++++++ --- /var/tmp/diff_new_pack.26ZoJJ/_old 2009-11-27 00:53:29.000000000 +0100 +++ /var/tmp/diff_new_pack.26ZoJJ/_new 2009-11-27 00:53:29.000000000 +0100 @@ -1,6 +1,8 @@ ---- configure -+++ configure 2003/11/21 14:06:46 -@@ -69,7 +69,7 @@ +Index: configure +=================================================================== +--- configure.orig 2005-07-11 22:11:57.000000000 +0200 ++++ configure 2009-11-24 17:22:26.143484000 +0100 +@@ -73,7 +73,7 @@ esac if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then CC="$cc" @@ -8,4 +10,4 @@ + SFLAGS="-fPIC "${CFLAGS-"-O3"} CFLAGS="$cflags" case `(uname -s || echo unknown) 2>/dev/null` in - Linux | linux) LDSHARED=${LDSHARED-"gcc -shared -Wl,-soname,libz.so.1"};; + Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};; ++++++ zlib-1.2.1-make-test.patch ++++++ --- /var/tmp/diff_new_pack.26ZoJJ/_old 2009-11-27 00:53:29.000000000 +0100 +++ /var/tmp/diff_new_pack.26ZoJJ/_new 2009-11-27 00:53:29.000000000 +0100 @@ -1,7 +1,9 @@ ---- zlib-1.1.4/Makefile.in.jj Mon Mar 11 08:58:30 2002 -+++ zlib-1.1.4/Makefile.in Fri Apr 26 06:53:12 2002 -@@ -62,13 +62,16 @@ all: example minigzip - +Index: Makefile.in +=================================================================== +--- Makefile.in.orig 2005-07-18 04:25:21.000000000 +0200 ++++ Makefile.in 2009-11-24 17:22:25.561564000 +0100 +@@ -59,13 +59,16 @@ all: example$(EXE) minigzip$(EXE) + check: test test: all @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ - echo hello world | ./minigzip | ./minigzip -d || \ ++++++ zlib-1.2.1-vsnprintf.patch ++++++ --- /var/tmp/diff_new_pack.26ZoJJ/_old 2009-11-27 00:53:29.000000000 +0100 +++ /var/tmp/diff_new_pack.26ZoJJ/_new 2009-11-27 00:53:29.000000000 +0100 @@ -1,6 +1,8 @@ ---- gzio.c -+++ gzio.c -@@ -606,16 +606,19 @@ +Index: gzio.c +=================================================================== +--- gzio.c.orig 2005-07-11 22:31:48.000000000 +0200 ++++ gzio.c 2009-11-24 17:22:25.927568000 +0100 +@@ -610,16 +610,19 @@ int ZEXPORTVA gzprintf (gzFile file, con va_start(va, format); #ifdef NO_vsnprintf # ifdef HAS_vsprintf_void @@ -20,7 +22,7 @@ (void)vsnprintf(buf, sizeof(buf), format, va); va_end(va); len = strlen(buf); -@@ -643,16 +646,19 @@ +@@ -647,16 +650,19 @@ int ZEXPORTVA gzprintf (file, format, a1 buf[sizeof(buf) - 1] = 0; #ifdef NO_snprintf # ifdef HAS_sprintf_void ++++++ zlib-1.2.2-format.patch ++++++ --- /var/tmp/diff_new_pack.26ZoJJ/_old 2009-11-27 00:53:29.000000000 +0100 +++ /var/tmp/diff_new_pack.26ZoJJ/_new 2009-11-27 00:53:29.000000000 +0100 @@ -1,6 +1,8 @@ ---- zlib-1.2.2/zlib.h.xx 2005-02-23 12:52:02.889385975 +0100 -+++ zlib-1.2.2/zlib.h 2005-02-23 12:55:14.227599948 +0100 -@@ -986,7 +986,12 @@ +Index: zlib.h +=================================================================== +--- zlib.h.orig 2005-07-18 04:26:49.000000000 +0200 ++++ zlib.h 2009-11-24 17:22:26.357480000 +0100 +@@ -1119,7 +1119,12 @@ ZEXTERN int ZEXPORT gzwrite OF((gzFil (0 in case of error). */ ++++++ zlib-1.2.3-686.patch ++++++ --- /var/tmp/diff_new_pack.26ZoJJ/_old 2009-11-27 00:53:29.000000000 +0100 +++ /var/tmp/diff_new_pack.26ZoJJ/_new 2009-11-27 00:53:29.000000000 +0100 @@ -1,6 +1,7 @@ -diff -uNr zlib-1.2.3/contrib/asm686/match.S zlib-1.2.3-686/contrib/asm686/match.S ---- zlib-1.2.3/contrib/asm686/match.S 2005-07-12 11:08:20.000000000 -0700 -+++ zlib-1.2.3-686/contrib/asm686/match.S 2007-04-10 22:48:15.000000000 -0700 +Index: contrib/asm686/match.S +=================================================================== +--- contrib/asm686/match.S.orig 2005-07-12 20:08:20.000000000 +0200 ++++ contrib/asm686/match.S 2009-11-24 17:22:26.833478000 +0100 @@ -1,9 +1,23 @@ -/* match.s -- Pentium-Pro-optimized version of longest_match() - * Written for zlib 1.1.2 @@ -30,10 +31,11 @@ */ #ifndef NO_UNDERLINE -diff -uNr zlib-1.2.3/contrib/asm686/README.686 zlib-1.2.3-686/contrib/asm686/README.686 ---- zlib-1.2.3/contrib/asm686/README.686 1998-06-19 07:47:27.000000000 -0700 -+++ zlib-1.2.3-686/contrib/asm686/README.686 2007-04-10 22:33:54.000000000 -0700 -@@ -32,3 +32,20 @@ +Index: contrib/asm686/README.686 +=================================================================== +--- contrib/asm686/README.686.orig 1998-06-19 16:47:27.000000000 +0200 ++++ contrib/asm686/README.686 2009-11-24 17:22:26.838475000 +0100 +@@ -32,3 +32,20 @@ then do: CFLAGS="-O3 -DASMV" ./configure make OBJA=match.o ++++++ zlib-1.2.3-visibility-support.patch ++++++ --- /var/tmp/diff_new_pack.26ZoJJ/_old 2009-11-27 00:53:29.000000000 +0100 +++ /var/tmp/diff_new_pack.26ZoJJ/_new 2009-11-27 00:53:29.000000000 +0100 @@ -5,9 +5,11 @@ http://bugs.gentoo.org/32764 http://bugs.gentoo.org/149929 ---- zlib-1.2.3/configure -+++ zlib-1.2.3/configure -@@ -209,6 +209,20 @@ +Index: configure +=================================================================== +--- configure.orig 2009-11-24 17:22:26.143484000 +0100 ++++ configure 2009-11-24 17:22:26.578476000 +0100 +@@ -204,6 +204,20 @@ else fi cat > $test.c <<EOF @@ -28,8 +30,10 @@ #include <stdio.h> #include <stdarg.h> #include "zconf.h" ---- zlib-1.2.3/zconf.in.h -+++ zlib-1.2.3/zconf.in.h +Index: zconf.in.h +=================================================================== +--- zconf.in.h.orig 2005-05-28 08:40:35.000000000 +0200 ++++ zconf.in.h 2009-11-24 17:22:26.582476000 +0100 @@ -244,7 +244,11 @@ #endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gcc44 for openSUSE:Factory
by root＠Hilbert.suse.de 26 Nov '09

26 Nov '09

Hello community, here is the log from the commit of package gcc44 for openSUSE:Factory checked in at Fri Nov 27 00:52:53 CET 2009. -------- --- gcc44/cross-avr-gcc44.changes 2009-11-04 11:28:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/gcc44/cross-avr-gcc44.changes 2009-11-24 16:39:58.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Nov 24 14:40:33 CET 2009 - rguenther(a)suse.de + +- Update to gcc-4_4-branch head (r154496). [bnc#558005] +- Build ada with gcc43 packages to work around the issues caused + by the loss of program-transform-name.diff. + +------------------------------------------------------------------- +Tue Nov 24 11:06:12 CET 2009 - rguenther(a)suse.de + +- Re-instantiate lost program-transform-name.diff patch. + +------------------------------------------------------------------- cross-hppa-gcc-icecream-backend.changes: same change cross-i386-gcc-icecream-backend.changes: same change cross-ia64-gcc-icecream-backend.changes: same change cross-ppc-gcc-icecream-backend.changes: same change cross-ppc64-gcc-icecream-backend.changes: same change cross-s390-gcc-icecream-backend.changes: same change cross-s390x-gcc-icecream-backend.changes: same change cross-spu-gcc-static.changes: same change cross-spu-gcc.changes: same change cross-x86_64-gcc-icecream-backend.changes: same change gcc44.changes: same change libgcj44.changes: same change calling whatdependson for head-i586 Old: ---- gcc-4.4.2-20091104.tar.bz2 New: ---- gcc-4.4.2-20091124.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cross-avr-gcc44.spec ++++++ --- /var/tmp/diff_new_pack.VlxJRd/_old 2009-11-27 00:51:41.000000000 +0100 +++ /var/tmp/diff_new_pack.VlxJRd/_new 2009-11-27 00:51:41.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cross-avr-gcc44 (Version 4.4.2_20091104) +# spec file for package cross-avr-gcc44 (Version 4.4.2_20091124) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -64,7 +64,7 @@ # COMMON-BEGIN %define biarch_targets x86_64 s390x powerpc64 powerpc Url: http://gcc.gnu.org/ -Version: 4.4.2_20091104 +Version: 4.4.2_20091124 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -109,7 +109,7 @@ # LIBJAVA-DELETE-BEGIN Group: Development/Languages/C and C++ Summary: The GNU C Compiler and Support Files -License: GPL v3 or later +License: GPLv3+ %description This compiler supports the C language on avr microprocessors. ++++++ cross-hppa-gcc-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.VlxJRd/_old 2009-11-27 00:51:41.000000000 +0100 +++ /var/tmp/diff_new_pack.VlxJRd/_new 2009-11-27 00:51:41.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cross-hppa-gcc-icecream-backend (Version 4.4.2_20091104) +# spec file for package cross-hppa-gcc-icecream-backend (Version 4.4.2_20091124) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -41,7 +41,7 @@ # COMMON-BEGIN %define biarch_targets x86_64 s390x powerpc64 powerpc Url: http://gcc.gnu.org/ -Version: 4.4.2_20091104 +Version: 4.4.2_20091124 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -86,7 +86,7 @@ # LIBJAVA-DELETE-BEGIN Group: Development/Languages/C and C++ Summary: The GNU C Compiler and Support Files -License: GPL v3 or later +License: GPLv3+ %description Core package for the GNU Compiler Collection, including the C language cross-i386-gcc-icecream-backend.spec: same change cross-ia64-gcc-icecream-backend.spec: same change cross-ppc-gcc-icecream-backend.spec: same change cross-ppc64-gcc-icecream-backend.spec: same change cross-s390-gcc-icecream-backend.spec: same change cross-s390x-gcc-icecream-backend.spec: same change ++++++ cross-spu-gcc-static.spec ++++++ --- /var/tmp/diff_new_pack.VlxJRd/_old 2009-11-27 00:51:42.000000000 +0100 +++ /var/tmp/diff_new_pack.VlxJRd/_new 2009-11-27 00:51:42.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cross-spu-gcc-static (Version 4.4.2_20091104) +# spec file for package cross-spu-gcc-static (Version 4.4.2_20091124) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -64,7 +64,7 @@ # COMMON-BEGIN %define biarch_targets x86_64 s390x powerpc64 powerpc Url: http://gcc.gnu.org/ -Version: 4.4.2_20091104 +Version: 4.4.2_20091124 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -109,7 +109,7 @@ # LIBJAVA-DELETE-BEGIN Group: Development/Languages/C and C++ Summary: The GNU C Compiler and Support Files -License: GPL v3 or later +License: GPLv3+ %description This compiler supports the C language on spu microprocessors. cross-spu-gcc.spec: same change ++++++ cross-x86_64-gcc-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.VlxJRd/_old 2009-11-27 00:51:42.000000000 +0100 +++ /var/tmp/diff_new_pack.VlxJRd/_new 2009-11-27 00:51:42.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cross-x86_64-gcc-icecream-backend (Version 4.4.2_20091104) +# spec file for package cross-x86_64-gcc-icecream-backend (Version 4.4.2_20091124) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -41,7 +41,7 @@ # COMMON-BEGIN %define biarch_targets x86_64 s390x powerpc64 powerpc Url: http://gcc.gnu.org/ -Version: 4.4.2_20091104 +Version: 4.4.2_20091124 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -86,7 +86,7 @@ # LIBJAVA-DELETE-BEGIN Group: Development/Languages/C and C++ Summary: The GNU C Compiler and Support Files -License: GPL v3 or later +License: GPLv3+ %description Core package for the GNU Compiler Collection, including the C language ++++++ gcc44.spec ++++++ --- /var/tmp/diff_new_pack.VlxJRd/_old 2009-11-27 00:51:42.000000000 +0100 +++ /var/tmp/diff_new_pack.VlxJRd/_new 2009-11-27 00:51:42.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gcc44 (Version 4.4.2_20091104) +# spec file for package gcc44 (Version 4.4.2_20091124) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -58,8 +58,8 @@ %endif %if %{build_ada} %if %{suse_version} > 1120 -%define hostsuffix -4.4 -BuildRequires: gcc44-ada +%define hostsuffix -4.3 +BuildRequires: gcc43-ada %else %define hostsuffix %{nil} BuildRequires: gcc-ada @@ -117,7 +117,7 @@ # COMMON-BEGIN %define biarch_targets x86_64 s390x powerpc64 powerpc Url: http://gcc.gnu.org/ -Version: 4.4.2_20091104 +Version: 4.4.2_20091124 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -175,7 +175,7 @@ # LIBJAVA-DELETE-BEGIN Group: Development/Languages/C and C++ Summary: The GNU C Compiler and Support Files -License: GPL v3 or later +License: GPLv3+ %description Core package for the GNU Compiler Collection, including the C language @@ -188,7 +188,7 @@ %package -n gcc44-32bit -License: GPL v3 or later +License: GPLv3+ Summary: The GNU C Compiler 32bit support Group: Development/Languages/C and C++ AutoReqProv: on @@ -208,7 +208,7 @@ This package contains 32bit support for the GNU Compiler Collection. %package -n gcc44-64bit -License: GPL v3 or later +License: GPLv3+ Summary: The GNU C Compiler 64bit support Group: Development/Languages/C and C++ AutoReqProv: on @@ -229,7 +229,7 @@ %package locale -License: GPL v3 or later +License: GPLv3+ Summary: Locale Data for the GNU Compiler Collection Group: Development/Languages/C and C++ Requires: gcc44 = %{version}-%{release} @@ -241,7 +241,7 @@ %package c++ -License: GPL v3 or later +License: GPLv3+ Summary: The GNU C++ Compiler Group: Development/Languages/C and C++ AutoReqProv: on @@ -252,7 +252,7 @@ This package contains the GNU compiler for C++. %package -n libstdc++44-devel -License: GPL v3 or later +License: GPLv3+ Summary: Include Files and Libraries mandatory for Development Group: System/Libraries AutoReqProv: on @@ -266,7 +266,7 @@ This package contains all the headers and libraries of the standard C++ library. It is needed for compiling C++ code. %package -n libstdc++44-devel-32bit -License: GPL v3 or later +License: GPLv3+ Summary: Include Files and Libraries mandatory for Development Group: System/Libraries AutoReqProv: on @@ -283,7 +283,7 @@ This package contains all the headers and libraries of the standard C++ library. It is needed for compiling C++ code. %package -n libstdc++44-devel-64bit -License: GPL v3 or later +License: GPLv3+ Summary: Include Files and Libraries mandatory for Development Group: System/Libraries AutoReqProv: on @@ -301,7 +301,7 @@ library. It is needed for compiling C++ code. %package -n libstdc++44-doc -License: GPL v3 or later +License: GPLv3+ Summary: Documentation for the GNU C++ standard library Group: Development/Languages/C and C++ AutoReqProv: on @@ -311,7 +311,7 @@ %package -n libgcc44 -License: GPL v3 or later +License: GPLv3+ Summary: C compiler runtime library Group: System/Base Provides: libgcc = %{version}-%{release} @@ -337,7 +337,7 @@ # PACKAGE-BEGIN %package -n libgcc44-32bit -License: GPL v3 or later +License: GPLv3+ Summary: C compiler runtime library Group: System/Base Provides: libgcc-32bit = %{version}-%{release} @@ -366,7 +366,7 @@ # PACKAGE-BEGIN %package -n libgcc44-64bit -License: GPL v3 or later +License: GPLv3+ Summary: C compiler runtime library Group: System/Base Provides: libgcc-64bit = %{version}-%{release} @@ -395,7 +395,7 @@ # PACKAGE-BEGIN %package -n libgomp44 -License: GPL v3 or later +License: GPLv3+ Summary: The GNU compiler collection OpenMP runtime library Group: System/Base Provides: libgomp = %{version}-%{release} @@ -425,7 +425,7 @@ # PACKAGE-BEGIN %package -n libgomp44-32bit -License: GPL v3 or later +License: GPLv3+ Summary: The GNU compiler collection OpenMP runtime library Group: System/Base Provides: libgomp-32bit = %{version}-%{release} @@ -458,7 +458,7 @@ # PACKAGE-BEGIN %package -n libgomp44-64bit -License: GPL v3 or later +License: GPLv3+ Summary: The GNU compiler collection OpenMP runtime library Group: System/Base Provides: libgomp-64bit = %{version}-%{release} @@ -491,7 +491,7 @@ # PACKAGE-BEGIN %package -n libstdc++44 -License: GPL v3 or later +License: GPLv3+ Summary: The standard C++ shared library Group: System/Libraries Provides: libstdc++ = %{version}-%{release} @@ -518,7 +518,7 @@ # PACKAGE-BEGIN %package -n libstdc++44-32bit -License: GPL v3 or later +License: GPLv3+ Summary: The standard C++ shared library Group: System/Libraries Provides: libstdc++-32bit = %{version}-%{release} @@ -548,7 +548,7 @@ # PACKAGE-BEGIN %package -n libstdc++44-64bit -License: GPL v3 or later +License: GPLv3+ Summary: The standard C++ shared library Group: System/Libraries Provides: libstdc++-64bit = %{version}-%{release} @@ -576,7 +576,7 @@ # PACKAGE-END %package info -License: GFDL v1.1 +License: GFDLv1.1 Summary: Documentation for the GNU compiler collection Group: Development/Languages/C and C++ AutoReqProv: on @@ -588,7 +588,7 @@ %package objc -License: GPL v3 or later +License: GPLv3+ Summary: GNU Objective C Compiler Group: Development/Languages/Other AutoReqProv: on @@ -600,7 +600,7 @@ object oriented language, created by Next Inc. and used in their Nextstep OS. The source code is available in the gcc package. %package objc-32bit -License: GPL v3 or later +License: GPLv3+ Summary: GNU Objective C Compiler Group: Development/Languages/Other AutoReqProv: on @@ -615,7 +615,7 @@ object oriented language, created by Next Inc. and used in their Nextstep OS. The source code is available in the gcc package. %package objc-64bit -License: GPL v3 or later +License: GPLv3+ Summary: GNU Objective C Compiler Group: Development/Languages/Other AutoReqProv: on @@ -631,7 +631,7 @@ Nextstep OS. The source code is available in the gcc package. %package -n libobjc44 -License: GPL v3 or later +License: GPLv3+ Summary: Library for the GNU Objective C Compiler Group: Development/Libraries/Other Provides: libobjc2 = %{version}-%{release} @@ -655,7 +655,7 @@ # PACKAGE-BEGIN %package -n libobjc44-32bit -License: GPL v3 or later +License: GPLv3+ Summary: Library for the GNU Objective C Compiler Group: Development/Libraries/Other Provides: libobjc2-32bit = %{version}-%{release} @@ -682,7 +682,7 @@ # PACKAGE-BEGIN %package -n libobjc44-64bit -License: GPL v3 or later +License: GPLv3+ Summary: Library for the GNU Objective C Compiler Group: Development/Libraries/Other Provides: libobjc2-64bit = %{version}-%{release} @@ -707,7 +707,7 @@ # PACKAGE-END %package obj-c++ -License: GPL v3 or later +License: GPLv3+ Summary: GNU Objective C++ Compiler Group: Development/Languages/Other AutoReqProv: on @@ -721,7 +721,7 @@ %package -n cpp44 -License: GPL v3 or later +License: GPLv3+ Summary: The GCC Preprocessor Group: Development/Languages/C and C++ @@ -731,7 +731,7 @@ %package ada -License: GPL v3 or later +License: GPLv3+ Requires: gcc44 = %{version}-%{release} Requires: libada44 = %{version}-%{release} Summary: GNU Ada95 Compiler Based on GCC (GNAT) @@ -744,7 +744,7 @@ successor of the Ada83 language. To build this package from source you must have installed a binary version to bootstrap the compiler. %package ada-32bit -License: GPL v3 or later +License: GPLv3+ Requires: gcc44-32bit = %{version}-%{release} Requires: libada44-32bit = %{version}-%{release} Summary: GNU Ada95 Compiler Based on GCC (GNAT) @@ -760,7 +760,7 @@ successor of the Ada83 language. To build this package from source you must have installed a binary version to bootstrap the compiler. %package ada-64bit -License: GPL v3 or later +License: GPLv3+ Requires: gcc44-64bit = %{version}-%{release} Requires: libada44-64bit = %{version}-%{release} Summary: GNU Ada95 Compiler Based on GCC (GNAT) @@ -777,7 +777,7 @@ must have installed a binary version to bootstrap the compiler. %package -n libada44 -License: GPL v3 or later +License: GPLv3+ Summary: GNU Ada Runtime Libraries Group: System/Libraries AutoReqProv: on @@ -804,7 +804,7 @@ # PACKAGE-BEGIN %package -n libada44-32bit -License: GPL v3 or later +License: GPLv3+ Summary: GNU Ada Runtime Libraries Group: System/Libraries AutoReqProv: on @@ -834,7 +834,7 @@ # PACKAGE-BEGIN %package -n libada44-64bit -License: GPL v3 or later +License: GPLv3+ Summary: GNU Ada Runtime Libraries Group: System/Libraries AutoReqProv: on @@ -864,7 +864,7 @@ # PACKAGE-BEGIN %package fortran -License: GPL v3 or later +License: GPLv3+ Summary: The GNU Fortran Compiler and Support Files Group: Development/Languages/Fortran AutoReqProv: on @@ -874,7 +874,7 @@ %description fortran This is the Fortran compiler of the GNU Compiler Collection (GCC). %package fortran-32bit -License: GPL v3 or later +License: GPLv3+ Summary: The GNU Fortran Compiler and Support Files Group: Development/Languages/Fortran AutoReqProv: on @@ -887,7 +887,7 @@ This is the Fortran compiler of the GNU Compiler Collection (GCC). %package fortran-64bit -License: GPL v3 or later +License: GPLv3+ Summary: The GNU Fortran Compiler and Support Files Group: Development/Languages/Fortran AutoReqProv: on @@ -901,7 +901,7 @@ This is the Fortran compiler of the GNU Compiler Collection (GCC). %package -n libgfortran44 -License: GPL v3 or later +License: GPLv3+ Summary: The GNU Fortran Compiler Runtime Library Group: Development/Languages/Fortran Provides: libgfortran3 = %{version}-%{release} @@ -926,7 +926,7 @@ # PACKAGE-BEGIN %package -n libgfortran44-32bit -License: GPL v3 or later +License: GPLv3+ Summary: The GNU Fortran Compiler Runtime Library Group: Development/Languages/Fortran Provides: libgfortran3-32bit = %{version}-%{release} @@ -954,7 +954,7 @@ # PACKAGE-BEGIN %package -n libgfortran44-64bit -License: GPL v3 or later +License: GPLv3+ Summary: The GNU Fortran Compiler Runtime Library Group: Development/Languages/Fortran Provides: libgfortran3-64bit = %{version}-%{release} @@ -982,7 +982,7 @@ # PACKAGE-BEGIN %package -n libmudflap44 -License: GPL v3 or later +License: GPLv3+ Summary: The Mudflap Extension Runtime Library Group: Development/Languages/C and C++ Provides: libmudflap0 = %{version}-%{release} @@ -1011,7 +1011,7 @@ # PACKAGE-BEGIN %package -n libmudflap44-32bit -License: GPL v3 or later +License: GPLv3+ Summary: The Mudflap Extension Runtime Library Group: Development/Languages/C and C++ Provides: libmudflap0-32bit = %{version}-%{release} @@ -1043,7 +1043,7 @@ # PACKAGE-BEGIN %package -n libmudflap44-64bit -License: GPL v3 or later +License: GPLv3+ Summary: The Mudflap Extension Runtime Library Group: Development/Languages/C and C++ Provides: libmudflap0-64bit = %{version}-%{release} @@ -1074,7 +1074,7 @@ %package -n libgcj44 # LIBJAVA-DELETE-END -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Java Runtime Library for gcc Group: System/Libraries %define gcj_sover 10 @@ -1100,7 +1100,7 @@ /sbin/ldconfig %package -n gcc44-java -License: GPL v3 or later +License: GPLv3+ Summary: The GNU Java Compiler Group: Development/Languages/Java AutoReqProv: on @@ -1112,7 +1112,7 @@ %package -n libgcj_bc44 -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Fake library for BC-ABI compatibility. Group: Development/Libraries/Java AutoReqProv: on @@ -1140,7 +1140,7 @@ %package -n libgcj44-jar -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Java runtime library (jar files). Group: Development/Libraries/Java @@ -1149,7 +1149,7 @@ %package -n libgcj44-devel -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Include Files and Libraries mandatory for Development. Group: Development/Libraries/Java AutoReqProv: on @@ -1171,7 +1171,7 @@ %package -n gcc44-gij -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Java Bytecode Interpreter for gcc Group: Development/Libraries/Java Requires: libgcj%{gcj_sover} >= %{version}-%{release} @@ -1182,7 +1182,7 @@ %package -n libffi44 -License: BSD 3-clause (or similar) +License: BSD3c Summary: Foreign Function Interface library Group: Development/Languages/C and C++ AutoReqProv: on @@ -1207,7 +1207,7 @@ # PACKAGE-BEGIN %package -n libffi44-32bit -License: BSD 3-clause (or similar) +License: BSD3c Summary: Foreign Function Interface library Group: Development/Languages/C and C++ AutoReqProv: on @@ -1235,7 +1235,7 @@ # PACKAGE-BEGIN %package -n libffi44-64bit -License: BSD 3-clause (or similar) +License: BSD3c Summary: Foreign Function Interface library Group: Development/Languages/C and C++ AutoReqProv: on @@ -1263,7 +1263,7 @@ # PACKAGE-BEGIN %package -n libffi44-devel -License: BSD 3-clause (or similar) +License: BSD3c Summary: Foreign Function Interface library development files Group: Development/Languages/C and C++ AutoReqProv: on @@ -1272,7 +1272,7 @@ %description -n libffi44-devel A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language. %package -n libffi44-devel-32bit -License: BSD 3-clause (or similar) +License: BSD3c Summary: Foreign Function Interface library development files Group: Development/Languages/C and C++ AutoReqProv: on @@ -1284,7 +1284,7 @@ A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language. %package -n libffi44-devel-64bit -License: BSD 3-clause (or similar) +License: BSD3c Summary: Foreign Function Interface library development files Group: Development/Languages/C and C++ AutoReqProv: on ++++++ libgcj44.spec ++++++ --- /var/tmp/diff_new_pack.VlxJRd/_old 2009-11-27 00:51:42.000000000 +0100 +++ /var/tmp/diff_new_pack.VlxJRd/_new 2009-11-27 00:51:42.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libgcj44 (Version 4.4.2_20091104) +# spec file for package libgcj44 (Version 4.4.2_20091124) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -75,8 +75,8 @@ %endif %if %{build_ada} %if %{suse_version} > 1120 -%define hostsuffix -4.4 -BuildRequires: gcc44-ada +%define hostsuffix -4.3 +BuildRequires: gcc43-ada %else %define hostsuffix %{nil} BuildRequires: gcc-ada @@ -134,7 +134,7 @@ # COMMON-BEGIN %define biarch_targets x86_64 s390x powerpc64 powerpc Url: http://gcc.gnu.org/ -Version: 4.4.2_20091104 +Version: 4.4.2_20091124 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -189,7 +189,7 @@ Patch61: gcc44-rename-info-files.patch # Patches for SAP features Patch130: sap303956-uchar.diff -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Java Runtime Library for gcc Group: System/Libraries %define gcj_sover 10 @@ -215,7 +215,7 @@ /sbin/ldconfig %package -n gcc44-java -License: GPL v3 or later +License: GPLv3+ Summary: The GNU Java Compiler Group: Development/Languages/Java AutoReqProv: on @@ -227,7 +227,7 @@ %package -n libgcj_bc44 -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Fake library for BC-ABI compatibility. Group: Development/Libraries/Java AutoReqProv: on @@ -255,7 +255,7 @@ %package -n libgcj44-jar -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Java runtime library (jar files). Group: Development/Libraries/Java @@ -264,7 +264,7 @@ %package -n libgcj44-devel -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Include Files and Libraries mandatory for Development. Group: Development/Libraries/Java AutoReqProv: on @@ -286,7 +286,7 @@ %package -n gcc44-gij -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Java Bytecode Interpreter for gcc Group: Development/Libraries/Java Requires: libgcj%{gcj_sover} >= %{version}-%{release} @@ -297,7 +297,7 @@ %package -n libffi44 -License: BSD 3-clause (or similar) +License: BSD3c Summary: Foreign Function Interface library Group: Development/Languages/C and C++ AutoReqProv: on @@ -322,7 +322,7 @@ # PACKAGE-BEGIN %package -n libffi44-32bit -License: BSD 3-clause (or similar) +License: BSD3c Summary: Foreign Function Interface library Group: Development/Languages/C and C++ AutoReqProv: on @@ -350,7 +350,7 @@ # PACKAGE-BEGIN %package -n libffi44-64bit -License: BSD 3-clause (or similar) +License: BSD3c Summary: Foreign Function Interface library Group: Development/Languages/C and C++ AutoReqProv: on @@ -378,7 +378,7 @@ # PACKAGE-BEGIN %package -n libffi44-devel -License: BSD 3-clause (or similar) +License: BSD3c Summary: Foreign Function Interface library development files Group: Development/Languages/C and C++ AutoReqProv: on @@ -387,7 +387,7 @@ %description -n libffi44-devel A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language. %package -n libffi44-devel-32bit -License: BSD 3-clause (or similar) +License: BSD3c Summary: Foreign Function Interface library development files Group: Development/Languages/C and C++ AutoReqProv: on @@ -399,7 +399,7 @@ A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language. %package -n libffi44-devel-64bit -License: BSD 3-clause (or similar) +License: BSD3c Summary: Foreign Function Interface library development files Group: Development/Languages/C and C++ AutoReqProv: on ++++++ gcc-4.4.2-20091104.tar.bz2 -> gcc-4.4.2-20091124.tar.bz2 ++++++ gcc44/gcc-4.4.2-20091104.tar.bz2 /mounts/work_src_done/STABLE/gcc44/gcc-4.4.2-20091124.tar.bz2 differ: char 11, line 1 ++++++ gcc.spec.in ++++++ --- /var/tmp/diff_new_pack.VlxJRd/_old 2009-11-27 00:51:42.000000000 +0100 +++ /var/tmp/diff_new_pack.VlxJRd/_new 2009-11-27 00:51:42.000000000 +0100 @@ -66,8 +66,8 @@ %endif %if %{build_ada} %if %{suse_version} > 1120 -%define hostsuffix -4.4 -BuildRequires: gcc44-ada +%define hostsuffix -4.3 +BuildRequires: gcc43-ada %else %define hostsuffix %{nil} BuildRequires: gcc-ada @@ -132,7 +132,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc URL: http://gcc.gnu.org/ -Version: 4.4.2_20091104 +Version: 4.4.2_20091124 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) ++++++ program-transform-name.diff ++++++ --- /var/tmp/diff_new_pack.VlxJRd/_old 2009-11-27 00:51:42.000000000 +0100 +++ /var/tmp/diff_new_pack.VlxJRd/_new 2009-11-27 00:51:42.000000000 +0100 @@ -0,0 +1,344 @@ +Index: gcc/ada/gcc-interface/Make-lang.in +=================================================================== +*** gcc/ada/gcc-interface/Make-lang.in.orig 2008-06-11 15:24:06.000000000 +0200 +--- gcc/ada/gcc-interface/Make-lang.in 2008-06-11 15:48:23.000000000 +0200 +*************** doc/gnat-style.pdf: ada/gnat-style.texi +*** 494,499 **** +--- 494,515 ---- + # likewise for gnatf, gnatchop, and gnatlink, gnatkr, gnatmake, gnat, + # gnatprep, gnatls, gnatxref, gnatfind, gnatname, gnatclean, + # gnatsym ++ GNATBIND_INSTALL_NAME := $(shell echo gnatbind|sed '$(program_transform_name)') ++ GNATCHOP_INSTALL_NAME := $(shell echo gnatchop|sed '$(program_transform_name)') ++ GNAT_INSTALL_NAME := $(shell echo gnat|sed '$(program_transform_name)') ++ GNATKR_INSTALL_NAME := $(shell echo gnatkr|sed '$(program_transform_name)') ++ GNATLINK_INSTALL_NAME := $(shell echo gnatlink|sed '$(program_transform_name)') ++ GNATLS_INSTALL_NAME := $(shell echo gnatls|sed '$(program_transform_name)') ++ GNATMAKE_INSTALL_NAME := $(shell echo gnatmake|sed '$(program_transform_name)') ++ GNATNAME_INSTALL_NAME := $(shell echo gnatname|sed '$(program_transform_name)') ++ GNATPREP_INSTALL_NAME := $(shell echo gnatprep|sed '$(program_transform_name)') ++ GNATXREF_INSTALL_NAME := $(shell echo gnatxref|sed '$(program_transform_name)') ++ GNATFIND_INSTALL_NAME := $(shell echo gnatfind|sed '$(program_transform_name)') ++ GNATCLEAN_INSTALL_NAME := $(shell echo gnatclean|sed '$(program_transform_name)') ++ GNATSYM_INSTALL_NAME := $(shell echo gnatsym|sed '$(program_transform_name)') ++ GNATLBR_INSTALL_NAME := $(shell echo gnatlbr|sed '$(program_transform_name)') ++ GNATDLL_INSTALL_NAME := $(shell echo gnatdll|sed '$(program_transform_name)') ++ VXADDR2LINE_INSTALL_NAME := $(shell echo vxaddr2line|sed '$(program_transform_name)') + ada.install-common: + $(MKDIR) $(DESTDIR)$(bindir) + -if [ -f gnat1$(exeext) ] ; \ +*************** ada.install-common: +*** 507,514 **** + $(INSTALL_PROGRAM) gnatbind-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatbind$(exeext); \ + fi; \ + else \ +! $(RM) $(DESTDIR)$(bindir)/gnatbind$(exeext); \ +! $(INSTALL_PROGRAM) gnatbind$(exeext) $(DESTDIR)$(bindir)/gnatbind$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +--- 523,530 ---- + $(INSTALL_PROGRAM) gnatbind-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatbind$(exeext); \ + fi; \ + else \ +! $(RM) $(DESTDIR)$(bindir)/$(GNATBIND_INSTALL_NAME)$(exeext); \ +! $(INSTALL_PROGRAM) gnatbind$(exeext) $(DESTDIR)$(bindir)/$(GNATBIND_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +*************** ada.install-common: +*** 522,529 **** + $(INSTALL_PROGRAM) gnatchop-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatchop$(exeext); \ + fi ; \ + else \ +! $(RM) $(DESTDIR)$(bindir)/gnatchop$(exeext); \ +! $(INSTALL_PROGRAM) gnatchop$(exeext) $(DESTDIR)$(bindir)/gnatchop$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +--- 538,545 ---- + $(INSTALL_PROGRAM) gnatchop-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatchop$(exeext); \ + fi ; \ + else \ +! $(RM) $(DESTDIR)$(bindir)/$(GNATCHOP_INSTALL_NAME)$(exeext); \ +! $(INSTALL_PROGRAM) gnatchop$(exeext) $(DESTDIR)$(bindir)/$(GNATCHOP_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +*************** ada.install-common: +*** 537,544 **** + $(INSTALL_PROGRAM) gnat-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnat$(exeext); \ + fi; \ + else \ +! $(RM) $(DESTDIR)$(bindir)/gnat$(exeext); \ +! $(INSTALL_PROGRAM) gnat$(exeext) $(DESTDIR)$(bindir)/gnat$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +--- 553,560 ---- + $(INSTALL_PROGRAM) gnat-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnat$(exeext); \ + fi; \ + else \ +! $(RM) $(DESTDIR)$(bindir)/$(GNAT_INSTALL_NAME)$(exeext); \ +! $(INSTALL_PROGRAM) gnat$(exeext) $(DESTDIR)$(bindir)/$(GNAT_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +*************** ada.install-common: +*** 552,559 **** + $(INSTALL_PROGRAM) gnatkr-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatkr$(exeext); \ + fi; \ + else \ +! $(RM) $(DESTDIR)$(bindir)/gnatkr$(exeext); \ +! $(INSTALL_PROGRAM) gnatkr$(exeext) $(DESTDIR)$(bindir)/gnatkr$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +--- 568,575 ---- + $(INSTALL_PROGRAM) gnatkr-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatkr$(exeext); \ + fi; \ + else \ +! $(RM) $(DESTDIR)$(bindir)/$(GNATKR_INSTALL_NAME)$(exeext); \ +! $(INSTALL_PROGRAM) gnatkr$(exeext) $(DESTDIR)$(bindir)/$(GNATKR_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +*************** ada.install-common: +*** 567,574 **** + $(INSTALL_PROGRAM) gnatlink-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatlink$(exeext); \ + fi; \ + else \ +! $(RM) $(DESTDIR)$(bindir)/gnatlink$(exeext); \ +! $(INSTALL_PROGRAM) gnatlink$(exeext) $(DESTDIR)$(bindir)/gnatlink$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +--- 583,590 ---- + $(INSTALL_PROGRAM) gnatlink-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatlink$(exeext); \ + fi; \ + else \ +! $(RM) $(DESTDIR)$(bindir)/$(GNATLINK_INSTALL_NAME)$(exeext); \ +! $(INSTALL_PROGRAM) gnatlink$(exeext) $(DESTDIR)$(bindir)/$(GNATLINK_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +*************** ada.install-common: +*** 582,589 **** + $(INSTALL_PROGRAM) gnatls-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatls$(exeext); \ + fi; \ + else \ +! $(RM) $(DESTDIR)$(bindir)/gnatls$(exeext); \ +! $(INSTALL_PROGRAM) gnatls$(exeext) $(DESTDIR)$(bindir)/gnatls$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +--- 598,605 ---- + $(INSTALL_PROGRAM) gnatls-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatls$(exeext); \ + fi; \ + else \ +! $(RM) $(DESTDIR)$(bindir)/$(GNATLS_INSTALL_NAME)$(exeext); \ +! $(INSTALL_PROGRAM) gnatls$(exeext) $(DESTDIR)$(bindir)/$(GNATLS_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +*************** ada.install-common: +*** 597,604 **** + $(INSTALL_PROGRAM) gnatmake-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatmake$(exeext); \ + fi; \ + else \ +! $(RM) $(DESTDIR)$(bindir)/gnatmake$(exeext); \ +! $(INSTALL_PROGRAM) gnatmake$(exeext) $(DESTDIR)$(bindir)/gnatmake$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +--- 613,620 ---- + $(INSTALL_PROGRAM) gnatmake-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatmake$(exeext); \ + fi; \ + else \ +! $(RM) $(DESTDIR)$(bindir)/$(GNATMAKE_INSTALL_NAME)$(exeext); \ +! $(INSTALL_PROGRAM) gnatmake$(exeext) $(DESTDIR)$(bindir)/$(GNATMAKE_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +*************** ada.install-common: +*** 608,615 **** + $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatname$(exeext); \ + $(INSTALL_PROGRAM) gnatname-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatname$(exeext); \ + else \ +! $(RM) $(DESTDIR)$(bindir)/gnatname$(exeext); \ +! $(INSTALL_PROGRAM) gnatname$(exeext) $(DESTDIR)$(bindir)/gnatname$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +--- 624,631 ---- + $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatname$(exeext); \ + $(INSTALL_PROGRAM) gnatname-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatname$(exeext); \ + else \ +! $(RM) $(DESTDIR)$(bindir)/$(GNATNAME_INSTALL_NAME)$(exeext); \ +! $(INSTALL_PROGRAM) gnatname$(exeext) $(DESTDIR)$(bindir)/$(GNATNAME_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +*************** ada.install-common: +*** 623,630 **** + $(INSTALL_PROGRAM) gnatprep-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatprep$(exeext); \ + fi; \ + else \ +! $(RM) $(DESTDIR)$(bindir)/gnatprep$(exeext); \ +! $(INSTALL_PROGRAM) gnatprep$(exeext) $(DESTDIR)$(bindir)/gnatprep$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +--- 639,646 ---- + $(INSTALL_PROGRAM) gnatprep-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatprep$(exeext); \ + fi; \ + else \ +! $(RM) $(DESTDIR)$(bindir)/$(GNATPREP_INSTALL_NAME)$(exeext); \ +! $(INSTALL_PROGRAM) gnatprep$(exeext) $(DESTDIR)$(bindir)/$(GNATPREP_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +*************** ada.install-common: +*** 634,641 **** + $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatxref$(exeext); \ + $(INSTALL_PROGRAM) gnatxref-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatxref$(exeext); \ + else \ +! $(RM) $(DESTDIR)$(bindir)/gnatxref$(exeext); \ +! $(INSTALL_PROGRAM) gnatxref$(exeext) $(DESTDIR)$(bindir)/gnatxref$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +--- 650,657 ---- + $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatxref$(exeext); \ + $(INSTALL_PROGRAM) gnatxref-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatxref$(exeext); \ + else \ +! $(RM) $(DESTDIR)$(bindir)/$(GNATXREF_INSTALL_NAME)$(exeext); \ +! $(INSTALL_PROGRAM) gnatxref$(exeext) $(DESTDIR)$(bindir)/$(GNATXREF_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +*************** ada.install-common: +*** 645,652 **** + $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatfind$(exeext); \ + $(INSTALL_PROGRAM) gnatfind-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatfind$(exeext); \ + else \ +! $(RM) $(DESTDIR)$(bindir)/gnatfind$(exeext); \ +! $(INSTALL_PROGRAM) gnatfind$(exeext) $(DESTDIR)$(bindir)/gnatfind$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +--- 661,668 ---- + $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatfind$(exeext); \ + $(INSTALL_PROGRAM) gnatfind-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatfind$(exeext); \ + else \ +! $(RM) $(DESTDIR)$(bindir)/$(GNATFIND_INSTALL_NAME)$(exeext); \ +! $(INSTALL_PROGRAM) gnatfind$(exeext) $(DESTDIR)$(bindir)/$(GNATFIND_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +*************** ada.install-common: +*** 656,663 **** + $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatclean$(exeext); \ + $(INSTALL_PROGRAM) gnatclean-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatclean$(exeext); \ + else \ +! $(RM) $(DESTDIR)$(bindir)/gnatclean$(exeext); \ +! $(INSTALL_PROGRAM) gnatclean$(exeext) $(DESTDIR)$(bindir)/gnatclean$(exeext); \ + fi ; \ + fi + # +--- 672,679 ---- + $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatclean$(exeext); \ + $(INSTALL_PROGRAM) gnatclean-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatclean$(exeext); \ + else \ +! $(RM) $(DESTDIR)$(bindir)/$(GNATCLEAN_INSTALL_NAME)$(exeext); \ +! $(INSTALL_PROGRAM) gnatclean$(exeext) $(DESTDIR)$(bindir)/$(GNATCLEAN_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + # +*************** ada.install-common: +*** 667,674 **** + then \ + if [ -f gnatsym$(exeext) ] ; \ + then \ +! $(RM) $(DESTDIR)$(bindir)/gnatsym$(exeext); \ +! $(INSTALL_PROGRAM) gnatsym$(exeext) $(DESTDIR)$(bindir)/gnatsym$(exeext); \ + fi ; \ + fi + # +--- 683,690 ---- + then \ + if [ -f gnatsym$(exeext) ] ; \ + then \ +! $(RM) $(DESTDIR)$(bindir)/$(GNATSYM_INSTALL_NAME)$(exeext); \ +! $(INSTALL_PROGRAM) gnatsym$(exeext) $(DESTDIR)$(bindir)/$(GNATSYM_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + # +*************** ada.install-common: +*** 678,685 **** + then \ + if [ -f gnatlbr$(exeext) ] ; \ + then \ +! $(RM) $(DESTDIR)$(bindir)/gnatlbr$(exeext); \ +! $(INSTALL_PROGRAM) gnatlbr$(exeext) $(DESTDIR)$(bindir)/gnatlbr$(exeext); \ + fi ; \ + fi + # +--- 694,701 ---- + then \ + if [ -f gnatlbr$(exeext) ] ; \ + then \ +! $(RM) $(DESTDIR)$(bindir)/$(GNATLBR_INSTALL_NAME)$(exeext); \ +! $(INSTALL_PROGRAM) gnatlbr$(exeext) $(DESTDIR)$(bindir)/$(GNATLBR_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + # +*************** ada.install-common: +*** 687,694 **** + # + -if [ -f gnat1$(exeext) ] ; \ + then \ +! $(RM) $(DESTDIR)$(bindir)/gnatdll$(exeext); \ +! $(INSTALL_PROGRAM) gnatdll$(exeext) $(DESTDIR)$(bindir)/gnatdll$(exeext); \ + fi + # + # vxaddr2line is only used for cross ports (it calls the underlying cross +--- 703,710 ---- + # + -if [ -f gnat1$(exeext) ] ; \ + then \ +! $(RM) $(DESTDIR)$(bindir)/$(GNATDLL_INSTALL_NAME)$(exeext); \ +! $(INSTALL_PROGRAM) gnatdll$(exeext) $(DESTDIR)$(bindir)/$(GNATDLL_INSTALL_NAME)$(exeext); \ + fi + # + # vxaddr2line is only used for cross ports (it calls the underlying cross +*************** ada.install-common: +*** 698,705 **** + then \ + if [ -f vxaddr2line$(exeext) ] ; \ + then \ +! $(RM) $(DESTDIR)$(bindir)/vxaddr2line$(exeext); \ +! $(INSTALL_PROGRAM) vxaddr2line$(exeext) $(DESTDIR)$(bindir)/vxaddr2line$(exeext); \ + fi ; \ + fi + +--- 714,721 ---- + then \ + if [ -f vxaddr2line$(exeext) ] ; \ + then \ +! $(RM) $(DESTDIR)$(bindir)/$(VXADDR2LINE_INSTALL_NAME)$(exeext); \ +! $(INSTALL_PROGRAM) vxaddr2line$(exeext) $(DESTDIR)$(bindir)/$(VXADDR2LINE_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + +*************** ada.uninstall: +*** 765,772 **** + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatxref$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatclean$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatsym$(exeext) +- # Gnatlbr and Gnatchop are only used on VMS +- -$(RM) $(DESTDIR)$(bindir)/gnatlbr$(exeext) $(DESTDIR)$(bindir)/gnatchop$(exeext) + + # Clean hooks: + # A lot of the ancillary files are deleted by the main makefile. +--- 781,786 ---- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dovecot12 for openSUSE:Factory
by root＠Hilbert.suse.de 25 Nov '09

25 Nov '09

Hello community, here is the log from the commit of package dovecot12 for openSUSE:Factory checked in at Wed Nov 25 16:22:58 CET 2009. -------- --- dovecot12/dovecot12.changes 2009-10-08 17:18:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/dovecot12/dovecot12.changes 2009-11-23 18:39:32.000000000 +0100 @@ -1,0 +2,74 @@ +Mon Nov 23 17:36:38 UTC 2009 - alexandre(a)exatati.com.br + +- update managesieve patch to match the release: + old: dovecot-1.2.7-managesieve-0.11.9.diff.bz2 + new: dovecot-1.2.8-managesieve-0.11.9.diff.bz2 + +------------------------------------------------------------------- +Fri Nov 20 13:51:18 UTC 2009 - alexandre(a)exatati.com.br + +- update to version 1.2.8 + * Dovecot v1.2.x had been creating base_dir (and its parents if + necessary) with 0777 permissions. The base_dir's permissions get + changed to 0755 automatically at startup, but you may need to + chmod the parent directories manually. + - acl: If user has rights from more than one group, merge them instead + of choosing one group's rights and ignoring others. + - virtual: When using a lot of mailboxes, the virtual mailbox's header + could have grown over 32 kB and caused "out of memory" crashes. Also + over 64 kB headers couldn't even be updated with existing transaction + log records. Added a new record type that gets used with >=64 kB + headers. Older Dovecot versions don't understand this header and + will log errors if they see it. + - FETCH BODYSTRUCTURE didn't return RFC 2231 "key*" fields correctly + +------------------------------------------------------------------- +Sat Nov 14 14:20:04 UTC 2009 - alexandre(a)exatati.com.br + +- update to version 1.2.7 + * IMAP: IDLE now sends "Still here" notifications to same user's + connections at the same time. This hopefully reduces power usage + of some mobile clients that use multiple IDLEing connections. + * IMAP: If imap_capability is set, show it in the login banner. + + IMAP: Implemented SORT=DISPLAY extension. + - Login process creation could have sometimes failed with epoll_ctl() + errors or without epoll probably some other strange things could + have happened. + - Maildir: Fixed some performance issues + - Maildir: Fixed crash when using a lot of keywords. + - Several fixes to QRESYNC extension and modseq handling + - mbox: Make sure failed saves get rolled back with NFS. + - dbox: Several fixes. +- update managesieve patch to match the release: + old: dovecot-1.2.6-managesieve-0.11.9.diff.bz2 + new: dovecot-1.2.7-managesieve-0.11.9.diff.bz2 + +------------------------------------------------------------------- +Mon Oct 19 11:22:57 UTC 2009 - alexandre(a)exatati.com.br + +- update sieve version to 0.1.13 + + Body extension: implemented proper handling of the :raw transform + and added various new tests to the test suite. However, :content + "multipart" and :content "message/rfc822" are still not working. + + Fixed race condition occuring when multiple instances are saving the + same binary (patch by Timo Sirainen). + + Test suite: added support for testing multiscript execution. + - Made compiler more lenient towars missing CRLF at the end of the + script in a hash comment. + - Body extension: don't give SKIP_BODY_BLOCK flag to message parser, + we want the body! (patch by Timo Sirainen). + - Fixed handling of implicit side effects for multiscript execution. + - Fixed bugs in multiscript support; subsequent keep actions were not + always merged correctly and implicit side effects were not always + handled correctly. + - Fixed a segfault bug in the sieve-test tool occuring when compile + fails. + - Fixed segfault bug in action procesing. It was triggered while + merging side effects in duplicate actions. + - Fixed bug in the Sieve plugin that caused it to try to stat() a NULL + path, yielding a 'Bad address' error. +- update sieve pie patch to match release: + old: dovecot-1.2-sieve-0.1.12_pie.patch + new: dovecot-1.2-sieve-0.1.13_pie.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- dovecot-1.2.6-managesieve-0.11.9.diff.bz2 dovecot-1.2.6.tar.bz2 dovecot-1.2-sieve-0.1.12_pie.patch dovecot-1.2-sieve-0.1.12.tar.bz2 New: ---- dovecot-1.2.8-managesieve-0.11.9.diff.bz2 dovecot-1.2.8.tar.bz2 dovecot-1.2-sieve-0.1.13_pie.patch dovecot-1.2-sieve-0.1.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dovecot12.spec ++++++ --- /var/tmp/diff_new_pack.r0YlAq/_old 2009-11-25 16:19:29.000000000 +0100 +++ /var/tmp/diff_new_pack.r0YlAq/_new 2009-11-25 16:19:29.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package dovecot12 (Version 1.2.6) +# spec file for package dovecot12 (Version 1.2.8) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: dovecot12 -Version: 1.2.6 +Version: 1.2.8 Release: 1 %define dovecot_major_version 1.2 -%define dovecot_sieve_version 0.1.12 +%define dovecot_sieve_version 0.1.13 %define dovecot_managesieve_version 0.11.9 %define dovecot_managesieve_docdir %{_docdir}/%{pkg_name}/dovecot-managesieve/ %define dovecot_sieve_docdir %{_docdir}/%{pkg_name}/dovecot-sieve @@ -72,7 +72,7 @@ Url: http://www.dovecot.org # taken from http://www.dovecot.org/releases/1.0/%{pkg_name}-%{version}.tar.gz Source: %{pkg_name}-%{version}.tar.bz2 -# taken from http://www.rename-it.nl/dovecot/1.2/dovecot-1.2-sieve-0.1.12.tar.gz +# taken from http://www.rename-it.nl/dovecot/1.2/dovecot-1.2-sieve-0.1.13.tar.gz %define dovecot_sieve_source_dir dovecot-%{dovecot_major_version}-sieve-%{dovecot_sieve_version} Source1: %{dovecot_sieve_source_dir}.tar.bz2 Source2: %{pkg_name}.init @@ -81,10 +81,10 @@ Source5: dovecot-rpmlintrc %define dovecot_managesieve_source_dir dovecot-%{dovecot_major_version}-managesieve-%{dovecot_managesieve_version} Source6: http://www.rename-it.nl/dovecot/1.1/%{dovecot_managesieve_source_dir}.tar.b… -Patch: http://www.rename-it.nl/dovecot/1.1/dovecot-1.2.6-managesieve-%{dovecot_man… +Patch: http://www.rename-it.nl/dovecot/1.1/dovecot-1.2.8-managesieve-%{dovecot_man… Patch1: dovecot-1.2.4_pie.patch Patch2: dovecot-1.2-managesieve-0.11.9_pie.patch -Patch3: dovecot-1.2-sieve-0.1.12_pie.patch +Patch3: dovecot-1.2-sieve-0.1.13_pie.patch # Summary: IMAP and POP3 Server Written Primarily with Security in Mind ++++++ dovecot-1.2.6-managesieve-0.11.9.diff.bz2 -> dovecot-1.2.8-managesieve-0.11.9.diff.bz2 ++++++ Files dovecot12/dovecot-1.2.6-managesieve-0.11.9.diff.bz2 and /mounts/work_src_done/STABLE/dovecot12/dovecot-1.2.8-managesieve-0.11.9.diff.bz2 differ ++++++ dovecot-1.2.6.tar.bz2 -> dovecot-1.2.8.tar.bz2 ++++++ ++++ 55308 lines of diff (skipped) ++++++ dovecot-1.2-sieve-0.1.12_pie.patch -> dovecot-1.2-sieve-0.1.13_pie.patch ++++++ --- dovecot12/dovecot-1.2-sieve-0.1.12_pie.patch 2009-08-27 18:49:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/dovecot12/dovecot-1.2-sieve-0.1.13_pie.patch 2009-10-19 14:00:59.000000000 +0200 @@ -1,7 +1,7 @@ -Index: dovecot-1.2-sieve-0.1.12/configure.in +Index: dovecot-1.2-sieve-0.1.13/configure.in =================================================================== ---- dovecot-1.2-sieve-0.1.12/configure.in.orig 2009-07-12 23:41:12.000000000 +0200 -+++ dovecot-1.2-sieve-0.1.12/configure.in 2009-07-15 16:32:06.900287563 +0200 +--- dovecot-1.2-sieve-0.1.13.orig/configure.in ++++ dovecot-1.2-sieve-0.1.13/configure.in @@ -20,6 +20,37 @@ AC_PROG_CC AC_PROG_CPP AC_PROG_LIBTOOL ++++++ dovecot-1.2-sieve-0.1.12.tar.bz2 -> dovecot-1.2-sieve-0.1.13.tar.bz2 ++++++ ++++ 10753 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit librtas for openSUSE:Factory
by root＠Hilbert.suse.de 25 Nov '09

25 Nov '09

Hello community, here is the log from the commit of package librtas for openSUSE:Factory checked in at Wed Nov 25 16:18:20 CET 2009. -------- --- librtas/librtas.changes 2008-11-05 16:47:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/librtas/librtas.changes 2009-11-20 15:34:01.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 20 14:45:45 CET 2009 - uli(a)suse.de + +- update -> 1.3.4: + - new inventory model (fate#304149) + - support rtas event updates (fate#307049) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- librtas-1.3.3.tar.bz2 librtas.firmware_rev.patch librtas.header-compile.patch librtas.open_create.patch librtas.open_prop_file-off_by_one.patch New: ---- librtas-1.3.4.tar.bz2 librtas-failedmagic.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ librtas.spec ++++++ --- /var/tmp/diff_new_pack.bt7dIk/_old 2009-11-25 16:17:19.000000000 +0100 +++ /var/tmp/diff_new_pack.bt7dIk/_new 2009-11-25 16:17:19.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package librtas (Version 1.3.3) +# spec file for package librtas (Version 1.3.4) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 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 @@ -20,19 +20,16 @@ Name: librtas BuildRequires: doxygen -Version: 1.3.3 -Release: 39 +Version: 1.3.4 +Release: 1 Group: System/Libraries -License: IBM Public License +License: IBM Public License .. Summary: Libraries to provide access to RTAS calls and RTAS events BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ppc ppc64 Url: http://librtas.ozlabs.org/ Source0: http://librtas.ozlabs.org/downloads/librtas-%{version}.tar.bz2 -Patch0: librtas.open_prop_file-off_by_one.patch -Patch2: librtas.open_create.patch -Patch3: librtas.firmware_rev.patch -Patch4: librtas.header-compile.patch +Patch: librtas-failedmagic.patch %description The librtas shared library provides userspace with an interface through @@ -54,10 +51,8 @@ %prep %setup -q -%patch0 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 +%patch +sed s,rtasevent,ofdt,g <doxygen.rtasevent >doxygen.ofdt %build make CFLAGS="$RPM_OPT_FLAGS -fPIC -g -I $PWD/librtasevent_src" LIB_DIR="%{_libdir}" %{?jobs:-j%jobs} ++++++ librtas-1.3.3.tar.bz2 -> librtas-1.3.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.3/Changelog new/librtas-1.3.4/Changelog --- old/librtas-1.3.3/Changelog 2007-12-12 23:31:25.000000000 +0100 +++ new/librtas-1.3.4/Changelog 2009-05-19 00:42:31.000000000 +0200 @@ -1,3 +1,12 @@ +Changelog for librtas-1.3.4 +======================================= + - Several minor fixes from Olaf Hering; use correct open mode for O_CREAT, + fix out-of-bounds access in parse_post_scn() and alloc the trailing null + in open_prop_file(). + - Update rules.mk to install 64-bit libraries to /usr/lib64 + - Update librtasevent for recent PAPR+ updates. + - Add libofdt + Changelog for librtas-1.3.3 ======================================= - Changed ibm,get-vpd call to reuse the same RMO buffer for both diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.3/libofdt_src/common.h new/librtas-1.3.4/libofdt_src/common.h --- old/librtas-1.3.3/libofdt_src/common.h 1970-01-01 01:00:00.000000000 +0100 +++ new/librtas-1.3.4/libofdt_src/common.h 2009-05-19 00:42:31.000000000 +0200 @@ -0,0 +1,60 @@ +/** + * @file common.h + * + * Copyright (C) 2008/2009 IBM Corporation + * Common Public License Version 1.0 (see COPYRIGHT) + * + * @author Manish Ahuja mahuja(a)us.ibm.com + */ +#ifndef _COMMON_H_ +#define _COMMON_H_ + +#include "libofdt.h" + +#define DRC_STR_MAX 48 +#define OFDT_BASE "/proc/device-tree" + +struct delete_struct { + struct delete_struct *next; + struct node *dnode; + struct property *dprop; +}; + +struct dr_connector { + char name[DRC_STR_MAX]; + char type[DRC_STR_MAX]; + unsigned int index; + unsigned int powerdomain; + struct dr_connector *next; +}; + +struct of_list_prop { + char *_data; + char *val; + int n_entries; +}; + +struct drc_prop_grp { + struct of_list_prop drc_names; + struct of_list_prop drc_types; + struct of_list_prop drc_indexes; + struct of_list_prop drc_domains; +}; + +struct dr_connector *get_drc_info(const char *); +void free_drc_info(struct dr_connector *); +char *of_to_full_path(const char *); +struct dr_connector *find_drc_info(const char *); +int file_exists(const char *, const char *); +void create_drc_properties(struct node *, struct dr_connector *); +void add_property(struct node *, const char *, char *); + +static inline void *zalloc(int sz) { + void *tmp = malloc(sz); + if (tmp) + memset(tmp, 0, sz); + + return tmp; +} + +#endif /* COMMON_H_ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.3/libofdt_src/drc.c new/librtas-1.3.4/libofdt_src/drc.c --- old/librtas-1.3.3/libofdt_src/drc.c 1970-01-01 01:00:00.000000000 +0100 +++ new/librtas-1.3.4/libofdt_src/drc.c 2009-05-19 00:42:31.000000000 +0200 @@ -0,0 +1,327 @@ +/** + * @file drc.c + * @brief Common routines for building DRC Info. + * @author Borrowed/Adapted code from drmgr authored by "Nathan Fontenont". + * @author Manish Ahuja mahuja(a)us.ibm.com + * + * Copyright (C) IBM Corporation 2009 + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <dirent.h> +#include <stdint.h> +#include "common.h" + +/** + * get_property + * @brief retrieve a device-tree property from /proc + * + * @param path path to the property to retrieve + * @param name name of the property to retrieve + * @param prop of_list_prop to retrieve property for + * @returns 0 on success, !0 otherwise + */ +static int get_property(const char *path, const char *property, + void *buf, int buf_sz) +{ + FILE *fp; + int rc; + char dir[OFDT_MAX_PATH]; + + if ((path == NULL) || (property == NULL)) + return -1; + + sprintf(dir, "%s/%s", path, property); + fp = fopen(dir, "r"); + if (fp == NULL) + return -1; + + rc = fread(buf, buf_sz, 1, fp); + + fclose(fp); + return 0; +} + +/** + * get_proprety_size + * @brief Retrieve the size of a device tree property + * + * @param path full path to property + * @param name property name + * @returns size of property + */ +static int get_property_size(const char *path, const char *name) +{ + char file_path[OFDT_MAX_PATH]; + struct stat sb; + int rc; + + sprintf(file_path, "%s/%s", path, name); + rc = stat(file_path, &sb); + + return sb.st_size; +} + +/** + * get_of_list_prop + * @breif retrieve the specified open firmware property list + * + * @param full_path + * @param prop_name + * @param prop + * @returns 0 on success, !0 otherwise + */ +static int get_of_list_prop(const char *full_path, char *prop_name, + struct of_list_prop *prop) +{ + int rc, size; + + size = get_property_size(full_path, prop_name); + prop->_data = zalloc(size); + if (prop->_data == NULL) + return -1; + + rc = get_property(full_path, prop_name, prop->_data, size); + if (rc) { + free(prop->_data); + return -1; + } + + prop->n_entries = *(uint *)prop->_data; + prop->val = prop->_data + sizeof(uint); + + return 0; +} + +/** + * get_drc_prop_grp + * + * @param full_path + * @param group + * @returns 0 on success, !0 otherwise + */ +static int get_drc_prop_grp(const char *full_path, struct drc_prop_grp *group) +{ + int rc; + + memset(group, 0, sizeof(*group)); + + rc = get_of_list_prop(full_path, "ibm,drc-names", &group->drc_names); + if (rc) + return rc; + + rc = get_of_list_prop(full_path, "ibm,drc-types", &group->drc_types); + if (rc) + return rc; + + rc = get_of_list_prop(full_path, "ibm,drc-indexes", + &group->drc_indexes); + if (rc) + return rc; + + rc = get_of_list_prop(full_path, "ibm,drc-power-domains", + &group->drc_domains); + if (rc) + return rc; + + return 0; +} + +/** + * free_drc_props + * @brief free the properties associated with a drc group + * + * @param group + */ +static void free_drc_props(struct drc_prop_grp *group) +{ + if (group->drc_names.val) + free(group->drc_names._data); + if (group->drc_types.val) + free(group->drc_types._data); + if (group->drc_indexes.val) + free(group->drc_indexes._data); + if (group->drc_domains.val) + free(group->drc_domains._data); +} + +/** + * build_connectors_group + * + * @param group + * @param n_entries + * @param list + * @returns 0 on success, !0 otherwise + */ +static int build_connectors_list(struct drc_prop_grp *group, int n_entries, + struct dr_connector *list) +{ + struct dr_connector *entry; + unsigned int *index_ptr; + unsigned int *domain_ptr; + char *name_ptr; + char *type_ptr; + int i; + + index_ptr = (unsigned int *)group->drc_indexes.val; + domain_ptr = (unsigned int *)group->drc_domains.val; + name_ptr = group->drc_names.val; + type_ptr = group->drc_types.val; + + for (i = 0; i < n_entries; i++) { + entry = &list[i]; + + entry->index = *(index_ptr++); + entry->powerdomain = *(domain_ptr++); + + strncpy(entry->name, name_ptr, DRC_STR_MAX); + name_ptr += strlen(name_ptr) + 1; + + strncpy(entry->type, type_ptr, DRC_STR_MAX); + type_ptr += strlen(type_ptr) + 1; + + if (i == (n_entries - 1)) + entry->next = NULL; + else + entry->next = &list[i+1]; + } + + return 0; +} + +/** + * get_dr_connectors + * + * NOTE:Callers of this function are expected to free drc_list themselves + * + * @param of_path + * @param drc_list + * @param n_drcs + * @returns 0 on success, !0 otherwise + */ +struct dr_connector *get_drc_info(const char *of_path) +{ + struct dr_connector *list = NULL; + struct of_list_prop *drc_names; + struct drc_prop_grp prop_grp; + int n_drcs; + int rc; + + rc = get_drc_prop_grp(of_path, &prop_grp); + if (rc) + return NULL; + + drc_names = &prop_grp.drc_names; + n_drcs = drc_names->n_entries; + + list = zalloc(n_drcs * sizeof(struct dr_connector)); + if (list) + rc = build_connectors_list(&prop_grp, n_drcs, list); + + free_drc_props(&prop_grp); + return list; +} + +/** + * free_drc_info + * + * @param drc_list + */ +void free_drc_info(struct dr_connector *drc_list) +{ + free(drc_list); +} + +/** + * file_exists + * + * @brief Function that checks whether ibm,my-drc-index exists. + * + * @param path + * @returns 0 on success, !0 otherwise + */ +int file_exists(const char *path, const char *fname) +{ + int rc; + struct stat sb; + char file_path[OFDT_MAX_PATH]; + + sprintf(file_path, "%s/%s", path, fname); + rc = stat(file_path, &sb); + + return !rc; +} + +/** + * create_drc_props + * + * @brief Function that creates drc,type/name/powerdomain. + * + * @param dr_connector + * @param parent node + * @param path + */ +void create_drc_properties(struct node *node, struct dr_connector *drc_list) +{ + char powerdomain[OFDT_MAX_NAME]; + struct dr_connector *drc; + int rc; + uint32_t drc_index; + + if (drc_list == NULL) + return; + + rc = get_property(node->path, "ibm,my-drc-index", &drc_index, + sizeof(drc_index)); + if (rc) + return; + + for (drc = drc_list; drc; drc = drc->next) { + if (drc_index == drc->index) + break; + } + + if (!drc) + return + + add_property(node, "ibm,drc-name", drc->name); + add_property(node, "ibm,drc-type", drc->type); + + sprintf(powerdomain, "%u", drc->powerdomain); + add_property(node, "ibm,drc-powerdomain", powerdomain); +} + +/** + * find_drc_info + * + * @brief Function that parses prev sub-directories until it finds + * ibm,drc-index file + * + * @param path + * @returns dr_connector type. + */ +struct dr_connector *find_drc_info(const char *path) +{ + struct stat sb; + int rc; + char tmp_path[OFDT_MAX_PATH]; + char buf[OFDT_MAX_PATH]; + char *slash; + + sprintf(buf, "%s", path); + + do { + sprintf(tmp_path, "%s/%s", buf, "ibm,drc-indexes"); + rc = stat(buf, &sb); + if (rc == 0) + return get_drc_info(buf); + + slash = strrchr(buf, '/'); + if (slash) + *slash = '\0'; + } while (slash); + + return NULL; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.3/libofdt_src/dtree.c new/librtas-1.3.4/libofdt_src/dtree.c --- old/librtas-1.3.3/libofdt_src/dtree.c 1970-01-01 01:00:00.000000000 +0100 +++ new/librtas-1.3.4/libofdt_src/dtree.c 2009-05-19 00:42:31.000000000 +0200 @@ -0,0 +1,530 @@ +/** + * @file dtree.c + * + * Copyright (C) 2008/2009 IBM Corporation + * Common Public License Version 1.0 (see COPYRIGHT) + * + * @author Manish Ahuja mahuja(a)us.ibm.com + */ + +#include "common.h" + +struct node *treehead = NULL; +struct delete_struct *delete_list = NULL; + +void __libofdt_fini() __attribute__((destructor)); + +/** + * allocate_property + * @brief allocates property + * + * @param name + * @param path + * @param value + * @param size + * @return property + */ +static struct property *allocate_property(const char *name, const char *path, + char *value) +{ + struct property *prop; + int rc; + + prop = zalloc(sizeof(*prop)); + if (!prop) + return NULL; + + if (!value) { + FILE *fp; + struct stat sb; + + rc = stat(path, &sb); + if (rc) + return NULL; + + prop->value = zalloc(sb.st_size + 1); + if (prop->value) { + free(prop); + return NULL; + } + + fp = fopen(path, "r"); + if (fp == NULL) { + free(prop); + return NULL; + } + + rc = fread(prop->value, 1, sb.st_size, fp); + fclose(fp); + } else { + int length = strlen(value); + + prop->value = zalloc(length + 1); + if (!prop->value) { + free(prop); + return NULL; + } + + strncpy(prop->value, value, length); + } + + /* struct alredy nulled out, not copying last null */ + strncpy(prop->path, path, strlen(path)); + strncpy(prop->name, name, strlen(name)); + + return prop; +} + +/** + * add_property + * @brief adds property to head of queue and then calls allocate_property + * + * @param name + * @param path + * @param value + * @param size + */ +void add_property(struct node *node, const char *name, char *value) +{ + struct property *prop; + + prop = allocate_property(name, node->path, value); + + prop->next = node->properties; + node->properties = prop; +} + +/** + * allocate_node + * @brief allocates the actual node. + * + * @param parent + * @param path + * @returns node + */ +static struct node *allocate_node(struct node *parent, const char* path) +{ + struct node *node; + + node = zalloc(sizeof(*node)); + if (node == NULL) + return NULL; + + strncpy(node->path, path, strlen(path)); + node->parent = parent; + + return node; +} + +/** + * build_node + * @brief the heart of this library, that builds and creates the whole tree. + * + * @param dirname + * @param parent_node + * @param parent_list + * @returns node + */ +static struct node *build_node(const char *path, + struct dr_connector *my_drc_info) +{ + int rc; + DIR *d; + struct dirent *de; + struct node *node; + char buf[OFDT_MAX_PATH]; + struct dr_connector *child_drc_info; + + /* Check to see if we need to create drc info for any child nodes */ + if (file_exists(path, "ibm,drc-indexes")) + child_drc_info = get_drc_info(path); + else + child_drc_info = my_drc_info; + + node = allocate_node(NULL, path); + if (!node) { + if (child_drc_info != my_drc_info) + free_drc_info(child_drc_info); + + return NULL; + } + + if (file_exists(path, "ibm,my-drc-index")) + create_drc_properties(node, my_drc_info); + + d = opendir(path); + if (!d) { + if (child_drc_info != my_drc_info) + free_drc_info(child_drc_info); + + return NULL; + } + + while((de = readdir(d)) != NULL ) { + struct stat sb; + + sprintf(buf, "%s/%s", path, de->d_name); + rc = stat(buf, &sb); + if (rc) + break; + + if (S_ISDIR(sb.st_mode)) { + struct node *child; + + child = build_node(buf, child_drc_info); + + child->sibling = node->child; + node->child = child; + } else if (S_ISREG(sb.st_mode)) { + add_property(node, de->d_name, NULL); + } + } + + closedir(d); + + if (child_drc_info != my_drc_info) + free_drc_info(child_drc_info); + + return node; +} + +/** + * add_node_to_dl + * @brief Adds nodes to delete list. + * + * @param node to add + */ +static void add_node_to_dl(struct node *to_add) +{ + struct delete_struct *new; + + new = zalloc(sizeof(*new)); + if (!new) + return; + + new->dnode = to_add; + new->next = delete_list; + delete_list = new; +} + +/** + * add_prop_to_dl + * @brief Adds property to delete list. + * + * @param prop to add + */ +static void add_prop_to_dl(struct property *to_add) +{ + struct delete_struct *new; + + new = zalloc(sizeof(*new)); + if (!new) + return; + + new->dprop = to_add; + new->next = delete_list; + delete_list = new; +} + +/** + * delete_properties + * @brief deletes chained properties. + * + * @param prop to add + */ +static void delete_properties(struct node *to_delete) +{ + struct property *tmp, *prop; + prop = to_delete->properties; + + while (prop != NULL) { + tmp = prop; + prop = prop->next; + free(tmp); + } +} + +/** + * remove_node + * @brief removes sub-nodes and nodes recursively. + * + * @param node head. + */ +static void remove_node(struct node *head) +{ + struct node *tmp; + + while ((head->child) || (head->sibling)) { + if (head->child) { + remove_node(head->child); + if (head->sibling == NULL && (head->properties)) { + delete_properties(head); + free(head); + break; + } + } + if (head->sibling) { + if (head->properties) + delete_properties(head); + tmp = head; + head = head->sibling; + free(tmp); + } + } +} + +/** + * delete_node_from_dl + * @brief removes-any nodes being asked to delete. + * + * @param delete_node + */ +static void delete_node_from_dl(struct node *to_delete) +{ + struct delete_struct *tmp, *prev; + + tmp = delete_list; + while (tmp) { + if (tmp->dnode == to_delete) { + remove_node(tmp->dnode); + + if (tmp == delete_list) + delete_list = tmp->next; + else + prev->next = tmp->next; + + free(tmp); + break; + } + + prev = tmp; + tmp = tmp->next; + } +} + +/** + * delete_prop_from_dl + * @brief removes-any properties being asked to delete. + * + * @param delete_prop + */ +static void delete_prop_from_dl(struct property *to_delete) +{ + struct delete_struct *tmp, *prev; + + tmp = delete_list; + while (tmp) { + if (tmp->dprop == to_delete) { + free(tmp->dprop); + + if (tmp == delete_list) + delete_list = tmp->next; + else + prev->next = tmp->next; + + free(tmp); + return; + } + + prev = tmp; + tmp = tmp->next; + } +} + +/** + * base_path + * @brief builds appropriate path and returns it. + * + * The path specified can be either a full path to a device tree, or + * a relative path to the real device tree at /proc/device-tree. NOTE + * that the relative path of NULL implies the base device tree at + * /proc/device-tree + * + * @param dir + */ +static int path_to_full_dtpath(const char *user_path, char *full_path) +{ + struct stat sb; + int rc; + + memset(full_path, 0, OFDT_MAX_PATH); + + if (!user_path) { + /* NULL implies /proc/device-tree */ + sprintf(full_path, "%s", OFDT_BASE); + return 0; + } + + rc = stat(user_path, &sb); + if (rc == 0) { + /* Valid path specified, copy to full path */ + snprintf(full_path, OFDT_MAX_PATH, "%s", user_path); + return 0; + } + + /* build OFDT_BASE/user_path and validate */ + snprintf(full_path, OFDT_MAX_PATH, "%s/%s", OFDT_BASE, user_path); + rc = stat(full_path, &sb); + + return rc; +} + +/** + * ofdt_get + * @brief builds the device tree from the given path. + * + * @param path + * @returns node + */ +struct node *ofdt_get(const char * path) +{ + char full_path[OFDT_MAX_PATH]; + struct dr_connector *drc_info; + struct node *head; + int rc; + + rc = path_to_full_dtpath(path, full_path); + if (rc) + return NULL; + + drc_info = find_drc_info(full_path); + head = build_node(full_path, drc_info); + if (head) + add_node_to_dl(head); + + free_drc_info(drc_info); + return head; +} + +/** + * ofdt_put + * @brief releases the device tree from the given node pointer. + * + * @param path + * @returns node + */ +void ofdt_put(struct node *delete) +{ + delete_node_from_dl(delete); +} + +/** + * ofdt_get_property + * @brief returns the appropriate property pointer from given tree. It takes + * path. + * + * @param node + * @param path + * @returns property + */ +struct property *ofdt_get_property(struct node *node, const char *name) +{ + struct property *prop; + int len = strlen(name); + + for (prop = node->properties; prop; prop = prop->next) { + if (strncmp(prop->name, name, len) == 0) + return prop; + } + + return NULL; +} + +/** + * ofdt_get_property_by_name + * @brief builds and returns the appropriate property pointer from given path. + * + * @param path + * @returns property + */ +struct property * ofdt_get_property_by_name(const char * dir) +{ + struct property *prop; + char *name; + char path[OFDT_MAX_PATH]; + int rc; + + rc = path_to_full_dtpath(dir, path); + if (rc) + return NULL; + + name = strrchr(path, '/'); + if (!name) + return NULL; + + /* move past the '/' character */ + name++; + + prop = allocate_property(name, path, NULL); + add_prop_to_dl(prop); + return prop; +} + +/** + * ofdt_property_put + * @brief Deletes properties from delete list. + * + * @param property + */ +void ofdt_property_put(struct property *to_delete) +{ + delete_prop_from_dl(to_delete); +} + +#ifdef DEBUG +/** + * traverse_devicetree + * @brief Debug function, that prints nodes and properties. + * + * @param node_head + */ +void traverse_devicetree(struct node *head) +{ + struct property *prop; + + while ((head->child) || (head->sibling)) { + if (head->child) { + traverse_devicetree(head->child); + if (head->sibling == NULL) { + printf("NODE name is %s\n", head->path); + for (prop = head->properties; prop != NULL; + prop = prop->next) { + printf("\tProp name is %s path is %s\n", + prop->name, prop->path); + } + break; + } + } + if (head->sibling) { + printf("NODE name is %s\n", head->path); + for (prop = head->properties; prop != NULL; + prop = prop->next) { + printf("\tProp name is %s path is %s\n", + prop->name, prop->path); + } + head = head->sibling; + } + } +} +#endif + +/** + * __libofdt_fini() + * @brief fini routine that cleans everything when library exits. + * + */ +void __libofdt_fini() +{ + struct delete_struct *tmp, *prev; + + tmp = delete_list; + while (tmp) { + prev = tmp; + if (tmp->dnode) + remove_node(tmp->dnode); + if (tmp->dprop) + free(tmp->dprop); + tmp = tmp->next; + free(prev); + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.3/libofdt_src/libofdt.h new/librtas-1.3.4/libofdt_src/libofdt.h --- old/librtas-1.3.3/libofdt_src/libofdt.h 1970-01-01 01:00:00.000000000 +0100 +++ new/librtas-1.3.4/libofdt_src/libofdt.h 2009-05-19 00:42:31.000000000 +0200 @@ -0,0 +1,47 @@ +/** + * @file libofdt.h + * + * Copyright (C) 2008/2009 IBM Corporation + * Common Public License Version 1.0 (see COPYRIGHT) + * + * @author Manish Ahuja mahuja(a)us.ibm.com + */ + +#ifndef _LIBOFDT_H_ +#define _LIBOFDT_H_ + +#include <stdio.h> +#include <dirent.h> +#include <stdlib.h> +#include <string.h> +#include <errno.h> +#include <sys/stat.h> + +#define OFDT_MAX_NAME 128 /* Max name length */ +#define OFDT_MAX_PATH 1024 /* Max Path length */ + +struct property { + char name[OFDT_MAX_NAME]; + char path[OFDT_MAX_PATH]; + char *value; + struct property *next; + struct node * parent; +}; + +struct node { + char name[OFDT_MAX_NAME]; + char path[OFDT_MAX_PATH]; + struct property *properties; + struct node *child; + struct node *parent; + struct node *sibling; +}; + +extern struct node *ofdt_get(const char *); +extern void ofdt_put(struct node *); + +extern struct property *ofdt_get_property(struct node *, const char *); +extern struct property *ofdt_get_property_by_name(const char *); +extern void ofdt_property_put(struct property *); + +#endif /* _LIBOFDT_H_ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.3/libofdt_src/Makefile new/librtas-1.3.4/libofdt_src/Makefile --- old/librtas-1.3.3/libofdt_src/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ new/librtas-1.3.4/libofdt_src/Makefile 2009-05-19 00:42:31.000000000 +0200 @@ -0,0 +1,38 @@ + +# +# Makefile for librtas +# +# Copyright (C) 2005 IBM Corporation +# Common Public License Version 1.0 (see COPYRIGHT) +# + +include ../rules.mk + +LIBOFDT_SONAME = libofdt.so +LIBOFDT = $(LIBOFDT_SONAME).$(VERSION) + +LIBOFDT_OBJS = dtree.o drc.o + +LIBOFDT_HDR = libofdt.h common.h +HEADERS = $(LIBOFDT_HDR) + +CFLAGS += -fPIC -DPIC +LDFLAGS += -shared -Wl,-soname -Wl,$(LIBOFDT_SONAME).$(MAJOR_NO) + +all: $(LIBOFDT_OBJS) $(HEADERS) + @echo "LD $(WORK_DIR)/$(LIBOFDT)..." + @$(CC) $(LIBOFDT_OBJS) $(LDFLAGS) -o $(LIBOFDT) + +install: + @$(call install_lib,$(LIBOFDT),$(DESTDIR)) + @$(call install_inc,$(LIBOFDT_HDR),$(DESTDIR)) + @ln -sf $(LIBOFDT) $(DESTDIR)/$(LIB_DIR)/$(LIBOFDT_SONAME) + +uninstall: + @$(call uninstall_lib,$(LIBOFDT),$(DESTDIR)) + @$(call uninstall_inc,$(LIBOFDT_HDR),$(DESTDIR)) + @rm -f $(DESTDIR)/$(LIB_DIR)/$(LIBOFDT_SONAME) + +clean: + @echo "Cleaning up $(WORK_DIR) files..." + @rm -f $(LIBOFDT_OBJS) $(LIBOFDT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.3/libofdt_src/README new/librtas-1.3.4/libofdt_src/README --- old/librtas-1.3.3/libofdt_src/README 1970-01-01 01:00:00.000000000 +0100 +++ new/librtas-1.3.4/libofdt_src/README 2009-05-19 00:42:31.000000000 +0200 @@ -0,0 +1,57 @@ + +In most linux systems, most of the hardware bindings and values are exported +through /proc/devic-tree. This needs to be accessed frequently to query values +to enable or disable many functions on the system. Here, We attempt to provide +an API to read values and parse data that maybe required for many utilities +to do commonly required operations. Please note that this API only reads +and parses values. It does not modify anything. + +The API is as follows: + +1: +void ofdt_get(const char *path) +This function accepts a relative path to the deivce-tree. It can also be +NULL. If the value is null, the base path to the device-tree +/proc/device-tree is assumed. If the value is non null, a relative path +is assumed and /proc/device-tree is added to the path to fully qualify it. + +This function builds a complete tree from the given path. It processes +sub-directories and will also parse ibm,indexes file and find appropriate +values for "ibm,drc-name", "ibm,drc-type" & "ibm,drc-powerdomain" for the +approprate "ibm,my-drc-index" files. It fills these out and sends back +a pointer to the the head of the tree. + +It is always nice to call ofdt_put after this function has been called +with the right head pointer. + + +2: +void ofdt_put(struct node *delete) + +This function takes a node pointer type, normally this is the head of +a tree structure that needs to be freed. It is normally a good idea +to free the stuff allocated. But just incase you forget, there is a +fini_routine that takes care of it. + +3: +struct property *ofdt_get_property(struct node *prop_node, + const char * name); + +This function takes a path to the property and a node pointer. The node +pointer is normally the head of a fully populated tree structure formed +by ofdt_get() with appropriate values. The function returns the requested +property from the given tree. + +4: +struct property * ofdt_get_property_by_name(const char * path); + +This function returns a structure of type property. It builds and +returns the property from the given path. It does not build a tree. +It will also not return any property that does not exist like +for eg: when a ibm,my-drc-index exists and other properties do not, it +will return a NULL pointer. + +5: +void ofdt_property_put(struct property * to_delete); + +This function frees all properties that are passed in to this function. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.3/librtasevent_src/librtasevent.h new/librtas-1.3.4/librtasevent_src/librtasevent.h --- old/librtas-1.3.3/librtasevent_src/librtasevent.h 2007-12-12 23:31:25.000000000 +0100 +++ new/librtas-1.3.4/librtasevent_src/librtasevent.h 2009-05-19 00:42:31.000000000 +0200 @@ -380,6 +380,7 @@ #define RTAS_IO_SUBTYPE_REBALANCE 0x01 #define RTAS_IO_SUBTYPE_NODE_ONLINE 0x02 #define RTAS_IO_SUBTYPE_NODE_OFFLINE 0x04 +#define RTAS_IO_SUBTYPE_PLAT_DUMP_SZ 0x05 uint32_t drc_index:32; /**< DRC index */ char rpc_data[216]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.3/librtasevent_src/librtasevent_v4.h new/librtas-1.3.4/librtasevent_src/librtasevent_v4.h --- old/librtas-1.3.3/librtasevent_src/librtasevent_v4.h 2007-12-12 23:31:25.000000000 +0100 +++ new/librtas-1.3.4/librtasevent_src/librtasevent_v4.h 2009-05-19 00:42:31.000000000 +0200 @@ -11,6 +11,7 @@ #ifndef _H_RTAS_EVENT_HDRS #define _H_RTAS_EVENT_HDRS +#include <librtasevent.h> #include <inttypes.h> #define RE_V4_SCN_SZ 28 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.3/librtasevent_src/librtasevent_v6.h new/librtas-1.3.4/librtasevent_src/librtasevent_v6.h --- old/librtas-1.3.3/librtasevent_src/librtasevent_v6.h 2007-12-12 23:31:25.000000000 +0100 +++ new/librtas-1.3.4/librtasevent_src/librtasevent_v6.h 2009-05-19 00:42:31.000000000 +0200 @@ -11,6 +11,7 @@ #ifndef _H_RE_V6_RTAS_EVENT #define _H_RE_V6_RTAS_EVENT +#include <librtasevent.h> #include <inttypes.h> /** @@ -137,6 +138,8 @@ #define RTAS_DUMP_SUBTYPE_SMA 0x03 #define RTAS_DUMP_SUBTYPE_POWER 0x04 #define RTAS_DUMP_SUBTYPE_LOG 0x05 +#define RTAS_DUMP_SUBTYPE_PARTDUMP 0x06 +#define RTAS_DUMP_SUBTYPE_PLATDUMP 0x07 uint32_t id:32; /**< dump id */ uint32_t location:1; /**< 0 => dump sent to HMC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.3/librtasevent_src/Makefile new/librtas-1.3.4/librtasevent_src/Makefile --- old/librtas-1.3.3/librtasevent_src/Makefile 2007-12-12 23:31:25.000000000 +0100 +++ new/librtas-1.3.4/librtasevent_src/Makefile 2009-05-19 00:42:31.000000000 +0200 @@ -17,7 +17,7 @@ LIBRE_HDRS = librtasevent.h librtasevent_v4.h librtasevent_v6.h HEADERS = $(LIBRE_HDRS) rtas_event.h -CFLAGS += -fPIC -DPIC +CFLAGS += -fPIC -DPIC -I. LDFLAGS += -shared -Wl,-soname -Wl,$(LIBRE_SONAME).$(MAJOR_NO) all: $(LIBRE_OBJS) $(HEADERS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.3/librtasevent_src/rtas_io.c new/librtas-1.3.4/librtasevent_src/rtas_io.c --- old/librtas-1.3.3/librtasevent_src/rtas_io.c 2007-12-12 23:31:25.000000000 +0100 +++ new/librtas-1.3.4/librtasevent_src/rtas_io.c 2009-05-19 00:42:31.000000000 +0200 @@ -231,6 +231,10 @@ case 0x04: len += rtas_print(" - Node off-line.\n"); break; + + case 0x05: + len += rtas_print(" - Platform Dump maximum size change.\n"); + break; default: len += rtas_print(" - Unknown subtype.\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.3/librtasevent_src/rtas_post.c new/librtas-1.3.4/librtasevent_src/rtas_post.c --- old/librtas-1.3.3/librtasevent_src/rtas_post.c 2007-12-12 23:31:25.000000000 +0100 +++ new/librtas-1.3.4/librtasevent_src/rtas_post.c 2009-05-19 00:42:31.000000000 +0200 @@ -48,7 +48,7 @@ /* and lastly, the location code */ rtas_copy(post->loc_code, re, 8); - post->firmware_rev[8] = '\0'; + post->loc_code[8] = '\0'; add_re_scn(re, post, RTAS_CPU_SCN); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.3/librtas-ppc64.spec new/librtas-1.3.4/librtas-ppc64.spec --- old/librtas-1.3.3/librtas-ppc64.spec 2007-12-12 23:31:25.000000000 +0100 +++ new/librtas-1.3.4/librtas-ppc64.spec 2009-05-19 00:42:31.000000000 +0200 @@ -1,5 +1,5 @@ %define name librtas -%define version 1.3.3 +%define version 1.3.4 %define release 0 Summary: Libraries to provide access to RTAS calls and RTAS events. Name: %{name} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.3/librtas_src/common.c new/librtas-1.3.4/librtas_src/common.c --- old/librtas-1.3.3/librtas_src/common.c 2007-12-12 23:31:25.000000000 +0100 +++ new/librtas-1.3.4/librtas_src/common.c 2009-05-19 00:42:31.000000000 +0200 @@ -7,6 +7,8 @@ * @author John Rose <johnrose(a)us.ibm.com> */ +#include <sys/types.h> +#include <sys/stat.h> #include <fcntl.h> #include <unistd.h> #include "librtas.h" @@ -65,7 +67,7 @@ npaths = sizeof(proc_rtas_paths) / sizeof(char *); for (i = 0; i < npaths; i++) { sprintf(full_name, "%s/%s", proc_rtas_paths[i], name); - fd = open(full_name, mode); + fd = open(full_name, mode, S_IRUSR | S_IWUSR); if (fd >= 0) break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.3/librtas_src/librtas.h new/librtas-1.3.4/librtas_src/librtas.h --- old/librtas-1.3.3/librtas_src/librtas.h 2007-12-12 23:31:25.000000000 +0100 +++ new/librtas-1.3.4/librtas_src/librtas.h 2009-05-19 00:42:31.000000000 +0200 @@ -10,6 +10,7 @@ #ifndef _LIBRTAS_H_ #define _LIBRTAS_H_ +#include <sys/types.h> #include <stdint.h> #define RTAS_KERNEL_INT -1001 /* No Kernel Interface to Firmware */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.3/librtas_src/ofdt.c new/librtas-1.3.4/librtas_src/ofdt.c --- old/librtas-1.3.3/librtas_src/ofdt.c 2007-12-12 23:31:25.000000000 +0100 +++ new/librtas-1.3.4/librtas_src/ofdt.c 2009-05-19 00:42:31.000000000 +0200 @@ -31,14 +31,15 @@ char *path; int len; - len = strlen(prop_path) + strlen(prop_name) + 1; + /* allocate enough for two string, a slash and trailing NULL */ + len = strlen(prop_path) + strlen(prop_name) + 1 + 1; path = malloc(len); if (path == NULL) { errno = ENOMEM; return -1; } - sprintf(path, "%s/%s", prop_path, prop_name); + snprintf(path, len, "%s/%s", prop_path, prop_name); *fd = open(path, O_RDONLY); free(path); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.3/librtas_src/syscall_rmo.c new/librtas-1.3.4/librtas_src/syscall_rmo.c --- old/librtas-1.3.3/librtas_src/syscall_rmo.c 2007-12-12 23:31:25.000000000 +0100 +++ new/librtas-1.3.4/librtas_src/syscall_rmo.c 2009-05-19 00:42:31.000000000 +0200 @@ -7,6 +7,8 @@ * @author John Rose <johnrose(a)us.ibm.com> */ +#include <sys/types.h> +#include <sys/stat.h> #include <fcntl.h> #include <unistd.h> #include <sys/mman.h> @@ -117,7 +119,8 @@ /* Lazily open lock file */ if (wa_config.lockfile_fd < 0) { - wa_config.lockfile_fd = open(lockfile_path, O_CREAT | O_RDWR); + wa_config.lockfile_fd = open(lockfile_path, O_CREAT | O_RDWR, + S_IRUSR | S_IWUSR); if (wa_config.lockfile_fd < 0) { dbg1("could not open lockfile %s\n", lockfile_path); return RTAS_IO_ASSERT; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.3/Makefile new/librtas-1.3.4/Makefile --- old/librtas-1.3.3/Makefile 2007-12-12 23:31:25.000000000 +0100 +++ new/librtas-1.3.4/Makefile 2009-05-19 00:42:31.000000000 +0200 @@ -7,7 +7,7 @@ .SILENT: FILES = README COPYRIGHT -SUBDIRS = librtas_src librtasevent_src +SUBDIRS = librtas_src librtasevent_src libofdt_src TARBALL_FILES += $(FILES) doxygen.rtas doxygen.rtasevent Changelog @@ -27,6 +27,7 @@ @export DESTDIR=$(SHIPDIR); $(MAKE) install @rm $(SHIPDIR)/usr/lib/librtas.so @rm $(SHIPDIR)/usr/lib/librtasevent.so + @rm $(SHIPDIR)/usr/lib/libofdt.so @$(RPM) -bb $(SPECFILE) @rm -rf $(SHIPDIR) @@ -34,8 +35,10 @@ @echo "Creating doxygen documents..." @mkdir -p doc/librtasevent @mkdir -p doc/librtas + @mkdir -p doc/libofdt @$(DOXYGEN) doxygen.rtas @$(DOXYGEN) doxygen.rtasevent + @$(DOXYGEN) doxygen.ofdt tarball: clean @echo "Creating release tarball..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.3/rules.mk new/librtas-1.3.4/rules.mk --- old/librtas-1.3.3/rules.mk 2007-12-12 23:31:25.000000000 +0100 +++ new/librtas-1.3.4/rules.mk 2009-05-19 00:42:31.000000000 +0200 @@ -135,7 +135,7 @@ endef define install_lib - $(call install_files,$1,755,$2/$(LIB_DIR)) + $(call install_files,$1,755,$2/$(LIB_DIR)$(findstring 64,$(shell file $(firstword $1)))) endef define install_inc ++++++ librtas-failedmagic.patch ++++++ --- rules.mk +++ rules.mk @@ -135,7 +135,7 @@ endef define install_lib - $(call install_files,$1,755,$2/$(LIB_DIR)$(findstring 64,$(shell file $(firstword $1)))) + $(call install_files,$1,755,$2/$(LIB_DIR)) endef define install_inc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit compiz-manager for openSUSE:Factory
by root＠Hilbert.suse.de 25 Nov '09

25 Nov '09

Hello community, here is the log from the commit of package compiz-manager for openSUSE:Factory checked in at Wed Nov 25 16:16:40 CET 2009. -------- --- compiz-manager/compiz-manager.changes 2009-11-22 19:01:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/compiz-manager/compiz-manager.changes 2009-11-23 18:11:27.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Nov 23 18:09:37 CET 2009 - dimstar(a)opensuse.org + +- Add compiz-manager-fallback_xterm.patch - Have a last fallback to + xterm in case nothing else goes +- Add compiz-manager-dry_run.patch - Re-introduce CM_DRY variable; + both patches from upstream git. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- compiz-manager-dry_run.patch compiz-manager-fallback_xterm.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz-manager.spec ++++++ --- /var/tmp/diff_new_pack.fqQ0LH/_old 2009-11-25 16:15:58.000000000 +0100 +++ /var/tmp/diff_new_pack.fqQ0LH/_new 2009-11-25 16:15:58.000000000 +0100 @@ -19,7 +19,7 @@ Name: compiz-manager Version: 0.6.0 -Release: 1 +Release: 2 License: GPL v2 or later Summary: A wrapper script to launch Compiz with proper options Url: http://opencompositing.org @@ -34,6 +34,10 @@ Patch7: bug-469785-disable-loose-binding.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches Patch8: compiz-manager-avoid-sw-rast-bug-479060.diff +# PATCH-FIX-UPSTREAM compiz-manager-dry_run.patch -- Add dry_run capabilities, taken from upstream git +Patch9: compiz-manager-dry_run.patch +# PATCH-FIX-UPSTREAM compiz-manager-fallback_xterm.patch -- Have one last fallback to xterm if nothing else works, taken from upstream git +Patch10: compiz-manager-fallback_xterm.patch PreReq: %fillup_prereq Requires: compiz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -52,6 +56,8 @@ %patch6 -p0 %patch7 -p1 %patch8 -p0 +%patch9 -p1 +%patch10 -p1 %build ++++++ compiz-manager-dry_run.patch ++++++ >From 4e04f52ff5616a331f726cd46bca0bac9205b46e Mon Sep 17 00:00:00 2001 From: Kristian Lyngstol <kristian(a)bohemians.org> Date: Tue, 30 Oct 2007 16:14:24 +0000 Subject: Add DRY_RUN capability Uses an environmental variable to avoid dealing with pushing and popping arguments to compiz. --- diff --git a/compiz-manager b/compiz-manager index f19c969..81bcdd3 100755 --- a/compiz-manager +++ b/compiz-manager @@ -92,6 +92,11 @@ abort_with_fallback_wm() verbose "SKIP_CHECKS is yes, so continuing despite problems.\n" return 0; fi + + if [ "x$CM_DRY" = "xyes" ]; then + verbose "Dry run failed: Problems detected with 3D support.'n" + exit 1; + fi verbose "aborting and using fallback: $FALLBACKWM \n" @@ -369,6 +374,10 @@ fi build_env build_args +if [ "x$CM_DRY" = "xyes" ]; then + verbose "Dry run finished: everything should work with regards to Compiz and 3D.\n" + exit 0; +fi # start the gtk-window-decorator if present if [ -x ${COMPIZ_BIN_PATH}emerald ] && [ "$USE_EMERALD" = "yes" ]; then verbose "Starting emerald\n" -- cgit v0.8.2 ++++++ compiz-manager-fallback_xterm.patch ++++++ >From 166b83e385e75eff50697c8d0fd24c27848f5ac0 Mon Sep 17 00:00:00 2001 From: Kristian Lyngstol <kristian(a)linpro.no> Date: Thu, 16 Oct 2008 17:40:58 +0000 Subject: Allow for detection of fallback wm. Use xterm if no DE is detected. Original patch by cyberorg? --- Index: compiz-manager-0.6.0/compiz-manager =================================================================== --- compiz-manager-0.6.0.orig/compiz-manager +++ compiz-manager-0.6.0/compiz-manager @@ -39,6 +39,7 @@ PLUGIN_PATH="${PREFIX}/${LIB}/compiz/" GLXINFO=$(which glxinfo) KWIN="/usr/bin/kwin" METACITY="/usr/bin/metacity" +XFWM="/usr/bin/xfwm" COMPIZ_NAME="compiz" # Final name for compiz (compiz.real) # For Xgl LD_PRELOAD @@ -53,8 +54,15 @@ NVIDIA_SETTINGS="nvidia-settings" # Assu # For detecting what driver is in use, the + is for one or more /'s XORG_DRIVER_PATH="/usr/lib/xorg/modules/drivers/+" +FALLBACKWM="xterm" +if [ x"$KDE_FULL_SESSION" = x"true" ]; then + FALLBACKWM="${KWIN}"; +elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then + FALLBACKWM="${METACITY}" +elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then + FALLBACKWM="${XFWM}" +fi -FALLBACKWM="${METACITY}" FALLBACKWM_OPTIONS="--replace $@" # Driver whitelist ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit koffice2-l10n for openSUSE:Factory
by root＠Hilbert.suse.de 25 Nov '09

25 Nov '09

Hello community, here is the log from the commit of package koffice2-l10n for openSUSE:Factory checked in at Wed Nov 25 16:15:39 CET 2009. -------- --- KDE/koffice2-l10n/koffice2-l10n.changes 2009-08-06 23:05:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/koffice2-l10n/koffice2-l10n.changes 2009-11-21 08:26:58.000000000 +0100 @@ -1,0 +2,25 @@ +Sat Nov 21 08:11:53 UTC 2009 - binner(a)kde.org + +- update to 2.1 release + +------------------------------------------------------------------- +Wed Oct 28 18:14:59 UTC 2009 - beineri(a)opensuse.org + +- update to 2.0.91 (2.1 RC 1) + +------------------------------------------------------------------- +Thu Oct 8 20:15:19 UTC 2009 - beineri(a)opensuse.org + +- update to 2.0.83 (2.1 Beta 3) + +------------------------------------------------------------------- +Fri Sep 11 12:35:06 UTC 2009 - beineri(a)opensuse.org + +- update to 2.0.82 (2.1 Beta 2) + +------------------------------------------------------------------- +Tue Aug 25 06:12:17 UTC 2009 - beineri(a)opensuse.org + +- update to 2.0.81 (2.1 Beta 1) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- koffice-l10n-ca-2.0.2.tar.bz2 koffice-l10n-cs-2.0.2.tar.bz2 koffice-l10n-da-2.0.2.tar.bz2 koffice-l10n-de-2.0.2.tar.bz2 koffice-l10n-el-2.0.2.tar.bz2 koffice-l10n-en_GB-2.0.2.tar.bz2 koffice-l10n-es-2.0.2.tar.bz2 koffice-l10n-et-2.0.2.tar.bz2 koffice-l10n-fr-2.0.2.tar.bz2 koffice-l10n-fy-2.0.2.tar.bz2 koffice-l10n-gl-2.0.2.tar.bz2 koffice-l10n-hi-2.0.2.tar.bz2 koffice-l10n-it-2.0.2.tar.bz2 koffice-l10n-ja-2.0.2.tar.bz2 koffice-l10n-kk-2.0.2.tar.bz2 koffice-l10n-nb-2.0.2.tar.bz2 koffice-l10n-nds-2.0.2.tar.bz2 koffice-l10n-nl-2.0.2.tar.bz2 koffice-l10n-pl-2.0.2.tar.bz2 koffice-l10n-pt-2.0.2.tar.bz2 koffice-l10n-pt_BR-2.0.2.tar.bz2 koffice-l10n-sv-2.0.2.tar.bz2 koffice-l10n-tr-2.0.2.tar.bz2 koffice-l10n-uk-2.0.2.tar.bz2 koffice-l10n-wa-2.0.2.tar.bz2 koffice-l10n-zh_CN-2.0.2.tar.bz2 koffice-l10n-zh_TW-2.0.2.tar.bz2 New: ---- koffice-l10n-ca-2.1.0.tar.bz2 koffice-l10n-da-2.1.0.tar.bz2 koffice-l10n-de-2.1.0.tar.bz2 koffice-l10n-el-2.1.0.tar.bz2 koffice-l10n-en_GB-2.1.0.tar.bz2 koffice-l10n-es-2.1.0.tar.bz2 koffice-l10n-et-2.1.0.tar.bz2 koffice-l10n-fr-2.1.0.tar.bz2 koffice-l10n-fy-2.1.0.tar.bz2 koffice-l10n-gl-2.1.0.tar.bz2 koffice-l10n-hne-2.1.0.tar.bz2 koffice-l10n-it-2.1.0.tar.bz2 koffice-l10n-ja-2.1.0.tar.bz2 koffice-l10n-kk-2.1.0.tar.bz2 koffice-l10n-nb-2.1.0.tar.bz2 koffice-l10n-nds-2.1.0.tar.bz2 koffice-l10n-nl-2.1.0.tar.bz2 koffice-l10n-pl-2.1.0.tar.bz2 koffice-l10n-pt-2.1.0.tar.bz2 koffice-l10n-pt_BR-2.1.0.tar.bz2 koffice-l10n-sv-2.1.0.tar.bz2 koffice-l10n-tr-2.1.0.tar.bz2 koffice-l10n-uk-2.1.0.tar.bz2 koffice-l10n-wa-2.1.0.tar.bz2 koffice-l10n-zh_CN-2.1.0.tar.bz2 koffice-l10n-zh_TW-2.1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ koffice2-l10n.spec ++++++ --- /var/tmp/diff_new_pack.Y8Vb2H/_old 2009-11-25 16:14:54.000000000 +0100 +++ /var/tmp/diff_new_pack.Y8Vb2H/_new 2009-11-25 16:14:54.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package koffice2-l10n (Version 2.0.2) +# spec file for package koffice2-l10n (Version 2.1.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,41 +25,40 @@ License: GPL v2 or later Group: System/Localization Summary: Translations for KDE Applications -Version: 2.0.2 +Version: 2.1.0 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Source0: koffice-l10n-ca-%version.tar.bz2 -Source1: koffice-l10n-cs-%version.tar.bz2 -Source2: koffice-l10n-da-%version.tar.bz2 -Source3: koffice-l10n-de-%version.tar.bz2 -Source4: koffice-l10n-el-%version.tar.bz2 -Source5: koffice-l10n-en_GB-%version.tar.bz2 -Source6: koffice-l10n-es-%version.tar.bz2 -Source7: koffice-l10n-et-%version.tar.bz2 -Source8: koffice-l10n-fr-%version.tar.bz2 -Source9: koffice-l10n-fy-%version.tar.bz2 -Source10: koffice-l10n-gl-%version.tar.bz2 -Source11: koffice-l10n-hi-%version.tar.bz2 -Source12: koffice-l10n-it-%version.tar.bz2 -Source13: koffice-l10n-ja-%version.tar.bz2 -Source14: koffice-l10n-kk-%version.tar.bz2 -Source15: koffice-l10n-nb-%version.tar.bz2 -Source16: koffice-l10n-nds-%version.tar.bz2 -Source17: koffice-l10n-nl-%version.tar.bz2 -Source18: koffice-l10n-pl-%version.tar.bz2 -Source19: koffice-l10n-pt-%version.tar.bz2 -Source20: koffice-l10n-pt_BR-%version.tar.bz2 -Source21: koffice-l10n-sv-%version.tar.bz2 -Source22: koffice-l10n-tr-%version.tar.bz2 -Source23: koffice-l10n-uk-%version.tar.bz2 -Source24: koffice-l10n-wa-%version.tar.bz2 -Source25: koffice-l10n-zh_CN-%version.tar.bz2 -Source26: koffice-l10n-zh_TW-%version.tar.bz2 +Source1: koffice-l10n-da-%version.tar.bz2 +Source2: koffice-l10n-de-%version.tar.bz2 +Source3: koffice-l10n-el-%version.tar.bz2 +Source4: koffice-l10n-en_GB-%version.tar.bz2 +Source5: koffice-l10n-es-%version.tar.bz2 +Source6: koffice-l10n-et-%version.tar.bz2 +Source7: koffice-l10n-fr-%version.tar.bz2 +Source8: koffice-l10n-fy-%version.tar.bz2 +Source9: koffice-l10n-gl-%version.tar.bz2 +Source10: koffice-l10n-it-%version.tar.bz2 +Source11: koffice-l10n-ja-%version.tar.bz2 +Source12: koffice-l10n-kk-%version.tar.bz2 +Source13: koffice-l10n-nb-%version.tar.bz2 +Source14: koffice-l10n-nds-%version.tar.bz2 +Source15: koffice-l10n-nl-%version.tar.bz2 +Source16: koffice-l10n-pl-%version.tar.bz2 +Source17: koffice-l10n-pt-%version.tar.bz2 +Source18: koffice-l10n-pt_BR-%version.tar.bz2 +Source19: koffice-l10n-sv-%version.tar.bz2 +Source20: koffice-l10n-tr-%version.tar.bz2 +Source21: koffice-l10n-uk-%version.tar.bz2 +Source22: koffice-l10n-wa-%version.tar.bz2 +Source23: koffice-l10n-zh_CN-%version.tar.bz2 +Source24: koffice-l10n-zh_TW-%version.tar.bz2 +Source25: koffice-l10n-hne-%version.tar.bz2 #@SOURCES@ Source200: update_spec.pl Source201: attributes -%define build_languages ca cs da de el en_GB es et fr fy gl hi it ja kk nb nds nl pl pt pt_BR sv tr uk wa zh_CN zh_TW +%define build_languages ca da de el en_GB es et fr fy gl it ja kk nb nds nl pl pt pt_BR sv tr uk wa zh_CN zh_TW hne %description Translations for KDE applications. @@ -83,15 +82,6 @@ %description ca-doc Catalan translations for KOffice -%package cs -License: GPL v2 or later -Summary: Czech translations for KOffice -Group: System/Localization -Provides: locale(koffice2:cs) - -%description cs -Czech translations for KOffice - %package da License: GPL v2 or later Summary: Danish translations for KOffice @@ -227,15 +217,6 @@ %description gl Galician translations for KOffice -%package hi -License: GPL v2 or later -Summary: Hindi translations for KOffice -Group: System/Localization -Provides: locale(koffice2:hi) - -%description hi -Hindi translations for KOffice - %package it License: GPL v2 or later Summary: Italian translations for KOffice @@ -421,8 +402,18 @@ All the stuff for a translated KOffice. This package contains application translations, help files and screenshots. +%package hne +License: GPL v2 or later +Summary: KOffice2 Translations for hne +Group: System/GUI/KDE +Provides: locale(koffice2:hne) + +%description hne +hne + + %prep -%setup -q -n koffice-l10n-de-%version -b 0 -b 1 -b 2 -b 3 -b 4 -b 5 -b 6 -b 7 -b 8 -b 9 -b 10 -b 11 -b 12 -b 13 -b 14 -b 15 -b 16 -b 17 -b 18 -b 19 -b 20 -b 21 -b 22 -b 23 -b 24 -b 25 -b 26 +%setup -q -n koffice-l10n-de-%version -b 0 -b 1 -b 2 -b 3 -b 4 -b 5 -b 6 -b 7 -b 8 -b 9 -b 10 -b 11 -b 12 -b 13 -b 14 -b 15 -b 16 -b 17 -b 18 -b 19 -b 20 -b 21 -b 22 -b 23 -b 24 -b 25 %build cd .. @@ -474,8 +465,6 @@ %files ca-doc -f ../files.doc.ca -%files cs -f ../files.both.cs - %files da -f ../files.da %files da-doc -f ../files.doc.da @@ -506,8 +495,6 @@ %files gl -f ../files.both.gl -%files hi -f ../files.both.hi - %files it -f ../files.it %files it-doc -f ../files.doc.it @@ -547,6 +534,13 @@ %files zh_CN -f ../files.both.zh_CN %files zh_TW -f ../files.both.zh_TW + +%files hne -f ../files.both.hne #@FILES@ +%if %suse_version<1120 +%defattr(-,root,root) +%dir /usr/share/locale/hne +%dir /usr/share/locale/hne/LC_MESSAGES +%endif %changelog ++++++ koffice2-l10n.spec.in ++++++ --- /var/tmp/diff_new_pack.Y8Vb2H/_old 2009-11-25 16:14:55.000000000 +0100 +++ /var/tmp/diff_new_pack.Y8Vb2H/_new 2009-11-25 16:14:55.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package koffice-l10n (Version 2.0.2) +# spec file for package koffice-l10n (Version 2.1.0) # # Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,7 +17,7 @@ License: GPL Group: System/GUI/KDE Summary: Translations for KOffice2 -Version: 2.0.2 +Version: 2.1.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ koffice-l10n-ca-2.0.2.tar.bz2 -> koffice-l10n-ca-2.1.0.tar.bz2 ++++++ ++++ 80491 lines of diff (skipped) ++++++ koffice-l10n-da-2.0.2.tar.bz2 -> koffice-l10n-da-2.1.0.tar.bz2 ++++++ ++++ 66238 lines of diff (skipped) ++++++ koffice-l10n-de-2.0.2.tar.bz2 -> koffice-l10n-de-2.1.0.tar.bz2 ++++++ ++++ 77151 lines of diff (skipped) ++++++ koffice-l10n-el-2.0.2.tar.bz2 -> koffice-l10n-el-2.1.0.tar.bz2 ++++++ ++++ 46271 lines of diff (skipped) ++++++ koffice-l10n-en_GB-2.0.2.tar.bz2 -> koffice-l10n-en_GB-2.1.0.tar.bz2 ++++++ ++++ 44014 lines of diff (skipped) ++++++ koffice-l10n-es-2.0.2.tar.bz2 -> koffice-l10n-es-2.1.0.tar.bz2 ++++++ ++++ 85762 lines of diff (skipped) ++++++ koffice-l10n-et-2.0.2.tar.bz2 -> koffice-l10n-et-2.1.0.tar.bz2 ++++++ ++++ 45970 lines of diff (skipped) ++++++ koffice-l10n-fr-2.0.2.tar.bz2 -> koffice-l10n-fr-2.1.0.tar.bz2 ++++++ KDE/koffice2-l10n/koffice-l10n-fr-2.0.2.tar.bz2 /mounts/work_src_done/STABLE/koffice2-l10n/koffice-l10n-fr-2.1.0.tar.bz2 differ: byte 11, line 1 ++++++ koffice-l10n-fy-2.0.2.tar.bz2 -> koffice-l10n-fy-2.1.0.tar.bz2 ++++++ ++++ 46321 lines of diff (skipped) ++++++ koffice-l10n-gl-2.0.2.tar.bz2 -> koffice-l10n-gl-2.1.0.tar.bz2 ++++++ ++++ 44807 lines of diff (skipped) ++++++ koffice-l10n-it-2.0.2.tar.bz2 -> koffice-l10n-it-2.1.0.tar.bz2 ++++++ ++++ 82270 lines of diff (skipped) ++++++ koffice-l10n-ja-2.0.2.tar.bz2 -> koffice-l10n-ja-2.1.0.tar.bz2 ++++++ ++++ 45370 lines of diff (skipped) ++++++ koffice-l10n-kk-2.0.2.tar.bz2 -> koffice-l10n-kk-2.1.0.tar.bz2 ++++++ ++++ 44892 lines of diff (skipped) ++++++ koffice-l10n-nb-2.0.2.tar.bz2 -> koffice-l10n-nb-2.1.0.tar.bz2 ++++++ ++++ 50532 lines of diff (skipped) ++++++ koffice-l10n-nds-2.0.2.tar.bz2 -> koffice-l10n-nds-2.1.0.tar.bz2 ++++++ ++++ 44351 lines of diff (skipped) ++++++ koffice-l10n-nl-2.0.2.tar.bz2 -> koffice-l10n-nl-2.1.0.tar.bz2 ++++++ ++++ 53680 lines of diff (skipped) ++++++ koffice-l10n-pl-2.0.2.tar.bz2 -> koffice-l10n-pl-2.1.0.tar.bz2 ++++++ ++++ 45734 lines of diff (skipped) ++++++ koffice-l10n-pt-2.0.2.tar.bz2 -> koffice-l10n-pt-2.1.0.tar.bz2 ++++++ ++++ 50701 lines of diff (skipped) ++++++ koffice-l10n-pt_BR-2.0.2.tar.bz2 -> koffice-l10n-pt_BR-2.1.0.tar.bz2 ++++++ ++++ 82784 lines of diff (skipped) ++++++ koffice-l10n-sv-2.0.2.tar.bz2 -> koffice-l10n-sv-2.1.0.tar.bz2 ++++++ ++++ 80427 lines of diff (skipped) ++++++ koffice-l10n-tr-2.0.2.tar.bz2 -> koffice-l10n-tr-2.1.0.tar.bz2 ++++++ ++++ 45470 lines of diff (skipped) ++++++ koffice-l10n-uk-2.0.2.tar.bz2 -> koffice-l10n-uk-2.1.0.tar.bz2 ++++++ ++++ 52962 lines of diff (skipped) ++++++ koffice-l10n-wa-2.0.2.tar.bz2 -> koffice-l10n-wa-2.1.0.tar.bz2 ++++++ ++++ 46964 lines of diff (skipped) ++++++ koffice-l10n-zh_CN-2.0.2.tar.bz2 -> koffice-l10n-zh_CN-2.1.0.tar.bz2 ++++++ ++++ 45240 lines of diff (skipped) ++++++ koffice-l10n-zh_TW-2.0.2.tar.bz2 -> koffice-l10n-zh_TW-2.1.0.tar.bz2 ++++++ ++++ 43749 lines of diff (skipped) ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.Y8Vb2H/_old 2009-11-25 16:15:12.000000000 +0100 +++ /var/tmp/diff_new_pack.Y8Vb2H/_new 2009-11-25 16:15:12.000000000 +0100 @@ -8,6 +8,8 @@ languages="$languages $lang" done +languages="`echo $languages | sed \"s,hne ,,"` hne" + for lang in $languages; do sed -e "s,#@SOURCES@,Source$nr: koffice-l10n-$lang-%version.tar.bz2\n#@SOURCES@," koffice2-l10n.spec > koffice2-l10n.spec.tmp && mv koffice2-l10n.spec.tmp koffice2-l10n.spec @@ -35,7 +37,11 @@ if test $splitdoc; then sed -e "s,#@FILES@,%files $lang -f ../files.$lang\n%files $lang-doc -f ../files.doc.$lang\n#@FILES@," koffice2-l10n.spec > koffice2-l10n.spec.tmp && mv koffice2-l10n.spec.tmp koffice2-l10n.spec else - sed -e "s,#@FILES@,%files $lang -f ../files.both.$lang\n#@FILES@," koffice2-l10n.spec > koffice2-l10n.spec.tmp && mv koffice2-l10n.spec.tmp koffice2-l10n.spec + if test "$lang" = "hne"; then + sed -e "s,#@FILES@,%files $lang -f ../files.both.$lang\n#@FILES@\n%if %suse_version<1120\n%defattr$-\,root\,root$\n%dir /usr/share/locale/hne\n%dir /usr/share/locale/hne/LC_MESSAGES\n%endif," koffice2-l10n.spec > koffice2-l10n.spec.tmp && mv koffice2-l10n.spec.tmp koffice2-l10n.spec + else + sed -e "s,#@FILES@,%files $lang -f ../files.both.$lang\n#@FILES@," koffice2-l10n.spec > koffice2-l10n.spec.tmp && mv koffice2-l10n.spec.tmp koffice2-l10n.spec + fi fi nr=$(( $nr + 1 )) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit linux_pcnfsd2 for openSUSE:Factory
by root＠Hilbert.suse.de 25 Nov '09

25 Nov '09

Hello community, here is the log from the commit of package linux_pcnfsd2 for openSUSE:Factory checked in at Wed Nov 25 16:12:35 CET 2009. -------- --- linux_pcnfsd2/linux_pcnfsd2.changes 2008-08-28 01:40:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/linux_pcnfsd2/linux_pcnfsd2.changes 2009-11-23 17:40:10.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 23 17:06:04 CET 2009 - meissner(a)suse.de + +- fixed some implicit warnings +- portmap -> $portmap + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linux_pcnfsd2.spec ++++++ --- /var/tmp/diff_new_pack.HwwblR/_old 2009-11-25 16:11:35.000000000 +0100 +++ /var/tmp/diff_new_pack.HwwblR/_new 2009-11-25 16:11:35.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package linux_pcnfsd2 (Version 1.6) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 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 @@ -20,13 +20,13 @@ Name: linux_pcnfsd2 #!BuildIgnore: nkitb -License: Any permissive +License: PERMISSIVE-OSI-COMPLIANT Group: Productivity/Networking/NFS PreReq: %insserv_prereq %fillup_prereq Requires: net-tools netcfg AutoReqProv: on Version: 1.6 -Release: 630 +Release: 637 Summary: RPC Server That Supports ONC Clients Source: linux_pcnfsd2.tar.gz Source1: pcnfsd @@ -63,13 +63,13 @@ ln -sf ../../etc/init.d/pcnfsd $RPM_BUILD_ROOT/usr/sbin/rcpcnfsd %post -%{fillup_and_insserv -n pcnfsd pcnfsd} +%{fillup_and_insserv pcnfsd} %preun -%stop_on_removal -n pcnfsd pcnfsd} +%stop_on_removal pcnfsd} %postun -%restart_on_update -n pcnfsd pcnfsd +%restart_on_update pcnfsd %{insserv_cleanup} %clean ++++++ linux_pcnfsd2.dif ++++++ --- /var/tmp/diff_new_pack.HwwblR/_old 2009-11-25 16:11:35.000000000 +0100 +++ /var/tmp/diff_new_pack.HwwblR/_new 2009-11-25 16:11:35.000000000 +0100 @@ -1,6 +1,8 @@ ---- Makefile.linux +Index: Makefile.linux +=================================================================== +--- Makefile.linux.orig +++ Makefile.linux -@@ -40,13 +40,14 @@ +@@ -40,13 +40,14 @@ HDRS= pcnfsd.h common.h LINTFLAGS= -hbax # uncomment as appropriate for debugging @@ -19,7 +21,9 @@ linux/pcnfsd_svc.o: $(HDRS) pcnfsd_svc.c $(CC) -c $(CFLAGS) -o $@ pcnfsd_svc.c ---- common.h +Index: common.h +=================================================================== +--- common.h.orig +++ common.h @@ -67,7 +67,7 @@ **--------------------------------------------------------------------- @@ -30,9 +34,20 @@ /* **--------------------------------------------------------------------- ---- pcnfsd_misc.c +Index: pcnfsd_misc.c +=================================================================== +--- pcnfsd_misc.c.orig +++ pcnfsd_misc.c -@@ -29,6 +29,7 @@ +@@ -18,6 +18,8 @@ + #include "pcnfsd.h" + + #include <stdio.h> ++#include <unistd.h> ++#include <stdlib.h> + #include <pwd.h> + #include <sys/file.h> + #include <signal.h> +@@ -29,6 +31,7 @@ #include <string.h> #include <memory.h> #include <ctype.h> @@ -40,7 +55,7 @@ #ifdef ISC_2_0 #include <sys/fcntl.h> -@@ -48,7 +49,7 @@ +@@ -48,7 +51,7 @@ extern char *getusershell(); /* **--------------------------------------------------------------------- @@ -49,7 +64,7 @@ **--------------------------------------------------------------------- */ -@@ -68,7 +69,7 @@ +@@ -68,7 +71,7 @@ int uidrhi[NUMUIDS]; */ /* **--------------------------------------------------------------------- @@ -58,7 +73,7 @@ **--------------------------------------------------------------------- */ -@@ -114,8 +115,13 @@ +@@ -114,8 +117,13 @@ char *r; int suspicious (s) char *s; { @@ -74,7 +89,7 @@ return 0; } -@@ -124,7 +130,7 @@ +@@ -124,7 +132,7 @@ scramble(s1, s2) char *s1; char *s2; { @@ -83,7 +98,7 @@ { *s2++ = (*s1 ^ zchar) & 0x7f; s1++; -@@ -212,6 +218,7 @@ +@@ -212,6 +220,7 @@ long expday; #endif #ifdef SHADOW_SUPPORT @@ -91,7 +106,7 @@ /* **-------------------------------------------------------------- ** Check the existence of SHADOW. If it is there, then we are -@@ -231,7 +238,7 @@ +@@ -231,7 +240,7 @@ long expday; (shadowfile && (sp = getspnam(usrnam)) == (struct spwd *)NULL)) return ((struct passwd *)NULL); @@ -100,7 +115,7 @@ { /* * New - check password expiry situation -@@ -271,10 +278,22 @@ +@@ -271,10 +280,22 @@ long expday; } pswd = sp->sp_pwdp; (void) endspent(); @@ -113,10 +128,10 @@ + if (p == (struct passwd *)NULL) + return ((struct passwd *)NULL); + endpwent(); -+ + + sp = getspnam(p->pw_name); + endspent(); - ++ + if (sp) + pswd = sp->sp_pwdp; + else @@ -124,7 +139,7 @@ #else p = getpwnam(usrnam); if (p == (struct passwd *)NULL) -@@ -283,12 +302,12 @@ +@@ -283,12 +304,12 @@ long expday; #endif #ifdef ISC_2_0 @@ -139,7 +154,7 @@ { struct spwd *shadow = getspnam(usrnam); -@@ -340,7 +359,7 @@ +@@ -340,7 +361,7 @@ long expday; /* **--------------------------------------------------------------------- @@ -148,7 +163,7 @@ **--------------------------------------------------------------------- */ -@@ -440,7 +459,7 @@ +@@ -440,7 +461,7 @@ run_ps630(f, opts) /* **--------------------------------------------------------------------- @@ -157,7 +172,7 @@ **--------------------------------------------------------------------- */ -@@ -480,7 +499,8 @@ +@@ -480,7 +501,8 @@ extern char *getcallername(); #else SVR4 #include <utmp.h> @@ -167,7 +182,7 @@ void wlogin(name) -@@ -509,7 +529,7 @@ +@@ -509,7 +531,7 @@ extern char *getcallername(); /* **--------------------------------------------------------------------- @@ -176,7 +191,24 @@ **--------------------------------------------------------------------- */ -@@ -737,7 +757,7 @@ +@@ -644,8 +666,14 @@ su_popen(user, cmd, maxtime) + } + dup2(1, 2); /* let's get stderr as well */ + +- (void) setgid(cached_gid); +- (void) setuid(cached_uid); ++ if (-1 == setgid(cached_gid)) { ++ perror ("setgid"); ++ exit(1); ++ } ++ if (-1 == setuid(cached_uid)) { ++ perror ("setuid"); ++ exit(1); ++ } + + (void) execl("/bin/sh", "sh", "-c", cmd, (char *) NULL); + _exit(255); +@@ -737,7 +765,7 @@ char *arg2; wtmp_enabled = 0;; continue; } @@ -185,9 +217,19 @@ if(!mystrcasecmp(kw, "printer")) { arg1 = strtok(NULL, " \t"); arg2 = (arg1 == NULL ? NULL : strtok(NULL, "")); ---- pcnfsd_print.c +Index: pcnfsd_print.c +=================================================================== +--- pcnfsd_print.c.orig +++ pcnfsd_print.c -@@ -96,7 +96,7 @@ +@@ -17,6 +17,7 @@ + */ + #include "pcnfsd.h" + #include <stdlib.h> ++#include <unistd.h> + #include <stdio.h> + #include <pwd.h> + #include <ctype.h> +@@ -96,7 +97,7 @@ struct stat statbuf; char pathname[MAXPATHLEN]; char new_pathname[MAXPATHLEN]; char sp_name[MAXPATHLEN] = SPOOLDIR; @@ -196,7 +238,7 @@ char delims[] = " \t\r\n:()"; pr_list printers = NULL; -@@ -219,8 +219,11 @@ +@@ -219,8 +220,11 @@ char *sys; char *pr; char**sp; { @@ -210,7 +252,7 @@ *sp = &pathname[0]; pathname[0] = '\0'; -@@ -230,12 +233,19 @@ +@@ -230,12 +234,19 @@ int rc; /* get pathname of current directory and return to client */ @@ -233,7 +275,7 @@ (stat(pathname, &statbuf) != 0) || !(statbuf.st_mode & S_IFDIR)) { (void)sprintf(tempstr, -@@ -395,7 +405,7 @@ +@@ -395,7 +406,7 @@ int failed = 0; */ if(!xcmd) { #ifdef BSD_STYLE_PRINT @@ -242,7 +284,7 @@ sprintf(cmdbuf, "/usr/bin/lpr -P%s -C%s -J%s %s", pr, system, user, new_pathname); #else -@@ -1487,7 +1497,7 @@ +@@ -1487,7 +1498,7 @@ struct { char default_cmd[] = "lp $FILE"; #endif SVR4_STYLE_PRINT #ifdef BSD_STYLE_PRINT @@ -251,3 +293,15 @@ char default_cmd[] = "/usr/bin/lpr $FILE"; #else char default_cmd[] = "/usr/ucb/lpr $FILE"; +Index: pcnfsd_svc.c +=================================================================== +--- pcnfsd_svc.c.orig ++++ pcnfsd_svc.c +@@ -10,6 +10,7 @@ + #include "common.h" + + #include <stdio.h> ++#include <unistd.h> + #include <rpc/rpc.h> + #include <signal.h> + #include <sys/socket.h> ++++++ pcnfsd ++++++ --- /var/tmp/diff_new_pack.HwwblR/_old 2009-11-25 16:11:35.000000000 +0100 +++ /var/tmp/diff_new_pack.HwwblR/_new 2009-11-25 16:11:35.000000000 +0100 @@ -12,8 +12,8 @@ # ### BEGIN INIT INFO # Provides: pcnfsd -# Required-Start: $remote_fs portmap $syslog -# Required-Stop: $remote_fs portmap $syslog +# Required-Start: $remote_fs $portmap $syslog +# Required-Stop: $remote_fs $portmap $syslog # Default-Start: 3 5 # Default-Stop: # Description: PC NFS server ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mozilla-xulrunner191-kde4 for openSUSE:Factory
by root＠Hilbert.suse.de 25 Nov '09

25 Nov '09

Hello community, here is the log from the commit of package mozilla-xulrunner191-kde4 for openSUSE:Factory checked in at Wed Nov 25 16:11:16 CET 2009. -------- --- mozilla-xulrunner191-kde4/mozilla-xulrunner191-kde4.changes 2009-11-11 14:30:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/mozilla-xulrunner191-kde4/mozilla-xulrunner191-kde4.changes 2009-11-23 13:43:35.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 23 13:35:11 CET 2009 - llunak(a)novell.com + +- 0.6, use mimetype for opening url if known (bnc#556156) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kmozillahelper-0.5.2.tar.bz2 New: ---- kmozillahelper-0.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-xulrunner191-kde4.spec ++++++ --- /var/tmp/diff_new_pack.wCY7HK/_old 2009-11-25 16:10:38.000000000 +0100 +++ /var/tmp/diff_new_pack.wCY7HK/_new 2009-11-25 16:10:38.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package mozilla-xulrunner191-kde4 (Version 0.5.2) +# spec file for package mozilla-xulrunner191-kde4 (Version 0.6) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,13 +24,13 @@ Group: System/GUI/KDE BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Mozilla KDE Integration -Version: 0.5.2 +Version: 0.6 Release: 1 Source: kmozillahelper-%{version}.tar.bz2 Supplements: packageand(mozilla-xulrunner191:kdebase4-workspace) # this is needed to match this package with the main package without the main package # having a hard requirement on this package -%define helper_version 5 +%define helper_version 6 Requires: mozilla-xulrunner191-kde4-version = %{helper_version} Obsoletes: MozillaFirefox-kde4-addon <= 0.3.0 %kde4_runtime_requires ++++++ kmozillahelper-0.5.2.tar.bz2 -> kmozillahelper-0.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmozillahelper/main.cpp new/kmozillahelper/main.cpp --- old/kmozillahelper/main.cpp 2009-11-11 14:25:44.000000000 +0100 +++ new/kmozillahelper/main.cpp 2009-11-23 13:18:31.000000000 +0100 @@ -49,8 +49,8 @@ //#define DEBUG_KDE -#define HELPER_VERSION 5 -#define APP_HELPER_VERSION "0.5" +#define HELPER_VERSION 6 +#define APP_HELPER_VERSION "0.6" int main( int argc, char* argv[] ) { @@ -441,13 +441,23 @@ if( !readArguments( 1 )) return false; KUrl url = getArgument(); + QString mime; + if( isArgument( "MIMETYPE" )) + mime = getArgument(); if( !allArgumentsUsed()) return false; KApplication::updateUserTimestamp( 0 ); // TODO - (void) new KRun( url, NULL ); // TODO parent -// QObject::connect( run, SIGNAL( finished()), &app, SLOT( openDone())); -// QObject::connect( run, SIGNAL( error()), &app, SLOT( openDone())); - return true; // TODO check for errors? + if( !mime.isEmpty()) + { + return KRun::runUrl( url, mime, NULL ); // TODO parent + } + else + { + (void) new KRun( url, NULL ); // TODO parent + // QObject::connect( run, SIGNAL( finished()), &app, SLOT( openDone())); + // QObject::connect( run, SIGNAL( error()), &app, SLOT( openDone())); + return true; // TODO check for errors? + } } bool App::handleRun() ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0