May 2009 - openSUSE Commits - openSUSE Mailing Lists

commit SDL_ttf for openSUSE:Factory
by root＠Hilbert.suse.de 28 May '09

28 May '09

Hello community, here is the log from the commit of package SDL_ttf for openSUSE:Factory checked in at Thu May 28 23:49:03 CEST 2009. -------- --- SDL_ttf/SDL_ttf.changes 2008-07-13 22:47:38.000000000 +0200 +++ SDL_ttf/SDL_ttf.changes 2009-05-20 17:18:23.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 20 17:17:46 CEST 2009 - prusnak(a)suse.cz + +- follow Shared Library Policy + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SDL_ttf.spec ++++++ --- /var/tmp/diff_new_pack.z30010/_old 2009-05-28 23:41:39.000000000 +0200 +++ /var/tmp/diff_new_pack.z30010/_new 2009-05-28 23:41:39.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package SDL_ttf (Version 2.0.9) # -# 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 @@ -19,13 +19,13 @@ Name: SDL_ttf -BuildRequires: SDL-devel freetype2-devel gcc-c++ xorg-x11-Mesa-devel xorg-x11-devel +BuildRequires: freetype2-devel libSDL-devel xorg-x11-devel Url: http://www.libsdl.org/projects/SDL_ttf/ License: LGPL v2.1 or later -Group: Development/Libraries/X11 +Group: System/Libraries Version: 2.0.9 -Release: 133 -Summary: Simple DirectMedia Layer--Truetype Library +Release: 151 +Summary: Simple DirectMedia Layer - Truetype Library Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -39,13 +39,33 @@ -------- Sam Lantinga <slouken(a)libsdl.org> -%package devel +%package -n libSDL_ttf-2_0-0 +Summary: Simple DirectMedia Layer - Truetype Library +Group: System/Libraries +License: LGPL v2.1 or later +Provides: SDL_ttf = %{version} +Obsoletes: SDL_ttf < %{version} + +%description -n libSDL_ttf-2_0-0 +This is a sample library that allows you to use TrueType fonts in your +SDL applications. + + + +Authors: +-------- + Sam Lantinga <slouken(a)libsdl.org> + +%package -n libSDL_ttf-devel License: LGPL v2.1 or later Requires: %{name} = %{version} SDL-devel -Summary: Simple DirectMedia Layer--Truetype Library -Group: Development/Libraries/X11 +Summary: Simple DirectMedia Layer - Truetype Library +Group: Development/Libraries/C and C++ +Requires: libSDL_ttf-2_0-0 = %{version} libSDL-devel +Provides: SDL_ttf-devel = %{version} +Obsoletes: SDL_ttf-devel < %{version} -%description devel +%description -n libSDL_ttf-devel This is a sample library that allows you to use TrueType fonts in your SDL applications. @@ -59,29 +79,33 @@ %setup -q %build -%configure --with-pic --disable-static +%configure \ + --with-pic \ + --disable-static %{__make} %{?jobs:-j %jobs} %install make DESTDIR=$RPM_BUILD_ROOT install rm -f %{buildroot}%{_libdir}/*.la -%post -p /sbin/ldconfig +%post -n libSDL_ttf-2_0-0 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libSDL_ttf-2_0-0 -p /sbin/ldconfig -%files +%files -n libSDL_ttf-2_0-0 %defattr(-,root,root) %doc CHANGES COPYING README -%{_libdir}/libSDL_ttf-2.0.so.* +%{_libdir}/lib*.so.* -%files devel +%files -n libSDL_ttf-devel %defattr(-,root,root) %{_includedir}/SDL/SDL_ttf.h -%{_libdir}/libSDL_ttf.so +%{_libdir}/lib*.so %changelog -* Mon Jul 14 2008 crrodriguez(a)suse.de +* Wed May 20 2009 prusnak(a)suse.cz +- follow Shared Library Policy +* Sun Jul 13 2008 crrodriguez(a)suse.de - remove unusable static libraries - SDL_ttf-devel requires SDL-devel * Sun Dec 16 2007 sndirsch(a)suse.de ++++++ baselibs.conf ++++++ libSDL_ttf-2_0-0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 SDL_mixer for openSUSE:Factory
by root＠Hilbert.suse.de 28 May '09

28 May '09

Hello community, here is the log from the commit of package SDL_mixer for openSUSE:Factory checked in at Thu May 28 23:36:13 CEST 2009. -------- --- SDL_mixer/SDL_mixer.changes 2008-12-10 13:41:13.000000000 +0100 +++ SDL_mixer/SDL_mixer.changes 2009-05-20 16:28:20.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 20 16:12:36 CEST 2009 - prusnak(a)suse.cz + +- follow Shared Library Policy + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SDL_mixer.spec ++++++ --- /var/tmp/diff_new_pack.z29261/_old 2009-05-28 23:28:29.000000000 +0200 +++ /var/tmp/diff_new_pack.z29261/_new 2009-05-28 23:28:29.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package SDL_mixer (Version 1.2.8) # -# 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 @@ -19,42 +19,57 @@ Name: SDL_mixer -BuildRequires: SDL-devel libmikmod-devel libogg-devel libvorbis-devel +BuildRequires: libSDL-devel libmikmod-devel libogg-devel libvorbis-devel Summary: Sample Mixer Library for SDL Version: 1.2.8 -Release: 153 +Release: 154 License: LGPL v2.1 or later Group: System/Libraries -# bug437293 -%ifarch ppc64 -Obsoletes: SDL_mixer-64bit -%endif -# Source: %{name}-%{version}.tar.bz2 Patch0: %{name}-%{version}-timidity_cfg.patch Patch1: %{name}-%{version}-64bit-fix.patch Url: http://www.libsdl.org/projects/SDL_mixer/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -%package devel +%description +A multichannel audio mixer. It supports four channels of 16-bit stereo +audio, plus a single channel of music, mixed by the popular MikMod MOD, +Timidity MIDI, and SMPEG MP3 libraries. + + + +%package -n libSDL_mixer-1_2-0 +Summary: Sample Mixer Library for SDL +Group: System/Libraries License: LGPL v2.1 or later -Requires: %{name} = %{version} SDL-devel -Summary: Sample Mixer Library for SDL - files mandatory for development -Group: Development/Libraries/C and C++ +Provides: SDL_mixer = %{version} +Obsoletes: SDL_mixer < %{version} # bug437293 %ifarch ppc64 -Obsoletes: SDL_mixer-devel-64bit +Obsoletes: SDL_mixer-64bit %endif -# -%description +%description -n libSDL_mixer-1_2-0 A multichannel audio mixer. It supports four channels of 16-bit stereo audio, plus a single channel of music, mixed by the popular MikMod MOD, Timidity MIDI, and SMPEG MP3 libraries. -%description devel +%package -n libSDL_mixer-devel +License: LGPL v2.1 or later +Requires: %{name} = %{version} SDL-devel +Summary: Sample Mixer Library for SDL - files mandatory for development +Group: Development/Libraries/C and C++ +Requires: libSDL_mixer-1_2-0 = %{version} libSDL-devel +Provides: SDL_mixer-devel = %{version} +Obsoletes: SDL_mixer-devel < %{version} +# bug437293 +%ifarch ppc64 +Obsoletes: SDL_mixer-devel-64bit +%endif + +%description -n libSDL_mixer-devel A multi-channel audio mixer. It supports 4 channels of 16-bit stereo audio, plus a single channel of music, mixed by the popular MikMod MOD, Timidity MIDI, and SMPEG MP3 libraries. @@ -67,7 +82,9 @@ %patch1 %build -%configure --disable-static --with-pic\ +%configure \ + --disable-static \ + --with-pic \ --enable-music-libmikmod make %{?jobs:-j %jobs} @@ -78,28 +95,30 @@ %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig +%post -n libSDL_mixer-1_2-0 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libSDL_mixer-1_2-0 -p /sbin/ldconfig -%files +%files -n libSDL_mixer-1_2-0 %defattr(-,root,root) %doc README CHANGES COPYING -%{_bindir}/play* %{_libdir}/*.so.* -%files devel +%files -n libSDL_mixer-devel %defattr(-,root,root) +%{_bindir}/play* %{_includedir}/SDL/* %{_libdir}/*.so %changelog +* Wed May 20 2009 prusnak(a)suse.cz +- follow Shared Library Policy * Wed Dec 10 2008 olh(a)suse.de - use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade (bnc#437293) * Thu Oct 30 2008 olh(a)suse.de - obsolete old -XXbit packages (bnc#437293) -* Sat Jul 05 2008 crrodriguez(a)suse.de +* Sun Jul 06 2008 crrodriguez(a)suse.de - remove unusable static libraries - cleanup BuildRequires and -devel package dependencies * Thu Apr 10 2008 ro(a)suse.de @@ -127,7 +146,7 @@ * libmikmod.patch (included in update) * Sun Jul 22 2007 aj(a)suse.de - Cleanup BuildRequires. -* Sat Apr 14 2007 dmueller(a)suse.de +* Sun Apr 15 2007 dmueller(a)suse.de - fix requires of devel package again * Wed Apr 11 2007 sbrabec(a)suse.cz - Require just created libmikmod-devel instead of libmikmod. ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.z29261/_old 2009-05-28 23:28:29.000000000 +0200 +++ /var/tmp/diff_new_pack.z29261/_new 2009-05-28 23:28:29.000000000 +0200 @@ -1,2 +1 @@ -SDL_mixer -SDL_mixer-devel +libSDL_mixer-1_2-0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 SDL_image for openSUSE:Factory
by root＠Hilbert.suse.de 28 May '09

28 May '09

