January 2010 - openSUSE Commits - openSUSE Mailing Lists

commit ruby for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '10

29 Jan '10

Hello community, here is the log from the commit of package ruby for openSUSE:Factory checked in at Fri Jan 29 20:53:57 CET 2010. -------- --- ruby/ruby.changes 2009-08-20 21:20:54.000000000 +0200 +++ ruby/ruby.changes 2009-12-17 14:43:29.000000000 +0100 @@ -1,0 +2,12 @@ +Thu Dec 17 00:42:51 CET 2009 - jengelh(a)medozas.de + +- package documentation as noarch +- adjust ruby.macros to ask the ruby binary for the target plaform. + This is because %_host_cpu can expand to sparc64, while ruby is + built for the sparcv9 target, and %_target_cpu can expand to + noarch. +- in ruby.spec, %rb_arch is statically reset to %_target_cpu, as + we need the target name. Since it won't be noarch in this case, + that is good. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ruby.spec ++++++ --- /var/tmp/diff_new_pack.g8EKxN/_old 2010-01-29 20:46:01.000000000 +0100 +++ /var/tmp/diff_new_pack.g8EKxN/_new 2010-01-29 20:46:01.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ruby (Version 1.8.7.p72) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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,14 @@ Name: ruby Version: 1.8.7.p72 -Release: 6 +Release: 7 # %define pkg_version 1.8.7 %define patch_level p72 +%define rb_arch %(echo %{_target_cpu}-linux | sed -e "s/i686/i586/" -e "s/hppa2.0/hppa/") %define rb_ver %(echo %{pkg_version} | sed -e 's/\\\.[0-9]\\\+$//') # -License: GPL v2 or later +License: GPLv2+ Group: Development/Languages/Ruby # BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -111,7 +112,7 @@ Yukihiro Matsumoto <matz(a)netlab.co.jp> %package devel -License: GPL v2 or later +License: GPLv2+ Group: Development/Languages/Ruby Summary: Development files to link against Ruby Requires: %{name} = %{version} @@ -130,7 +131,7 @@ Yukihiro Matsumoto <matz(a)netlab.co.jp> %package tk -License: GPL v2 or later +License: GPLv2+ Group: Development/Languages/Ruby Summary: TCL/TK bindings for Ruby Requires: %{name} = %{version} @@ -145,10 +146,13 @@ Yukihiro Matsumoto <matz(a)netlab.co.jp> %package doc-ri -License: GPL v2 or later +License: GPLv2+ Group: Development/Languages/Ruby Summary: Ruby Interactive Documentation Requires: %{name} = %{version} +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %description doc-ri This package contains the RI docs for ruby @@ -160,9 +164,12 @@ Yukihiro Matsumoto <matz(a)netlab.co.jp> %package doc-html -License: GPL v2 or later +License: GPLv2+ Group: Development/Languages/Ruby Summary: This package contains the HTML docs for ruby +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %description doc-html This package contains the HTML docs for ruby @@ -174,7 +181,7 @@ Yukihiro Matsumoto <matz(a)netlab.co.jp> %package examples -License: GPL v2 or later +License: GPLv2+ Group: Development/Languages/Ruby Summary: Example scripts for ruby Requires: %{name} = %{version} @@ -189,7 +196,7 @@ Yukihiro Matsumoto <matz(a)netlab.co.jp> %package test-suite -License: GPL v2 or later +License: GPLv2+ Group: Development/Languages/Ruby Summary: An Interpreted Object-Oriented Scripting Language ++++++ ruby.macros ++++++ --- /var/tmp/diff_new_pack.g8EKxN/_old 2010-01-29 20:46:02.000000000 +0100 +++ /var/tmp/diff_new_pack.g8EKxN/_new 2010-01-29 20:46:02.000000000 +0100 @@ -1,4 +1,4 @@ -%rb_arch %(echo %{_host_cpu}-linux | sed -e "s/i686/i586/" -e "s/hppa2.0/hppa/") +%rb_arch %(/usr/bin/ruby -e 'print RUBY_PLATFORM') %rb_ver %(/usr/bin/ruby -e 'puts VERSION.sub(/\\\.\\\d$/, "")') # %rb_dir %{_libdir}/ruby/ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 monodevelop-python for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '10

29 Jan '10

Hello community, here is the log from the commit of package monodevelop-python for openSUSE:Factory checked in at Fri Jan 29 19:14:31 CET 2010. -------- New Changes file: --- /dev/null 2009-09-30 08:50:26.000000000 +0200 +++ monodevelop-python/monodevelop-python.changes 2010-01-29 18:53:54.000000000 +0100 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Fri Jan 29 17:52:58 UTC 2010 - ajorgensen(a)novell.com + +- First stable version + calling whatdependson for head-i586 New: ---- monodevelop-python-2.2.tar.bz2 monodevelop-python.changes monodevelop-python.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monodevelop-python.spec ++++++ # # spec file for package monodevelop-python (Version 2.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: monodevelop-python Version: 2.2 Release: 1 License: MIT/X11 AutoReqProv: on BuildArch: noarch Url: http://www.monodevelop.com Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: mono-devel monodevelop = %{version} Requires: monodevelop = %{version} Requires: python Summary: Monodevelop Python Addin Group: Development/Tools %if 0%{?fedora_version} %define env_options export MONO_SHARED_DIR=/tmp %endif %description Python support for MonoDevelop. %files %defattr(-, root, root) %_prefix/lib/monodevelop/AddIns/PyBinding/ %_prefix/share/pkgconfig/monodevelop-pybinding.pc %prep %setup -q %build %{?env_options} ./configure --prefix=%_prefix make %install %{?env_options} make install DESTDIR=${RPM_BUILD_ROOT} mkdir -p $RPM_BUILD_ROOT%_prefix/share/pkgconfig mv $RPM_BUILD_ROOT%_prefix/lib/pkgconfig/*.pc $RPM_BUILD_ROOT%_prefix/share/pkgconfig #%find_lang %{name} %clean rm -rf "$RPM_BUILD_ROOT" %if 0%{?fedora_version} || 0%{?rhel_version} # Allows overrides of __find_provides in fedora distros... (already set to zero on newer suse distros) %define _use_internal_dependency_generator 0 %endif %define __find_provides env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-provides && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-provides ; } | sort | uniq' %define __find_requires env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-requires && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-requires ; } | sort | uniq' %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xpdf-poppler for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '10

29 Jan '10

