May 2006 - openSUSE Commits - openSUSE Mailing Lists

commit gnome-session
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package gnome-session checked in at Thu May 25 00:25:00 CEST 2006. -------- --- GNOME/gnome-session/gnome-session.changes 2006-05-21 20:59:09.000000000 +0200 +++ gnome-session/gnome-session.changes 2006-05-24 22:43:40.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 24 22:42:28 CEST 2006 - joeshaw(a)suse.de + +- Fix the gnome script to not break when setting the background on + multihead setups. Patch from Erik Jacobsen. (bnc #178388) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-session.spec ++++++ --- /var/tmp/diff_new_pack.QaBcal/_old 2006-05-25 00:21:35.000000000 +0200 +++ /var/tmp/diff_new_pack.QaBcal/_new 2006-05-25 00:21:35.000000000 +0200 @@ -18,7 +18,7 @@ Group: System/GUI/GNOME Autoreqprov: on Version: 2.12.0 -Release: 110 +Release: 112 Summary: Session Tools for the GNOME 2.x Desktop Source: gnome-session-%{version}.tar.bz2 Source1: gnome @@ -150,6 +150,9 @@ %dir /usr/share/xsessions %changelog -n gnome-session +* Wed May 24 2006 - joeshaw(a)suse.de +- Fix the gnome script to not break when setting the background on + multihead setups. Patch from Erik Jacobsen. (bnc #178388) * Sun May 21 2006 - jpr(a)suse.de - Reset the user's UI if upgrading from NLD9/SLES9 to SLED10, leave ui for SLES10 upgrades (#174123) ++++++ gnome ++++++ --- GNOME/gnome-session/gnome 2006-05-22 20:12:40.000000000 +0200 +++ gnome-session/gnome 2006-05-24 22:42:23.000000000 +0200 @@ -82,8 +82,8 @@ [ -e $HOME/.gconf/desktop/gnome/background/%gconf.xml ] && return mkdir -p ~/.gconf/desktop/gnome/background # determine X-Resolution -X=$(xdpyinfo |grep dimensions:|cut -d " " -f 7 |cut -d "x" -f 1) -Y=$(xdpyinfo |grep dimensions:|cut -d " " -f 7 |cut -d "x" -f 2) +X=$(xdpyinfo |grep dimensions:|head -1|cut -d " " -f 7 |cut -d "x" -f 1) +Y=$(xdpyinfo |grep dimensions:|head -1|cut -d " " -f 7 |cut -d "x" -f 2) # set default wallpaper to 1600x1200 GNOME_WALLPAPER="default-1600x1200.jpg" [ $((($X * 10) / $Y)) -ge 15 ] && GNOME_WALLPAPER="default-1920x1200.jpg" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit gdm
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package gdm checked in at Thu May 25 00:21:32 CEST 2006. -------- --- GNOME/gdm/gdm.changes 2006-05-19 03:16:07.000000000 +0200 +++ gdm/gdm.changes 2006-05-24 18:06:48.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 24 17:43:36 CEST 2006 - sbrabec(a)suse.cz + +- Do not display Japanese string in terminal, which doesn't support + it (#168736). +- Disabled beep on start (#174786). + +------------------------------------------------------------------- New: ---- gdm-no-ja-in-console.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdm.spec ++++++ --- /var/tmp/diff_new_pack.8S6B5p/_old 2006-05-25 00:21:04.000000000 +0200 +++ /var/tmp/diff_new_pack.8S6B5p/_new 2006-05-25 00:21:04.000000000 +0200 @@ -22,7 +22,7 @@ Group: System/GUI/GNOME Autoreqprov: on Version: 2.8.0.7 -Release: 60 +Release: 63 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd @@ -54,6 +54,7 @@ Patch24: gdm2-server-timeout.patch Patch25: gdm-2.8.0.7-user-must-own-iceauthority.patch Patch26: gdm-2.8.0.7-some-info-in-dialog.patch +Patch27: gdm-no-ja-in-console.patch URL: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Docdir: %{_defaultdocdir} @@ -110,6 +111,7 @@ %patch24 %patch25 -p1 %patch26 -p1 +%patch27 gnome-patch-translation-update # This patch has its own translation updater. %patch18 @@ -237,6 +239,10 @@ %endif %changelog -n gdm +* Wed May 24 2006 - sbrabec(a)suse.cz +- Do not display Japanese string in terminal, which doesn't support + it (#168736). +- Disabled beep on start (#174786). * Fri May 19 2006 - hpj(a)suse.de - Made GDM use the more graphically intensive, but prettier, gdmgreeter for remote logins. Fixes Novell bug #176661. ++++++ gdm-conf.patch ++++++ --- /var/tmp/diff_new_pack.8S6B5p/_old 2006-05-25 00:21:06.000000000 +0200 +++ /var/tmp/diff_new_pack.8S6B5p/_new 2006-05-25 00:21:06.000000000 +0200 @@ -1,7 +1,6 @@ -diff -upr gdm-2.8.0.7-pre/config/gdm.conf.in gdm-2.8.0.7-post/config/gdm.conf.in ---- gdm-2.8.0.7-pre/config/gdm.conf.in 2005-10-06 14:25:45.000000000 -0500 -+++ gdm-2.8.0.7-post/config/gdm.conf.in 2006-05-18 20:08:53.000000000 -0500 -@@ -45,11 +45,11 @@ TimedLoginDelay=30 +--- gdm-2.8.0.7/config/gdm.conf.in ++++ gdm-2.8.0.7/config/gdm.conf.in +@@ -45,11 +45,11 @@ # The greeter for local (non-xdmcp) logins. Change gdmlogin to gdmgreeter to # get the new graphical greeter. @@ -15,7 +14,7 @@ # Launch the greeter with an additional list of colon seperated gtk # modules. This is useful for enabling additional feature support -@@ -61,8 +61,10 @@ TimedLoginDelay=30 +@@ -61,8 +61,10 @@ # Default path to set. The profile scripts will likely override this #DefaultPath=@GDM_USER_PATH@ @@ -26,7 +25,7 @@ # If you are having trouble with using a single server for a long time and # want gdm to kill/restart the server, turn this on -@@ -98,6 +100,9 @@ XKeepsCrashing=@EXPANDED_SYSCONFDIR@/gdm +@@ -98,6 +100,9 @@ #RebootCommand=@REBOOT_COMMAND@ #HaltCommand=@HALT_COMMAND@ #SuspendCommand=@SUSPEND_COMMAND@ @@ -36,7 +35,7 @@ # Probably should not touch the below this is the standard setup ServAuthDir=@EXPANDED_AUTHDIR@ # This is our standard startup script. A bit different from a normal -@@ -108,7 +113,7 @@ BaseXsession=@EXPANDED_SYSCONFDIR@/gdm/X +@@ -108,7 +113,7 @@ # It is really a PATH style variable since 2.4.4.2 to allow actual # interoperability with KDM. Note that <sysconfdir>/dm/Sessions is there # for backwards compatibility reasons with 2.4.4.x @@ -45,7 +44,7 @@ # This is the default .desktop session. One of the ones in SessionDesktopDir #DefaultSession=gnome.desktop # Better leave this blank and HOME will be used. You can use syntax ~/ below -@@ -174,7 +179,7 @@ Xnest=@X_XNEST_PATH@/Xnest @X_XNEST_CONF +@@ -174,7 +179,7 @@ # want to minimize possibility of breakin AllowRoot=true # If you want to be paranoid, turn this one off @@ -54,7 +53,7 @@ # This will allow remote timed login AllowRemoteAutoLogin=false # 0 is the most restrictive, 1 allows group write permissions, 2 allows all -@@ -184,7 +189,7 @@ RelaxPermissions=0 +@@ -184,7 +189,7 @@ # example, home directories owned by some other user. CheckDirOwner=true # Number of seconds to wait after a bad login @@ -63,7 +62,7 @@ # Maximum size of a file we wish to read. This makes it hard for a user to DoS # us by using a large file. #UserMaxFile=65536 -@@ -239,18 +244,18 @@ Enable=false +@@ -239,18 +244,18 @@ #PingIntervalSeconds=15 # The port. 177 is the standard port so better keep it that way #Port=177 @@ -89,7 +88,7 @@ # The GTK+ theme to use for the gui #GtkTheme=Default -@@ -282,7 +287,7 @@ Browser=false +@@ -282,7 +287,7 @@ # face browser or in the gdmselection list for Automatic/Timed login. # They will not be displayed regardless of the settings for # Include and Exclude. @@ -98,7 +97,7 @@ # Users listed in Include will be included in the face browser and in # the gdmsetup selection list for Automatic/Timed login. Users # should be separated by commas. -@@ -310,7 +315,7 @@ Browser=false +@@ -310,7 +315,7 @@ #Logo=@EXPANDED_PIXMAPDIR@/gdm-foot-logo.png # The standard greeter should shake if a user entered the wrong username or # password. Kind of cool looking @@ -107,7 +106,7 @@ # The Actions menu (formerly system menu) is shown in the greeter, this is the # menu that contains reboot, shutdown, suspend, config and chooser. None of # these is available if this is off. They can be turned off individually -@@ -338,7 +343,7 @@ DefaultRemoteWelcome=true +@@ -338,7 +343,7 @@ #RemoteWelcome=Welcome to %n # Don't allow user to move the standard greeter window. Only makes sense # if TitleBar is on @@ -116,7 +115,7 @@ # Set a position rather then just centering the window. If you enter # negative values for the position it is taken as an offset from the # right or bottom edge. -@@ -351,9 +356,9 @@ DefaultRemoteWelcome=true +@@ -351,9 +356,9 @@ # Background settings for the standard greeter: # Type can be 0=None, 1=Image, 2=Color #BackgroundType=2 @@ -128,7 +127,7 @@ # XDMCP session should only get a color, this is the sanest setting since # you don't want to take up too much bandwidth #BackgroundRemoteOnlyColor=true -@@ -385,7 +390,7 @@ DefaultRemoteWelcome=true +@@ -385,7 +390,7 @@ # then provide a list that is delimited by /: to the GraphicalThemes key and # set GraphicalThemeRand to true. Otherwise use GraphicalTheme and specify # just one theme. @@ -137,3 +136,11 @@ #GraphicalThemes=circles/:happygnome GraphicalThemeDir=@EXPANDED_DATADIR@/gdm/themes/ GraphicalThemeRand=false +@@ -400,6 +405,7 @@ + # 'play' executable (see daemon/SoundProgram) it will play that file + # instead of just beeping + #SoundOnLogin=true ++SoundOnLogin=false + #SoundOnLoginFile= + # If SoundOnLoginSuccess, then the greeter will play a sound (as above) + # when a user successfully logs in ++++++ gdm-no-ja-in-console.patch ++++++ Untranslate due to these message displays at shutdown process but it supports only iso-8859 character set. ================================================================================ --- po/ja.po +++ po/ja.po @@ -618,12 +618,12 @@ #: ../daemon/gdm.c:1385 #, c-format msgid "System is rebooting, please wait ..." -msgstr "システムを再起動しています。少々、お待ち下さい..." +msgstr "System is rebooting, please wait ..." #: ../daemon/gdm.c:1387 #, c-format msgid "System is shutting down, please wait ..." -msgstr "システムを停止しています。少々、お待ち下さい..." +msgstr "System is shutting down, please wait ..." #: ../daemon/gdm.c:1398 msgid "Master halting..." ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit gkrellm
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package gkrellm checked in at Thu May 25 00:21:27 CEST 2006. -------- --- gkrellm/gkrellm.changes 2006-01-25 21:36:12.000000000 +0100 +++ gkrellm/gkrellm.changes 2006-05-24 17:22:29.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 24 17:22:23 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gkrellm.spec ++++++ --- /var/tmp/diff_new_pack.eZQubn/_old 2006-05-25 00:21:21.000000000 +0200 +++ /var/tmp/diff_new_pack.eZQubn/_new 2006-05-25 00:21:21.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package gkrellm (Version 2.2.7) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -16,9 +16,9 @@ Group: System/Monitoring Autoreqprov: on Version: 2.2.7 -Release: 1 +Release: 14 URL: http://www.gkrellm.net -Summary: Manages multiple stacked monitors +Summary: Manages Multiple Stacked Monitors Source: %{name}-%{version}.tar.bz2 Source1: %name.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,21 +35,23 @@ * Memory and swap space usage meters and a system uptime monitor. -* File system meters show capacity/free space and can mount/umount. +* File system meters show capacity and free space and can mount and + umount. -* A mailbox monitor which can launch mail reader, remote mail fetch. +* A mailbox monitor that can launch a mail reader and fetch remote + mail. -* Clock/calendar and hostname display. +* Clock, calendar, and hostname display. * APM laptop battery monitor. -* CPU/motherboard temperature display if lm_sensors modules +* CPU and motherboard temperature display if lm_sensors modules are installed. * Multiple monitors managed by a single process to reduce system load. -* PPP on/off button that can execute your PPP scripts. +* PPP on and off button that can execute your PPP scripts. * Charts are autoscaling with configurable grid line resolution. @@ -74,12 +76,11 @@ make "CFLAGS=$RPM_OPT_FLAGS -fno-strict-aliasing" SMC_LIBS="-L/usr/X11R6/%_lib -lSM -lICE" LOCALEDIR="%{_prefix}/share/locale" %install -rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/usr/bin mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1 mkdir -p $RPM_BUILD_ROOT/usr/include mkdir -p $RPM_BUILD_ROOT/usr/%_lib/pkgconfig -make install \ +make install STRIP= \ SMC_LIBS="-L/usr/X11R6/%_lib -lSM -lICE" \ INSTALLROOT=$RPM_BUILD_ROOT/%{_prefix} \ PKGCONFIGDIR=$RPM_BUILD_ROOT/usr/%_lib/pkgconfig \ @@ -100,6 +101,8 @@ %{_datadir}/locale/*/*/* %changelog -n gkrellm +* Wed May 24 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Fri Jul 29 2005 - ltinkl(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit freeradius
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package freeradius checked in at Thu May 25 00:21:14 CEST 2006. -------- --- freeradius/freeradius.changes 2006-03-28 21:04:23.000000000 +0200 +++ freeradius/freeradius.changes 2006-05-24 15:58:47.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 24 15:58:41 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freeradius.spec ++++++ --- /var/tmp/diff_new_pack.mMHXw0/_old 2006-05-25 00:20:56.000000000 +0200 +++ /var/tmp/diff_new_pack.mMHXw0/_new 2006-05-25 00:20:56.000000000 +0200 @@ -16,7 +16,7 @@ Provides: radiusd Conflicts: radiusd-livingston radiusd-cistron icradius Version: 1.1.0 -Release: 13 +Release: 19 URL: http://www.freeradius.org/ Summary: Very Highly Configurable Radius Server Source0: %{name}-%{version}.tar.bz2 @@ -158,10 +158,8 @@ make %install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/var/lib/radiusd -make install R=$RPM_BUILD_ROOT +make install R=$RPM_BUILD_ROOT INSTALLSTRIP= # modify default configuration RADDB=$RPM_BUILD_ROOT%{_sysconfdir}/raddb perl -i -pe 's/^#user =.*$/user = radiusd/' $RADDB/radiusd.conf @@ -351,6 +349,8 @@ #%attr(644,root,root) /usr/lib/freeradius/*.la %changelog -n freeradius +* Wed May 24 2006 - schwab(a)suse.de +- Don't strip binaries. * Tue Mar 28 2006 - stark(a)suse.de - fixed an error on x86_64 machines when reading dictionaries (#161503) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit f-spot
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package f-spot checked in at Thu May 25 00:20:55 CEST 2006. -------- --- GNOME/f-spot/f-spot.changes 2006-05-19 18:31:38.000000000 +0200 +++ f-spot/f-spot.changes 2006-05-24 23:30:36.000000000 +0200 @@ -1,0 +2,13 @@ +Wed May 24 23:29:49 CEST 2006 - lewing(a)suse.de + +- Avoid long intervals with no refresh in slideshow. Fixes 177745. +- Handle errors while attempting to adjust colors. Fixes 178415. +- Avoid raising the main window above the fullscreen window. Fixes 178358. + +------------------------------------------------------------------- +Wed May 24 03:02:59 CEST 2006 - lewing(a)suse.de + +- Make the importer handle cancelation properly. Fixes 173643. +- When copying files unset the readonly flag. Fixes 177738. + +------------------------------------------------------------------- New: ---- f-spot-black.patch f-spot-cancel.patch f-spot-colordialog.patch f-spot-popup.patch f-spot-readonly.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ f-spot.spec ++++++ --- /var/tmp/diff_new_pack.W4oCL6/_old 2006-05-25 00:20:16.000000000 +0200 +++ /var/tmp/diff_new_pack.W4oCL6/_new 2006-05-25 00:20:16.000000000 +0200 @@ -19,7 +19,7 @@ Autoreqprov: on Suggests: dcraw Version: 0.1.11 -Release: 22 +Release: 24 Summary: GNOME Photo Management Application URL: http://www.gnome.org/projects/f-spot/ Source: %{name}-%{version}.tar.bz2 @@ -43,6 +43,11 @@ Patch15: %{name}-idleimport.patch Patch16: %{name}-missingfile.patch Patch17: %{name}-screensaverprefs.patch +Patch18: %{name}-cancel.patch +Patch19: %{name}-readonly.patch +Patch20: %{name}-black.patch +Patch21: %{name}-colordialog.patch +Patch22: %{name}-popup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mono-core nautilus-cd-burner dbus-1-x11 @@ -86,6 +91,11 @@ %patch15 %patch16 %patch17 +%patch18 +%patch19 +%patch20 +%patch21 +%patch22 %build rename no nb po/no.* @@ -144,6 +154,13 @@ %endif %changelog -n f-spot +* Wed May 24 2006 - lewing(a)suse.de +- Avoid long intervals with no refresh in slideshow. Fixes 177745. +- Handle errors while attempting to adjust colors. Fixes 178415. +- Avoid raising the main window above the fullscreen window. Fixes 178358. +* Wed May 24 2006 - lewing(a)suse.de +- Make the importer handle cancelation properly. Fixes 173643. +- When copying files unset the readonly flag. Fixes 177738. * Fri May 19 2006 - gekker(a)suse.de - Update translations for cs, hu, and fi * Fri May 19 2006 - lewing(a)suse.de ++++++ f-spot-black.patch ++++++ Index: src/SlideView.cs =================================================================== RCS file: /cvs/gnome/f-spot/src/SlideView.cs,v retrieving revision 1.46 diff -u -p -r1.46 SlideView.cs --- src/SlideView.cs 2 Mar 2006 00:19:39 -0000 1.46 +++ src/SlideView.cs 23 May 2006 21:43:30 -0000 @@ -285,12 +285,24 @@ namespace FSpot { private Pixbuf CrossFade (Pixbuf current, Pixbuf prev, Pixbuf next, double percent) { - int width = Allocation.Width; - int height = Allocation.Height; - - prev.CopyArea (0, 0, width, height, current, 0, 0); - next.Composite (current, 0,0, width, height, 0, 0, 1, 1, + Rectangle area = new Rectangle (0, 0, Allocation.Width, Allocation.Height); + Rectangle rect = new Rectangle (0, 0, 256, 256); + Rectangle subarea; + + while (rect.Y < area.Height) { + while (rect.X < area.Width) { + if (IsRealized) + GdkWindow.ProcessUpdates (false); + + rect.Intersect (area, out subarea); + prev.CopyArea (subarea.X, subarea.Y, subarea.Width, subarea.Height, current, subarea.X, subarea.Y); + next.Composite (current, subarea.X, subarea.Y, subarea.Width, subarea.Height, 0, 0, 1, 1, Gdk.InterpType.Nearest, (int) System.Math.Round (255 * percent)); + rect.X += rect.Width; + } + rect.X = area.X; + rect.Y += rect.Height; + } return current; } @@ -321,7 +333,35 @@ namespace FSpot { private Pixbuf GetScaled (Pixbuf orig) { - Pixbuf scaled = PixbufUtils.ScaleToAspect (orig, Allocation.Width, Allocation.Height); + Gdk.Rectangle pos; + int width = Allocation.Width; + int height = Allocation.Height; + double scale = PixbufUtils.Fit (orig, width, height, false, out pos.Width, out pos.Height); + pos.X = (width - pos.Width) / 2; + pos.Y = (height - pos.Height) / 2; + + Pixbuf scaled = new Pixbuf (Colorspace.Rgb, false, 8, width, height); + scaled.Fill (0x000000); + + Rectangle rect = new Rectangle (pos.X, pos.Y, 256, 256); + Rectangle subarea; + + while (rect.Top < pos.Bottom) { + while (rect.X < pos.Right) { + if (IsRealized) + GdkWindow.ProcessUpdates (false); + + rect.Intersect (pos, out subarea); + orig.Composite (scaled, subarea.X, subarea.Y, + subarea.Width, subarea.Height, + pos.X, pos.Y, scale, scale, + Gdk.InterpType.Bilinear, + 255); + rect.X += rect.Width; + } + rect.X = pos.X; + rect.Y += rect.Height; + } orig.Dispose (); return scaled; ++++++ f-spot-cancel.patch ++++++ Index: src/ImportCommand.cs =================================================================== RCS file: /cvs/gnome/f-spot/src/ImportCommand.cs,v retrieving revision 1.59.2.1 diff -u -p -r1.59.2.1 ImportCommand.cs --- src/ImportCommand.cs 18 May 2006 00:58:52 -0000 1.59.2.1 +++ src/ImportCommand.cs 23 May 2006 21:25:01 -0000 @@ -365,7 +365,7 @@ public class ImportCommand : FSpot.Glade MainWindow.Toplevel.ImportCamera (port); } - Start (); + idle_start.Start (); } } @@ -692,6 +697,8 @@ public class ImportCommand : FSpot.Glade public void Cancel () { + idle_start.Stop (); + step.Stop (); if (importer != null) { importer.Cancel (); importer = null; ++++++ f-spot-colordialog.patch ++++++ Index: src/ColorDialog.cs =================================================================== RCS file: /cvs/gnome/f-spot/src/ColorDialog.cs,v retrieving revision 1.45.4.1 diff -u -p -r1.45.4.1 ColorDialog.cs --- src/ColorDialog.cs 19 May 2006 18:52:39 -0000 1.45.4.1 +++ src/ColorDialog.cs 24 May 2006 05:49:13 -0000 @@ -137,6 +137,9 @@ namespace FSpot { [Glade.Widget] private Gtk.CheckButton white_check; [Glade.Widget] private Gtk.CheckButton exposure_check; + + [Glade.Widget] Gtk.Button ok_button; + [Glade.Widget] Gtk.VBox control_vbox; private FSpot.PhotoImageView view; @@ -157,6 +160,9 @@ namespace FSpot { if (brightness_scale == null) return; + if (AdjustedPixbuf == null) + return; + Cms.Profile display_profile = Cms.Profile.GetScreenProfile (view.Screen); Cms.Profile [] list; @@ -268,33 +274,34 @@ namespace FSpot { return; Console.WriteLine ("Saving...."); + Photo photo = (Photo)view.Item.Current; - bool create_version = photo.DefaultVersionId == Photo.OriginalVersionId; - - Gdk.Pixbuf orig = view.CompletePixbuf (); - Gdk.Pixbuf final = new Gdk.Pixbuf (Gdk.Colorspace.Rgb, - false, 8, - orig.Width, - orig.Height); - - Cms.Profile abs = AdjustmentProfile (); - - // FIXME this shouldn't use the screen as the destination profile. - Cms.Profile destination = Cms.Profile.GetScreenProfile (view.Screen); - if (destination == null) - destination = Cms.Profile.CreateStandardRgb (); - - Cms.Profile [] list = new Cms.Profile [] { image_profile, abs, destination }; - Cms.Transform transform = new Cms.Transform (list, - PixbufUtils.PixbufCmsFormat (orig), - PixbufUtils.PixbufCmsFormat (final), - Cms.Intent.Perceptual, 0x0000); - - PixbufUtils.ColorAdjust (orig, - final, - transform); - try { + bool create_version = photo.DefaultVersionId == Photo.OriginalVersionId; + + Gdk.Pixbuf orig = view.CompletePixbuf (); + Gdk.Pixbuf final = new Gdk.Pixbuf (Gdk.Colorspace.Rgb, + false, 8, + orig.Width, + orig.Height); + + Cms.Profile abs = AdjustmentProfile (); + + // FIXME this shouldn't use the screen as the destination profile. + Cms.Profile destination = Cms.Profile.GetScreenProfile (view.Screen); + if (destination == null) + destination = Cms.Profile.CreateStandardRgb (); + + Cms.Profile [] list = new Cms.Profile [] { image_profile, abs, destination }; + Cms.Transform transform = new Cms.Transform (list, + PixbufUtils.PixbufCmsFormat (orig), + PixbufUtils.PixbufCmsFormat (final), + Cms.Intent.Perceptual, 0x0000); + + PixbufUtils.ColorAdjust (orig, + final, + transform); + photo.SaveVersion (final, create_version); ((PhotoQuery)view.Query).Commit (view.Item.Index); } catch (System.Exception e) { @@ -340,39 +347,39 @@ namespace FSpot { private void HandlePhotoChanged (PhotoImageView view) { - if (!view.Item.IsValid) { - image_profile = null; - return; - } - try { + if (!view.Item.IsValid) + throw new Exception ("Invalid Image"); + FSpot.ImageFile img = FSpot.ImageFile.Create (((Photo)view.Item.Current).DefaultVersionPath); - - image_profile = img.GetProfile (); - + + try { + image_profile = img.GetProfile (); + } catch (System.Exception e) { + image_profile = null; + System.Console.WriteLine (e); + } + // FIXME fall back to rgb for now if (image_profile == null) image_profile = Cms.Profile.CreateStandardRgb (); AdjustedPixbuf = img.Load (256, 256); ScaledPixbuf = AdjustedPixbuf.Copy (); - - #if false - Cms.Profile srgb = Cms.Profile.CreateSRgb (); - Cms.Profile lab = Cms.Profile.CreateLab (); - Cms.Profile [] list = new Cms.Profile [] { srgb, lab }; - - Cms.Transform t = new Cms.Transform (list, - PixbufUtils.PixbufCmsFormat (AdjustedPixbuf), - PixbufUtils.PixbufCmsFormat (AdjustedPixbuf), - Cms.Intent.Perceptual, 0x0000); - - PixbufUtils.ColorAdjust (AdjustedPixbuf, - ScaledPixbuf, - t); - #endif + + // FIXME handle alpha + if (AdjustedPixbuf.HasAlpha) + throw new Exception ("Unsupported Alpha Channel"); + + control_vbox.Sensitive = true; + ok_button.Sensitive = true; + RangeChanged (null, null); } catch (System.Exception e) { + control_vbox.Sensitive = false; + ok_button.Sensitive = false; + AdjustedPixbuf = null; + ScaledPixbuf = null; image_profile = null; } } Index: src/f-spot.glade =================================================================== RCS file: /cvs/gnome/f-spot/src/f-spot.glade,v retrieving revision 1.159.2.1 diff -u -p -r1.159.2.1 f-spot.glade --- src/f-spot.glade 23 May 2006 16:26:33 -0000 1.159.2.1 +++ src/f-spot.glade 24 May 2006 05:49:14 -0000 @@ -11087,7 +11087,7 @@ Photo Details</property> </child> <child> - <widget class="GtkVBox" id="vbox67"> + <widget class="GtkVBox" id="control_vbox"> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">0</property> ++++++ f-spot-popup.patch ++++++ Index: src/FullScreenView.cs =================================================================== RCS file: /cvs/gnome/f-spot/src/FullScreenView.cs,v retrieving revision 1.15 diff -u -p -r1.15 FullScreenView.cs --- src/FullScreenView.cs 11 Aug 2005 19:50:20 -0000 1.15 +++ src/FullScreenView.cs 24 May 2006 15:19:17 -0000 @@ -129,7 +129,7 @@ namespace FSpot { if (args.Event.Type == Gdk.EventType.ButtonPress && args.Event.Button == 3) { PhotoPopup popup = new PhotoPopup (); - popup.Activate (args.Event); + popup.Activate (this.Toplevel, args.Event); } } Index: src/PhotoPopup.cs =================================================================== RCS file: /cvs/gnome/f-spot/src/PhotoPopup.cs,v retrieving revision 1.13 diff -u -p -r1.13 PhotoPopup.cs --- src/PhotoPopup.cs 1 Mar 2006 07:51:19 -0000 1.13 +++ src/PhotoPopup.cs 24 May 2006 15:19:17 -0000 @@ -17,31 +17,41 @@ using Gdk; using Mono.Posix; public class PhotoPopup { - public void Activate () + Widget creator; + + public Widget Creator { + get { + return creator; + } + } + + public void Activate (Widget w) { - Activate (null); + Activate (w, null); } - public void Activate (Gdk.EventButton eb) + public void Activate (Widget w, Gdk.EventButton eb) { // FIXME this is a hack to handle the --view case for the time being. if (MainWindow.Toplevel == null) return; + creator = w; + int count = MainWindow.Toplevel.SelectedIds ().Length; - Gtk.Menu popup_menu = new Gtk.Menu (); + Gtk.Menu popup_menu = new Menu (); bool have_selection = count > 0; GtkUtil.MakeMenuItem (popup_menu, Mono.Posix.Catalog.GetString ("Copy Photo Location"), - new EventHandler (MainWindow.Toplevel.HandleCopyLocation), have_selection); + delegate { MainWindow.Toplevel.HandleCopyLocation (creator, null); }, have_selection); GtkUtil.MakeMenuSeparator (popup_menu); GtkUtil.MakeMenuItem (popup_menu, "f-spot-rotate-270", - new EventHandler (MainWindow.Toplevel.HandleRotate270Command), have_selection); + delegate { MainWindow.Toplevel.HandleRotate270Command(creator, null); }, have_selection); GtkUtil.MakeMenuItem (popup_menu, "f-spot-rotate-90", - new EventHandler (MainWindow.Toplevel.HandleRotate90Command), have_selection); + delegate { MainWindow.Toplevel.HandleRotate90Command (creator, null); }, have_selection); GtkUtil.MakeMenuSeparator (popup_menu); @@ -50,9 +60,9 @@ public class PhotoPopup { owm.ApplicationActivated += MainWindow.Toplevel.HandleOpenWith; GtkUtil.MakeMenuItem (popup_menu, Mono.Posix.Catalog.GetString ("Remove From Catalog"), - new EventHandler (MainWindow.Toplevel.HandleRemoveCommand), have_selection); + delegate { MainWindow.Toplevel.HandleRemoveCommand (creator, null); }, have_selection); GtkUtil.MakeMenuItem (popup_menu, Mono.Posix.Catalog.GetString ("Delete From Drive"), - new EventHandler (MainWindow.Toplevel.HandleDeleteCommand), have_selection); + delegate { MainWindow.Toplevel.HandleDeleteCommand (creator, null); }, have_selection); GtkUtil.MakeMenuSeparator (popup_menu); @@ -82,5 +92,7 @@ public class PhotoPopup { popup_menu.Popup (null, null, null, eb.Button, eb.Time); else popup_menu.Popup (null, null, null, 0, Gtk.Global.CurrentEventTime); - } + } + + } Index: src/PhotoView.cs =================================================================== RCS file: /cvs/gnome/f-spot/src/PhotoView.cs,v retrieving revision 1.84.2.2 diff -u -p -r1.84.2.2 PhotoView.cs --- src/PhotoView.cs 18 May 2006 14:50:45 -0000 1.84.2.2 +++ src/PhotoView.cs 24 May 2006 15:19:17 -0000 @@ -240,14 +240,14 @@ public class PhotoView : EventBox { if (args.Event.Type == EventType.ButtonPress && args.Event.Button == 3) { PhotoPopup popup = new PhotoPopup (); - popup.Activate (args.Event); + popup.Activate (this.Toplevel, args.Event); } } protected override bool OnPopupMenu () { PhotoPopup popup = new PhotoPopup (); - popup.Activate (); + popup.Activate (this.Toplevel); return true; } Index: src/QueryView.cs =================================================================== RCS file: /cvs/gnome/f-spot/src/QueryView.cs,v retrieving revision 1.14 diff -u -p -r1.14 QueryView.cs --- src/QueryView.cs 25 Feb 2006 08:54:05 -0000 1.14 +++ src/QueryView.cs 24 May 2006 15:19:17 -0000 @@ -55,14 +55,14 @@ public class QueryView : IconView { protected override bool OnPopupMenu () { PhotoPopup popup = new PhotoPopup (); - popup.Activate (); + popup.Activate (this); return true; } protected override void ContextMenu (Gtk.ButtonPressEventArgs args, int cell_num) { PhotoPopup popup = new PhotoPopup (); - popup.Activate (args.Event); + popup.Activate (this, args.Event); } } Index: src/MainWindow.cs =================================================================== RCS file: /cvs/gnome/f-spot/src/MainWindow.cs,v retrieving revision 1.286.2.3 diff -u -p -r1.286.2.3 MainWindow.cs --- src/MainWindow.cs 19 May 2006 18:54:41 -0000 1.286.2.3 +++ src/MainWindow.cs 24 May 2006 15:19:17 -0000 @@ -675,9 +679,9 @@ public class MainWindow { // Commands // - private void RotateSelectedPictures (RotateDirection direction) + private void RotateSelectedPictures (Gtk.Window parent, RotateDirection direction) { - RotateCommand command = new RotateCommand (main_window); + RotateCommand command = new RotateCommand (parent); int [] selected_ids = SelectedIds (); if (command.Execute (direction, SelectedPhotos (selected_ids))) { @@ -2065,6 +2065,21 @@ public class MainWindow { main_window, DialogFlags.DestroyWithParent, MessageType.Error, error, msg, ok_caption); } + + public Gtk.Window GetToplevel (object sender) + { + Widget wsender = sender as Widget; + Gtk.Window toplevel = null; + + if (wsender != null) + toplevel = (Gtk.Window) wsender.Toplevel; + else if (fsview != null) + toplevel = fsview; + else + toplevel = main_window; + + return toplevel; + } public void HandleDeleteCommand (object sender, EventArgs args) { @@ -2077,7 +2092,13 @@ public class MainWindow { "This deletes all versions of the selected photos from your drive.", photos.Length); string ok_caption = Mono.Posix.Catalog.GetPluralString ("_Delete photo", "_Delete photos", photos.Length); - if (ResponseType.Ok == HigMessageDialog.RunHigConfirmation(main_window, DialogFlags.DestroyWithParent, MessageType.Warning, header, msg, ok_caption)) { + + + + if (ResponseType.Ok == HigMessageDialog.RunHigConfirmation(GetToplevel (sender), + DialogFlags.DestroyWithParent, + MessageType.Warning, + header, msg, ok_caption)) { foreach (Photo photo in photos) { foreach (uint id in photo.VersionIds) { @@ -2105,7 +2126,7 @@ public class MainWindow { header = String.Format (header, photos.Length); string msg = Mono.Posix.Catalog.GetString("If you remove photos from the F-Spot catalog all tag information will be lost. The photos remain on your computer and can be imported into F-Spot again."); string ok_caption = Mono.Posix.Catalog.GetString("_Remove from Catalog"); - if (ResponseType.Ok == HigMessageDialog.RunHigConfirmation(main_window, DialogFlags.DestroyWithParent, + if (ResponseType.Ok == HigMessageDialog.RunHigConfirmation(GetToplevel (sender), DialogFlags.DestroyWithParent, MessageType.Warning, header, msg, ok_caption)) { db.Photos.Remove (photos); UpdateQuery (); @@ -2208,12 +2229,12 @@ public class MainWindow { public void HandleRotate90Command (object sender, EventArgs args) { - RotateSelectedPictures (RotateDirection.Clockwise); + RotateSelectedPictures (GetToplevel (sender), RotateDirection.Clockwise); } public void HandleRotate270Command (object sender, EventArgs args) { - RotateSelectedPictures (RotateDirection.Counterclockwise); + RotateSelectedPictures (GetToplevel (sender), RotateDirection.Counterclockwise); } public void HandleCopyLocation (object sender, EventArgs args) ++++++ f-spot-readonly.patch ++++++ Index: src/FileImportBackend.cs =================================================================== RCS file: /cvs/gnome/f-spot/src/FileImportBackend.cs,v retrieving revision 1.29.2.1 diff -u -p -r1.29.2.1 FileImportBackend.cs --- src/FileImportBackend.cs 17 May 2006 22:17:04 -0000 1.29.2.1 +++ src/FileImportBackend.cs 23 May 2006 21:25:24 -0000 @@ -3,6 +3,7 @@ using Gtk; using Gnome; using System.Collections; using System; +using System.IO; public class ImportException : System.Exception { public ImportException (string msg) : base (msg) @@ -177,6 +178,12 @@ public class FileImportBackend : ImportB System.IO.File.Copy (path, dest); photo = store.Create (dest, path, out thumbnail); path = dest; + + try { + File.SetAttributes (dest, File.GetAttributes (dest) & ~FileAttributes.ReadOnly); + } catch (System.Exception e) { + // we don't want an exception here to be fatal. + } } else { photo = store.Create (path, out thumbnail); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit enscript
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package enscript checked in at Thu May 25 00:20:09 CEST 2006. -------- --- enscript/enscript.changes 2006-01-25 21:35:43.000000000 +0100 +++ enscript/enscript.changes 2006-05-24 19:47:46.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 24 19:47:39 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ enscript.spec ++++++ --- /var/tmp/diff_new_pack.xguaMH/_old 2006-05-25 00:19:59.000000000 +0200 +++ /var/tmp/diff_new_pack.xguaMH/_new 2006-05-25 00:19:59.000000000 +0200 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -19,7 +19,7 @@ PreReq: %install_info_prereq Autoreqprov: on Version: 1.6.4 -Release: 8 +Release: 19 Summary: An ASCII to PostScript(tm) Converter Source: enscript-%{version}.tar.bz2 Source1: enscript-gs-font.map @@ -51,7 +51,7 @@ %build CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -funroll-loops -Wall -fno-strict-aliasing -pipe -fstack-protector" - LDFLAGS='-s' + LDFLAGS= export CC CFLAGS LDFLAGS autoreconf --force # --install test ! -f po/Makevars.template || mv po/Makevars.template po/Makevars @@ -71,7 +71,7 @@ make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" %install - make install-strip DESTDIR=$RPM_BUILD_ROOT + make install DESTDIR=$RPM_BUILD_ROOT ln -sf enscript $RPM_BUILD_ROOT/usr/bin/genscript ln -sf enscript.1 $RPM_BUILD_ROOT%{_mandir}/man1/genscript.1 mkdir -p -m 0755 $RPM_BUILD_ROOT%{_datadir}/ghostscript/fonts @@ -110,6 +110,8 @@ %{_datadir}/locale/*/LC_MESSAGES/enscript.mo %changelog -n enscript +* Wed May 24 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Thu Jan 12 2006 - werner(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit dia
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package dia checked in at Thu May 25 00:19:59 CEST 2006. -------- --- GNOME/dia/dia.changes 2006-05-17 13:28:28.000000000 +0200 +++ dia/dia.changes 2006-05-23 18:55:03.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 23 18:15:45 CEST 2006 - sbrabec(a)suse.cz + +- Fixed more format string vulnerabilities (CVE-2006-2453, + #173867). + +------------------------------------------------------------------- @@ -4 +10,2 @@ -- Fixed message format string vulnerability (#173867). +- Fixed message format string vulnerability (CVE-2006-2480, + #173867). Old: ---- dia-message-format.patch New: ---- dia-cve-2006-2453.patch dia-cve-2006-2480.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dia.spec ++++++ --- /var/tmp/diff_new_pack.xBTncj/_old 2006-05-25 00:19:43.000000000 +0200 +++ /var/tmp/diff_new_pack.xBTncj/_new 2006-05-25 00:19:43.000000000 +0200 @@ -19,7 +19,7 @@ Autoreqprov: on Summary: A Diagram Creation Program Version: 0.94 -Release: 41 +Release: 43 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/dia-%{version}.tar.bz2 Source1: font-test-japanese.dia Source2: font-test-czech.dia @@ -33,7 +33,8 @@ Patch8: dia-group-props-size.patch Patch9: dia-can-2005-2966.patch Patch10: dia-xfig.patch -Patch11: dia-message-format.patch +Patch11: dia-cve-2006-2480.patch +Patch12: dia-cve-2006-2453.patch URL: http://www.gnome.org/projects/dia/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -72,6 +73,7 @@ %patch10 cd ../.. %patch11 +%patch12 gnome-patch-translation-update cp $RPM_SOURCE_DIR/font-test*dia . @@ -116,8 +118,12 @@ %prefix/share/pixmaps/* %changelog -n dia +* Tue May 23 2006 - sbrabec(a)suse.cz +- Fixed more format string vulnerabilities (CVE-2006-2453, + [#173867]). * Wed May 17 2006 - sbrabec(a)suse.cz -- Fixed message format string vulnerability (#173867). +- Fixed message format string vulnerability (CVE-2006-2480, + [#173867]). * Thu Mar 30 2006 - sbrabec(a)suse.cz - Fixed XFig import buffer overflows (#162074). http://mail.gnome.org/archives/dia-list/2006-March/msg00149.html ++++++ dia-cve-2006-2453.patch ++++++ --- app/app_procs.c +++ app/app_procs.c @@ -897,22 +897,22 @@ g_print(_("The original author of Dia was:\n\n")); for (i = 0; i < NUMBER_OF_ORIG_AUTHORS; i++) { - g_print(authors[i]); g_print("\n"); + g_print("%s\n", authors[i]); } g_print(_("\nThe current maintainers of Dia are:\n\n")); for (i = NUMBER_OF_ORIG_AUTHORS; i < NUMBER_OF_ORIG_AUTHORS + NUMBER_OF_MAINTAINERS; i++) { - g_print(authors[i]); g_print("\n"); + g_print("%s\n", authors[i]); } g_print(_("\nOther authors are:\n\n")); for (i = NUMBER_OF_ORIG_AUTHORS + NUMBER_OF_MAINTAINERS; i < nauthors; i++) { - g_print(authors[i]); g_print("\n"); + g_print("%s\n", authors[i]); } g_print(_("\nDia is documented by:\n\n")); for (i = 0; i < ndocumentors; i++) { - g_print(documentors[i]); g_print("\n"); + g_print("%s\n", documentors[i]); } exit(0); --- app/display.c +++ app/display.c @@ -968,7 +968,6 @@ Diagram *dia; GtkWidget *dialog, *button; gchar *fname; - gchar *msg; dia = ddisp->diagram; @@ -981,18 +980,14 @@ fname = dia->filename; if (!fname) fname = _("<unnamed>"); - msg = g_strdup_printf ( - _("The diagram '%s'\n" - "has not been saved. Save changes now?"), - fname); dialog = gtk_message_dialog_new(GTK_WINDOW (ddisp->shell), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, /* no standard buttons */ - msg, - NULL); - g_free (msg); + _("The diagram '%s'\n" + "has not been saved. Save changes now?"), + fname); gtk_window_set_title (GTK_WINDOW(dialog), _("Close Diagram")); button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); --- app/filedlg.c +++ app/filedlg.c @@ -251,7 +251,6 @@ if (stat(filename, &stat_struct) == 0) { GtkWidget *dialog = NULL; - char buffer[300]; char *utf8filename = NULL; if (!g_utf8_validate(filename, -1, NULL)) { utf8filename = g_filename_to_utf8(filename, -1, NULL, NULL, NULL); @@ -261,15 +260,12 @@ } if (utf8filename == NULL) utf8filename = g_strdup(filename); - g_snprintf(buffer, 300, - _("The file '%s' already exists.\n" - "Do you want to overwrite it?"), utf8filename); - g_free(utf8filename); - dialog = gtk_message_dialog_new (GTK_WINDOW(fs), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, - buffer); + _("The file '%s' already exists.\n" + "Do you want to overwrite it?"), utf8filename); + g_free(utf8filename); gtk_window_set_title (GTK_WINDOW (dialog), _("File already exists")); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES); @@ -442,16 +438,13 @@ if (stat(filename, &statbuf) == 0) { GtkWidget *dialog = NULL; - char buffer[300]; - g_snprintf(buffer, 300, - _("The file '%s' already exists.\n" - "Do you want to overwrite it?"), filename); dialog = gtk_message_dialog_new (GTK_WINDOW(fs), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, - buffer); + _("The file '%s' already exists.\n" + "Do you want to overwrite it?"), filename); gtk_window_set_title (GTK_WINDOW (dialog), _("File already exists")); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES); --- app/load_save.c +++ app/load_save.c @@ -199,7 +199,7 @@ g_hash_table_foreach(unknown_hash, GHFuncUnknownObjects, unknown_str); - message_error(unknown_str->str); + message_error("%s", unknown_str->str); } g_hash_table_destroy(unknown_hash); g_string_free(unknown_str, TRUE); --- app/sheets.c +++ app/sheets.c @@ -338,7 +338,7 @@ gdk_pixbuf_render_pixmap_and_mask(pixbuf, pixmap, mask, 1.0); gdk_pixbuf_unref(pixbuf); } else { - g_warning (error->message); + g_warning ("%s", error->message); g_error_free (error); } } --- plug-ins/python/diamodule.c +++ plug-ins/python/diamodule.c @@ -377,11 +377,11 @@ return NULL; if (0 == type) - message_notice (text); + message_notice ("%s", text); else if (1 == type) - message_warning (text); + message_warning ("%s", text); else - message_error (text); + message_error ("%s", text); Py_INCREF(Py_None); return Py_None; --- plug-ins/python/pydia-error.c +++ plug-ins/python/pydia-error.c @@ -98,7 +98,7 @@ if (self->str) g_string_append (self->str, s); - g_print (s); + g_print ("%s", s); Py_INCREF(Py_None); return Py_None; --- plug-ins/wmf/wmf.cpp +++ plug-ins/wmf/wmf.cpp @@ -223,7 +223,7 @@ va_end (args); //fprintf(renderer->file, string); - g_print(string); + g_print("%s", string); g_free(string); } --- plug-ins/xfig/xfig-export.c +++ plug-ins/xfig/xfig-export.c @@ -263,7 +263,7 @@ figWarn(XfigRenderer *renderer, int warning) { if (renderer->warnings[warning]) { - message_warning(renderer->warnings[warning]); + message_warning("%s", renderer->warnings[warning]); renderer->warnings[warning] = NULL; } } ++++++ dia-cve-2006-2480.patch ++++++ --- lib/message.c +++ lib/message.c @@ -86,7 +86,7 @@ 0, /* GtkDialogFlags */ type, GTK_BUTTONS_CLOSE, - buf); + "%s", buf); if (title) { gchar *real_title; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit createrepo
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package createrepo checked in at Thu May 25 00:19:52 CEST 2006. -------- --- createrepo/createrepo.changes 2006-03-22 16:16:18.000000000 +0100 +++ createrepo/createrepo.changes 2006-05-24 00:49:09.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 24 00:46:45 CEST 2006 - cthiel(a)suse.de + +- added license-to-confirm.patch (by Jose Mercado <jose(a)novell.com>) + * adds license-to-confirm element for packages which have EULAs + +------------------------------------------------------------------- @@ -4 +10 @@ -- added createrepo-0.4.4-suse-changelogs.diff (#159882) +- added createrepo-0.4.4-suse-changelogs.patch (#159882) @@ -8 +14 @@ -- merged cleanup.diff into missing-tags.diff +- merged cleanup.patch into missing-tags.patch @@ -29 +35 @@ -- missing-tags.diff: Include the new Enhances, Supplements, +- missing-tags.patch: Include the new Enhances, Supplements, Old: ---- createrepo-0.4.4-suse-changelogs.diff missing-tags.diff New: ---- createrepo-0.4.4-suse-changelogs.patch license-to-confirm.patch missing-tags.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ createrepo.spec ++++++ --- /var/tmp/diff_new_pack.cQ69cF/_old 2006-05-25 00:19:33.000000000 +0200 +++ /var/tmp/diff_new_pack.cQ69cF/_new 2006-05-25 00:19:33.000000000 +0200 @@ -13,13 +13,14 @@ Name: createrepo BuildRequires: python Version: 0.4.4 -Release: 2 +Release: 9 License: GPL Summary: Creates a Common Metadata Repository Group: System/Packages Source: %{name}-%{version}.tar.bz2 -Patch: missing-tags.diff -Patch1: %{name}-%{version}-suse-changelogs.diff +Patch: missing-tags.patch +Patch1: %{name}-%{version}-suse-changelogs.patch +Patch2: license-to-confirm.patch URL: http://linux.duke.edu/metadata/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -44,6 +45,7 @@ %setup -q %patch %patch1 +%patch2 %install make install DESTDIR=$RPM_BUILD_ROOT @@ -60,11 +62,14 @@ %{_datadir}/%{name}/* %changelog -n createrepo +* Wed May 24 2006 - cthiel(a)suse.de +- added license-to-confirm.patch (by Jose Mercado <jose(a)novell.com>) + * adds license-to-confirm element for packages which have EULAs * Wed Mar 22 2006 - cthiel(a)suse.de -- added createrepo-0.4.4-suse-changelogs.diff (#159882) +- added createrepo-0.4.4-suse-changelogs.patch (#159882) * removes superfluous "- " from author information on changelogs -- merged cleanup.diff into missing-tags.diff +- merged cleanup.patch into missing-tags.patch * Thu Mar 16 2006 - cthiel(a)suse.de - update to version 0.4.4 * introduces split media support @@ -76,7 +81,7 @@ - Fix a data type conversion bug introduced in the last change that triggers with some package repositories. Code cleanup. * Mon Mar 13 2006 - agruen(a)suse.de -- missing-tags.diff: Include the new Enhances, Supplements, +- missing-tags.patch: Include the new Enhances, Supplements, Suggests, and Recommends rpm tags in the metadata. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires ++++++ createrepo-0.4.4-suse-changelogs.patch ++++++ --- dumpMetadata.py +++ dumpMetadata.py @@ -744,7 +744,10 @@ for (name, time, text) in clogs: clog = pkg.newChild(None, 'changelog', None) clog.addContent(utf8String(text)) - clog.newProp('author', utf8String(name)) + if name[0] != '-': + clog.newProp('author', utf8String(name)) + else: + clog.newProp('author', utf8String(name[2:])) clog.newProp('date', str(time)) return pkg ++++++ license-to-confirm.patch ++++++ --- ChangeLog 2006-05-19 15:54:09.000000000 -0500 +++ ChangeLog 2006-05-19 15:54:14.000000000 -0500 @@ -1,3 +1,7 @@ +2006-05-17 23:31 Jose Mercado <jose(a)novell.com> + * dumpMetadata.py, getpkgmetadata.py: + added license-to-confirm element for packages which have EULAs + 2006-03-04 01:28 pnasrat * createrepo.spec: release --- dumpMetadata.py 2006-05-19 15:54:08.000000000 -0500 +++ dumpMetadata.py 2006-05-19 17:39:36.000000000 -0500 @@ -18,6 +18,7 @@ # $Id: dumpMetadata.py,v 1.36 2006/02/21 20:10:08 pnasrat Exp $ +import glob import os import rpm import exceptions @@ -583,7 +584,7 @@ -def generateXML(doc, node, formatns, rpmObj, sumtype): +def generateXML(doc, node, formatns, susens, rpmObj, sumtype): """takes an xml doc object and a package metadata entry node, populates a package node with the md information""" ns = node.ns() @@ -616,6 +617,27 @@ if rpmObj.localurl is not None: location.newProp('xml:base', rpmObj.localurl) location.newProp('href', rpmObj.relativepath) + + eulas = glob.glob("%s.eula.*" % os.path.join(rpmObj.options['basedir'], rpmObj.relativepath)) + if eulas is not None: + for eula in eulas: + match = re.match("(.*eula)\.(.*)", eula) + lang = match.group(2) + + eulaContent = None + + try: + fd = open(eula, "r") + eulaContent = fd.read() + fd.close() + except IOError: + raise MDError, "Failed read contents of %s" % eula + + if eulaContent is not None: + eulaNode = pkgNode.newChild(susens, 'license-to-confirm', None) + eulaNode.newProp('lang', lang) + eulaNode.addContent(utf8String(eulaContent)) + format = pkgNode.newChild(ns, 'format', None) for tag in ['license', 'vendor', 'group', 'buildhost', 'sourcerpm']: value = rpmObj.tagByName(tag) --- genpkgmetadata.py 2006-05-19 15:54:11.000000000 -0500 +++ genpkgmetadata.py 2006-05-19 17:32:58.000000000 -0500 @@ -88,6 +88,7 @@ if totalpath.find(basepath) == 0: relativepath = totalpath.replace(basepath, "", 1) relativepath = relativepath.lstrip("/") + print os.path.join(relativepath, d) filelist.append(os.path.join(relativepath, d)) else: raise "basepath '%s' not found in path '%s'" % (basepath, totalpath) @@ -131,11 +132,12 @@ self.baseroot = self.basedoc.newChild(None, "metadata", None) basens = self.baseroot.newNs('http://linux.duke.edu/metadata/common', None) self.formatns = self.baseroot.newNs('http://linux.duke.edu/metadata/rpm', 'rpm') + self.susens = self.baseroot.newNs('http://novell.com/package/metadata/suse/common', 'suse') self.baseroot.setNs(basens) basefilepath = os.path.join(self.cmds['outputdir'], self.cmds['tempdir'], self.cmds['primaryfile']) self.basefile = _gzipOpen(basefilepath, 'w') self.basefile.write('<?xml version="1.0" encoding="UTF-8"?>\n') - self.basefile.write('<metadata xmlns="http://linux.duke.edu/metadata/common" xmlns:rpm="http://linux.duke.edu/metadata/rpm" packages="%s">\n' % + self.basefile.write('<metadata xmlns="http://linux.duke.edu/metadata/common" xmlns:rpm="http://linux.duke.edu/metadata/rpm" xmlns:suse="http://novell.com/package/metadata/suse/common" packages="%s">\n' % self.pkgcount) def _setupFilelists(self): @@ -179,7 +181,7 @@ continue else: try: - node = dumpMetadata.generateXML(self.basedoc, self.baseroot, self.formatns, mdobj, self.cmds['sumtype']) + node = dumpMetadata.generateXML(self.basedoc, self.baseroot, self.formatns, self.susens, mdobj, self.cmds['sumtype']) except dumpMetadata.MDError, e: errorprint(_('\nAn error occurred creating primary metadata: %s') % e) continue ++++++ missing-tags.patch ++++++ --- dumpMetadata.py +++ dumpMetadata.py @@ -267,14 +267,10 @@ return returnflags if type(flags) is not types.ListType: - newflag = flags & 0xf - returnflags.append(newflag) + returnflags.append(flags) else: for flag in flags: - newflag = flag - if flag is not None: - newflag = flag & 0xf - returnflags.append(newflag) + returnflags.append(flag) return returnflags def _checkPreReq(self, flags): @@ -516,36 +512,48 @@ lst = zip(names, flags, ver, prereq) return self._uniq(lst) - def obsoletesList(self): + def tagsList(self, name, flags, version): lst = [] - names = self.hdr[rpm.RPMTAG_OBSOLETENAME] - tmpflags = self.hdr[rpm.RPMTAG_OBSOLETEFLAGS] + names = self.hdr[name] + tmpflags = self.hdr[flags] flags = self._correctFlags(tmpflags) - ver = self._correctVersion(self.hdr[rpm.RPMTAG_OBSOLETEVERSION]) + ver = self._correctVersion(self.hdr[version]) if names is not None: lst = zip(names, flags, ver) return self._uniq(lst) + def obsoletesList(self): + return self.tagsList(rpm.RPMTAG_OBSOLETENAME, rpm.RPMTAG_OBSOLETEFLAGS, + rpm.RPMTAG_OBSOLETEVERSION) + def conflictsList(self): - lst = [] - names = self.hdr[rpm.RPMTAG_CONFLICTNAME] - tmpflags = self.hdr[rpm.RPMTAG_CONFLICTFLAGS] - flags = self._correctFlags(tmpflags) - ver = self._correctVersion(self.hdr[rpm.RPMTAG_CONFLICTVERSION]) - if names is not None: - lst = zip(names, flags, ver) - return self._uniq(lst) + return self.tagsList(rpm.RPMTAG_CONFLICTNAME, rpm.RPMTAG_CONFLICTFLAGS, + rpm.RPMTAG_CONFLICTVERSION) def providesList(self): - lst = [] - names = self.hdr[rpm.RPMTAG_PROVIDENAME] - tmpflags = self.hdr[rpm.RPMTAG_PROVIDEFLAGS] - flags = self._correctFlags(tmpflags) - ver = self._correctVersion(self.hdr[rpm.RPMTAG_PROVIDEVERSION]) - if names is not None: - lst = zip(names, flags, ver) - return self._uniq(lst) + return self.tagsList(rpm.RPMTAG_PROVIDENAME, rpm.RPMTAG_PROVIDEFLAGS, + rpm.RPMTAG_PROVIDEVERSION) + def enhancesList(self): + lst = self.tagsList(rpm.RPMTAG_ENHANCESNAME, rpm.RPMTAG_ENHANCESFLAGS, + rpm.RPMTAG_ENHANCESVERSION) + return [ l for l in lst if not l[1] & rpm.RPMSENSE_STRONG ] + + def supplementsList(self): + lst = self.tagsList(rpm.RPMTAG_ENHANCESNAME, rpm.RPMTAG_ENHANCESFLAGS, + rpm.RPMTAG_ENHANCESVERSION) + return [ l for l in lst if l[1] & rpm.RPMSENSE_STRONG ] + + def suggestsList(self): + lst = self.tagsList(rpm.RPMTAG_SUGGESTSNAME, rpm.RPMTAG_SUGGESTSFLAGS, + rpm.RPMTAG_SUGGESTSVERSION) + return [ l for l in lst if not l[1] & rpm.RPMSENSE_STRONG ] + + def recommendsList(self): + lst = self.tagsList(rpm.RPMTAG_SUGGESTSNAME, rpm.RPMTAG_SUGGESTSFLAGS, + rpm.RPMTAG_SUGGESTSVERSION) + return [ l for l in lst if l[1] & rpm.RPMSENSE_STRONG ] + def changelogLists(self): lst = [] names = self.listTagByName('changelogname') @@ -629,12 +637,18 @@ hr.newProp('end', str(rpmObj.rangeend)) for (lst, nodename) in [(rpmObj.providesList(), 'provides'), (rpmObj.conflictsList(), 'conflicts'), - (rpmObj.obsoletesList(), 'obsoletes')]: + (rpmObj.obsoletesList(), 'obsoletes'), + (rpmObj.enhancesList(), 'enhances'), + (rpmObj.supplementsList(), 'supplements'), + (rpmObj.suggestsList(), 'suggests'), + (rpmObj.recommendsList(), 'recommends')]: if len(lst) > 0: rpconode = format.newChild(formatns, nodename, None) for (name, flags, (e,v,r)) in lst: entry = rpconode.newChild(formatns, 'entry', None) entry.newProp('name', name) + if flags is not None: + flags = flags & 0xf if flags != 0: if flags == 2: arg = 'LT' if flags == 4: arg = 'GT' @@ -656,6 +670,8 @@ for (name, flags, (e,v,r), prereq) in depsList: entry = rpconode.newChild(formatns, 'entry', None) entry.newProp('name', name) + if flags is not None: + flags = flags & 0xf if flags != 0: if flags == 2: arg = 'LT' if flags == 4: arg = 'GT' ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit arts
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package arts checked in at Thu May 25 00:19:26 CEST 2006. -------- --- KDE/arts/arts.changes 2006-05-20 15:10:18.000000000 +0200 +++ arts/arts.changes 2006-05-24 12:15:33.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 24 09:48:35 CEST 2006 - stbinner(a)suse.de + +- version number increase to 1.5.3 + +------------------------------------------------------------------- Old: ---- arts-1.5.2.tar.bz2 New: ---- arts-1.5.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arts.spec ++++++ --- /var/tmp/diff_new_pack.olwarV/_old 2006-05-25 00:18:31.000000000 +0200 +++ /var/tmp/diff_new_pack.olwarV/_new 2006-05-25 00:18:31.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package arts (Version 1.5.2) +# spec file for package arts (Version 1.5.3) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,8 +21,8 @@ Provides: kdelibs3-artsd kdelibs-artsd Summary: Modular Software Synthesizer PreReq: permissions -Version: 1.5.2 -Release: 3 +Version: 1.5.3 +Release: 1 Source0: %{name}-%{version}.tar.bz2 #Patch0: 1_5_BRANCH.diff Patch2: no-informational-messages.diff @@ -185,6 +185,8 @@ /opt/kde3/%_lib/*.la %changelog -n arts +* Wed May 24 2006 - stbinner(a)suse.de +- version number increase to 1.5.3 * Sat May 20 2006 - adrian(a)suse.de - do not require libdrm-devel for < 10.1 * Mon Mar 20 2006 - stbinner(a)suse.de ++++++ arts-1.5.2.tar.bz2 -> arts-1.5.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/arts-1.5.2/acinclude.m4 new/arts-1.5.3/acinclude.m4 --- old/arts-1.5.2/acinclude.m4 2006-03-18 12:05:04.000000000 +0100 +++ new/arts-1.5.3/acinclude.m4 2006-05-23 22:16:17.000000000 +0200 @@ -784,7 +784,7 @@ # CoreAudio framework AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [ AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API]) - FRAMEWORK_COREAUDIO="-Xlinker -framework -Xlinker CoreAudio" + FRAMEWORK_COREAUDIO="-Wl,-framework,CoreAudio" ]) AC_CHECK_RES_INIT @@ -3023,8 +3023,8 @@ [ kde_cv_opt_noinline_match=irrelevant dnl if we don't use both -O2 and -fno-inline, this check is moot - if echo "$CFLAGS" | grep -qe -O2 \ - && echo "$CFLAGS" | grep -qe -fno-inline ; then + if echo "$CFLAGS" | grep -e -O2 >/dev/null 2>/dev/null \ + && echo "$CFLAGS" | grep -e -fno-inline >/dev/null 2>/dev/null ; then ac_cflags_save="$CFLAGS" CFLAGS="$CFLAGS -D_USE_GNU" @@ -3501,7 +3501,7 @@ [ kdelibsuff="$kde_libs_suffix" if test -z "$kdelibsuff"; then - kdelibsuff="auto" + kdelibsuff="no" fi AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], @@ -3516,13 +3516,16 @@ return 0; } EOF - kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out | grep -E "libc.so"| grep -E -o "/lib[[^\/]]*/" | sed "s/lib//" | sed "s/\/*//g"` + kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ + s,.*/lib$[[^\/]]*$/.*,\1, + p +}'` rm -rf conftest.* fi - if test "$kdelibsuff" = "no"; then + if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then kdelibsuff= - fi + fi if test -z "$kdelibsuff"; then AC_MSG_RESULT([not using lib directory suffix]) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) @@ -4998,7 +5001,7 @@ ]) fi kde_libs_htmldir=`$KDECONFIG --install html --expandvars` - kde_libs_suffix=`$KDECONFIG --libsuffix` + kde_libs_suffix=`$KDECONFIG --libsuffix` || kde_libs_suffix=auto AC_MSG_CHECKING([where to install]) if test "x$prefix" = "xNONE"; then @@ -5374,7 +5377,7 @@ JAVAC=$kde_java_bindir/javac JAVAH=$kde_java_bindir/javah JAR=$kde_java_bindir/jar - JVMLIBS="-Xlinker -framework -Xlinker JavaVM" + JVMLIBS="-Wl,-framework,JavaVM" AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) AC_MSG_RESULT([Apple Java Framework]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/arts-1.5.2/admin/acinclude.m4.in new/arts-1.5.3/admin/acinclude.m4.in --- old/arts-1.5.2/admin/acinclude.m4.in 2006-03-17 22:38:42.000000000 +0100 +++ new/arts-1.5.3/admin/acinclude.m4.in 2006-05-23 14:51:55.000000000 +0200 @@ -784,7 +784,7 @@ # CoreAudio framework AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [ AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API]) - FRAMEWORK_COREAUDIO="-Xlinker -framework -Xlinker CoreAudio" + FRAMEWORK_COREAUDIO="-Wl,-framework,CoreAudio" ]) AC_CHECK_RES_INIT @@ -3023,8 +3023,8 @@ [ kde_cv_opt_noinline_match=irrelevant dnl if we don't use both -O2 and -fno-inline, this check is moot - if echo "$CFLAGS" | grep -qe -O2 \ - && echo "$CFLAGS" | grep -qe -fno-inline ; then + if echo "$CFLAGS" | grep -e -O2 >/dev/null 2>/dev/null \ + && echo "$CFLAGS" | grep -e -fno-inline >/dev/null 2>/dev/null ; then ac_cflags_save="$CFLAGS" CFLAGS="$CFLAGS -D_USE_GNU" @@ -3501,7 +3501,7 @@ [ kdelibsuff="$kde_libs_suffix" if test -z "$kdelibsuff"; then - kdelibsuff="auto" + kdelibsuff="no" fi AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], @@ -3516,13 +3516,16 @@ return 0; } EOF - kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out | grep -E "libc.so"| grep -E -o "/lib[[^\/]]*/" | sed "s/lib//" | sed "s/\/*//g"` + kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ + s,.*/lib$[[^\/]]*$/.*,\1, + p +}'` rm -rf conftest.* fi - if test "$kdelibsuff" = "no"; then + if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then kdelibsuff= - fi + fi if test -z "$kdelibsuff"; then AC_MSG_RESULT([not using lib directory suffix]) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) @@ -4998,7 +5001,7 @@ ]) fi kde_libs_htmldir=`$KDECONFIG --install html --expandvars` - kde_libs_suffix=`$KDECONFIG --libsuffix` + kde_libs_suffix=`$KDECONFIG --libsuffix` || kde_libs_suffix=auto AC_MSG_CHECKING([where to install]) if test "x$prefix" = "xNONE"; then @@ -5374,7 +5377,7 @@ JAVAC=$kde_java_bindir/javac JAVAH=$kde_java_bindir/javah JAR=$kde_java_bindir/jar - JVMLIBS="-Xlinker -framework -Xlinker JavaVM" + JVMLIBS="-Wl,-framework,JavaVM" AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) AC_MSG_RESULT([Apple Java Framework]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/arts-1.5.2/admin/cvs.sh new/arts-1.5.3/admin/cvs.sh --- old/arts-1.5.2/admin/cvs.sh 2006-03-17 22:38:41.000000000 +0100 +++ new/arts-1.5.3/admin/cvs.sh 2006-05-23 14:51:55.000000000 +0200 @@ -316,7 +316,7 @@ fi fi if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then - VERSION="\"3.5.2\"" + VERSION="\"3.5.3\"" fi if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then modulename=`pwd`; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/arts-1.5.2/arts.lsm new/arts-1.5.3/arts.lsm --- old/arts-1.5.2/arts.lsm 2006-03-17 22:33:40.000000000 +0100 +++ new/arts-1.5.3/arts.lsm 2006-05-23 13:16:17.000000000 +0200 @@ -1,7 +1,7 @@ Begin4 Title: arts -Version: 1.5.2 -Entered-date: 2006-03-17 +Version: 1.5.3 +Entered-date: 2006-05-23 Description: Soundserver for the K Desktop Environment (KDE) Keywords: KDE X11 desktop Qt Author: http://bugs.kde.org/ (KDE Bugtracking System) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/arts-1.5.2/configure new/arts-1.5.3/configure --- old/arts-1.5.2/configure 2006-03-18 12:05:39.000000000 +0100 +++ new/arts-1.5.3/configure 2006-05-23 22:16:55.000000000 +0200 @@ -1704,7 +1704,7 @@ ARTS_MAJOR_VERSION=1 ARTS_MINOR_VERSION=5 -ARTS_MICRO_VERSION=2 +ARTS_MICRO_VERSION=3 ARTS_VERSION=$ARTS_MAJOR_VERSION.$ARTS_MINOR_VERSION.$ARTS_MICRO_VERSION am__api_version="1.9" @@ -5469,8 +5469,8 @@ else kde_cv_opt_noinline_match=irrelevant - if echo "$CFLAGS" | grep -qe -O2 \ - && echo "$CFLAGS" | grep -qe -fno-inline ; then + if echo "$CFLAGS" | grep -e -O2 >/dev/null 2>/dev/null \ + && echo "$CFLAGS" | grep -e -fno-inline >/dev/null 2>/dev/null ; then ac_cflags_save="$CFLAGS" CFLAGS="$CFLAGS -D_USE_GNU" @@ -7033,7 +7033,7 @@ kdelibsuff="$kde_libs_suffix" if test -z "$kdelibsuff"; then - kdelibsuff="auto" + kdelibsuff="no" fi # Check whether --enable-libsuffix or --disable-libsuffix was given. if test "${enable_libsuffix+set}" = set; then @@ -7049,11 +7049,14 @@ return 0; } EOF - kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out | grep -E "libc.so"| grep -E -o "/lib[^\/]*/" | sed "s/lib//" | sed "s/\/*//g"` + kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ + s,.*/lib$[^\/]*$/.*,\1, + p +}'` rm -rf conftest.* fi - if test "$kdelibsuff" = "no"; then + if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then kdelibsuff= fi if test -z "$kdelibsuff"; then @@ -7605,7 +7608,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7608 "configure"' > conftest.$ac_ext + echo '#line 7611 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8250,7 +8253,7 @@ # Provide some information about the compiler. -echo "$as_me:8253:" \ +echo "$as_me:8256:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -9282,11 +9285,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9285: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9288: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9289: \$? = $ac_status" >&5 + echo "$as_me:9292: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -9515,11 +9518,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9518: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9521: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9522: \$? = $ac_status" >&5 + echo "$as_me:9525: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -9582,11 +9585,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9585: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9588: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9589: \$? = $ac_status" >&5 + echo "$as_me:9592: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11705,7 +11708,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 11708 "configure" +#line 11711 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11803,7 +11806,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 11806 "configure" +#line 11809 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13968,11 +13971,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13971: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13974: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13975: \$? = $ac_status" >&5 + echo "$as_me:13978: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -14035,11 +14038,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14038: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14041: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14042: \$? = $ac_status" >&5 + echo "$as_me:14045: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15371,7 +15374,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 15374 "configure" +#line 15377 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15469,7 +15472,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 15472 "configure" +#line 15475 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16292,11 +16295,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16295: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16298: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16299: \$? = $ac_status" >&5 + echo "$as_me:16302: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -16359,11 +16362,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16362: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16365: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16366: \$? = $ac_status" >&5 + echo "$as_me:16369: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18332,11 +18335,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18335: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18338: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18339: \$? = $ac_status" >&5 + echo "$as_me:18342: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -18565,11 +18568,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18568: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18571: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18572: \$? = $ac_status" >&5 + echo "$as_me:18575: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -18632,11 +18635,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18635: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18638: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18639: \$? = $ac_status" >&5 + echo "$as_me:18642: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -20755,7 +20758,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 20758 "configure" +#line 20761 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -20853,7 +20856,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 20856 "configure" +#line 20859 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -26181,7 +26184,7 @@ #define HAVE_COREAUDIO 1 _ACEOF - FRAMEWORK_COREAUDIO="-Xlinker -framework -Xlinker CoreAudio" + FRAMEWORK_COREAUDIO="-Wl,-framework,CoreAudio" fi @@ -32700,7 +32703,7 @@ do for j in jpeglib.h; do - echo "configure: 32703: $i/$j" >&5 + echo "configure: 32706: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 jpeg_incdir=$i @@ -32998,7 +33001,7 @@ do for j in $kde_qt_header; do - echo "configure: 33001: $i/$j" >&5 + echo "configure: 33004: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 qt_incdir=$i @@ -33834,7 +33837,7 @@ do for j in $kde_check_header; do - echo "configure: 33837: $i/$j" >&5 + echo "configure: 33840: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 kde_incdir=$i @@ -33864,7 +33867,7 @@ do for j in $kde_check_lib; do - echo "configure: 33867: $i/$j" >&5 + echo "configure: 33870: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 kde_libdir=$i @@ -33882,7 +33885,7 @@ do for j in "kde3/plugins/designer/kdewidgets.la"; do - echo "configure: 33885: $i/$j" >&5 + echo "configure: 33888: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 kde_widgetdir=$i diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/arts-1.5.2/configure.in new/arts-1.5.3/configure.in --- old/arts-1.5.2/configure.in 2006-03-18 12:05:04.000000000 +0100 +++ new/arts-1.5.3/configure.in 2006-05-23 22:16:18.000000000 +0200 @@ -21,7 +21,7 @@ dnl Version (we /might/ want to use libtool versioning, too) ARTS_MAJOR_VERSION=1 ARTS_MINOR_VERSION=5 -ARTS_MICRO_VERSION=2 +ARTS_MICRO_VERSION=3 ARTS_VERSION=$ARTS_MAJOR_VERSION.$ARTS_MINOR_VERSION.$ARTS_MICRO_VERSION dnl Automake doc recommends to do this only here. (Janos) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/arts-1.5.2/configure.in.in new/arts-1.5.3/configure.in.in --- old/arts-1.5.2/configure.in.in 2006-03-17 22:26:42.000000000 +0100 +++ new/arts-1.5.3/configure.in.in 2006-05-23 13:16:17.000000000 +0200 @@ -17,7 +17,7 @@ dnl Version (we /might/ want to use libtool versioning, too) ARTS_MAJOR_VERSION=1 ARTS_MINOR_VERSION=5 -ARTS_MICRO_VERSION=2 +ARTS_MICRO_VERSION=3 ARTS_VERSION=$ARTS_MAJOR_VERSION.$ARTS_MINOR_VERSION.$ARTS_MICRO_VERSION dnl Automake doc recommends to do this only here. (Janos) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit amarok
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package amarok checked in at Thu May 25 00:19:06 CEST 2006. -------- --- KDE/amarok/amarok.changes 2006-05-22 15:26:28.000000000 +0200 +++ amarok/amarok.changes 2006-05-24 18:47:24.000000000 +0200 @@ -1,0 +2,9 @@ +Wed May 24 10:28:41 CEST 2006 - adrian(a)suse.de + +- enable gstreamer support again for 10.1 and later +- fix build for plain 10.0 +- require libvisual package, because 10.0 -devel does not require + main package +- keep gstreamer engine disabled as in 1.4.0 release + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.uhAlsM/_old 2006-05-25 00:18:30.000000000 +0200 +++ /var/tmp/diff_new_pack.uhAlsM/_new 2006-05-25 00:18:30.000000000 +0200 @@ -11,8 +11,13 @@ # norootforbuild Name: amarok -BuildRequires: SDL-devel flac-devel gnutls-devel kdebase3-devel kdebindings3-javascript kdemultimedia3-devel libglade2-devel libgnomeprintui-devel libgnomeui-devel libtunepimp-devel libvisual-devel libwnck-devel mDNSResponder-devel mad-devel ruby-devel sqlite-devel taglib-devel xine-devel xine-lib xmms-devel -#BuildRequires: gstreamer010-plugins-base-devel +BuildRequires: SDL-devel flac-devel gnutls-devel kdebase3-devel kdebindings3-javascript kdemultimedia3-devel libglade2-devel libgnomeprintui-devel libgnomeui-devel libtunepimp-devel libvisual-devel libwnck-devel mDNSResponder-devel ruby-devel sqlite-devel taglib-devel xine-devel xine-lib xmms-devel +BuildRequires: libmusicbrainz-devel +%if %suse_version < 1010 +BuildRequires: update-desktop-files +%else +BuildRequires: gstreamer010-plugins-base-devel +%endif URL: http://amarok.kde.org License: GPL Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) @@ -20,7 +25,7 @@ Group: Productivity/Multimedia/Sound/Players Summary: Media Player for KDE Version: 1.4.0 -Release: 4 +Release: 6 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define mversion 0.5 Source0: %name-%version.tar.bz2 @@ -50,6 +55,7 @@ Max Howell <max.howell(a)methylblue.com> Stanislav Karchebny <berk(a)inbox.ru> +%if %suse_version > 1000 %package gstreamer Group: Productivity/Multimedia/Sound/Players Summary: GStreamer Output Plugin for amaroK @@ -68,6 +74,7 @@ Max Howell <max.howell(a)methylblue.com> Stanislav Karchebny <berk(a)inbox.ru> +%endif %package helix-backend Group: Productivity/Multimedia/Sound/Players Summary: Helix/RealPlayer engine for amaroK @@ -269,7 +276,6 @@ %defattr(-,root,root) /opt/kde3/bin/amarok-helix-helper %endif -%if %suse_version > 910 %if 0 %files gstreamer @@ -278,7 +284,6 @@ /opt/kde3/%_lib/kde3/libamarok_gst10engine_plugin.* /opt/kde3/share/services/amarok_gst10engine_plugin.desktop %endif -%endif %files xmms %defattr(-,root,root) @@ -289,6 +294,12 @@ /opt/kde3/bin/amarok_libvisual %changelog -n amarok +* Wed May 24 2006 - adrian(a)suse.de +- enable gstreamer support again for 10.1 and later +- fix build for plain 10.0 +- require libvisual package, because 10.0 -devel does not require + main package +- keep gstreamer engine disabled as in 1.4.0 release * Mon May 22 2006 - stbinner(a)suse.de - disable 64-bit helix wrapper patch until it's ported * Sat May 20 2006 - schwab(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0