Hello community, here is the log from the commit of package SDL_image for openSUSE:Factory checked in at Thu May 28 23:26:28 CEST 2009. -------- --- SDL_image/SDL_image.changes 2009-05-19 15:47:55.000000000 +0200 +++ SDL_image/SDL_image.changes 2009-05-20 16:10:58.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 20 16:10:42 CEST 2009 - prusnak(a)suse.cz + +- follow Shared Library Policy + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SDL_image.spec ++++++ --- /var/tmp/diff_new_pack.p16598/_old 2009-05-28 23:21:50.000000000 +0200 +++ /var/tmp/diff_new_pack.p16598/_new 2009-05-28 23:21:50.000000000 +0200 @@ -19,11 +19,11 @@ Name: SDL_image -BuildRequires: SDL-devel libjpeg-devel libpng-devel libtiff-devel xorg-x11-devel +BuildRequires: libSDL-devel libjpeg-devel libpng-devel libtiff-devel xorg-x11-devel Url: http://www.libsdl.org/projects/SDL_image/ Summary: Simple DirectMedia Layer--Sample Image Loading Library Version: 1.2.7 -Release: 1 +Release: 2 Source: %{name}-%{version}.tar.bz2 License: LGPL v2.1 or later Group: System/Libraries @@ -40,13 +40,33 @@ -------- Sam Lantinga <slouken(a)devolution.com> -%package devel +%package -n libSDL_image-1_2-0 +Summary: Simple DirectMedia Layer--Sample Image Loading Library +Group: System/Libraries +License: LGPL v2.1 or later +Provides: SDL_image = %{version} +Obsoletes: SDL_image < %{version} + +%description -n libSDL_image-1_2-0 +This is a simple library to load images of various formats as SDL +surfaces. This library supports BMP, PPM, PCX, GIF, JPEG, PNG, and TIFF +formats. + + + +Authors: +-------- + Sam Lantinga <slouken(a)devolution.com> + +%package -n libSDL_image-devel License: LGPL v2.1 or later Summary: Libraries, includes and more to develop SDL_image applications -Group: Development/Libraries/X11 -Requires: %{name} = %{version} SDL-devel +Group: Development/Libraries/C and C++ +Requires: libSDL_image-1_2-0 = %{version} libSDL-devel +Provides: SDL_image-devel = %{version} +Obsoletes: SDL_image-devel < %{version} -%description devel +%description -n libSDL_image-devel This is a simple library to load images of various formats as SDL surfaces. This library supports BMP, PPM, PCX, GIF, JPEG, PNG, and TIFF formats. @@ -68,24 +88,26 @@ make install DESTDIR=$RPM_BUILD_ROOT %{__rm} -f %{buildroot}%{_libdir}/*.la -%post -p /sbin/ldconfig +%post -n libSDL_image-1_2-0 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libSDL_image-1_2-0 -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT -%files +%files -n libSDL_image-1_2-0 %defattr(-,root,root) %doc CHANGES COPYING README %{_libdir}/lib*.so.* -%files devel +%files -n libSDL_image-devel %defattr(-,root,root) %{_includedir}/SDL %{_libdir}/lib*.so %changelog +* Wed May 20 2009 prusnak(a)suse.cz +- follow Shared Library Policy * Tue May 19 2009 prusnak(a)suse.cz - updated to 2.1.7 * Fixed buffer overflow in BMP loading code ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.p16598/_old 2009-05-28 23:21:50.000000000 +0200 +++ /var/tmp/diff_new_pack.p16598/_new 2009-05-28 23:21:50.000000000 +0200 @@ -1 +1 @@ -SDL_image +libSDL_image-1_2-0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xorg-x11-server for openSUSE:Factory
by root＠Hilbert.suse.de 28 May '09