Hello community, here is the log from the commit of package xpdf-poppler for openSUSE:Factory checked in at Fri Jan 29 18:55:05 CET 2010. -------- --- xpdf-poppler/xpdf-poppler.changes 2009-12-30 11:37:13.000000000 +0100 +++ xpdf-poppler/xpdf-poppler.changes 2010-01-26 11:04:21.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Jan 26 11:02:26 CET 2010 - pgajdos(a)suse.cz + +- fixed crash when xpdf called for nonexisting file [bnc#573792] + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xpdf-poppler.spec ++++++ --- /var/tmp/diff_new_pack.5jbqt8/_old 2010-01-29 18:54:28.000000000 +0100 +++ /var/tmp/diff_new_pack.5jbqt8/_new 2010-01-29 18:54:28.000000000 +0100 @@ -24,7 +24,7 @@ License: GPLv2 Group: Productivity/Publishing/PDF Version: 3.02 -Release: 5 +Release: 6 AutoReqProv: on Requires: ghostscript-fonts-std Summary: A PDF File Viewer for the X Window System ++++++ xpdf-poppler-autohinting-as-option.patch ++++++ --- /var/tmp/diff_new_pack.5jbqt8/_old 2010-01-29 18:54:28.000000000 +0100 +++ /var/tmp/diff_new_pack.5jbqt8/_new 2010-01-29 18:54:28.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- /dev/null +++ GlobalParamsGUI.cc -@@ -0,0 +1,3247 @@ +@@ -0,0 +1,3242 @@ +//======================================================================== +// +// GlobalParamsGUI.cc @@ -42,7 +42,6 @@ +#include "CharCodeToUnicode.h" +#include "UnicodeMap.h" +#include "CMap.h" -+#include "BuiltinFontTables.h" +#include "FontEncodingTables.h" +#include <langinfo.h> +#include <locale.h> @@ -629,8 +628,6 @@ + gInitMutex(&cMapCacheMutex); +#endif + -+ initBuiltinFontTables(); -+ + // scan the encoding in reverse because we want the lowest-numbered + // index for each char name ('space' is encoded twice) + macRomanReverseMap = new NameToCharCode(); @@ -1837,8 +1834,6 @@ + GooString *key; + GooList *list; + -+ freeBuiltinFontTables(); -+ + delete macRomanReverseMap; + + delete baseDir; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 procps for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '10

29 Jan '10

Hello community, here is the log from the commit of package procps for openSUSE:Factory checked in at Fri Jan 29 18:52:28 CET 2010. -------- --- procps/procps.changes 2009-12-15 01:32:04.000000000 +0100 +++ procps/procps.changes 2010-01-29 15:36:58.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Jan 29 15:24:32 CET 2010 - werner(a)suse.de + +- Sysctl: ignore not existing directories in case of -e (bnc#559866) +- Ps: Ignore the environment variable $COLUMS if stdout is not a + terminal but only for $PS_PERSONALITY="posix" (bnc#497087) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- procps-3.2.8-columns.dif procps-3.2.8-sysctlerr.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ procps.spec ++++++ --- /var/tmp/diff_new_pack.8AHEAx/_old 2010-01-29 18:51:59.000000000 +0100 +++ /var/tmp/diff_new_pack.8AHEAx/_new 2010-01-29 18:51:59.000000000 +0100 @@ -27,7 +27,7 @@ PreReq: %fillup_prereq %insserv_prereq AutoReqProv: on Version: 3.2.8 -Release: 7 +Release: 8 Summary: ps utilities for /proc Provides: ps Obsoletes: ps @@ -63,6 +63,8 @@ Patch27: procps-3.2.7-terabyte.dif Patch28: procps-3.2.6-xen.dif Patch29: procps-3.2.8-fdleak.dif +Patch30: procps-3.2.8-sysctlerr.dif +Patch31: procps-3.2.8-columns.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -120,6 +122,8 @@ %patch27 %patch28 %patch29 +%patch30 +%patch31 %build make %{?jobs:-j%jobs} CFLAGS="-Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS -pipe" \ ++++++ procps-3.2.8-columns.dif ++++++ --- ps/global.c +++ ps/global.c 2009-11-17 16:59:38.279430039 +0000 @@ -139,8 +139,12 @@ static void set_screen_size(void){ screen_cols = ws.ws_col; // hmmm, NetBSD subtracts 1 screen_rows = ws.ws_row; - // TODO: delete this line - if(!isatty(STDOUT_FILENO)) screen_cols = OUTBUF_SIZE; + // override COLUMNS setting if not a tty + if(!isatty(STDOUT_FILENO)){ + screen_cols = OUTBUF_SIZE; + screen_rows = OUTBUF_SIZE; + if (personality&PER_UNIX_COLS) return; // SysV/UNIX98 based personality + } columns = getenv("COLUMNS"); if(columns && *columns){ @@ -286,6 +290,7 @@ static const char *set_personality(void) return NULL; case_aix: + personality |= PER_UNIX_COLS; bsd_j_format = "FB_j"; bsd_l_format = "FB_l"; /* bsd_s_format not used */ @@ -313,6 +318,7 @@ static const char *set_personality(void) case_sunos4: personality = PER_NO_DEFAULT_g; + personality |= PER_UNIX_COLS; prefer_bsd_defaults = 1; bsd_j_format = "FB_j"; bsd_l_format = "FB_l"; @@ -337,12 +343,14 @@ static const char *set_personality(void) case_hp: case_hpux: personality = PER_BROKEN_o | PER_HPUX_x; + personality |= PER_UNIX_COLS; return NULL; case_svr4: case_sysv: case_sco: personality = PER_BROKEN_o | PER_SVR4_x; + personality |= PER_UNIX_COLS; return NULL; case_posix: @@ -351,6 +359,7 @@ static const char *set_personality(void) case_unix98: case_unix: personality = PER_BROKEN_o; + personality |= PER_UNIX_COLS; return NULL; } @@ -361,8 +370,8 @@ void reset_global(void){ double uptime_secs; reset_selection_list(); look_up_our_self(&p); - set_screen_size(); set_personality(); + set_screen_size(); all_processes = 0; bsd_c_option = 0; ++++++ procps-3.2.8-sysctlerr.dif ++++++ --- sysctl.c +++ sysctl.c 2010-01-29 14:22:55.119429196 +0000 @@ -146,8 +146,10 @@ static int ReadSetting(const char *restr slashdot(outname,'/','.'); /* change / to . */ if (stat(tmpname, &ts) < 0) { - perror(tmpname); - rc = -1; + if (!IgnoreError) { + perror(tmpname); + rc = -1; + } goto out; } if ((ts.st_mode & S_IRUSR) == 0) @@ -322,8 +324,10 @@ static int WriteSetting(const char *sett slashdot(outname,'/','.'); /* change / to . */ if (stat(tmpname, &ts) < 0) { - perror(tmpname); - rc = -1; + if (!IgnoreError) { + perror(tmpname); + rc = -1; + } goto out; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 python for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '10

29 Jan '10

Hello community, here is the log from the commit of package python for openSUSE:Factory checked in at Fri Jan 29 18:51:41 CET 2010. -------- --- python/python-base.changes 2009-12-15 00:22:54.000000000 +0100 +++ python/python-base.changes 2010-01-29 15:45:50.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Jan 29 15:44:15 CET 2010 - matejcik(a)suse.cz + +- enabled ipv6 in configure (bnc#572673) + +------------------------------------------------------------------- +Wed Dec 23 08:36:29 UTC 2009 - aj(a)suse.de + +- Apply patches with fuzz=0 + +------------------------------------------------------------------- --- python/python-doc.changes 2009-04-27 15:21:46.000000000 +0200 +++ python/python-doc.changes 2009-12-23 09:36:41.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 23 08:36:27 UTC 2009 - aj(a)suse.de + +- Apply patches with fuzz=0 + +------------------------------------------------------------------- --- python/python.changes 2009-12-02 19:41:44.000000000 +0100 +++ python/python.changes 2010-01-29 15:45:51.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Jan 29 15:44:28 CET 2010 - matejcik(a)suse.cz + +- enabled ipv6 in configure (bnc#572673) + +------------------------------------------------------------------- +Wed Dec 23 08:36:32 UTC 2009 - aj(a)suse.de + +- Apply patches with fuzz=0 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-base.spec ++++++ --- /var/tmp/diff_new_pack.k0eXu8/_old 2010-01-29 18:49:26.000000000 +0100 +++ /var/tmp/diff_new_pack.k0eXu8/_new 2010-01-29 18:49:26.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-base (Version 2.6.2) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -33,7 +33,7 @@ # Summary: Python Interpreter base package Version: 2.6.2 -Release: 7 +Release: 8 %define tarname Python-%{version} Source0: %{tarname}.tar.bz2 Source1: macros.python @@ -168,6 +168,7 @@ --mandir=%{_mandir} \ --docdir=%{_docdir}/python \ --with-fpectl \ + --enable-ipv6 \ --enable-shared \ --enable-unicode=ucs4 ######################################## ++++++ python-doc.spec ++++++ --- /var/tmp/diff_new_pack.k0eXu8/_old 2010-01-29 18:49:26.000000000 +0100 +++ /var/tmp/diff_new_pack.k0eXu8/_new 2010-01-29 18:49:26.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-doc (Version 2.6) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation for Python. Version: 2.6 -Release: 17 +Release: 18 %define pyver 2.6.2 BuildArch: noarch %define tarname Python-%{pyver} ++++++ python.spec ++++++ --- /var/tmp/diff_new_pack.k0eXu8/_old 2010-01-29 18:49:26.000000000 +0100 +++ /var/tmp/diff_new_pack.k0eXu8/_new 2010-01-29 18:49:26.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python (Version 2.6.2) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -35,7 +35,7 @@ Obsoletes: python-nothreads python21 python-elementtree python-sqlite Summary: Python Interpreter Version: 2.6.2 -Release: 7 +Release: 8 Requires: python-base = %{version} %define tarname Python-%{version} Source0: %{tarname}.tar.bz2 ++++++ python-2.5.2-configure.patch ++++++ --- /var/tmp/diff_new_pack.k0eXu8/_old 2010-01-29 18:49:27.000000000 +0100 +++ /var/tmp/diff_new_pack.k0eXu8/_new 2010-01-29 18:49:27.000000000 +0100 @@ -1,6 +1,8 @@ ---- configure.in +Index: configure.in +=================================================================== +--- configure.in.orig +++ configure.in -@@ -509,9 +509,6 @@ +@@ -511,9 +511,6 @@ then fi @@ -10,7 +12,7 @@ # Check for unsupported systems case $ac_sys_system/$ac_sys_release in atheos*|Linux*/1*) -@@ -572,6 +569,9 @@ +@@ -574,6 +571,9 @@ SunOS*) ;; esac @@ -20,7 +22,7 @@ AC_SUBST(ARCH) AC_MSG_CHECKING(ARCH) ARCH=`uname -m` -@@ -3406,9 +3406,18 @@ +@@ -3413,9 +3413,18 @@ then fi # check for readline 4.0 ++++++ python-2.5.2-fwrapv.patch ++++++ --- /var/tmp/diff_new_pack.k0eXu8/_old 2010-01-29 18:49:27.000000000 +0100 +++ /var/tmp/diff_new_pack.k0eXu8/_new 2010-01-29 18:49:27.000000000 +0100 @@ -1,6 +1,8 @@ ---- Makefile.pre.in +Index: Makefile.pre.in +=================================================================== +--- Makefile.pre.in.orig +++ Makefile.pre.in -@@ -57,7 +57,7 @@ +@@ -57,7 +57,7 @@ MAKESETUP= $(srcdir)/Modules/makese # Compiler options OPT= @OPT@ BASECFLAGS= @BASECFLAGS@ ++++++ python-2.6-gettext-plurals.patch ++++++ --- /var/tmp/diff_new_pack.k0eXu8/_old 2010-01-29 18:49:27.000000000 +0100 +++ /var/tmp/diff_new_pack.k0eXu8/_new 2010-01-29 18:49:27.000000000 +0100 @@ -1,6 +1,8 @@ ---- Lib/gettext.py +Index: Lib/gettext.py +=================================================================== +--- Lib/gettext.py.orig +++ Lib/gettext.py -@@ -311,8 +311,9 @@ +@@ -311,8 +311,9 @@ class GNUTranslations(NullTranslations): self._charset = v.split('charset=')[1] elif k == 'plural-forms': v = v.split(';') ++++++ python-2.6.2-expat.patch ++++++ --- /var/tmp/diff_new_pack.k0eXu8/_old 2010-01-29 18:49:27.000000000 +0100 +++ /var/tmp/diff_new_pack.k0eXu8/_new 2010-01-29 18:49:27.000000000 +0100 @@ -1,8 +1,8 @@ Index: Lib/test/test_pyexpat.py =================================================================== ---- Lib/test/test_pyexpat.py (revision 74428) -+++ Lib/test/test_pyexpat.py (revision 74429) -@@ -559,7 +559,25 @@ +--- Lib/test/test_pyexpat.py.orig ++++ Lib/test/test_pyexpat.py +@@ -559,6 +559,24 @@ class ChardataBufferTest(unittest.TestCa parser.Parse(xml2, 1) self.assertEquals(self.n, 4) @@ -15,7 +15,7 @@ + self.fail() + except expat.ExpatError as e: + self.assertEquals(str(e), 'no element found: line 2, column 1') - ++ + def test2(self): + xml = "<?xml version\xc2\x85='1.0'?>\r\n" + parser = expat.ParserCreate() @@ -24,11 +24,10 @@ + self.fail() + except expat.ExpatError as e: + self.assertEquals(str(e), 'XML declaration not well-formed: line 1, column 14') -+ + def test_main(): run_unittest(SetAttributeTest, - ParseTest, -@@ -569,7 +587,8 @@ +@@ -569,7 +587,8 @@ def test_main(): HandlerExceptionTest, PositionTest, sf1296433Test, @@ -40,9 +39,9 @@ test_main() Index: Modules/expat/xmltok_impl.c =================================================================== ---- Modules/expat/xmltok_impl.c (revision 74428) -+++ Modules/expat/xmltok_impl.c (revision 74429) -@@ -1741,7 +1741,7 @@ +--- Modules/expat/xmltok_impl.c.orig ++++ Modules/expat/xmltok_impl.c +@@ -1741,7 +1741,7 @@ PREFIX(updatePosition)(const ENCODING *e const char *end, POSITION *pos) { ++++++ python-2.6.2-test_distutils.patch ++++++ --- /var/tmp/diff_new_pack.k0eXu8/_old 2010-01-29 18:49:27.000000000 +0100 +++ /var/tmp/diff_new_pack.k0eXu8/_new 2010-01-29 18:49:27.000000000 +0100 @@ -1,6 +1,8 @@ ---- Lib/distutils/tests/test_bdist_wininst.py +Index: Lib/distutils/tests/test_bdist_wininst.py +=================================================================== +--- Lib/distutils/tests/test_bdist_wininst.py.orig +++ Lib/distutils/tests/test_bdist_wininst.py -@@ -5,11 +5,13 @@ +@@ -5,11 +5,13 @@ import os from distutils.dist import Distribution from distutils.command.bdist_wininst import bdist_wininst from distutils.tests import support ++++++ python-2.6b1-canonicalize2.patch ++++++ --- /var/tmp/diff_new_pack.k0eXu8/_old 2010-01-29 18:49:27.000000000 +0100 +++ /var/tmp/diff_new_pack.k0eXu8/_new 2010-01-29 18:49:27.000000000 +0100 @@ -1,6 +1,8 @@ ---- Python/sysmodule.c +Index: Python/sysmodule.c +=================================================================== +--- Python/sysmodule.c.orig +++ Python/sysmodule.c -@@ -1532,7 +1532,20 @@ +@@ -1550,7 +1550,20 @@ PySys_SetArgv(int argc, char **argv) char *p = NULL; Py_ssize_t n = 0; PyObject *a; @@ -22,7 +24,7 @@ char link[MAXPATHLEN+1]; char argv0copy[2*MAXPATHLEN+1]; int nr = 0; -@@ -1559,7 +1572,8 @@ +@@ -1577,7 +1590,8 @@ PySys_SetArgv(int argc, char **argv) } } } @@ -32,7 +34,7 @@ #if SEP == '\\' /* Special case for MS filename syntax */ if (argc > 0 && argv0 != NULL && strcmp(argv0, "-c") != 0) { char *q; -@@ -1585,11 +1599,6 @@ +@@ -1606,11 +1620,6 @@ PySys_SetArgv(int argc, char **argv) } #else /* All other filename syntaxes */ if (argc > 0 && argv0 != NULL && strcmp(argv0, "-c") != 0) { @@ -44,7 +46,7 @@ p = strrchr(argv0, SEP); } if (p != NULL) { -@@ -1607,6 +1616,9 @@ +@@ -1628,6 +1637,9 @@ PySys_SetArgv(int argc, char **argv) a = PyString_FromStringAndSize(argv0, n); if (a == NULL) Py_FatalError("no mem for sys.path insertion"); @@ -54,9 +56,11 @@ if (PyList_Insert(path, 0, a) < 0) Py_FatalError("sys.path.insert(0) failed"); Py_DECREF(a); ---- configure.in +Index: configure.in +=================================================================== +--- configure.in.orig +++ configure.in -@@ -2473,7 +2473,7 @@ +@@ -2495,7 +2495,7 @@ AC_CHECK_FUNCS(alarm setitimer getitimer getpriority getpwent getspnam getspent getsid getwd \ kill killpg lchmod lchown lstat mkfifo mknod mktime \ mremap nice pathconf pause plock poll pthread_init \ @@ -65,7 +69,9 @@ select setegid seteuid setgid \ setlocale setregid setreuid setsid setpgid setpgrp setuid setvbuf snprintf \ sigaction siginterrupt sigrelse strftime \ ---- pyconfig.h.in +Index: pyconfig.h.in +=================================================================== +--- pyconfig.h.in.orig +++ pyconfig.h.in @@ -79,6 +79,9 @@ /* Define to 1 if you have the `chflags' function. */ ++++++ python-2.6rc2-https-proxy.patch ++++++ --- /var/tmp/diff_new_pack.k0eXu8/_old 2010-01-29 18:49:27.000000000 +0100 +++ /var/tmp/diff_new_pack.k0eXu8/_new 2010-01-29 18:49:27.000000000 +0100 @@ -1,8 +1,8 @@ Index: Lib/httplib.py =================================================================== ---- Lib/httplib.py (revision 66111) -+++ Lib/httplib.py (working copy) -@@ -651,11 +651,17 @@ +--- Lib/httplib.py.orig ++++ Lib/httplib.py +@@ -652,11 +652,17 @@ class HTTPConnection: self.__response = None self.__state = _CS_IDLE self._method = None @@ -20,7 +20,7 @@ def _set_hostport(self, host, port): if port is None: i = host.rfind(':') -@@ -676,10 +682,24 @@ +@@ -677,10 +683,24 @@ class HTTPConnection: def set_debuglevel(self, level): self.debuglevel = level @@ -45,7 +45,7 @@ def close(self): """Close the connection to the HTTP server.""" -@@ -1069,6 +1089,9 @@ +@@ -1070,6 +1090,9 @@ else: "Connect to a host on a given (SSL) port." sock = socket.create_connection((self.host, self.port), self.timeout) @@ -57,9 +57,9 @@ __all__.append("HTTPSConnection") Index: Lib/urllib2.py =================================================================== ---- Lib/urllib2.py (revision 66111) -+++ Lib/urllib2.py (working copy) -@@ -192,6 +192,7 @@ +--- Lib/urllib2.py.orig ++++ Lib/urllib2.py +@@ -192,6 +192,7 @@ class Request: # self.__r_type is what's left after doing the splittype self.host = None self.port = None @@ -67,7 +67,7 @@ self.data = data self.headers = {} for key, value in headers.items(): -@@ -252,9 +253,14 @@ +@@ -252,8 +253,13 @@ class Request: return self.__r_host def set_proxy(self, host, type): @@ -79,12 +79,11 @@ + self.type = type + self.__r_host = self.__original + self.host = host - + + def has_proxy(self): return self.__r_host == self.__original - -@@ -700,7 +706,7 @@ +@@ -700,7 +706,7 @@ class ProxyHandler(BaseHandler): req.add_header('Proxy-authorization', 'Basic ' + creds) hostport = unquote(hostport) req.set_proxy(hostport, proxy_type) @@ -93,7 +92,7 @@ # let other handlers take care of it return None else: -@@ -1098,6 +1104,9 @@ +@@ -1098,6 +1104,9 @@ class AbstractHTTPHandler(BaseHandler): headers["Connection"] = "close" headers = dict( (name.title(), val) for name, val in headers.items()) @@ -105,9 +104,9 @@ r = h.getresponse() Index: Lib/test/test_urllib2.py =================================================================== ---- Lib/test/test_urllib2.py (revision 66111) -+++ Lib/test/test_urllib2.py (working copy) -@@ -939,6 +939,23 @@ +--- Lib/test/test_urllib2.py.orig ++++ Lib/test/test_urllib2.py +@@ -939,6 +939,23 @@ class HandlerTests(unittest.TestCase): self.assertEqual([(handlers[0], "http_open")], [tup[0:2] for tup in o.calls]) ++++++ python-distutils-rpm-8.patch ++++++ --- /var/tmp/diff_new_pack.k0eXu8/_old 2010-01-29 18:49:27.000000000 +0100 +++ /var/tmp/diff_new_pack.k0eXu8/_new 2010-01-29 18:49:27.000000000 +0100 @@ -1,6 +1,8 @@ ---- Python-2.4c1.orig/Lib/distutils/command/install.py 2004-11-23 12:03:25.394124018 +0100 -+++ Python-2.4c1/Lib/distutils/command/install.py 2004-11-23 12:29:28.270687563 +0100 -@@ -135,6 +135,8 @@ +Index: Python-2.6.2/Lib/distutils/command/install.py +=================================================================== +--- Python-2.6.2.orig/Lib/distutils/command/install.py ++++ Python-2.6.2/Lib/distutils/command/install.py +@@ -168,6 +168,8 @@ class install (Command): ('record=', None, "filename in which to record list of installed files"), @@ -8,8 +10,8 @@ + "filename in which to record list of installed files and directories suitable as filelist for rpm"), ] - boolean_options = ['compile', 'force', 'skip-build'] -@@ -207,6 +209,7 @@ + boolean_options = ['compile', 'force', 'skip-build', 'user'] +@@ -243,6 +245,7 @@ class install (Command): #self.install_info = None self.record = None @@ -17,7 +19,7 @@ # -- Option finalizing methods ------------------------------------- -@@ -508,12 +511,61 @@ +@@ -592,12 +595,61 @@ class install (Command): self.create_path_file() # write list of installed files, if requested. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kipi-plugins for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '10

29 Jan '10

Hello community, here is the log from the commit of package kipi-plugins for openSUSE:Factory checked in at Fri Jan 29 18:48:52 CET 2010. -------- --- KDE/kipi-plugins/kipi-plugins.changes 2010-01-11 16:12:31.000000000 +0100 +++ kipi-plugins/kipi-plugins.changes 2010-01-29 13:42:44.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Jan 29 12:42:20 UTC 2010 - llunak(a)novell.com + +- split out -doc subpackage + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- kipi-plugins-docs.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kipi-plugins.spec ++++++ --- /var/tmp/diff_new_pack.wkM4MF/_old 2010-01-29 18:48:17.000000000 +0100 +++ /var/tmp/diff_new_pack.wkM4MF/_new 2010-01-29 18:48:17.000000000 +0100 @@ -17,12 +17,20 @@ # norootforbuild -%bcond_with opencv +%if !0%{?sles_version} +%if %suse_version > 1100 +%define with_opencv 1 +%else +%define with_opencv 0 +%endif +%else +%define with_opencv 0 +%endif Name: kipi-plugins -BuildRequires: libkdcraw-devel libkdepim4-devel libkexiv2-devel libkipi-devel +BuildRequires: libkdcraw-devel libkdepimlibs4-devel libkexiv2-devel libkipi-devel BuildRequires: cmake libexpat-devel libgcrypt-devel libgphoto2-devel libksane-devel -%if %{with opencv} +%if %{with_opencv} BuildRequires: libopencv-devel %endif BuildRequires: libgpod-devel @@ -32,13 +40,15 @@ Group: Productivity/Graphics/Other Summary: KDE Plug-Ins for Image Manipulation Version: 1.0.0 -Release: 3 +Release: 4 %define rversion 1.0.0 Recommends: dcraw Requires: /usr/bin/jpegtran Requires: %{name}-lang = %{version} +Suggests: %{name}-doc = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-%{rversion}.tar.bz2 +Source1: %{name}-docs.tar.bz2 Patch: desktop-files.diff Provides: kde4-kipi-plugins = 0.2 Obsoletes: kde4-kipi-plugins <= 0.2 @@ -62,14 +72,45 @@ Richard Groult <Richard dot Groult at jalix.org> Ralf Hoelzer <kde at ralfhoelzer dot com> + +%package doc +License: BSD3c(or similar) ; GPLv2+ ; LGPLv2.1+ ; MIT License (or similar) +Group: Productivity/Graphics/Other +Summary: KDE Plug-Ins for Image Manipulation +Requires: %{name} = %{version} + +%description doc +A set of plug-ins for the KDE KIPI interface, used by some KDE imaging +applications. + +This is the manual. + + +Authors: +-------- + Renchi Raju <renchi at pooh.tam.uiuc.edu> + Gilles Caulier <caulier dot gilles at free.fr> + Jesper K. Pedersen <blackie at kde.org> + + CONTRIBUTORS : + Aurelien Gateau <aurelien dot gateau at free.fr> + Todd Shoemaker <todd at theshoemakers.net> + Gregory Kokanosky <gregory dot kokanosky at free.fr> + Richard Groult <Richard dot Groult at jalix.org> + Ralf Hoelzer <kde at ralfhoelzer dot com> + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %lang_package %prep -%setup -q -n %name-%rversion +%setup -q -n %name-%rversion -a 1 %patch +echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt +echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt +echo "add_subdirectory( doc-translations )" >> CMakeLists.txt +echo "add_subdirectory( doc )" >> CMakeLists.txt %build %cmake_kde4 -d build @@ -86,6 +127,14 @@ for l in kipiplugin_acquireimages kipiplugin_batchprocessimages kipiplugin_dngconverter kipiplugin_flashexport kipiplugin_flickrexport kipiplugin_galleryexport kipiplugin_gpssync kipiplugin_htmlexport kipiplugin_imageviewer kipiplugin_jpeglossless kipiplugin_metadataedit kipiplugin_picasawebexport kipiplugin_rawconverter kipiplugin_sendimages kipiplugin_advancedslideshow kipiplugin_timeadjust kipiplugin_wallpaper kipiplugins kipiplugin_calendar kipiplugin_ipodexport kipiplugin_removeredeyes kipiplugin_facebook kipiplugin_smug kipiplugin_printimages kipiplugin_kioexportimport kipiplugin_shwup; do %find_lang $l suse.lang done +%if %suse_version < 1120 + mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/sv/common + mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/it/common + mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/et/common + mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/de/common + mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/pt_BR/common + mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/uk/common +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -93,6 +142,20 @@ %files lang -f suse.lang %defattr(-,root,root) +%files doc +%defattr(-,root,root) +%dir /usr/share/doc/kde/HTML/*/kipi-plugins +%if %suse_version < 1120 +%dir /usr/share/doc/kde/HTML/*/common +%endif +%doc %lang(de) /usr/share/doc/kde/HTML/de/* +%doc %lang(en) /usr/share/doc/kde/HTML/en/* +%doc %lang(et) /usr/share/doc/kde/HTML/et/* +%doc %lang(it) /usr/share/doc/kde/HTML/it/* +%doc %lang(pt_BR) /usr/share/doc/kde/HTML/pt_BR/* +%doc %lang(sv) /usr/share/doc/kde/HTML/sv/* +%doc %lang(uk) /usr/share/doc/kde/HTML/uk/* + %files %defattr(-,root,root) %doc COPYING AUTHORS ChangeLog README @@ -143,7 +206,7 @@ %_kde4_modules/kipiplugin_acquireimages.so %_kde_share_dir/services/kipiplugin_acquireimages.desktop %_kde4_modules/kipiplugin_advancedslideshow.so -%if %{with opencv} +%if %{with_opencv} %_kde4_modules/kipiplugin_removeredeyes.so %_kde_share_dir/apps/kipiplugin_removeredeyes %_kde_share_dir/services/kipiplugin_removeredeyes.desktop ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 perl-IPC-Run3 for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '10

29 Jan '10

Hello community, here is the log from the commit of package perl-IPC-Run3 for openSUSE:Factory checked in at Fri Jan 29 18:46:55 CET 2010. -------- New Changes file: --- /dev/null 2009-09-30 08:50:26.000000000 +0200 +++ perl-IPC-Run3/perl-IPC-Run3.changes 2010-01-25 15:23:26.000000000 +0100 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Mon Jan 25 15:22:48 CET 2010 - anicka(a)suse.cz + +- cleaned Requires + calling whatdependson for head-i586 New: ---- IPC-Run3-0.043.tar.gz perl-IPC-Run3.changes perl-IPC-Run3.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-IPC-Run3.spec ++++++ # # spec file for package perl-IPC-Run3 (Version 0.043) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: perl-IPC-Run3 Version: 0.043 Release: 1 Summary: Run a subprocess with input/ouput redirection License: OSI-Approved, see LICENSE Group: Development/Libraries Url: http://search.cpan.org/dist/IPC-Run3/ Source0: http://www.cpan.org/authors/id/R/RJ/RJBS/IPC-Run3-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Requires: perl = %{perl_version} %description This module allows you to run a subprocess and redirect stdin, stdout, and/or stderr to files and perl data structures. It aims to satisfy 99% of the need for using system, qx, and open3 with a simple, extremely Perlish API. %prep %setup -q -n IPC-Run3-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes LICENSE README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 cups-drivers for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '10

29 Jan '10

Hello community, here is the log from the commit of package cups-drivers for openSUSE:Factory checked in at Fri Jan 29 18:38:53 CET 2010. -------- --- cups-drivers/cups-drivers.changes 2009-07-14 10:21:54.000000000 +0200 +++ cups-drivers/cups-drivers.changes 2010-01-18 10:22:02.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Sep 17 01:05:30 CEST 2009 - crrodriguez(a)suse.de + +- use find_lang macro + +------------------------------------------------------------------- +Tue Sep 1 16:56:51 CEST 2009 - kernel01(a)hailfinger.org + +- update gutenprint to 5.2.4 + - The "epson" and "canon" backends have been removed as they + are not strictly needed with CUPS 1.2 + - see NEWS for the details and list of changes + +------------------------------------------------------------------- @@ -5,0 +19,5 @@ + +------------------------------------------------------------------- +Fri Jan 23 00:00:00 CET 2009 - kernel01(a)hailfinger.org + +- update gutenprint to 5.2.3 calling whatdependson for head-i586 Old: ---- gutenprint-5.0.0-A4.patch gutenprint-5.0.2-resolution.patch gutenprint-5.0.2-updp10_pagesize.patch gutenprint-5.0.2.tar.bz2 New: ---- gutenprint-5.2.3-A4.patch gutenprint-5.2.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups-drivers.spec ++++++ --- /var/tmp/diff_new_pack.qGIwiL/_old 2010-01-29 18:14:52.000000000 +0100 +++ /var/tmp/diff_new_pack.qGIwiL/_new 2010-01-29 18:14:52.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package cups-drivers (Version 1.3.9) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,13 +22,13 @@ BuildRequires: a2ps bison cairo-devel cups-devel cupsddk foomatic-filters BuildRequires: gcc-c++ ghostscript-ijs-devel ghostscript-library BuildRequires: ghostscript-x11 gimp-devel glib2-devel gtk2-devel -BuildRequires: libgimpprint-devel libpng-devel libtiff-devel libxml2-devel +BuildRequires: libpng-devel libtiff-devel libxml2-devel BuildRequires: libxslt openssl-devel pango-devel -License: GPL v2 only ; GPL v2 or later +License: GPLv2 ; GPLv2+ Group: Hardware/Printing Summary: Drivers for the Common UNIX Printing System Version: 1.3.9 -Release: 3 +Release: 4 Provides: cups_drv Requires: ghostscript-library >= 7.05, foomatic-filters PreReq: sysvinit, sh-utils, procps @@ -40,7 +40,8 @@ # linuxprinting.org database variables %define DBDate 20080909 %define foomaticver bzr -%define gutenprintver 5.0.2 +%define gutenprintver 5.2.4 +%define gutenprintmajor 5.2 %define splixver 1.1.1 %define m2300wver 0.51 #URL: http://www.linuxprinting.org/download/foomatic/ @@ -61,9 +62,7 @@ Patch5: cups-drivers-1.3.8-Samsung-CLP-550.patch Patch6: cups-drivers-1.3.8-gcc_warn.patch Patch7: cups-drivers-1.3.9-maxspot_compare.patch -Patch300: gutenprint-5.0.0-A4.patch -Patch301: gutenprint-5.0.2-resolution.patch -Patch302: gutenprint-5.0.2-updp10_pagesize.patch +Patch300: gutenprint-5.2.3-A4.patch Patch400: splix-1.1.1-install.patch Patch401: splix-1.1.1-make.patch Patch500: m2300w-0.51-foomatic.patch @@ -83,12 +82,12 @@ Grant Taylor <www.linuxprinting.com> %package -n gutenprint -License: GPL v2 or later +License: GPLv2+ Summary: Gutenprint drivers for CUPS Group: Hardware/Printing Requires: ghostscript-library >= 7.05, cups >= 1.2.2, pstoraster Version: %{gutenprintver} -Release: 16 +Release: 1 Obsoletes: cups-drivers-stp Provides: cups-drivers-stp PreReq: procps @@ -100,11 +99,11 @@ %package -n gutenprint-devel -License: GPL v2 or later +License: GPLv2+ Summary: Development Environment for Gutenprint Group: Hardware/Printing Version: %{gutenprintver} -Release: 16 +Release: 1 Requires: ghostscript-library >= 7.05, cups >= 1.2.2, gutenprint = %{gutenprintver} Requires: gtk2-devel, glibc-devel @@ -119,11 +118,11 @@ Grant Taylor <www.linuxprinting.com> %package -n gutenprint-gimpplugin -License: GPL v2 or later +License: GPLv2+ Summary: GIMP plug-in for gutenprint Group: Hardware/Printing Version: %{gutenprintver} -Release: 6 +Release: 1 %description -n gutenprint-gimpplugin This package contains the gutenprint GIMP plug-in. @@ -164,8 +163,6 @@ # pushd gutenprint %patch300 -p1 -%patch301 -p1 -%patch302 -p1 popd # # @@ -245,8 +242,8 @@ # unusable printer/driver combos. perl ./foomatic-cleanupdrivers ../foomatic-db # -# Add the Foomatgic data for gutenprint -perl ./foomatic-kitload -k ../gutenprint/src/foomatic/foomatic-db/gutenprint-ijs.5.0 -f +# Add the Foomatic data for gutenprint +perl ./foomatic-kitload -k ../gutenprint/src/foomatic/foomatic-db/gutenprint-ijs.%{gutenprintmajor} -f # # Correct the default drivers of the printer entries to have a valid # default for every printer. @@ -269,7 +266,7 @@ PREFIX=%{_prefix} \ DESTDIR=$mydir/foomatic-db-engine \ install -echo "BuilRoot = '"$RPM_BUILD_ROOT\' +echo "BuildRoot = '"$RPM_BUILD_ROOT\' cd ../foomatic-db-engine mkdir -p $mydir/foomatic-db-engine/usr/share/foomatic/templates make \ @@ -381,15 +378,16 @@ make DESTDIR=$RPM_BUILD_ROOT \ FOOMATIC_KITLOAD=${RPM_BUILD_DIR}/%{name}/foomatic-db-engine/foomatic-kitload \ install - mv $RPM_BUILD_ROOT/%{_datadir}/cups/model/gutenprint/5.0/C \ + mv $RPM_BUILD_ROOT/%{_datadir}/cups/model/gutenprint/%{gutenprintmajor}/C \ $RPM_BUILD_ROOT/%{_datadir}/cups/model - rmdir $RPM_BUILD_ROOT/%{_datadir}/cups/model/gutenprint/5.0 + rm $RPM_BUILD_ROOT/usr/share/locale/*/gutenprint_*.po + rmdir $RPM_BUILD_ROOT/%{_datadir}/cups/model/gutenprint/%{gutenprintmajor} rmdir $RPM_BUILD_ROOT/%{_datadir}/cups/model/gutenprint mv $RPM_BUILD_ROOT/%{_datadir}/cups/model/C \ $RPM_BUILD_ROOT/%{_datadir}/cups/model/gutenprint cd .. # -mv $RPM_BUILD_ROOT/%{_bindir}/testpattern $RPM_BUILD_ROOT/%{_libdir}/gutenprint/%{gutenprintver} +mv $RPM_BUILD_ROOT/%{_bindir}/testpattern $RPM_BUILD_ROOT/%{_libdir}/gutenprint/%{gutenprintmajor} # ##### GUTENPRINT (end) # @@ -482,6 +480,7 @@ # set LSB symlink to let CUPS find the PPDs ln -s /usr/share/ppd $RPM_BUILD_ROOT/usr/share/cups/model/0-driverppds # +%find_lang gutenprint %clean test -n "$RPM_BUILD_ROOT" && @@ -531,13 +530,13 @@ /usr/share/m2300w/%{m2300wver}/psfiles/* %doc %{_defaultdocdir}/%{name} -%files -n gutenprint +%files -n gutenprint -f gutenprint.lang %defattr(-,root,root) %config /etc/cups/command.types %{_bindir}/cups-calibrate %{_bindir}/escputil -%{_bindir}/ijsgutenprint.5.0 -%{_libdir}/cups/backend +%{_bindir}/ijsgutenprint.%{gutenprintmajor} +# %{_libdir}/cups/backend %{_libdir}/cups/filter/c* %{_libdir}/cups/filter/rastertogutenprint* %{_sbindir}/cups-genppd* @@ -547,12 +546,11 @@ %dir /usr/share/cups/model/gutenprint /usr/share/cups/model/gutenprint/* %dir %{_libdir}/gutenprint -%dir %{_libdir}/gutenprint/%{gutenprintver} -%{_libdir}/gutenprint/%{gutenprintver}/* +%dir %{_libdir}/gutenprint/%{gutenprintmajor} +%{_libdir}/gutenprint/%{gutenprintmajor}/* %{_libdir}/libgutenprint*.so?* %dir /usr/share/gutenprint /usr/share/gutenprint/* -/usr/share/locale/*/*/gutenprint* %doc /usr/share/man/man?/*.gz %dir %{_libdir}/cups/driver %{_libdir}/cups/driver/gutenprint* ++++++ gutenprint-5.0.0-A4.patch -> gutenprint-5.2.3-A4.patch ++++++ --- cups-drivers/gutenprint-5.0.0-A4.patch 2007-01-16 00:08:18.000000000 +0100 +++ cups-drivers/gutenprint-5.2.3-A4.patch 2009-01-23 11:27:54.000000000 +0100 @@ -1,62 +1,41 @@ -Index: src/main/papers.xml -=================================================================== -RCS file: /cvsroot/gimp-print/print/src/main/papers.xml,v -retrieving revision 1.21 -diff -u -r1.21 papers.xml ---- gutenprint-5.0.0/src/main/papers.xml 20 Apr 2006 00:33:41 -0000 1.21 -+++ gutenprint-5.0.0/src/main/papers.xml 7 Sep 2006 13:20:20 -0000 -@@ -19,6 +19,16 @@ - xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd"> +--- gutenprint-5.2.3/src/xml/papers.xml~ 2009-01-22 16:19:12.000000000 +0100 ++++ gutenprint-5.2.3/src/xml/papers.xml 2009-01-22 16:19:20.000000000 +0100 +@@ -46,6 +46,20 @@ + </copyright> <paperdef>  + + <paper name="A4"> -+ <description value="A4"/> ++ <description translate="value" value="A4"/> + <comment value="210mm x 297mm"/> + <width value="595"/> + <height value="842"/> + <unit value="metric"/> ++ ++ ++ ++ + </paper> <paper name="Letter"> - <description value="Letter"/> + <description translate="value" value="Letter"/> <comment value="8.5in x 11in"/> -@@ -268,13 +278,6 @@ +@@ -316,17 +330,6 @@ <height value="1191"/> <unit value="metric"/> </paper> - <paper name="A4"> -- <description value="A4"/> +- <description translate="value" value="A4"/> - <comment value="210mm x 297mm"/> - <width value="595"/> - <height value="842"/> - <unit value="metric"/> +- +- +- +- - </paper> <paper name="A5"> - <description value="A5"/> + <description translate="value" value="A5"/> <comment value="148mm x 210mm"/> ---- gutenprint/src/main/papers.xml.orig 2006-11-27 17:27:23.000000000 +0100 -+++ gutenprint/src/main/papers.xml 2006-11-27 17:28:54.000000000 +0100 -@@ -27,6 +27,10 @@ - <comment value="210mm x 297mm"/> - <width value="595"/> - <height value="842"/> -+ <top value="24"/> -+ <left value="24"/> -+ <bottom value="48"/> -+ <right value="24"/> - <unit value="metric"/> - </paper> - <paper name="Letter"> -@@ -34,6 +38,10 @@ - <comment value="8.5in x 11in"/> - <width value="612"/> - <height value="792"/> -+ <top value="24"/> -+ <left value="24"/> -+ <bottom value="48"/> -+ <right value="24"/> - <unit value="english"/> - </paper> - <paper name="Legal"> ++++++ gutenprint-5.0.2.tar.bz2 -> gutenprint-5.2.4.tar.bz2 ++++++ ++++ 654424 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 cvs for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '10

29 Jan '10

Hello community, here is the log from the commit of package cvs for openSUSE:Factory checked in at Fri Jan 29 18:14:35 CET 2010. -------- --- cvs/cvs.changes 2009-04-28 15:38:23.000000000 +0200 +++ cvs/cvs.changes 2009-12-16 10:53:06.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 16 10:52:55 CET 2009 - jengelh(a)medozas.de + +- Package documentation as noarch + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cvs.spec ++++++ --- /var/tmp/diff_new_pack.bKo5vy/_old 2010-01-29 18:14:14.000000000 +0100 +++ /var/tmp/diff_new_pack.bKo5vy/_new 2010-01-29 18:14:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package cvs (Version 1.12.12) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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,12 +20,12 @@ Name: cvs BuildRequires: gdbm-devel zlib-devel -License: GPL v2 or later; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Group: Development/Tools/Version Control Url: http://www.cvshome.org/ AutoReqProv: on Version: 1.12.12 -Release: 154 +Release: 155 Summary: Concurrent Versions System Requires: /bin/mktemp, /usr/bin/csh Source: %name-%version.tar.bz2 @@ -74,9 +74,12 @@ Jeff Polk <polk(a)bsdi.com> %package doc -License: GPL v2 or later; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Open Source Development with CVS, 2nd Edition Book Group: Development/Tools/Version Control +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %description doc The complete Open Source Development with CVS, 2nd Edition book. @@ -124,9 +127,9 @@ cd cvslock-* %configure cd - -make +make %{?jobs:-j%jobs} cd cvslock-* -make +make %{?jobs:-j%jobs} cd - %install ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kcall for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '10

29 Jan '10

Hello community, here is the log from the commit of package kcall for openSUSE:Factory checked in at Fri Jan 29 18:06:58 CET 2010. -------- --- KDE/kcall/kcall.changes 2009-11-03 20:19:04.000000000 +0100 +++ kcall/kcall.changes 2010-01-29 13:30:23.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Jan 29 12:30:06 UTC 2010 - llunak(a)novell.com + +- adjust buildrequires + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcall.spec ++++++ --- /var/tmp/diff_new_pack.Lwbb4C/_old 2010-01-29 18:06:47.000000000 +0100 +++ /var/tmp/diff_new_pack.Lwbb4C/_new 2010-01-29 18:06:47.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kcall (Version 0.7.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,13 @@ Name: kcall -BuildRequires: libdecibel-devel libkdepimlibs4-devel oxygen-icon-theme +BuildRequires: libdecibel-devel libkdepimlibs4-devel oxygen-icon-theme-large Url: http://www.basyskom.de/index.pl/kcall -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Telephony/SIP/Clients Summary: SIP (Voice over IP) Solution for KDE and Kontact Version: 0.7.0 -Release: 178 +Release: 179 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libkde4 >= %( echo `rpm -q --queryformat '%{VERSION}' libkde4`) Source0: %name-%version.tar.bz2 @@ -33,6 +33,7 @@ Patch1: kcall-fixes-from-svn.diff %kde4_runtime_requires %kde4_pimlibs_requires +Requires: kdepim4-runtime %description KCall is the telephony application of Kontact. It supports computer ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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