28 May '09

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at Thu May 28 23:20:45 CEST 2009. -------- --- xorg-x11-server/xorg-x11-server.changes 2009-04-30 15:05:24.000000000 +0200 +++ xorg-x11-server/xorg-x11-server.changes 2009-05-28 15:29:02.000000000 +0200 @@ -1,0 +2,7 @@ +Thu May 28 15:23:44 CEST 2009 - sndirsch(a)suse.de + +- fbdev_fallback_fail_fix.diff + * fix fbdev fallback failure if no xorg.conf exists; fbdev driver + complained about required BusID (Egbert Eich) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- fbdev_fallback_fail_fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.m12254/_old 2009-05-28 23:20:18.000000000 +0200 +++ /var/tmp/diff_new_pack.m12254/_new 2009-05-28 23:20:18.000000000 +0200 @@ -32,7 +32,7 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.4 -Release: 36 +Release: 37 License: GPL v2 or later; X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -111,6 +111,7 @@ Patch130: radeonhd.diff Patch131: commit-cadf65a.diff Patch132: fixed-SYNC-extension-trigger-BlockHandler-test.diff +Patch140: fbdev_fallback_fail_fix.diff %description This package contains the X.Org Server. @@ -229,6 +230,7 @@ cp $RPM_SOURCE_DIR/radeonhd.h hw/xfree86/common %patch131 -p1 %patch132 -p1 +%patch140 -p1 %build pushd xorg-docs-* @@ -552,6 +554,10 @@ %endif %changelog +* Thu May 28 2009 sndirsch(a)suse.de +- fbdev_fallback_fail_fix.diff + * fix fbdev fallback failure if no xorg.conf exists; fbdev driver + complained about required BusID (Egbert Eich) * Thu Apr 30 2009 sndirsch(a)suse.de - instead of require do provide INPUT_ABI_VERSION/VIDEO_ABI_VERSION to fix dependancy loop ++++++ fbdev_fallback_fail_fix.diff ++++++ diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index b94d500..e624a17 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/hw/xfree86/common/xf86Bus.c @@ -429,7 +429,7 @@ xf86GetEntityInfo(int entityIndex) EntityInfoPtr pEnt; int i; - if (entityIndex >= xf86NumEntities) + if (entityIndex < 0 || entityIndex >= xf86NumEntities) return NULL; pEnt = xnfcalloc(1,sizeof(EntityInfoRec)); @@ -1816,6 +1816,20 @@ checkRoutingForScreens(xf86State state) xf86FreeResList(pResVGA); } +CARD16 +xf86BusesClaimed(void) +{ + CARD16 ret = 0; + + if (pciSlotClaimed) ret |= 1 << BUS_PCI; + if (fbSlotClaimed) ret |= 1 << BUS_NONE; +#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__) + if (sbusSlotClaimed) ret |= 1 << BUS_SBUS; +#endif + + return ret; +} + /* * xf86PostProbe() -- Allocate all non conflicting resources * This function gets called by xf86Init(). diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h index 41ca8f5..80d4d00 100644 --- a/hw/xfree86/common/xf86Priv.h +++ b/hw/xfree86/common/xf86Priv.h @@ -123,6 +123,7 @@ extern RootWinPropPtr *xf86RegisteredPropertiesTable; /* xf86Bus.c */ +CARD16 xf86BusesClaimed(void); void xf86BusProbe(void); void xf86ChangeBusIndex(int oldIndex, int newIndex); void xf86AccessInit(void); diff --git a/hw/xfree86/common/xf86fbBus.c b/hw/xfree86/common/xf86fbBus.c index 102f6b1..1c99175 100644 --- a/hw/xfree86/common/xf86fbBus.c +++ b/hw/xfree86/common/xf86fbBus.c @@ -58,7 +58,10 @@ xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active) { EntityPtr p; int num; - + + if (xf86BusesClaimed() & ~(1 << BUS_NONE)) + return -1; + num = xf86AllocateEntity(); p = xf86Entities[num]; p->driver = drvp; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-ncurses-pkg for openSUSE:Factory
by root＠Hilbert.suse.de 28 May '09

28 May '09

Hello community, here is the log from the commit of package yast2-ncurses-pkg for openSUSE:Factory checked in at Thu May 28 23:19:56 CEST 2009. -------- --- yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2009-05-06 12:44:15.000000000 +0200 +++ yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2009-05-28 11:39:01.000000000 +0200 @@ -1,0 +2,12 @@ +Wed May 27 15:15:42 CEST 2009 - ma(a)suse.de + +- Remove use of deprecated Package::filenames. +- 2.18.4 + +------------------------------------------------------------------- +Wed May 27 12:07:31 CEST 2009 - gs(a)suse.de + +- Sorting the package list by size works correctly (bnc#437217) +- 2.18.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-ncurses-pkg-2.18.2.tar.bz2 New: ---- yast2-ncurses-pkg-2.18.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses-pkg.spec ++++++ --- /var/tmp/diff_new_pack.c25780/_old 2009-05-28 23:16:28.000000000 +0200 +++ /var/tmp/diff_new_pack.c25780/_new 2009-05-28 23:16:28.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ncurses-pkg (Version 2.18.2) +# spec file for package yast2-ncurses-pkg (Version 2.18.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-ncurses-pkg -Version: 2.18.2 +Version: 2.18.4 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-pkg-2.18.2.tar.bz2 +Source0: yast2-ncurses-pkg-2.18.4.tar.bz2 Prefix: /usr BuildRequires: dejagnu doxygen gcc-c++ yast2-core-devel yast2-devtools BuildRequires: blocxx-devel libxcrypt-devel ncurses-devel yast2-ncurses-devel @@ -37,7 +37,7 @@ BuildRequires: libzypp-devel >= 4.2.3 Requires: yast2-core >= 2.16.33 #addItem(item, true) -Requires: yast2-ncurses >= 2.18.2 +Requires: yast2-ncurses >= 2.18.9 %description This package contains character based (ncurses) frontend of YaST2 @@ -46,7 +46,7 @@ %prep -%setup -n yast2-ncurses-pkg-2.18.2 +%setup -n yast2-ncurses-pkg-2.18.4 %build %{prefix}/bin/y2tool y2autoconf @@ -76,6 +76,12 @@ %{_libdir}/YaST2/plugin/libpy2ncurses_pkg.so %doc %{prefix}/share/doc/packages/yast2-ncurses-pkg %changelog +* Wed May 27 2009 ma(a)suse.de +- Remove use of deprecated Package::filenames. +- 2.18.4 +* Wed May 27 2009 gs(a)suse.de +- Sorting the package list by size works correctly (bnc#437217) +- 2.18.3 * Wed May 06 2009 kmachalkova(a)suse.cz - Speeding up scrolling big package lists left/right (bnc#498267) - 2.18.2 ++++++ yast2-ncurses-pkg-2.18.2.tar.bz2 -> yast2-ncurses-pkg-2.18.4.tar.bz2 ++++++ ++++ 62016 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 yast2-ncurses for openSUSE:Factory
by root＠Hilbert.suse.de 28 May '09

28 May '09

Hello community, here is the log from the commit of package yast2-ncurses for openSUSE:Factory checked in at Thu May 28 23:16:16 CEST 2009. -------- --- yast2-ncurses/yast2-ncurses.changes 2009-04-29 12:23:30.000000000 +0200 +++ yast2-ncurses/yast2-ncurses.changes 2009-05-28 11:35:00.000000000 +0200 @@ -1,0 +2,20 @@ +Thu May 28 11:28:12 CEST 2009 - gs(a)suse.de + +- NCTable/NCTablePad: only sort in reverse order if Ctrl 'o' + is used for table sorting +- V 2.18.10 + +------------------------------------------------------------------- +Wed May 27 10:56:58 CEST 2009 - gs(a)suse.de + +- NCTablePad: add the possibility to set a dedicated sort strategy + for table sorting (required for bnc #437217) +- V 2.18.9 + +------------------------------------------------------------------- +Tue May 12 11:03:04 CEST 2009 - gs(a)suse.de + +- NCAskForFile/NCAskForDirectory: use YUI::widgetFactory() to + create the layout + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-ncurses-2.18.8.tar.bz2 New: ---- yast2-ncurses-2.18.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.zG4796/_old 2009-05-28 23:15:12.000000000 +0200 +++ /var/tmp/diff_new_pack.zG4796/_new 2009-05-28 23:15:12.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ncurses (Version 2.18.8) +# spec file for package yast2-ncurses (Version 2.18.10) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-ncurses -Version: 2.18.8 +Version: 2.18.10 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-2.18.8.tar.bz2 +Source0: yast2-ncurses-2.18.10.tar.bz2 Prefix: /usr BuildRequires: dejagnu doxygen gcc-c++ yast2-devtools BuildRequires: blocxx-devel libxcrypt-devel ncurses-devel @@ -56,7 +56,7 @@ %prep -%setup -n yast2-ncurses-2.18.8 +%setup -n yast2-ncurses-2.18.10 %build %{prefix}/bin/y2tool y2autoconf @@ -93,6 +93,17 @@ %{prefix}/include/YaST2/ncurses/ %doc %{prefix}/share/doc/packages/yast2-ncurses %changelog +* Thu May 28 2009 gs(a)suse.de +- NCTable/NCTablePad: only sort in reverse order if Ctrl 'o' + is used for table sorting +- V 2.18.10 +* Wed May 27 2009 gs(a)suse.de +- NCTablePad: add the possibility to set a dedicated sort strategy + for table sorting (required for bnc #437217) +- V 2.18.9 +* Tue May 12 2009 gs(a)suse.de +- NCAskForFile/NCAskForDirectory: use YUI::widgetFactory() to + create the layout * Wed Apr 29 2009 gs(a)suse.de - NCursesWindow: revert the patch which sets back_color_erase to FALSE (isn't necessary any longer, see bnc #418613). Except for ++++++ yast2-ncurses-2.18.8.tar.bz2 -> yast2-ncurses-2.18.10.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.18.8/configure.in new/yast2-ncurses-2.18.10/configure.in --- old/yast2-ncurses-2.18.8/configure.in 2009-04-29 11:45:59.000000000 +0200 +++ new/yast2-ncurses-2.18.10/configure.in 2009-05-27 11:00:38.000000000 +0200 @@ -1,6 +1,6 @@ dnl configure.in for yast2-ncurses dnl -dnl -- This file is generated by y2autoconf 2.18.3 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.5 - DO NOT EDIT! -- dnl (edit configure.in.in instead) AC_INIT(yast2-ncurses, 2.18.8, http://bugs.opensuse.org/, yast2-ncurses) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.18.8/src/NCAskForDirectory.cc new/yast2-ncurses-2.18.10/src/NCAskForDirectory.cc --- old/yast2-ncurses-2.18.8/src/NCAskForDirectory.cc 2009-02-17 11:44:36.000000000 +0100 +++ new/yast2-ncurses-2.18.10/src/NCAskForDirectory.cc 2009-05-12 12:12:00.000000000 +0200 @@ -23,6 +23,8 @@ #include <YUILog.h> #include "YDialog.h" #include "YTypes.h" +#include "NCWidgetFactory.h" +#include "NCWidgetFactory.h" #include "NCLayoutBox.h" #include "NCSpacing.h" #include "NCFrame.h" @@ -65,12 +67,12 @@ setTextdomain( "ncurses" ); // the vertical split is the (only) child of the dialog - NCLayoutBox * split = new NCLayoutBox( this, YD_VERT ); + YLayoutBox * split = YUI::widgetFactory()->createVBox( this ); // the headline new NCLabel( split, headline, true, false ); // isHeading = true - NCFrame * frame = new NCFrame( split, "" ); + YFrame * frame = YUI::widgetFactory()->createFrame( split, "" ); // label for text field showing the selected dir dirName = new NCComboBox( frame, _( "Selected Directory:" ), false ); // editable = false @@ -78,7 +80,7 @@ dirName->setStretchable( YD_HORIZ, true ); // add the checkBox detailed - NCLayoutBox * hSplit = new NCLayoutBox( split, YD_HORIZ ); + YLayoutBox * hSplit = YUI::widgetFactory()->createHBox( split ); // label for checkbox detailed = new NCCheckBox( hSplit, _( "&Detailed View" ), false ); @@ -95,26 +97,26 @@ NCFileTable::T_Overview, iniDir ); - new NCSpacing( split, YD_VERT, false, 1.0 ); + YUI::widgetFactory()->createSpacing( split, YD_VERT, false, 1.0 ); // HBox for the buttons - NCLayoutBox * hSplit1 = new NCLayoutBox( split, YD_HORIZ ); + YLayoutBox * hSplit1 = YUI::widgetFactory()->createHBox( split ); - new NCSpacing( hSplit1, YD_HORIZ, true, 0.2 ); // stretchable = true + YUI::widgetFactory()->createSpacing( hSplit1, YD_HORIZ, true, 0.2 ); // stretchable = true // add the OK button okButton = new NCPushButton( hSplit1, _( "&OK" ) ); okButton->setFunctionKey( 10 ); okButton->setStretchable( YD_HORIZ, true ); - new NCSpacing( hSplit1, YD_HORIZ, true, 0.4 ); - + YUI::widgetFactory()->createSpacing( hSplit1, YD_HORIZ, true, 0.4 ); + // add the Cancel button cancelButton = new NCPushButton( hSplit1, _( "&Cancel" ) ); cancelButton->setFunctionKey( 9 ); cancelButton->setStretchable( YD_HORIZ, true ); - new NCSpacing( hSplit1, YD_HORIZ, true, 0.2 ); + YUI::widgetFactory()->createSpacing( hSplit1, YD_HORIZ, true, 0.2 ); // restore former text domain setTextdomain( old_textdomain.c_str() ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.18.8/src/NCAskForFile.cc new/yast2-ncurses-2.18.10/src/NCAskForFile.cc --- old/yast2-ncurses-2.18.8/src/NCAskForFile.cc 2009-02-17 11:44:16.000000000 +0100 +++ new/yast2-ncurses-2.18.10/src/NCAskForFile.cc 2009-05-12 12:11:38.000000000 +0200 @@ -23,6 +23,7 @@ #include "YDialog.h" +#include "NCWidgetFactory.h" #include "NCLayoutBox.h" #include "NCSpacing.h" #include "NCFrame.h" @@ -109,11 +110,11 @@ startDir = checkIniDir( iniDir ); // the vertical split is the (only) child of the dialog - NCLayoutBox * split = new NCLayoutBox( this, YD_VERT ); + YLayoutBox * split = YUI::widgetFactory()->createVBox( this ); new NCLabel( split, headline, true, false ); // isHeading = true - NCFrame * frame = new NCFrame( split, "" ); + YFrame * frame = YUI::widgetFactory()->createFrame( split, "" ); // label for text field showing the selected dir dirName = new NCComboBox( frame, _( "Selected Directory:" ), false ); // editable = false; @@ -121,14 +122,14 @@ dirName->setStretchable( YD_HORIZ, true ); // add the checkBox detailed - NCLayoutBox * hSplit = new NCLayoutBox( split, YD_HORIZ ); + YLayoutBox * hSplit = YUI::widgetFactory()->createHBox( split ); // label for checkbox detailed = new NCCheckBox( hSplit, _( "&Detailed View" ), false ); detailed->setNotify( true ); // HBox for the lists - NCLayoutBox * hSplit1 = new NCLayoutBox( split, YD_HORIZ ); + YLayoutBox * hSplit1 = YUI::widgetFactory()->createHBox( split ); // create table header for table type T_Overview YTableHeader * dirHeader = new YTableHeader(); @@ -156,7 +157,7 @@ fileList->setSendKeyEvents( true ); - NCLayoutBox * hSplit2 = new NCLayoutBox( split, YD_HORIZ ); + YLayoutBox * hSplit2 = YUI::widgetFactory()->createHBox( split ); // opt.isEditable.setValue( edit ); // NCInputField doesn't support mode 'not editable' any longer @@ -177,26 +178,26 @@ extension->addItem( filter, true ); // selected - new NCSpacing( split, YD_VERT, false, 1.0 ); + YUI::widgetFactory()->createSpacing( split, YD_VERT, false, 1.0 ); // HBox for the buttons - NCLayoutBox * hSplit3 = new NCLayoutBox( split, YD_HORIZ ); + YLayoutBox * hSplit3 = YUI::widgetFactory()->createHBox( split ); - new NCSpacing( hSplit3, YD_HORIZ, true, 0.2 ); // stretchable = true + YUI::widgetFactory()->createSpacing( hSplit3, YD_HORIZ, true, 0.2 ); // stretchable = true // add the OK button okButton = new NCPushButton( hSplit3, _( "&OK" ) ); okButton->setFunctionKey( 10 ); okButton->setStretchable( YD_HORIZ, true ); - new NCSpacing( hSplit3, YD_HORIZ, true, 0.4 ); + YUI::widgetFactory()->createSpacing( hSplit3, YD_HORIZ, true, 0.4 ); // add the Cancel button cancelButton = new NCPushButton( hSplit3, _( "&Cancel" ) ); cancelButton->setFunctionKey( 9 ); cancelButton->setStretchable( YD_HORIZ, true ); - new NCSpacing( hSplit3, YD_HORIZ, true, 0.2 ); + YUI::widgetFactory()->createSpacing( hSplit3, YD_HORIZ, true, 0.2 ); // restore former text domain setTextdomain( old_textdomain.c_str() ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.18.8/src/NCTable.cc new/yast2-ncurses-2.18.10/src/NCTable.cc --- old/yast2-ncurses-2.18.8/src/NCTable.cc 2009-04-27 10:06:09.000000000 +0200 +++ new/yast2-ncurses-2.18.10/src/NCTable.cc 2009-05-28 11:26:13.000000000 +0200 @@ -137,6 +137,18 @@ YTable::setTableHeader( th ); } +// +// Return table header as string vector (alignment removed) +// +void NCTable::getHeader( vector<string> & header ) +{ + header.assign( _header.size(), "" ); + + for ( unsigned int i = 0; i < _header.size(); i++ ) + { + header[ i ] = _header[i].Str().substr( 1 ); // remove alignment + } +} // Set alignment of i-th table column (left, right, center). @@ -491,7 +503,7 @@ int column = dialog->post(); if ( column != -1 ) - myPad()->setOrder( column ); + myPad()->setOrder( column, true ); //enable sorting in reverse order //remove the popup YDialog::deleteTopmostDialog(); @@ -517,13 +529,14 @@ } - if ( notify() && immediateMode() && citem != getCurrentItem() ) + if ( citem != getCurrentItem() ) { - ret = NCursesEvent::SelectionChanged; - } + if ( notify() && immediateMode() ) + ret = NCursesEvent::SelectionChanged; - if ( !multiselect ) - selectCurrentItem(); + if ( !multiselect ) + selectCurrentItem(); + } return ret; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.18.8/src/NCTable.h new/yast2-ncurses-2.18.10/src/NCTable.h --- old/yast2-ncurses-2.18.8/src/NCTable.h 2009-01-27 13:20:10.000000000 +0100 +++ new/yast2-ncurses-2.18.10/src/NCTable.h 2009-05-19 14:09:09.000000000 +0200 @@ -37,6 +37,10 @@ bool bigList() const { return biglist; } void setHeader( vector <string> head ); + void getHeader( vector <string> & head ); + + //vector<NCstring> getHeader( ) const { return _header }; + virtual void setAlignment( int col, YAlignmentType al ); void setBigList( const bool big ) { biglist = big; } @@ -82,6 +86,7 @@ void stripHotkeys() { myPad()->stripHotkeys(); } + void setSortStrategy( NCTableSortStrategyBase * newStrategy ) { myPad()->setSortStrategy( newStrategy ); } protected: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.18.8/src/NCTablePad.cc new/yast2-ncurses-2.18.10/src/NCTablePad.cc --- old/yast2-ncurses-2.18.8/src/NCTablePad.cc 2009-04-27 10:06:09.000000000 +0200 +++ new/yast2-ncurses-2.18.10/src/NCTablePad.cc 2009-05-28 11:18:31.000000000 +0200 @@ -33,6 +33,7 @@ , Headline( 0 ) , Items( 0 ) , citem( 0 ) + , sortStrategy ( new NCTableSortDefault ) { } @@ -316,23 +317,25 @@ return false; } -static int column = -1; - -static bool compare_column( NCTableLine* first, NCTableLine* second ) +// +// setOrder() sorts the table according to given column by calling +// the sort startegy. Sorting in reverse order is only done +// if 'do_reverse' is set to 'true'. +// +void NCTablePad::setOrder( int col, bool do_reverse ) { - return first->GetCol( column )->Label().getText().begin()->str() - < second->GetCol( column )->Label().getText().begin()->str(); -} - -void NCTablePad::setOrder( int col ) -{ - if (column != col) + if ( col < 0 ) + return; + + if ( sortStrategy->getColumn() == col && do_reverse ) { - column = col; - std::sort( Items.begin(), Items.end(), compare_column ); + std::reverse( Items.begin(), Items.end() ); } else - std::reverse( Items.begin(), Items.end() ); + { + sortStrategy->setColumn( col ); + sortStrategy->sort( Items.begin(), Items.end(), col ); + } dirty = true; update(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.18.8/src/NCTablePad.h new/yast2-ncurses-2.18.10/src/NCTablePad.h --- old/yast2-ncurses-2.18.8/src/NCTablePad.h 2008-08-20 14:57:14.000000000 +0200 +++ new/yast2-ncurses-2.18.10/src/NCTablePad.h 2009-05-28 11:01:09.000000000 +0200 @@ -21,6 +21,7 @@ #include <iosfwd> #include <vector> +#include <memory> // auto_ptr #include "NCTableItem.h" #include "NCPad.h" @@ -31,6 +32,59 @@ using std::vector; +class NCTableSortStrategyBase +{ +public: + NCTableSortStrategyBase( ) { _uiColumn = -1; } + + virtual ~NCTableSortStrategyBase() {} + + virtual void sort ( + vector<NCTableLine *>::iterator itemsBegin, + vector<NCTableLine *>::iterator itemsEnd, + int uiColumn + ) = 0; + int getColumn () { return _uiColumn; } + void setColumn ( int column) { _uiColumn = column; } + +private: + int _uiColumn; + +}; + +class NCTableSortDefault : public NCTableSortStrategyBase { +public: + virtual void sort ( + vector<NCTableLine *>::iterator itemsBegin, + vector<NCTableLine *>::iterator itemsEnd, + int uiColumn + ) + { + std::sort ( itemsBegin, itemsEnd, Compare(uiColumn) ); + } + +private: + class Compare + { + public: + Compare ( int uiCol) + : _uiCol ( uiCol ) + {} + + bool operator() ( NCTableLine * first, + NCTableLine * second + ) const + { + return first->GetCol( _uiCol )->Label().getText().begin()->str() + < second->GetCol( _uiCol )->Label().getText().begin()->str(); + } + private: + int _uiCol; + }; + + +}; + class NCTableTag : public NCTableCol { private: @@ -93,6 +147,8 @@ vector<NCTableLine*> Items; wpos citem; + std::auto_ptr<NCTableSortStrategyBase> sortStrategy; + void assertLine( unsigned idx ); protected: @@ -127,7 +183,7 @@ : wsze( Lines(), ItemStyle.TableWidth() ); } - void setOrder( int column ); + void setOrder( int column, bool do_reverse = false ); public: @@ -178,6 +234,12 @@ NCTableLine * ModifyLine( unsigned idx ); void stripHotkeys(); + + void setSortStrategy ( NCTableSortStrategyBase * newSortStrategy ) // dyn. allocated + { + if ( newSortStrategy != 0 ) + sortStrategy.reset ( newSortStrategy ); + } }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.18.8/VERSION new/yast2-ncurses-2.18.10/VERSION --- old/yast2-ncurses-2.18.8/VERSION 2009-04-29 11:41:07.000000000 +0200 +++ new/yast2-ncurses-2.18.10/VERSION 2009-05-28 11:28:03.000000000 +0200 @@ -1 +1 @@ -2.18.8 +2.18.10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libgsf for openSUSE:Factory
by root＠Hilbert.suse.de 28 May '09

28 May '09

Hello community, here is the log from the commit of package libgsf for openSUSE:Factory checked in at Thu May 28 23:14:57 CEST 2009. -------- --- libgsf/libgsf.changes 2009-05-07 04:58:01.000000000 +0200 +++ libgsf/libgsf.changes 2009-05-24 14:04:52.000000000 +0200 @@ -1,0 +2,8 @@ +Sun May 24 14:03:54 CEST 2009 - vuntz(a)novell.com + +- Update to version 1.14.14: + + Added namespaces used by openoffice 3.0, Lotus Symphony, etc. + + Fix gsf_xml_out_start_element to allow child elements mixed + with other content + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libgsf-1.14.13.tar.bz2 New: ---- libgsf-1.14.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgsf.spec ++++++ --- /var/tmp/diff_new_pack.KD4088/_old 2009-05-28 23:14:30.000000000 +0200 +++ /var/tmp/diff_new_pack.KD4088/_new 2009-05-28 23:14:30.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libgsf (Version 1.14.13) +# spec file for package libgsf (Version 1.14.14) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,7 +29,7 @@ BuildRequires: update-desktop-files License: GPL v2 or later; LGPL v2.1 or later Group: Development/Libraries/GNOME -Version: 1.14.13 +Version: 1.14.14 Release: 1 Summary: GNOME Structured File Library Url: http://www.gnome.org @@ -190,6 +190,11 @@ %{_datadir}/gtk-doc/html/* %changelog +* Sun May 24 2009 vuntz(a)novell.com +- Update to version 1.14.14: + + Added namespaces used by openoffice 3.0, Lotus Symphony, etc. + + Fix gsf_xml_out_start_element to allow child elements mixed + with other content * Thu May 07 2009 vuntz(a)novell.com - Update to version 1.14.13: + Fix gsf_opendoc_metadata_subtree [bgo#581530] ++++++ libgsf-1.14.13.tar.bz2 -> libgsf-1.14.14.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.13/ChangeLog new/libgsf-1.14.14/ChangeLog --- old/libgsf-1.14.13/ChangeLog 2009-05-07 01:38:49.000000000 +0200 +++ new/libgsf-1.14.14/ChangeLog 2009-05-24 02:12:59.000000000 +0200 @@ -1,3 +1,49 @@ +2009-05-23 Morten Welinder <terra(a)gnome.org> + + * Release 1.14.14 + +2009-05-16 Andreas J. Guelzow <aguelzow(a)pyrshep.ca> + + * gsf/gsf-opendoc-utils.h: add namespace enumeration constant for + new OOo and Gnumeric namespaces + * gsf/gsf-opendoc-utils.c (gsf_ooo_ns): add new namespaces for OOo + and Gnumeric + +2009-05-13 Andreas J. Guelzow <aguelzow(a)pyrshep.ca> + + * gsf/gsf-libxml.c (gsf_xml_out_start_element): remove erroneous + g_return_if_fail. Note that some part of the code specifically + handles that situation. + (close_tag_if_neccessary): If we are in GSF_XML_OUT_CHILD we need + not close the tag + +2009-05-10 Andreas J. Guelzow <aguelzow(a)pyrshep.ca> + + * gsf/gsf-opendoc-utils.h: add namespace enumeration constant for + MSOXL + * gsf/gsf-opendoc-utils.c (gsf_ooo_ns): add namespace for MSOXL + +2009-05-10 Andreas J. Guelzow <aguelzow(a)pyrshep.ca> + + * gsf/gsf-opendoc-utils.c (gsf_opendoc_meta_dtd): scan meta's + children for more namespaces to handle CleverAge's files. + +2009-05-10 Andreas J. Guelzow <aguelzow(a)pyrshep.ca> + + * gsf/gsf-opendoc-utils.h: add more new namespace enumeration + constants + * gsf/gsf-opendoc-utils.c (gsf_ooo_ns): add more new namespaces + +2009-05-10 Andreas J. Guelzow <aguelzow(a)pyrshep.ca> + + * gsf/gsf-opendoc-utils.h: add new namespace enumeration + constants + * gsf/gsf-opendoc-utils.c (gsf_ooo_ns): add new namespaces + +2009-05-06 Morten Welinder <terra(a)gnome.org> + + * configure.in : post release bump + 2009-05-06 Morten Welinder <terra(a)gnome.org> * Release 1.14.13 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.13/configure new/libgsf-1.14.14/configure --- old/libgsf-1.14.13/configure 2009-05-07 02:00:51.000000000 +0200 +++ new/libgsf-1.14.14/configure 2009-05-24 01:47:34.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for libgsf 1.14.13. +# Generated by GNU Autoconf 2.63 for libgsf 1.14.14. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=libgsf>. # @@ -745,8 +745,8 @@ # Identity of this package. PACKAGE_NAME='libgsf' PACKAGE_TARNAME='libgsf' -PACKAGE_VERSION='1.14.13' -PACKAGE_STRING='libgsf 1.14.13' +PACKAGE_VERSION='1.14.14' +PACKAGE_STRING='libgsf 1.14.14' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=libgsf' ac_unique_file="gsf/gsf.h" @@ -1606,7 +1606,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libgsf 1.14.13 to adapt to many kinds of systems. +\`configure' configures libgsf 1.14.14 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1676,7 +1676,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libgsf 1.14.13:";; + short | recursive ) echo "Configuration of libgsf 1.14.14:";; esac cat <<\_ACEOF @@ -1816,7 +1816,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libgsf configure 1.14.13 +libgsf configure 1.14.14 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1830,7 +1830,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libgsf $as_me 1.14.13, which was +It was created by libgsf $as_me 1.14.14, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2207,12 +2207,12 @@ LIBGSF_MINOR_VERSION=14 -LIBGSF_MICRO_VERSION=13 +LIBGSF_MICRO_VERSION=14 -VERSION_INFO=114:13:0 +VERSION_INFO=114:14:0 CURRENT_MINUS_AGE=114 @@ -2565,7 +2565,7 @@ # Define the identity of the package. PACKAGE='libgsf' - VERSION='1.14.13' + VERSION='1.14.14' cat >>confdefs.h <<_ACEOF @@ -18456,7 +18456,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libgsf $as_me 1.14.13, which was +This file was extended by libgsf $as_me 1.14.14, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18519,7 +18519,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -libgsf config.status 1.14.13 +libgsf config.status 1.14.14 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.13/configure.in new/libgsf-1.14.14/configure.in --- old/libgsf-1.14.13/configure.in 2009-04-26 01:51:41.000000000 +0200 +++ new/libgsf-1.14.14/configure.in 2009-05-19 03:55:48.000000000 +0200 @@ -4,7 +4,7 @@ m4_define([libgsf_version_major], [1]) m4_define([libgsf_version_minor], [14]) -m4_define([libgsf_version_micro], [13]) +m4_define([libgsf_version_micro], [14]) m4_define([libgsf_version_extra], []) m4_define([libgsf_full_version], [libgsf_version_major.libgsf_version_minor.libgsf_version_micro[]libgsf_version_extra]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.13/doc/html/gsf-GIO.html new/libgsf-1.14.14/doc/html/gsf-GIO.html --- old/libgsf-1.14.13/doc/html/gsf-GIO.html 2009-05-07 02:06:45.000000000 +0200 +++ new/libgsf-1.14.14/doc/html/gsf-GIO.html 2009-05-24 02:13:03.000000000 +0200 @@ -91,17 +91,17 @@ <tbody> <tr> <td><code>file</code> :</td> -<td> an existing GFile +<td> </td> </tr> <tr> <td><code>err</code> :</td> -<td> +<td> optionally NULL. </td> </tr> <tr> <td>Returns :</td> -<td> A new <a class="link" href="gsf-GIO.html#GsfOutputGio" title="GsfOutputGio">GsfOutputGio</a> or NULL +<td> A new <a class="link" href="gsf-GIO.html#GsfInputGio" title="GsfInputGio">GsfInputGio</a> or NULL </td> </tr> </tbody> @@ -132,7 +132,7 @@ </tr> <tr> <td>Returns :</td> -<td> A new <a class="link" href="gsf-GIO.html#GsfOutputGio" title="GsfOutputGio">GsfOutputGio</a> or NULL +<td> A new <a class="link" href="gsf-GIO.html#GsfInputGio" title="GsfInputGio">GsfInputGio</a> or NULL </td> </tr> </tbody> @@ -163,7 +163,7 @@ </tr> <tr> <td>Returns :</td> -<td> A new <a class="link" href="gsf-GIO.html#GsfOutputGio" title="GsfOutputGio">GsfOutputGio</a> or NULL +<td> A new <a class="link" href="gsf-GIO.html#GsfInputGio" title="GsfInputGio">GsfInputGio</a> or NULL </td> </tr> </tbody> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.13/doc/tmpl/blobs.sgml.sgml new/libgsf-1.14.14/doc/tmpl/blobs.sgml.sgml --- old/libgsf-1.14.13/doc/tmpl/blobs.sgml.sgml 2009-05-07 02:06:44.000000000 +0200 +++ new/libgsf-1.14.14/doc/tmpl/blobs.sgml.sgml 2009-05-24 02:13:03.000000000 +0200 @@ -9,11 +9,13 @@ </para> +  <para> </para> +  diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.13/doc/tmpl/gio.sgml new/libgsf-1.14.14/doc/tmpl/gio.sgml --- old/libgsf-1.14.13/doc/tmpl/gio.sgml 2009-05-07 02:06:44.000000000 +0200 +++ new/libgsf-1.14.14/doc/tmpl/gio.sgml 2009-05-24 02:13:03.000000000 +0200 @@ -9,11 +9,13 @@ </para> +  <para> </para> +  diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.13/doc/tmpl/gnome-vfs.sgml new/libgsf-1.14.14/doc/tmpl/gnome-vfs.sgml --- old/libgsf-1.14.13/doc/tmpl/gnome-vfs.sgml 2009-05-07 02:06:44.000000000 +0200 +++ new/libgsf-1.14.14/doc/tmpl/gnome-vfs.sgml 2009-05-24 02:13:03.000000000 +0200 @@ -9,11 +9,13 @@ </para> +  <para> </para> +  diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.13/doc/tmpl/open-pkg.sgml new/libgsf-1.14.14/doc/tmpl/open-pkg.sgml --- old/libgsf-1.14.13/doc/tmpl/open-pkg.sgml 2009-05-07 02:06:44.000000000 +0200 +++ new/libgsf-1.14.14/doc/tmpl/open-pkg.sgml 2009-05-24 02:13:03.000000000 +0200 @@ -1,5 +1,5 @@  -Open Package (ECMA 376) +Open Package (ECMA 376)  @@ -9,11 +9,13 @@ </para> +  <para> </para> +  diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.13/doc/xml/gio.xml new/libgsf-1.14.14/doc/xml/gio.xml --- old/libgsf-1.14.13/doc/xml/gio.xml 2009-05-07 02:06:44.000000000 +0200 +++ new/libgsf-1.14.14/doc/xml/gio.xml 2009-05-24 02:13:03.000000000 +0200 @@ -64,12 +64,12 @@ </para><variablelist role="params"> <varlistentry><term><parameter>file</parameter> :</term> -<listitem><simpara> an existing GFile +<listitem><simpara> </simpara></listitem></varlistentry> <varlistentry><term><parameter>err</parameter> :</term> -<listitem><simpara> +<listitem><simpara> optionally NULL. </simpara></listitem></varlistentry> -<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara> A new <link linkend="GsfOutputGio"><type>GsfOutputGio</type></link> or NULL +<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara> A new <link linkend="GsfInputGio"><type>GsfInputGio</type></link> or NULL </simpara></listitem></varlistentry> </variablelist></refsect2> <refsect2 id="gsf-input-gio-new-for-path" role="function"> @@ -87,7 +87,7 @@ <varlistentry><term><parameter>err</parameter> :</term> <listitem><simpara> optionally NULL. </simpara></listitem></varlistentry> -<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara> A new <link linkend="GsfOutputGio"><type>GsfOutputGio</type></link> or NULL +<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara> A new <link linkend="GsfInputGio"><type>GsfInputGio</type></link> or NULL </simpara></listitem></varlistentry> </variablelist></refsect2> <refsect2 id="gsf-input-gio-new-for-uri" role="function"> @@ -105,7 +105,7 @@ <varlistentry><term><parameter>err</parameter> :</term> <listitem><simpara> optionally NULL. </simpara></listitem></varlistentry> -<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara> A new <link linkend="GsfOutputGio"><type>GsfOutputGio</type></link> or NULL +<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara> A new <link linkend="GsfInputGio"><type>GsfInputGio</type></link> or NULL </simpara></listitem></varlistentry> </variablelist></refsect2> <refsect2 id="GsfOutputGio" role="struct"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.13/gsf/gsf-libxml.c new/libgsf-1.14.14/gsf/gsf-libxml.c --- old/libgsf-1.14.13/gsf/gsf-libxml.c 2009-04-18 00:27:14.000000000 +0200 +++ new/libgsf-1.14.14/gsf/gsf-libxml.c 2009-05-19 03:55:48.000000000 +0200 @@ -1441,7 +1441,6 @@ { g_return_if_fail (id != NULL); g_return_if_fail (xout != NULL); - g_return_if_fail (xout->state != GSF_XML_OUT_CONTENT); if (xout->needs_header) { static char const header0[] = @@ -1562,7 +1561,7 @@ static void close_tag_if_neccessary (GsfXMLOut* xout) { - if (xout->state != GSF_XML_OUT_CONTENT) { + if (xout->state == GSF_XML_OUT_NOCONTENT) { xout->state = GSF_XML_OUT_CONTENT; gsf_output_write (xout->output, 1, ">"); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.13/gsf/gsf-opendoc-utils.c new/libgsf-1.14.14/gsf/gsf-opendoc-utils.c --- old/libgsf-1.14.13/gsf/gsf-opendoc-utils.c 2009-05-07 01:35:36.000000000 +0200 +++ new/libgsf-1.14.14/gsf/gsf-opendoc-utils.c 2009-05-19 03:55:48.000000000 +0200 @@ -42,6 +42,7 @@ /* Generated based on: * http://www.oasis-open.org/committees/download.php/12572/OpenDocument-v1.0-o… */ +/* and OpenDocument-v1.1.pdf */ GsfXMLInNS gsf_ooo_ns[] = { /* OOo 1.0.x & 1.1.x */ GSF_XML_IN_NS (OO_NS_OFFICE, "http://openoffice.org/2000/office"), @@ -84,6 +85,37 @@ GSF_XML_IN_NS (OO_NS_XFORMS, "http://www.w3.org/2002/xforms"), GSF_XML_IN_NS (OO_NS_XSD, "http://www.w3.org/2001/XMLSchema"), GSF_XML_IN_NS (OO_NS_XSI, "http://www.w3.org/2001/XMLSchema-instance"), + + /* OOo 3.0.x */ + GSF_XML_IN_NS (OO_NS_OF, "urn:oasis:names:tc:opendocument:xmlns:of:1.2"), + GSF_XML_IN_NS (OO_NS_FIELD, "urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"), + GSF_XML_IN_NS (OO_NS_FORMX, "urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"), + + GSF_XML_IN_NS (OO_NS_RPT, "http://openoffice.org/2005/report"), + GSF_XML_IN_NS (OO_NS_RDFA, "http://docs.oasis-open.org/opendocument/meta/rdfa#"), + + /* Other OpenDocument v 1.1 */ + GSF_XML_IN_NS (OO_NS_CONFIG, "urn:oasis:names:tc:opendocument:xmlns:config:1.0"), + GSF_XML_IN_NS (OO_NS_ANIM, "urn:oasis:names:tc:opendocument:xmlns:animation:1.0"), + GSF_XML_IN_NS (OO_NS_DATASTYLE, "urn:oasis:names:tc:opendocument:xmlns:data style:1.0"), + GSF_XML_IN_NS (OO_NS_MANIFEST, "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0"), + GSF_XML_IN_NS (OO_NS_SMIL, "urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0"), + + + /* Symphony 1.3 */ + GSF_XML_IN_NS (OO_LOTUS_NS_PRODTOOLS, "http://www.ibm.com/xmlns/prodtools"), + + /* CleverAge ODF Add-in for Microsoft Office 3.0.5224.0 (11.0.8302)*/ + GSF_XML_IN_NS (OO_CLEVERAGE_NS_DC, "http://purl.org/dc/terms/"), + + /* KOffice 1.6.3 */ + GSF_XML_IN_NS (OO_KDE_NS_KOFFICE, "http://www.koffice.org/2005/"), + + /* Microsoft Excel Formulas in ODF */ + GSF_XML_IN_NS (OO_MS_NS_MSOXL, "http://schemas.microsoft.com/office/excel/formula"), + + /* Gnumeric ODF extensions */ + GSF_XML_IN_NS (OO_GNUM_NS_EXT, "http://www.gnumeric.org/odf-extension/1.0"), { NULL, 0 } }; @@ -267,7 +299,7 @@ static GsfXMLInNode const gsf_opendoc_meta_dtd[] = { GSF_XML_IN_NODE_FULL (START, START, -1, NULL, FALSE, FALSE, TRUE, NULL, NULL, 0), - GSF_XML_IN_NODE (START, META, OO_NS_OFFICE, "meta", FALSE, &gsf_opendoc_metadata_subtree_internal, NULL), + GSF_XML_IN_NODE_FULL (START, META, OO_NS_OFFICE, "meta", FALSE, FALSE, TRUE, &gsf_opendoc_metadata_subtree_internal, NULL, 0), GSF_XML_IN_NODE_END }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.13/gsf/gsf-opendoc-utils.h new/libgsf-1.14.14/gsf/gsf-opendoc-utils.h --- old/libgsf-1.14.13/gsf/gsf-opendoc-utils.h 2009-04-18 00:27:14.000000000 +0200 +++ new/libgsf-1.14.14/gsf/gsf-opendoc-utils.h 2009-05-19 03:55:48.000000000 +0200 @@ -58,7 +58,35 @@ OO_NS_XSD, OO_NS_XSI, - OO_NS_PRESENT /* added in gsf-1.14.8 */ + OO_NS_PRESENT, /* added in gsf-1.14.8 */ + + /* new in 3.0 */ + OO_NS_RPT, + OO_NS_OF, + OO_NS_RDFA, + OO_NS_FIELD, + OO_NS_FORMX, + + /* Other OpenDocument 1.1 */ + OO_NS_ANIM, + OO_NS_DATASTYLE, + OO_NS_MANIFEST, + OO_NS_SMIL, + + /* Symphony 1.3 */ + OO_LOTUS_NS_PRODTOOLS, + + /* KOffice 1.6.3 */ + OO_KDE_NS_KOFFICE, + + /*CleverAge ODF Add-in for Microsoft Office 3.0.5224.0 (11.0.8302)*/ + OO_CLEVERAGE_NS_DC, + + /* Microsoft Excel Formulas */ + OO_MS_NS_MSOXL, + + /* Gnumeric ODF extensions */ + OO_GNUM_NS_EXT }; extern GsfXMLInNS gsf_ooo_ns[]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.13/gsf/version.c new/libgsf-1.14.14/gsf/version.c --- old/libgsf-1.14.13/gsf/version.c 2009-05-07 02:01:47.000000000 +0200 +++ new/libgsf-1.14.14/gsf/version.c 2009-05-24 01:47:50.000000000 +0200 @@ -1,3 +1,3 @@ int libgsf_major_version = 1; /* The ABI version */ int libgsf_minor_version = 14; /* The API version */ -int libgsf_micro_version = 13; /* bug fixes */ +int libgsf_micro_version = 14; /* bug fixes */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.13/libgsf-1.spec new/libgsf-1.14.14/libgsf-1.spec --- old/libgsf-1.14.13/libgsf-1.spec 2009-05-07 02:01:48.000000000 +0200 +++ new/libgsf-1.14.14/libgsf-1.spec 2009-05-24 01:47:50.000000000 +0200 @@ -1,5 +1,5 @@ %define name libgsf -%define version 1.14.13 +%define version 1.14.14 %define release 1 %define prefix /usr diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.13/libgsf-gnome-1.spec new/libgsf-1.14.14/libgsf-gnome-1.spec --- old/libgsf-1.14.13/libgsf-gnome-1.spec 2009-05-07 02:01:48.000000000 +0200 +++ new/libgsf-1.14.14/libgsf-gnome-1.spec 2009-05-24 01:47:50.000000000 +0200 @@ -1,5 +1,5 @@ %define name libgsf-1 -%define version 1.14.13 +%define version 1.14.14 %define release 1 %define prefix /usr diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.13/NEWS new/libgsf-1.14.14/NEWS --- old/libgsf-1.14.13/NEWS 2009-05-07 01:35:36.000000000 +0200 +++ new/libgsf-1.14.14/NEWS 2009-05-19 03:55:48.000000000 +0200 @@ -1,3 +1,11 @@ +libgsf 1.14.14 + +Andreas: + * Added namespaces used by openoffice 3.0, Lotus Symphony, etc. + * Fix gsf_xml_out_start_element to allow child elements mixed + with other content + +-------------------------------------------------------------------------- libgsf 1.14.13 Andreas: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.13/po/ChangeLog new/libgsf-1.14.14/po/ChangeLog --- old/libgsf-1.14.13/po/ChangeLog 2009-05-07 01:38:49.000000000 +0200 +++ new/libgsf-1.14.14/po/ChangeLog 2009-05-24 02:12:59.000000000 +0200 @@ -1,3 +1,7 @@ +2009-05-23 Morten Welinder <terra(a)gnome.org> + + * Release 1.14.14 + 2009-05-06 Morten Welinder <terra(a)gnome.org> * Release 1.14.13 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libgsf-1.14.13/python/ChangeLog new/libgsf-1.14.14/python/ChangeLog --- old/libgsf-1.14.13/python/ChangeLog 2009-05-07 01:38:49.000000000 +0200 +++ new/libgsf-1.14.14/python/ChangeLog 2009-05-24 02:12:59.000000000 +0200 @@ -1,3 +1,7 @@ +2009-05-23 Morten Welinder <terra(a)gnome.org> + + * Release 1.14.14 + 2009-05-06 Morten Welinder <terra(a)gnome.org> * Release 1.14.13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 pinentry for openSUSE:Factory
by root＠Hilbert.suse.de 28 May '09

28 May '09

Hello community, here is the log from the commit of package pinentry for openSUSE:Factory checked in at Thu May 28 23:14:19 CEST 2009. -------- --- pinentry/pinentry.changes 2008-11-10 14:57:38.000000000 +0100 +++ pinentry/pinentry.changes 2009-05-28 17:22:33.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 28 17:10:50 CEST 2009 - puzel(a)suse.cz + +- pinentry-qt4 (bnc#505134) + - add pinentry-qt4.patch.bz2 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- pinentry-qt4.patch.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pinentry.spec ++++++ --- /var/tmp/diff_new_pack.t23326/_old 2009-05-28 23:06:59.000000000 +0200 +++ /var/tmp/diff_new_pack.t23326/_new 2009-05-28 23:06:59.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package pinentry (Version 0.7.5) # -# 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 @@ -19,10 +19,10 @@ Name: pinentry -BuildRequires: gtk2-devel libdrm-devel libjpeg-devel ncurses-devel qt3-devel update-desktop-files +BuildRequires: cmake gtk2-devel libdrm-devel libjpeg-devel libqt4-devel ncurses-devel qt3-devel update-desktop-files Url: http://www.gnupg.org/aegypten/ Version: 0.7.5 -Release: 61 +Release: 62 PreReq: %install_info_prereq Summary: Collection of Simple PIN or Passphrase Entry Dialogs License: GPL v2 or later @@ -35,10 +35,9 @@ Patch3: %{name}-0.7.2-curses-utf-8.diff Patch5: pinentry-gsize.diff Patch6: pinentry-0.7.5-wrong-apostrophe.patch +Patch7: pinentry-qt4.patch.bz2 Group: Productivity/Other Provides: pinentry-dialog -# the requires is wrong as -curses is in the main package -#Requires: pinentry-dialog BuildRoot: %{_tmppath}/%{name}-%{version}-build %global ncursesw_config %(set -- %{_bindir}/ncursesw*-config; echo ${1}) @@ -58,7 +57,7 @@ %package -n pinentry-qt License: GPL v2 or later Version: %{version} -Release: 9 +Release: 10 Provides: pinentry-dialog Provides: pinentry:/usr/bin/pinentry-qt Requires: pinentry @@ -78,10 +77,33 @@ Steffen Hansen, Klar�lvdalens Datakonsult AB <steffen(a)klaralvdalens-datakonsult.se> Marcus Brinkmann, g10 Code GmbH <marcus(a)g10code.com> +%package -n pinentry-qt4 +License: GPL v2 or later +Version: %{version} +Release: 1 +Provides: pinentry-dialog +Provides: pinentry:/usr/bin/pinentry-qt4 +Requires: pinentry +Group: Productivity/Other +Summary: Collection of Simple PIN or Passphrase Entry Dialogs + +%description -n pinentry-qt4 +This is a collection of simple PIN or passphrase entry dialogs which +utilize the Assuan protocol as described by the Aegypten project. + + + +Authors: +-------- + Robert Bihlmeyer <robbe(a)orcus.priv.at> + Werner Koch, g10 Code GmbH <wk(a)gnupg.org> + Steffen Hansen, Klar�lvdalens Datakonsult AB <steffen(a)klaralvdalens-datakonsult.se> + Marcus Brinkmann, g10 Code GmbH <marcus(a)g10code.com> + %package -n pinentry-gtk2 License: GPL v2 or later Version: %{version} -Release: 9 +Release: 10 Provides: pinentry-dialog Provides: pinentry:/usr/bin/pinentry-gtk-2 Requires: pinentry @@ -109,6 +131,7 @@ %patch3 %patch5 %patch6 +%patch7 %build cp /usr/share/gettext/config.rpath . @@ -128,10 +151,17 @@ --with-qt-libraries=%{_libdir}/qt3/%_lib/ \ --without-ncurses-include-dir make +#build qt4 pinentry +mkdir _build +cd _build +export CFLAGS="-DHAVE_CONFIG_H" +cmake .. +make %install make DESTDIR=$RPM_BUILD_ROOT install -# remove simlink +install -D -m 0755 _build/pinentry-qt4 ${RPM_BUILD_ROOT}%{_bindir}/pinentry-qt4 +# remove symlink rm -rf ${RPM_BUILD_ROOT}%{_bindir}/pinentry cp %{S:1} ${RPM_BUILD_ROOT}%{_bindir} @@ -151,10 +181,16 @@ %files -n pinentry-qt %attr(755,root,root) %{_bindir}/pinentry-qt +%files -n pinentry-qt4 +%attr(755,root,root) %{_bindir}/pinentry-qt4 + %files -n pinentry-gtk2 %attr(755,root,root) %{_bindir}/pinentry-gtk-2 %changelog +* Thu May 28 2009 puzel(a)suse.cz +- pinentry-qt4 (bnc#505134) + - add pinentry-qt4.patch.bz2 * Mon Nov 10 2008 coolo(a)suse.de - revert the last entry (reopened the bug) * Wed Nov 05 2008 puzel(a)suse.cz @@ -191,7 +227,7 @@ - rewrite pinentry wrapper to use the right binary * Mon Nov 06 2006 pnemec(a)suse.cz - Fixed pinnentry wrapper #218257 -* Sun Oct 15 2006 schwab(a)suse.de +* Mon Oct 16 2006 schwab(a)suse.de - Make sure config.rpath is present. * Tue Oct 03 2006 pnemec(a)suse.cz - removed static simlink to pinentry-qt ++++++ pinentry ++++++ --- /var/tmp/diff_new_pack.t23326/_old 2009-05-28 23:06:59.000000000 +0200 +++ /var/tmp/diff_new_pack.t23326/_new 2009-05-28 23:06:59.000000000 +0200 @@ -8,8 +8,9 @@ # # Anna Bernathova <anicka(a)novell.com> 2006 # Pavel Nemec <pnemec(a)novell.com> 2006 -# -# use proper binary (pinentry-qt, pinentry-gtk-2 or pinentry-curses) +# Pavol Rusnak <prusnak(a)novell.com> 2009 +# +# use proper binary (pinentry-qt4, pinentry-qt, pinentry-gtk-2 or pinentry-curses) kde_running= if [ -n "$KDE_FULL_SESSION" ]; then @@ -39,25 +40,33 @@ fi fi +# if KDE is detected and pinentry-qt4 exists, use pinentry-qt4 +if [ -n "$kde_running" -a -f /usr/bin/pinentry-qt4 ] +then + export PINENTRY_BINARY="/usr/bin/pinentry-qt4" # if KDE is detected and pinentry-qt exists, use pinentry-qt -if [ -n "$kde_running" -a -f /usr/bin/pinentry-qt ] +elif [ -n "$kde_running" -a -f /usr/bin/pinentry-qt ] then export PINENTRY_BINARY="/usr/bin/pinentry-qt" # otherwise test if pinentry-gtk-2 is installed -elif [ -f /usr/bin/pinentry-gtk-2 ] +elif [ -f /usr/bin/pinentry-gtk-2 ] then export PINENTRY_BINARY="/usr/bin/pinentry-gtk-2" +# otherwise test if pinentry-qt4 exists although KDE is not detected +elif [ -f /usr/bin/pinentry-qt4 ] +then + export PINENTRY_BINARY="/usr/bin/pinentry-qt4" # otherwise test if pinentry-qt exists although KDE is not detected elif [ -f /usr/bin/pinentry-qt ] then export PINENTRY_BINARY="/usr/bin/pinentry-qt" -# pinentry-curses is installed by default +# pinentry-curses is installed by default else #test if gui binary is required for opt in "$@"; do if [ "x$opt" = "x--display" ]; then # should not happen because of package dependencies - echo "Please install pinentry-qt or pinentry-gtk2" >&2 + echo "Please install pinentry-qt4, pinentry-qt or pinentry-gtk2" >&2 exit 1 fi done ++++++ pinentry-qt4.patch.bz2 ++++++ ++++ 4965 lines (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 SDL for openSUSE:Factory
by root＠Hilbert.suse.de 28 May '09

28 May '09

Hello community, here is the log from the commit of package SDL for openSUSE:Factory checked in at Thu May 28 23:00:44 CEST 2009. -------- --- SDL/SDL.changes 2009-02-20 02:48:38.000000000 +0100 +++ SDL/SDL.changes 2009-05-20 15:41:15.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 20 15:33:30 CEST 2009 - prusnak(a)suse.cz + +- follow Shared Library Policy + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SDL.spec ++++++ --- /var/tmp/diff_new_pack.Cj6168/_old 2009-05-28 22:57:30.000000000 +0200 +++ /var/tmp/diff_new_pack.Cj6168/_new 2009-05-28 22:57:30.000000000 +0200 @@ -19,20 +19,17 @@ %define aalib 0 Name: SDL -BuildRequires: arts-devel esound-devel libpulse-devel nasm +BuildRequires: arts-devel esound-devel nasm +%if 0%{?suse_version} > 1100 +BuildRequires: libpulse-devel +%endif %if 0%{?aalib} == 1 BuildRequires: aalib-devel %endif License: LGPL v2.1 or later Group: System/Libraries -# bug437293 -%ifarch ppc64 -Obsoletes: SDL-64bit -%endif -# -AutoReqProv: on Version: 1.2.13 -Release: 105 +Release: 106 Summary: Simple DirectMedia Layer Library Source: %{name}-%{version}.tar.bz2 Patch0: %{name}-%{version}-rpath.patch @@ -56,24 +53,45 @@ -------- Sam Lantinga <slouken(a)libsdl.org> -%package devel +%package -n libSDL-1_2-0 +Summary: Simple DirectMedia Layer Library +Group: System/Libraries +License: LGPL v2.1 or later +Obsoletes: SDL < %{version} +Provides: SDL = %{version} +# bnc437293 +%ifarch ppc64 +Obsoletes: SDL-64bit +%endif + +%description -n libSDL-1_2-0 +This is the "Simple DirectMedia Layer" library. It provides a generic +API for access to audio, keyboard, mouse, and display framebuffer +across multiple platforms. + + + +Authors: +-------- + Sam Lantinga <slouken(a)libsdl.org> + +%package -n libSDL-devel License: LGPL v2.1 or later Summary: SDL Library Developer Files Group: Development/Libraries/X11 -# bug437293 +Provides: SDL-devel = %{version} +Obsoletes: SDL-devel < %{version} +# bnc437293 %ifarch ppc64 Obsoletes: SDL-devel-64bit %endif -# -Provides: sdl-devel -Obsoletes: sdl-devel -Requires: SDL = %{version} -Requires: gcc libstdc++-devel alsa-devel xorg-x11-devel Mesa-devel +Requires: libSDL-1_2-0 = %{version} +Requires: gcc libstdc++-devel alsa-devel xorg-x11-devel Mesa-devel pkgconfig %if 0%{?aalib} == 1 Requires: aalib-devel %endif -%description devel +%description -n libSDL-devel This package contains files needed for development with the SDL library. @@ -94,59 +112,49 @@ %patch6 %build -# Check for which CPU requirement we opimize and -# set _target_cpu to the CPU requirement or if no CPU -# requirement opimizations, just the architecture: -%define _target_cpu %(OPT_ARCH=`echo "%optflags"|sed -n "s/.*-march=\$[^[:space:]]*\$.*/\\1/p"`; echo ${OPT_ARCH:-%{_arch}}) -export CFLAGS="$RPM_OPT_FLAGS" -# -fomit-frame-pointer breaks the MMX YV12 conversion on gcc 2.95.2, -# so only add -fomit-frame-pointer if we are not in i386: -%ifnarch %ix86 - export CFLAGS="$CFLAGS -fomit-frame-pointer" -%endif +export CFLAGS="$RPM_OPT_FLAGS -fomit-frame-pointer" export CXXFLAGS="$CFLAGS" ./autogen.sh -%configure --disable-static --with-pic \ - --build=%{_target_platform} \ - --disable-video-svga \ - --disable-video-ggi \ +%configure \ + --disable-static \ + --with-pic \ %if 0%{?aalib} --enable-video-aalib \ %endif - --disable-debug \ - --enable-xfree86-glidehack \ - --enable-dlopen + --disable-video-svga make %{?jobs:-j %jobs} %install make install DESTDIR=$RPM_BUILD_ROOT -%{__rm} -f %{buildroot}%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %clean rm -rf "$RPM_BUILD_ROOT" -%post -p /sbin/ldconfig +%post -n libSDL-1_2-0 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libSDL-1_2-0 -p /sbin/ldconfig -%files +%files -n libSDL-1_2-0 %defattr(-,root,root) %doc BUGS COPYING CREDITS README README-SDL.txt -%{_libdir}/libSDL-1.2.so.0* +%{_libdir}/*.so.* -%files devel +%files -n libSDL-devel %defattr(-,root,root) %doc docs.html README.SVN TODO WhatsNew %doc docs/index.html docs/html docs/images -%{_libdir}/libSDL.so -%{_libdir}/libSDLmain.a %{_bindir}/* +%{_libdir}/*.so +%{_libdir}/libSDLmain.a %{_includedir}/SDL %{_datadir}/aclocal/* %{_mandir}/*/* %{_libdir}/pkgconfig/sdl.pc %changelog +* Wed May 20 2009 prusnak(a)suse.cz +- follow Shared Library Policy * Fri Feb 20 2009 crrodriguez(a)suse.de - disable all static libraries except loner libSDLmain.a which is now built --with-pic @@ -290,7 +298,7 @@ - work around problem with latest automake * Tue Nov 12 2002 nadvornik(a)suse.cz updated to 1.2.5: bugfix release -* Sun Nov 10 2002 ro(a)suse.de +* Mon Nov 11 2002 ro(a)suse.de - fix deprecated multiline string literal for gcc-3.3 * Tue Sep 24 2002 froh(a)suse.de - %%-ifarch'ed Requires: alsa-devel for all but s390 and s390x (#18647) ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.Cj6168/_old 2009-05-28 22:57:30.000000000 +0200 +++ /var/tmp/diff_new_pack.Cj6168/_new 2009-05-28 22:57:30.000000000 +0200 @@ -1,2 +1,2 @@ -SDL -SDL-devel +libSDL-1_2-0 +libSDL-devel ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-gobject2 for openSUSE:Factory
by root＠Hilbert.suse.de 28 May '09

28 May '09

Hello community, here is the log from the commit of package python-gobject2 for openSUSE:Factory checked in at Thu May 28 22:55:01 CEST 2009. -------- --- python-gobject2/python-gobject2.changes 2009-05-01 12:54:06.000000000 +0200 +++ python-gobject2/python-gobject2.changes 2009-05-27 12:32:24.000000000 +0200 @@ -1,0 +2,17 @@ +Wed May 27 12:25:51 CEST 2009 - vuntz(a)novell.com + +- Update to version 2.18.0: + + Improve gio docs with some more classes + + Wrap gio.OutputStream.splice_async() + + Add Python ver into installed libpyglib name + + Wrap gio.OutputStream.flush_async() + + Use 'Requires.private' for libffi in '.pc' files + + Add wrapper for gio.FileAttributeMatcher + + Mark relevant glib.IOChannel methods as METH_NOARGS + + Retire hand-written ChangeLog; autocreate from Git history + + Wrap gio.InputStream.skip_async() + + Add in codegen -n --namespace option and the code to remove dll + API in headers, added documentation + + Properly mark glib.get_user_special_dir() as a keywords method + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- pygobject-2.17.0.tar.bz2 New: ---- pygobject-2.18.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-gobject2.spec ++++++ --- /var/tmp/diff_new_pack.L32003/_old 2009-05-28 22:54:09.000000000 +0200 +++ /var/tmp/diff_new_pack.L32003/_new 2009-05-28 22:54:09.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package python-gobject2 (Version 2.17.0) +# spec file for package python-gobject2 (Version 2.18.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,9 +22,11 @@ %define _name pygobject BuildRequires: fdupes BuildRequires: glib2-devel +# our libffi package doesn't have a pkg-config file +# BuildRequires: libffi-devel BuildRequires: python-devel Summary: Python bindings for GObject -Version: 2.17.0 +Version: 2.18.0 Release: 1 License: LGPL v2.1 or later Group: Development/Libraries/Python @@ -122,6 +124,20 @@ %{_datadir}/gtk-doc/html/* %changelog +* Wed May 27 2009 vuntz(a)novell.com +- Update to version 2.18.0: + + Improve gio docs with some more classes + + Wrap gio.OutputStream.splice_async() + + Add Python ver into installed libpyglib name + + Wrap gio.OutputStream.flush_async() + + Use 'Requires.private' for libffi in '.pc' files + + Add wrapper for gio.FileAttributeMatcher + + Mark relevant glib.IOChannel methods as METH_NOARGS + + Retire hand-written ChangeLog; autocreate from Git history + + Wrap gio.InputStream.skip_async() + + Add in codegen -n --namespace option and the code to remove dll + API in headers, added documentation + + Properly mark glib.get_user_special_dir() as a keywords method * Fri May 01 2009 mboman(a)suse.de - Update to version 2.17.0: + Write a good part of the docs for gio ++++++ pygobject-2.17.0.tar.bz2 -> pygobject-2.18.0.tar.bz2 ++++++ ++++ 13461 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