openSUSE Commits January 2007

commit@lists.opensuse.org

1 participants
1139 discussions

by root＠Hilbert.suse.de

Hello community, here is the log from the commit of package avahi checked in at Wed Jan 31 23:50:47 CET 2007. -------- --- avahi/avahi.changes 2007-01-26 01:36:07.000000000 +0100 +++ /mounts/work_users/ro/STABLE/avahi/avahi.changes 2007-01-31 23:49:40.627826000 +0100 @@ -1,0 +2,6 @@ +Wed Jan 31 23:20:35 CET 2007 - ro(a)suse.de + +- removed gnome-nettool from BuildRequires (and Recommends) + (causes a build-cycle) and use local copy of the icon + +------------------------------------------------------------------- New: ---- avahi-discover-icon.patch gnome-nettool2.png ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ avahi.spec ++++++ --- /var/tmp/diff_new_pack.W13700/_old 2007-01-31 23:50:32.000000000 +0100 +++ /var/tmp/diff_new_pack.W13700/_new 2007-01-31 23:50:32.000000000 +0100 @@ -17,18 +17,17 @@ %else BuildRequires: python-gtk qt-devel %endif -# FIXME (upstream): Needed only for desktop icon -BuildRequires: gnome-nettool -Recommends: gnome-nettool Version: 0.6.16 -Release: 2 +Release: 3 URL: http://www.avahi.org/ Group: System/Daemons License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Summary: D-BUS Service for Zeroconf and Bonjour Source: %{name}-%{version}.tar.bz2 +Source1: gnome-nettool2.png Patch: avahi-gacdir.patch Patch1: avahi-random-return.patch +Patch2: avahi-discover-icon.patch Requires: dbus-1 python python-gdbm python-gtk Autoreqprov: on BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -338,6 +337,7 @@ %setup -q %patch %patch1 +%patch2 %build ACLOCAL="aclocal -I common" autoreconf -f -i @@ -355,6 +355,8 @@ %install make DESTDIR=$RPM_BUILD_ROOT install +install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps +install -m 644 %{S:1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-nettool2.png install -d $RPM_BUILD_ROOT%{_localstatedir}/run/avahi-daemon cd $RPM_BUILD_ROOT%{_includedir} ; ln -s avahi-compat-libdns_sd/dns_sd.h avahi-compat-howl/howl.h $RPM_BUILD_ROOT%{_includedir}/ # Work-around qt4 bug: @@ -411,6 +413,7 @@ %{_sysconfdir}/dbus-1/system.d/*.conf %{_sysconfdir}/init.d/* %{py_sitedir}/avahi +%{_datadir}/pixmaps/gnome-nettool2.png %files glib %defattr(-,root,root) @@ -488,6 +491,9 @@ %{_libdir}/pkgconfig/avahi-qt4.pc %changelog -n avahi +* Wed Jan 31 2007 - ro(a)suse.de +- removed gnome-nettool from BuildRequires (and Recommends) + (causes a build-cycle) and use local copy of the icon * Fri Jan 26 2007 - ro(a)suse.de - add mono-devel to build requires to make mono-reqprov work * Wed Jan 24 2007 - sbrabec(a)suse.cz ++++++ avahi-discover-icon.patch ++++++ --- avahi-python/avahi-discover.desktop.in +++ avahi-python/avahi-discover.desktop.in @@ -5,6 +5,6 @@ Exec=@bindir@/avahi-discover Terminal=false Type=Application -Icon=gnome-nettool +Icon=gnome-nettool2 Categories=GNOME;Application;System;Utility; StartupNotify=false ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

14 years, 5 months

commit vmx-manager

by root＠Hilbert.suse.de

Hello community, here is the log from the commit of package vmx-manager checked in at Wed Jan 31 02:09:13 CET 2007. -------- --- vmx-manager/vmx-manager.changes 2007-01-31 00:49:11.000000000 +0100 +++ /mounts/work_src_done/NOARCH/vmx-manager/vmx-manager.changes 2007-01-31 02:06:57.378709000 +0100 @@ -2 +2 @@ -Wed Jan 31 00:49:04 CET 2007 - ro(a)suse.de +Wed Jan 31 02:06:45 CET 2007 - ro(a)suse.de @@ -4 +4,18 @@ -- GNOME moved to /usr +- GNOME moved to /usr + +------------------------------------------------------------------- +Wed Jan 31 01:10:02 CET 2007 - james(a)suse.de + +- make new ethernet device default to using NAT on mobile devices + and bridged otherwise. + +- when the operating system is changed, also change the ethernet device + type to match the suggested one for that OS. + +- constrain the memory spin button to 4 megabyte increments + +------------------------------------------------------------------- +Tue Jan 30 23:01:42 CET 2007 - james(a)suse.de + +- update to 0.2.4, fixes a regression when setting the amount + of memory to use for a machine Old: ---- vmx-manager-0.2.3.tar.bz2 New: ---- vmx-manager-0.2.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vmx-manager.spec ++++++ --- /var/tmp/diff_new_pack.wV8429/_old 2007-01-31 02:08:58.000000000 +0100 +++ /var/tmp/diff_new_pack.wV8429/_new 2007-01-31 02:08:58.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package vmx-manager (Version 0.2.3) +# spec file for package vmx-manager (Version 0.2.5) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,8 +16,8 @@ License: GNU General Public License (GPL) Group: Productivity/Other Autoreqprov: on -Version: 0.2.3 -Release: 2 +Version: 0.2.5 +Release: 1 Summary: Create, configure, and manage VMware virtual machines Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -74,6 +74,15 @@ %changelog -n vmx-manager * Wed Jan 31 2007 - ro(a)suse.de - GNOME moved to /usr +* Wed Jan 31 2007 - james(a)suse.de +- make new ethernet device default to using NAT on mobile devices + and bridged otherwise. +- when the operating system is changed, also change the ethernet device + type to match the suggested one for that OS. +- constrain the memory spin button to 4 megabyte increments +* Tue Jan 30 2007 - james(a)suse.de +- update to 0.2.4, fixes a regression when setting the amount + of memory to use for a machine * Thu Jan 18 2007 - james(a)suse.de - update to 0.2.3, containing two bug fixes - #236385 and #236417 * Fri Jan 12 2007 - james(a)suse.de ++++++ vmx-manager-0.2.3.tar.bz2 -> vmx-manager-0.2.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vmx-manager-0.2.3/ChangeLog new/vmx-manager-0.2.5/ChangeLog --- old/vmx-manager-0.2.3/ChangeLog 2007-01-18 21:24:07.000000000 +0100 +++ new/vmx-manager-0.2.5/ChangeLog 2007-01-31 01:07:53.000000000 +0100 @@ -1,3 +1,20 @@ +2007-01-30 James Willcox <snorp(a)novell.com> + + * configure.ac: bump to 0.2.5 + * src/ConfigDialog.cs: when the operating system is changed, also + change the type of network card in the machine to the suggested one. + * src/Utility.cs: add GetDefaultNetworkType, which picks NAT if the + host machine is a laptop, bridged otherwise. This way if the user + switches between wired and wireless connections, the VMs will maintain + their connections. + * TODO: added + +2007-01-30 James Willcox <snorp(a)novell.com> + + * configure.ac: bump to 0.2.4 + * src/ConfigDialog.cs (Load): set the os combo first to avoid nuking + the memory spin button value. + 2007-01-18 James Willcox <snorp(a)novell.com> * configure.ac: bump to 0.2.3 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vmx-manager-0.2.3/configure new/vmx-manager-0.2.5/configure --- old/vmx-manager-0.2.3/configure 2007-01-18 21:23:30.000000000 +0100 +++ new/vmx-manager-0.2.5/configure 2007-01-31 01:02:02.000000000 +0100 @@ -2071,7 +2071,7 @@ # Define the identity of the package. PACKAGE=vmx-manager - VERSION=0.2.3 + VERSION=0.2.5 cat >>confdefs.h <<_ACEOF diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vmx-manager-0.2.3/configure.ac new/vmx-manager-0.2.5/configure.ac --- old/vmx-manager-0.2.3/configure.ac 2007-01-18 21:23:21.000000000 +0100 +++ new/vmx-manager-0.2.5/configure.ac 2007-01-31 01:01:52.000000000 +0100 @@ -1,6 +1,6 @@ AC_INIT(src/EntryPoint.cs) -AM_INIT_AUTOMAKE(vmx-manager, 0.2.3) +AM_INIT_AUTOMAKE(vmx-manager, 0.2.5) AM_MAINTAINER_MODE AC_PROG_INTLTOOL([0.21]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vmx-manager-0.2.3/data/defaults.vmx new/vmx-manager-0.2.5/data/defaults.vmx --- old/vmx-manager-0.2.3/data/defaults.vmx 2007-01-03 20:56:33.000000000 +0100 +++ new/vmx-manager-0.2.5/data/defaults.vmx 2007-01-31 00:49:36.000000000 +0100 @@ -8,10 +8,8 @@ floppy0.fileName = "/dev/fd0" floppy0.present = "FALSE" -ethernet0.present = "TRUE" usb.present = "TRUE" sound.present = "TRUE" sound.virtualDev = "es1371" guestOS = "sles" -ethernet0.addressType = "generated" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vmx-manager-0.2.3/data/vmx-manager.glade new/vmx-manager-0.2.5/data/vmx-manager.glade --- old/vmx-manager-0.2.3/data/vmx-manager.glade 2007-01-03 20:56:33.000000000 +0100 +++ new/vmx-manager-0.2.5/data/vmx-manager.glade 2007-01-31 00:55:45.000000000 +0100 @@ -700,7 +700,7 @@ <property name="update_policy">GTK_UPDATE_ALWAYS</property> <property name="snap_to_ticks">False</property> <property name="wrap">False</property> - <property name="adjustment">1 0 4096 1 10 10</property> + <property name="adjustment">1 0 4096 4 4 4</property> </widget> <packing> <property name="padding">0</property> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vmx-manager-0.2.3/src/ConfigDialog.cs new/vmx-manager-0.2.5/src/ConfigDialog.cs --- old/vmx-manager-0.2.3/src/ConfigDialog.cs 2007-01-18 21:05:10.000000000 +0100 +++ new/vmx-manager-0.2.5/src/ConfigDialog.cs 2007-01-31 00:54:18.000000000 +0100 @@ -140,6 +140,10 @@ } memorySpin.Value = os.SuggestedRam; + + foreach (VirtualEthernet ethernet in machine.EthernetDevices) { + ethernet.EthernetType = os.SuggestedEthernetDeviceType; + } } private void OnPopupPosition (Menu menu, out int x, out int y, out bool push_in) { @@ -170,12 +174,12 @@ } private void Load () { + SetOsCombo (); + nameEntry.Text = machine.Name; memorySpin.Value = machine.MemorySize; soundToggle.Active = machine.SoundEnabled; usbToggle.Active = machine.UsbEnabled; - - SetOsCombo (); } private GuestOperatingSystem GetSelectedOs () { @@ -271,7 +275,7 @@ } private void OnAddEthernet (object o, EventArgs args) { - VirtualEthernet ethernet = new VirtualEthernet (NetworkType.Bridged, null, + VirtualEthernet ethernet = new VirtualEthernet (Utility.GetDefaultNetworkType (), null, machine.OperatingSystem.SuggestedEthernetDeviceType); EthernetConfigDialog dialog = new EthernetConfigDialog (ethernet, this); dialog.Response += delegate (object b, ResponseArgs rargs) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vmx-manager-0.2.3/src/Utility.cs new/vmx-manager-0.2.5/src/Utility.cs --- old/vmx-manager-0.2.3/src/Utility.cs 2007-01-04 19:35:40.000000000 +0100 +++ new/vmx-manager-0.2.5/src/Utility.cs 2007-01-31 01:04:02.000000000 +0100 @@ -77,7 +77,7 @@ case "nat": return NetworkType.Nat; default: - return NetworkType.Bridged; + return GetDefaultNetworkType (); } } @@ -363,6 +363,15 @@ return devices; } + public static NetworkType GetDefaultNetworkType () { + Hal.Device computer = new Hal.Device ("/org/freedesktop/Hal/devices/computer"); + if (computer.GetPropertyString ("system.formfactor") == "laptop") { + return NetworkType.Nat; + } else { + return NetworkType.Bridged; + } + } + public static int GetHostMemorySize () { Regex regex = new Regex ("MemTotal:.*?([0-9]+).*kB"); using (StreamReader reader = new StreamReader (File.OpenRead ("/proc/meminfo"))) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vmx-manager-0.2.3/src/VirtualMachineManager.cs new/vmx-manager-0.2.5/src/VirtualMachineManager.cs --- old/vmx-manager-0.2.3/src/VirtualMachineManager.cs 2007-01-03 20:56:33.000000000 +0100 +++ new/vmx-manager-0.2.5/src/VirtualMachineManager.cs 2007-01-31 00:50:51.000000000 +0100 @@ -136,6 +136,11 @@ if (GetMachine (name) == null && GetMachineByFileName (name) == null) { VirtualMachine machine = CreateMachine (name); + // add one network interface + VirtualEthernet ethernet = new VirtualEthernet (Utility.GetDefaultNetworkType (), null, + machine.OperatingSystem.SuggestedEthernetDeviceType); + machine.AddEthernetDevice (ethernet); + // add a default 6gb disk VirtualHardDisk disk = new VirtualHardDisk (0, 0, DiskBusType.Ide, (long) 6 * 1024 * 1024 * 1024); disk.HardDiskType = HardDiskType.SplitSparse; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

14 years, 5 months

commit yast2-mail

by root＠Hilbert.suse.de

Hello community, here is the log from the commit of package yast2-mail checked in at Wed Jan 31 02:08:19 CET 2007. -------- --- yast2-mail/yast2-mail.changes 2006-11-06 15:26:45.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-mail/yast2-mail.changes 2007-01-30 18:34:46.000000000 +0100 @@ -1,0 +2,19 @@ +Tue Jan 30 18:34:41 CET 2007 - mvidner(a)suse.cz + +- Adjusted testsuite for changes in yast2-2.15.4. +- 2.15.1 + +------------------------------------------------------------------- +Wed Jan 3 16:52:01 CET 2007 - mvidner(a)suse.cz + +- Converted ag_mailtable to a module to eliminate parsing speed + bottleneck. Tables of 50000 entries no longer cause hours + of delays (#223560). +- 2.15.0 + +------------------------------------------------------------------- +Thu Dec 21 11:06:46 CET 2006 - mvidner(a)suse.cz + +- schema: added mail_smtp_auth + +------------------------------------------------------------------- Old: ---- yast2-mail-2.14.0.tar.bz2 New: ---- yast2-mail-2.15.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-mail.spec ++++++ --- /var/tmp/diff_new_pack.bY5021/_old 2007-01-31 02:07:59.000000000 +0100 +++ /var/tmp/diff_new_pack.bY5021/_new 2007-01-31 02:07:59.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-mail (Version 2.14.0) +# spec file for package yast2-mail (Version 2.15.1) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 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. # @@ -11,14 +11,15 @@ # norootforbuild Name: yast2-mail -Version: 2.14.0 +Version: 2.15.1 Release: 1 -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-mail-2.14.0.tar.bz2 +Source0: yast2-mail-2.15.1.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite +BuildRequires: yast2-perl-bindings # new firewall interface Requires: yast2 >= 2.11.11 Requires: yast2-mail-aliases @@ -61,7 +62,7 @@ Martin Vidner <mvidner(a)suse.cz> %prep -%setup -n yast2-mail-2.14.0 +%setup -n yast2-mail-2.15.1 %build %{prefix}/bin/y2tool y2autoconf @@ -115,6 +116,8 @@ %defattr(-,root,root) %dir /usr/share/YaST2/modules /usr/share/YaST2/modules/MailAliases.y* +/usr/share/YaST2/modules/MailTable.pm +/usr/share/YaST2/modules/MailTableInclude.pm %dir /usr/share/YaST2/scrconf /usr/share/YaST2/scrconf/cfg_mail.scr /usr/share/YaST2/scrconf/mail_aliases.scr @@ -124,6 +127,16 @@ /usr/lib/YaST2/servers_non_y2/ag_mailtable %changelog -n yast2-mail +* Tue Jan 30 2007 - mvidner(a)suse.cz +- Adjusted testsuite for changes in yast2-2.15.4. +- 2.15.1 +* Wed Jan 03 2007 - mvidner(a)suse.cz +- Converted ag_mailtable to a module to eliminate parsing speed + bottleneck. Tables of 50000 entries no longer cause hours + of delays (#223560). +- 2.15.0 +* Thu Dec 21 2006 - mvidner(a)suse.cz +- schema: added mail_smtp_auth * Mon Nov 06 2006 - mvidner(a)suse.cz - chown /etc/fetchmailrc to $FETCHMAIL_USER (#207305). - display errors that occur during writing. ++++++ yast2-mail-2.14.0.tar.bz2 -> yast2-mail-2.15.1.tar.bz2 ++++++ ++++ 5889 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.14.0/configure.in new/yast2-mail-2.15.1/configure.in --- old/yast2-mail-2.14.0/configure.in 2006-11-06 15:29:58.000000000 +0100 +++ new/yast2-mail-2.15.1/configure.in 2007-01-30 18:36:38.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-mail dnl -dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-mail, 2.14.0, http://bugs.opensuse.org/, yast2-mail) +AC_INIT(yast2-mail, 2.15.1, http://bugs.opensuse.org/, yast2-mail) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.14.0" +VERSION="2.15.1" RPMNAME="yast2-mail" MAINTAINER="Martin Vidner <mvidner(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.14.0/src/MailAliases.ycp new/yast2-mail-2.15.1/src/MailAliases.ycp --- old/yast2-mail-2.14.0/src/MailAliases.ycp 2005-05-06 17:02:41.000000000 +0200 +++ new/yast2-mail-2.15.1/src/MailAliases.ycp 2007-01-02 15:35:34.000000000 +0100 @@ -11,7 +11,7 @@ * Authors: * Martin Vidner <mvidner(a)suse.cz> * - * $Id: MailAliases.ycp 12978 2003-12-05 14:46:46Z jsuchome $ + * $Id: MailAliases.ycp 35035 2007-01-02 14:35:30Z mvidner $ * * Representation of the configuration of mail aliases. * Input and output routines. @@ -25,6 +25,7 @@ module "MailAliases"; // no translatable strings, no textdomain. + import "MailTable"; /* ---------------------------------------------------------------- */ @@ -72,7 +73,7 @@ * @return success? */ global define boolean ReadAliases () ``{ - list<map> a_raw = (list<map>) SCR::Read (.mail.aliases.table); + list<map> a_raw = MailTable::Read ("aliases"); aliases = maplist (map e, a_raw, ``($[ "comment" : e["comment"]: "", @@ -145,7 +146,7 @@ */ global define boolean WriteAliases () ``{ // aliases - path alias_path = .mail.aliases.table; + string alias_path = "aliases"; list<map> a_raw = maplist (map e, MergeRootAlias (aliases), ``($[ "comment" : e["comment"]:"", @@ -154,9 +155,9 @@ ])); // if (merge_aliases) // { -// a_raw = mergeTables (a_raw, SCR::Read (alias_path)); +// a_raw = mergeTables (a_raw, MailTable::Read (alias_path)); // } - SCR::Write (alias_path, a_raw); + MailTable::Write ("aliases", a_raw); return true; } @@ -200,7 +201,7 @@ return false; } - if (! SCR::Write (.mail.aliases, nil)) + if (! MailTable::Flush ("aliases")) { return false; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.14.0/src/mail.rnc new/yast2-mail-2.15.1/src/mail.rnc --- old/yast2-mail-2.14.0/src/mail.rnc 2006-11-06 13:25:14.000000000 +0100 +++ new/yast2-mail-2.15.1/src/mail.rnc 2006-11-14 16:03:25.000000000 +0100 @@ -10,6 +10,7 @@ from_header? & listen_remote? & local_domains? & + mail_smtp_auth? & masquerade_other_domains? & masquerade_users? & mta & @@ -102,3 +103,14 @@ element comment { text }? }* } + +mail_smtp_auth = + element smtp_auth { + LIST, + element smtp_auth_entry { + element password { text } & + element server { text } & + element user { text } + }* + } + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.14.0/src/MailTableInclude.pm new/yast2-mail-2.15.1/src/MailTableInclude.pm --- old/yast2-mail-2.14.0/src/MailTableInclude.pm 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-mail-2.15.1/src/MailTableInclude.pm 2007-01-02 15:40:19.000000000 +0100 @@ -0,0 +1,243 @@ +#!/usr/bin/perl -w +# +# Author: Martin Vidner <mvidner(a)suse.cz> +# $Id: MailTableInclude.pm 35036 2007-01-02 14:40:18Z mvidner $ +# to be included via "do 'MailTableInclude.pm'" + + +use strict; + +# the including file must declare these +our $filename; +our $continue_escaped_newline; +our $continue_leading_blanks; +our $colon; + +use Errno qw(ENOENT); +use YaST::YCP qw(:LOGGING); + +# Global variables: +# The file specifies a map, but we represent it as a list to preserve +# preceding comments and the order of entries. +# list entries: +# { "comment" => " foo\n bar\n", "key" => "root", "value" => "joe, \\root" } +# that is, comments have the leading '#' stripped but not the newline. +# Before the first entry, there can be a leading comment, separated by +# a blank line. +our $leading_comment; +our @table; +our $trailing_comment; + +# Parser features: + +my $modified = 0; +my $linenum; +my $line_comment; +my $line = ""; +my $backslashed_line; + +my $separator; +my $oseparator; + +my $debug = defined($ARGV[0]) && $ARGV[0] eq "-d"; + +# +# routine to log and return error +# +sub log_error ( $ ) { + my ($err_msg) = @_; + y2error ($err_msg); + return 0; +} + +sub dumpit () { + print STDERR "line: '$line' line_comment: '$line_comment'\n"; +} + +# create a map entry after it has been composed of split lines +sub parse_line ($) +{ + my $line = shift; + + # is this the first line? + if ($line ne "") + { + if ($line =~ /^(.*?)$separator(.*)$/s) + { + push (@table, { "comment" => $line_comment, + "key" => $1, + "value" => $2 }); + } + else + { + log_error ("No separator, $filename:$linenum '$line'"); + } + } +} + +# +sub parse_file () +{ + $linenum = 0; + $line = ""; + $line_comment = ""; + $backslashed_line = ""; + my $leading_comment_allowed = 1; + + $leading_comment = ""; + @table = (); + $trailing_comment = ""; + + if (!open (FILE, $filename)) + { + y2error ("$filename: $!") unless ($! == ENOENT); + # a missing file will be fixed by the module anyway + # and y2cc starts all agents :( + return; + } + + while (<FILE>) + { + chomp; # \n + ++$linenum; + dumpit () if ($debug); + + # Escaped newlines: merge them before any other processing. + # Is this one escaped? + if ($continue_escaped_newline && /\\$/) + { + print STDERR "$linenum:continued\n" if ($debug); + chop; # \\ + $backslashed_line .= "$_ "; + next; + } + # Was there one already? + if ($backslashed_line ne "") + { + $_ = $backslashed_line . $_; + $backslashed_line = ""; + } + + + # Accept comments + if (/^\#(.*)/) + { + print STDERR "$linenum:comment\n" if ($debug); + $trailing_comment .= "$1\n"; + } + elsif (/^$/) + { + if ($leading_comment_allowed) + { + $leading_comment .= $trailing_comment; + $trailing_comment = ""; + } + } + else + { + $leading_comment_allowed = 0; + # $line is the previous line, $_ is the current one + if (/^\s+(.*)/) + { + if ($continue_leading_blanks) + { + print STDERR "$linenum:leading blanks\n" if ($debug); + $line .= $_; + $line_comment .= $trailing_comment; + $trailing_comment = ""; + } + else + { + log_error ("Leading whitespace, $filename:$linenum"); + } + } + else + { + print STDERR "$linenum:regular\n" if ($debug); + # a regular line. process the _previous_ one + # because this one might continue + + parse_line ($line); + + # next buffer + $line = $_; + $line_comment = $trailing_comment; + $trailing_comment = ""; + } + } + } + # end of file, but we must not forget to process the buffer! + parse_line ($line); + # only a comment: make it a leading one + if ($leading_comment_allowed) + { + $leading_comment .= $trailing_comment; + $trailing_comment = ""; + } + + close (FILE); +} + +# take a multiline string and write it to FILE with a hash before each line +sub write_comment ($) +{ + my $comment = shift; + foreach my $line (split /\n/, $comment) + { + print FILE "\#$line\n"; + } +} +# +sub write_file () +{ + return 1 if (! $modified); + + open (FILE, ">$filename.YaST2.new") or return log_error ("Creating file: $!"); + if ($leading_comment) + { + write_comment ($leading_comment); + print FILE "\n"; + } + foreach my $entry (@table) + { + write_comment ($entry->{"comment"}); + print FILE $entry->{"key"}, $oseparator, $entry->{"value"}, "\n"; + } + write_comment ($trailing_comment); + close (FILE); + + if (-f $filename) + { + rename $filename, "$filename.YaST2.save" or return log_error ("Creating backup: $!"); + } + rename "$filename.YaST2.new", $filename or return log_error ("Moving temp file: $!"); + + $modified = 0; + return 1; +} + +# interface with MailTable.pm + +sub Read () +{ + $separator = $colon ? qr/:\s+/ : qr/\s+/; + $oseparator = $colon ? ":\t" : "\t"; + + parse_file (); + $modified = 0; + + return \@table; +} + +sub Write () +{ + my $value = shift; + @table = @{$value}; + $modified = 1; + return 1; +} + +sub Flush () +{ + return write_file(); +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.14.0/src/MailTable.pm new/yast2-mail-2.15.1/src/MailTable.pm --- old/yast2-mail-2.14.0/src/MailTable.pm 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-mail-2.15.1/src/MailTable.pm 2007-01-03 13:39:57.000000000 +0100 @@ -0,0 +1,149 @@ +#!/usr/bin/perl -w +# +# Author: Martin Vidner <mvidner(a)suse.cz> +# $Id: MailTable.pm 35039 2007-01-03 12:39:54Z mvidner $ +# +# Accessing sendmail and postfix maps described in +# makemap(8) and postmap(1) + +use strict; + +package MailTable; +use YaST::YCP qw(:LOGGING); + +# type information for YCP +our %TYPEINFO; + +my %modules = + ( + "aliases" => "Aliases", + "postfix.sendercanonical" => "PostfixSenderCanonical", + "postfix.virtual" => "PostfixVirtual", + "sendmail.generics" => "SendmailGenerics", + "sendmail.virtuser" => "SendmailVirtuser", + ); + +BEGIN {$TYPEINFO{Read} = ["function", ["list", ["map", "string", "any"]], "string kind"];} +sub Read +{ + my $class = shift; + my $kind = shift; + + if (!exists $modules{$kind}) { + y2internal ("No module defined for $kind"); + return []; + } + no strict "refs"; + return &{"MailTable::$modules{$kind}::Read"}(); +} + + +BEGIN {$TYPEINFO{Write} = ["function", "boolean", "string kind", ["list", ["map", "any", "any"]]];} +sub Write +{ + my $class = shift; + my $kind = shift; + my $value = shift; + + if (!exists $modules{$kind}) { + y2internal ("No module defined for $kind"); + return 0; + } + no strict "refs"; + return &{"MailTable::$modules{$kind}::Write"}($value); +} + +BEGIN {$TYPEINFO{Flush} = ["function", "boolean", "string kind"];} +sub Flush +{ + my $class = shift; + my $kind = shift; + + if (!exists $modules{$kind}) { + y2internal ("No module defined for $kind"); + return 0; + } + no strict "refs"; + return &{"MailTable::$modules{$kind}::Flush"}(); +} + +BEGIN {$TYPEINFO{FileName} = ["function", "string", "string kind"];} +sub FileName +{ + my $class = shift; + my $kind = shift; + + if (!exists $modules{$kind}) { + y2internal ("No module defined for $kind"); + return "FIXME $kind"; + } + no strict "refs"; + return ${"MailTable::$modules{$kind}::filename"}; +} + +# For testing purposes only +# Sets filename, returns previous one +BEGIN {$TYPEINFO{SetFileName} = ["function", "string", "string kind", "string new"];} +sub SetFileName +{ + my $class = shift; + my $kind = shift; + my $new = shift; + + if (!exists $modules{$kind}) { + y2internal ("No module defined for $kind"); + return "FIXME $kind"; + } + no strict "refs"; + my $fn_ref = "MailTable::$modules{$kind}::filename"; + my $old = ${$fn_ref}; + ${$fn_ref} = $new; + return $old; +} + +package MailTable::Aliases; + +our $filename = "/etc/aliases"; +our $continue_escaped_newline = 1; +our $continue_leading_blanks = 1; +our $colon = 1; + +do 'MailTableInclude.pm'; + +package MailTable::PostfixSenderCanonical; + +our $filename = "/etc/postfix/sender_canonical"; +our $continue_escaped_newline = 0; +our $continue_leading_blanks = 1; +our $colon = 0; + +do 'MailTableInclude.pm'; + +package MailTable::PostfixVirtual; + +our $filename = "/etc/postfix/virtual"; +our $continue_escaped_newline = 0; +our $continue_leading_blanks = 1; +our $colon = 0; + +do 'MailTableInclude.pm'; + +package MailTable::SendmailGenerics; + +our $filename = "/etc/mail/genericstable"; +our $continue_escaped_newline = 0; +our $continue_leading_blanks = 0; +our $colon = 0; + +do 'MailTableInclude.pm'; + +package MailTable::SendmailVirtuser; + +our $filename = "/etc/mail/virtusertable"; +our $continue_escaped_newline = 0; +our $continue_leading_blanks = 0; +our $colon = 0; + +do 'MailTableInclude.pm'; + +1; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.14.0/src/Mail.ycp new/yast2-mail-2.15.1/src/Mail.ycp --- old/yast2-mail-2.14.0/src/Mail.ycp 2006-10-13 14:01:05.000000000 +0200 +++ new/yast2-mail-2.15.1/src/Mail.ycp 2007-01-02 15:35:34.000000000 +0100 @@ -11,7 +11,7 @@ * Authors: * Martin Vidner <mvidner(a)suse.cz> * - * $Id: Mail.ycp 33397 2006-10-13 12:01:03Z mvidner $ + * $Id: Mail.ycp 35035 2007-01-02 14:35:30Z mvidner $ * * Representation of the configuration of mail. * Input and output routines. @@ -24,6 +24,7 @@ textdomain "mail"; import "MailAliases"; + import "MailTable"; import "Mode"; import "Report"; import "Service"; @@ -509,11 +510,11 @@ list<map> mu_raw = []; if (mta == `sendmail) { - mu_raw = (list<map>)SCR::Read (.mail.sendmail.generics.table); + mu_raw = MailTable::Read ("sendmail.generics"); } else if (mta == `postfix) { - mu_raw = (list<map>)SCR::Read (.mail.postfix.sendercanonical.table); + mu_raw = MailTable::Read ("postfix.sendercanonical"); } else { @@ -573,11 +574,11 @@ list<map> v_raw = []; if (mta == `sendmail) { - v_raw = (list<map>) SCR::Read (.mail.sendmail.virtuser.table); + v_raw = MailTable::Read ("sendmail.virtuser"); } else if (mta == `postfix) { - v_raw = (list<map>) SCR::Read (.mail.postfix.virtual.table); + v_raw = MailTable::Read ("postfix.virtual"); } else { @@ -835,11 +836,11 @@ ])); if (mta == `sendmail) { - SCR::Write (.mail.sendmail.generics.table, mu_raw); + MailTable::Write ("sendmail.generics", mu_raw); } else if (mta == `postfix) { - SCR::Write (.mail.postfix.sendercanonical.table, mu_raw); + MailTable::Write ("postfix.sendercanonical", mu_raw); } else { @@ -894,11 +895,11 @@ ])); if (mta == `sendmail) { - SCR::Write (.mail.sendmail.virtuser.table, v_raw); + MailTable::Write ("sendmail.virtuser", v_raw); } else if (mta == `postfix) { - SCR::Write (.mail.postfix.virtual.table, v_raw); + MailTable::Write ("postfix.virtual", v_raw); } else { @@ -947,47 +948,30 @@ */ define boolean WriteFlush () ``{ //flush the agents - if (!SCR::Write (.sysconfig.mail, nil)) - { - // Translators: error message - Report::Error (sformat (_("Error writing file %1"), "/etc/sysconfig/mail")); - return false; - } - if (!SCR::Write (.sysconfig.amavis, nil)) - { - // Translators: error message - Report::Error (sformat (_("Error writing file %1"), "/etc/sysconfig/amavis")); - return false; - } - list<path> tables = nil; + map<string, path> paths = $[ + "/etc/sysconfig/mail": .sysconfig.mail, + "/etc/sysconfig/amavis": .sysconfig.amavis, + ]; + list<string> tables = nil; + if (mta == `sendmail) { - if (!SCR::Write (.sysconfig.sendmail, nil)) - { - // Translators: error message - Report::Error (sformat (_("Error writing file %1"), "/etc/sysconfig/sendmail")); - return false; - } + paths["/etc/sysconfig/sendmail"] = .sysconfig.sendmail; + paths["/etc/mail/auth/auth-info"] = .mail.sendmail.auth; tables = [ - .mail.sendmail.generics, - .mail.aliases, - .mail.sendmail.virtuser, - .mail.sendmail.auth, + "sendmail.generics", + "aliases", + "sendmail.virtuser", ]; } else if (mta == `postfix) { - if (!SCR::Write (.sysconfig.postfix, nil)) - { - // Translators: error message - Report::Error (sformat (_("Error writing file %1"), "/etc/sysconfig/postfix")); - return false; - } + paths["/etc/sysconfig/postfix"] = .sysconfig.postfix; + paths["/etc/postfix/sasl_passwd"] = .mail.postfix.auth; tables = [ - .mail.postfix.sendercanonical, - .mail.aliases, - .mail.postfix.virtual, - .mail.postfix.auth, + "postfix.sendercanonical", + "aliases", + "postfix.virtual", ]; } else @@ -995,11 +979,19 @@ return false; } - foreach (path p, tables, ``{ + foreach (string filename, path p, paths, ``{ if (!SCR::Write (p, nil)) { - string filename = - (string) SCR::Read (p + topath (".meta.filename")); + // Translators: error message + Report::Error (sformat (_("Error writing file %1"), filename)); + return false; + } + }); + + foreach (string p, tables, ``{ + if (!MailTable::Flush (p)) + { + string filename = MailTable::FileName (p); // Translators: error message Report::Error (sformat (_("Error writing file %1"), filename)); return false; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.14.0/src/Makefile.am new/yast2-mail-2.15.1/src/Makefile.am --- old/yast2-mail-2.14.0/src/Makefile.am 2006-11-06 13:26:16.000000000 +0100 +++ new/yast2-mail-2.15.1/src/Makefile.am 2007-01-02 15:35:34.000000000 +0100 @@ -1,7 +1,7 @@ # # Makefile.am for y2c_mail/src # -# $Id: Makefile.am 34077 2006-11-06 12:26:15Z mvidner $ +# $Id: Makefile.am 35035 2007-01-02 14:35:30Z mvidner $ # myyncludedir = $(yncludedir)/mail @@ -21,6 +21,8 @@ module_DATA = \ MailAliases.ycp \ + MailTable.pm \ + MailTableInclude.pm \ Mail.ycp rncdir = $(schemadir)/autoyast/rnc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.14.0/testsuite/tests/aliases.out new/yast2-mail-2.15.1/testsuite/tests/aliases.out --- old/yast2-mail-2.14.0/testsuite/tests/aliases.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-mail-2.15.1/testsuite/tests/aliases.out 2007-01-30 18:30:16.000000000 +0100 @@ -0,0 +1,7 @@ +#baz +foo: bar +#kuk +root: leaf +#baz2 +foo2: bar2 +#trailing comment diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.14.0/testsuite/tests/readwrite.out new/yast2-mail-2.15.1/testsuite/tests/readwrite.out --- old/yast2-mail-2.14.0/testsuite/tests/readwrite.out 2006-01-16 14:48:53.000000000 +0100 +++ new/yast2-mail-2.15.1/testsuite/tests/readwrite.out 2007-01-30 18:28:45.000000000 +0100 @@ -1,4 +1,4 @@ -Execute .target.bash "rpm -q sendmail" 0 +Execute .target.bash "rpm -q --whatprovides sendmail" 0 Read .sysconfig.mail.MAIL_CREATE_CONFIG "yes" Read .sysconfig.mail.SMTPD_LISTEN_REMOTE "yes" Read .init.scripts.exists "SuSEfirewall2_init" true @@ -7,17 +7,14 @@ Execute .target.bash "/etc/init.d/SuSEfirewall2_init status" $["TERM":"raw"] 0 Read .sysconfig.sendmail.SENDMAIL_NOCANONIFY "no" Read .sysconfig.sendmail.SENDMAIL_EXPENSIVE "no" -Execute .target.bash "rpm -q amavisd-new" 0 +Execute .target.bash "rpm -q --whatprovides amavisd-new" 0 Read .sysconfig.amavis.USE_AMAVIS "yes" Read .sysconfig.sendmail.SENDMAIL_LOCALHOST "" Read .sysconfig.sendmail.SENDMAIL_SMARTHOST "" Read .sysconfig.mail.FROM_HEADER "foo.test" Read .sysconfig.sendmail.MASQUERADE_DOMAINS "" -Read .mail.sendmail.generics.table [] Execute .target.bash_output "/usr/bin/id --user" $["exit":0, "stderr":"", "stdout":""] Read .mail.fetchmail.accounts [] -Read .mail.aliases.table [] -Read .mail.sendmail.virtuser.table [] Read .mail.sendmail.auth.accounts [$["more":1, "password":"p", "server":"s", "user":"u"]] Read .sysconfig.sendmail.SMTP_AUTH_MECHANISMS "" Return true @@ -40,9 +37,6 @@ Write .sysconfig.sendmail.SENDMAIL_SMARTHOST "" true Write .sysconfig.mail.FROM_HEADER "foo.test" true Write .sysconfig.sendmail.MASQUERADE_DOMAINS "" true -Write .mail.sendmail.generics.table [] true -Write .mail.aliases.table [] true -Write .mail.sendmail.virtuser.table [] true Write .mail.fetchmail.accounts [] true Write .mail.fetchmail nil true Read .init.scripts.exists "fetchmail" true @@ -53,13 +47,10 @@ Execute .target.bash_output "/sbin/insserv -r /etc/init.d/fetchmail" $["exit":0, "stderr":"", "stdout":""] Write .mail.sendmail.auth.accounts [$["more":1, "password":"p", "server":"s", "user":"u"]] true Write .sysconfig.sendmail.SMTP_AUTH_MECHANISMS "plain gssapi digest-md5 cram-md5" true -Write .sysconfig.mail nil true +Write .mail.sendmail.auth nil true Write .sysconfig.amavis nil true +Write .sysconfig.mail nil true Write .sysconfig.sendmail nil true -Write .mail.sendmail.generics nil true -Write .mail.aliases nil true -Write .mail.sendmail.virtuser nil true -Write .mail.sendmail.auth nil true Execute .target.bash "/sbin/SuSEconfig --module sendmail" 0 Read .init.scripts.exists "amavis" true Execute .target.bash "/etc/init.d/amavis stop" $["TERM":"raw"] 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.14.0/testsuite/tests/readwrite.ycp new/yast2-mail-2.15.1/testsuite/tests/readwrite.ycp --- old/yast2-mail-2.14.0/testsuite/tests/readwrite.ycp 2005-05-06 17:02:42.000000000 +0200 +++ new/yast2-mail-2.15.1/testsuite/tests/readwrite.ycp 2007-01-03 13:39:57.000000000 +0100 @@ -6,10 +6,10 @@ * Authors: * Martin Vidner <mvidner(a)suse.cz> * - * $Id: readwrite.ycp 19379 2004-09-15 12:14:12Z mvidner $ + * $Id: readwrite.ycp 35039 2007-01-03 12:39:54Z mvidner $ */ { - // testedfiles: Mail.ycp MailAliases.ycp Package.ycp PackageSystem.ycp Require.ycp Service.ycp Testsuite.ycp + // testedfiles: Mail.ycp MailTable.pm MailTableInclude.pm MailAliases.ycp Package.ycp PackageSystem.ycp Report.ycp Require.ycp Service.ycp Testsuite.ycp include "testsuite.ycp"; @@ -151,7 +151,11 @@ import "Progress"; import "Mail"; + import "MailTable"; + MailTable::SetFileName ("aliases", "tests/aliases.out"); + MailTable::SetFileName ("sendmail.generics", "tests/generics.out"); + MailTable::SetFileName ("sendmail.virtuser", "tests/virtuser.out"); // Pkg::FAKE (`IsProvided, $["sendmail": true, "amavis-sendmail": true, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.14.0/testsuite/tests/rootalias.out new/yast2-mail-2.15.1/testsuite/tests/rootalias.out --- old/yast2-mail-2.14.0/testsuite/tests/rootalias.out 2005-05-06 17:02:42.000000000 +0200 +++ new/yast2-mail-2.15.1/testsuite/tests/rootalias.out 2007-01-03 13:37:34.000000000 +0100 @@ -1,22 +1,8 @@ Dump sendmail -Read .mail.aliases.table [$["comment":"baz", "key":"foo", "value":"bar"], $["comment":"kuk", "key":"root", "value":"leaf"], $["comment":"baz2", "key":"foo2", "value":"bar2"]] Return leaf -Read .mail.aliases.table [$["comment":"baz", "key":"foo", "value":"bar"], $["comment":"kuk", "key":"root", "value":"leaf"], $["comment":"baz2", "key":"foo2", "value":"bar2"]] -Write .mail.aliases.table [$["comment":"", "key":"root", "value":"ruut"], $["comment":"baz", "key":"foo", "value":"bar"], $["comment":"baz2", "key":"foo2", "value":"bar2"]] true -Write .mail.aliases nil true Return true -Read .mail.aliases.table [$["comment":"baz", "key":"foo", "value":"bar"], $["comment":"kuk", "key":"root", "value":"leaf"], $["comment":"baz2", "key":"foo2", "value":"bar2"]] -Write .mail.aliases.table [$["comment":"baz", "key":"foo", "value":"bar"], $["comment":"baz2", "key":"foo2", "value":"bar2"]] true -Write .mail.aliases nil true Return true Dump postfix -Read .mail.aliases.table [$["comment":"baz", "key":"foo", "value":"bar"], $["comment":"kuk", "key":"root", "value":"leaf"], $["comment":"baz2", "key":"foo2", "value":"bar2"]] -Return leaf -Read .mail.aliases.table [$["comment":"baz", "key":"foo", "value":"bar"], $["comment":"kuk", "key":"root", "value":"leaf"], $["comment":"baz2", "key":"foo2", "value":"bar2"]] -Write .mail.aliases.table [$["comment":"", "key":"root", "value":"ruut"], $["comment":"baz", "key":"foo", "value":"bar"], $["comment":"baz2", "key":"foo2", "value":"bar2"]] true -Write .mail.aliases nil true +Return Return true -Read .mail.aliases.table [$["comment":"baz", "key":"foo", "value":"bar"], $["comment":"kuk", "key":"root", "value":"leaf"], $["comment":"baz2", "key":"foo2", "value":"bar2"]] -Write .mail.aliases.table [$["comment":"baz", "key":"foo", "value":"bar"], $["comment":"baz2", "key":"foo2", "value":"bar2"]] true -Write .mail.aliases nil true Return true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.14.0/testsuite/tests/rootalias.ycp new/yast2-mail-2.15.1/testsuite/tests/rootalias.ycp --- old/yast2-mail-2.14.0/testsuite/tests/rootalias.ycp 2005-05-06 17:02:42.000000000 +0200 +++ new/yast2-mail-2.15.1/testsuite/tests/rootalias.ycp 2007-01-03 13:39:57.000000000 +0100 @@ -8,18 +8,15 @@ * Authors: * Martin Vidner <mvidner(a)suse.cz> * - * $Id: rootalias.ycp 13711 2004-01-30 16:53:07Z mvidner $ + * $Id: rootalias.ycp 35039 2007-01-03 12:39:54Z mvidner $ */ { include "testsuite.ycp"; TESTSUITE_INIT ([ $[], $[], $[] ], nil); + import "MailTable"; import "MailAliases"; - list<map> aliases = [ - $["key": "foo", "value": "bar", "comment": "baz",], - $["key": "root", "value": "leaf", "comment": "kuk",], - $["key": "foo2", "value": "bar2", "comment": "baz2",], - ]; + MailTable::SetFileName ("aliases", "tests/aliases.out"); // the test data is a bit convoluted because formerly // the data was read from .mail.{sendmail,postfix}.aliases.table @@ -30,12 +27,6 @@ // sendmail "installed": true, ], - // Mail itself: - "mail": $[ - "aliases": $[ - "table": aliases, - ], - ], ]; map READ_p1 = $[ @@ -44,12 +35,6 @@ // sendmail "installed": false, ], - // Mail itself: - "mail": $[ - "aliases": $[ - "table": aliases, - ], - ], ]; map READ_p2 = $[ @@ -58,12 +43,6 @@ // postfix "installed": true, ], - // Mail itself: - "mail": $[ - "aliases": $[ - "table": aliases, - ], - ], ]; map WRITE = $[ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.14.0/VERSION new/yast2-mail-2.15.1/VERSION --- old/yast2-mail-2.14.0/VERSION 2006-11-06 13:42:58.000000000 +0100 +++ new/yast2-mail-2.15.1/VERSION 2007-01-30 18:31:44.000000000 +0100 @@ -1 +1 @@ -2.14.0 +2.15.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

14 years, 5 months

commit licenses

by root＠Hilbert.suse.de

Hello community, here is the log from the commit of package licenses checked in at Wed Jan 31 02:06:00 CET 2007. -------- --- licenses/licenses.changes 2007-01-16 22:38:51.000000000 +0100 +++ /mounts/work_src_done/NOARCH/licenses/licenses.changes 2007-01-30 23:42:41.894931000 +0100 @@ -1,0 +2,5 @@ +Tue Jan 30 23:41:57 CET 2007 - jw(a)suse.de + +- collect_licenses.pl can now feed on rpm's directly. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ licenses.spec ++++++ --- /var/tmp/diff_new_pack.oH1218/_old 2007-01-31 02:05:50.000000000 +0100 +++ /var/tmp/diff_new_pack.oH1218/_new 2007-01-31 02:05:50.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package licenses (Version 20070116) +# spec file for package licenses (Version 20070130) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,7 +11,7 @@ # norootforbuild Name: licenses -Version: 20070116 +Version: 20070130 Release: 1 Url: http://www.novell.com Group: System/Packages @@ -22,6 +22,7 @@ Autoreqprov: on BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArchitectures: noarch +Requires: perl rpm cpio findutils grep %description Licenses is a collection of license texts found in the packages of a @@ -56,5 +57,7 @@ # %doc /usr/share/doc/licenses/* %changelog -n licenses +* Tue Jan 30 2007 - jw(a)suse.de +- collect_licenses.pl can now feed on rpm's directly. * Tue Jan 16 2007 - jw(a)suse.de - initial draft of a licenses collection. ++++++ collect_licenses.pl ++++++ --- licenses/collect_licenses.pl 2007-01-16 22:33:31.000000000 +0100 +++ /mounts/work_src_done/NOARCH/licenses/collect_licenses.pl 2007-01-30 23:40:59.837094000 +0100 @@ -27,27 +27,39 @@ # ##################################################################### # 2007-01-16, jw, V1.0 -- initial draft. +# 2007-01-30, jw, V1.1 -- rpm scanner added. use Data::Dumper; use Digest::MD5; +use Cwd; use strict; $ENV{PATH} = '/bin:/usr/bin'; delete $ENV{ENV}; -my $version = '1.0'; +my $version = '1.1'; my $verbose = 1; my $tarball = 'licenses.tar.gz'; my $dir = 'licenses'; my $logfile = 'licenses/meta/log.txt'; -my $collect = q{find /usr/share -type f | egrep -i '(license|copying|copyright)'}; + +my $blacklist_re = '(/usr/share/doc/licenses/|/usr/share/gnump3d/|\.png$|\.jpg$|\.svg$)'; + +my $collect_cmd_fmt = q{find '%s' -type f | egrep -i '%s'}; +my $collect = q{/usr/share:(license|copying|copyright)}; + +my $cpio = '/usr/bin/cpio --quiet'; +my $rpm = '/bin/rpm'; my $extract = 0; my $pack = 0; my $run_collect = 0; my $add = 0; my $keep_unpacked = 0; +my $rpmdir = undef; +my $tmpdir = $ENV{LICENSES_TMP_DIR} || "/tmp/licenses-$$/%s"; +my $noexec = 0; usage() unless @ARGV; @@ -57,8 +69,9 @@ elsif ($arg =~ m{^-q}) { $verbose = 0; } elsif ($arg =~ m{^--$}) { last; } elsif ($arg =~ m{^-a}) { $add++; } - elsif ($arg =~ m{^-c}) { $run_collect++; $collect = shift if $ARGV[0] } + elsif ($arg =~ m{^-c}) { $run_collect++; $collect = shift if $ARGV[0] and $ARGV[0] !~ m{^-}} elsif ($arg =~ m{^-x}) { $extract++; } + elsif ($arg =~ m{^-r}) { $rpmdir = shift; } elsif ($arg =~ m{^-p}) { $pack++; } elsif ($arg =~ m{^-t}) { $pack++; $extract++; } elsif ($arg =~ m{^-k}) { $keep_unpacked++; } @@ -68,7 +81,7 @@ } $keep_unpacked++ unless $pack; - +my ($prefix_string,$infix_pattern,$collect_cmd) = split_prefix_infix($collect); if ($extract && -f $tarball) { @@ -79,47 +92,38 @@ mkdir_pf($logfile); open L, ">>", $logfile; print L "$0 extract=$extract add=$add run_collect=$run_collect pack=$pack started " . scalar(localtime) . "\n"; +print L "collect=$collect\n" if $run_collect; +print L "rpmdir=$rpmdir\n" if defined $rpmdir; print L "$tarball extracted.\n" if $extract && -f $tarball; -if ($run_collect) +if (defined($rpmdir)) { - print L "running comand: $collect\n"; - open C, "$collect|" or die "'$collect' failed: $! $@\n"; - while (defined (my $line = <C>)) + $rpmdir = $1 if $rpmdir =~ m{^(.*)$}; # untaint. + if (-d $rpmdir) { - chomp $line; - my $file = ($line =~ m{^(.*)$})[0]; # force untaint - - if (open FILE, "<", $file) - { - my $md5 = Digest::MD5->new; - $md5->addfile(*FILE); - close(FILE); - my $digest = $md5->hexdigest; - my $dest = "$dir/md5/$digest"; - unless (-f $dest) - { - mkdir_pf($dest); - system "cp '$file' '$dest'" and die "cannot copy $file"; - print L "added $digest $file\n"; - print "added $file\n" if $verbose; - } - else - { - print L " have $digest $file\n"; - } - } - else + open FINDPKG, "find $rpmdir -name \*.rpm|" or die "open find $rpmdir failed: $! $@\n"; + while (defined(my $pkg = <FINDPKG>)) { - warn "cannot read $file: $!\n"; + $pkg = $1 if $pkg =~ m{(\S+)}; + die "find returned non-file: $pkg\n" unless -f $pkg; + print " $pkg\n" if $verbose; + collect_from_rpm($pkg); } - + close FINDPKG; + } + else + { + collect_from_rpm($rpmdir); } - close C; + } +else + { + collect_licenses('/'); } if ($pack && -d $dir) { + rename $tarball, "$tarball." . time() if -f $tarball; my $cmd = "tar zcvf '$tarball' '$dir'"; system $cmd and die "'$cmd' failed: $! $@\n"; print L "$tarball packed.\n"; @@ -128,7 +132,9 @@ print L "$0 done " . scalar(localtime) . "\n"; close L; rm_rf($dir) unless $keep_unpacked; + exit 0; +############################################################################ ## ## this version of mkdir_pf handles relative and absolute paths. @@ -219,6 +225,75 @@ } +sub rpm_header +{ + my ($file, $name) = @_; + my $cmd = "$rpm -qp --qf '%{$name}' '$file'"; + open RPM, "$cmd|" or die "cannot run $cmd: $!"; + my $r = join '', <RPM>; + close RPM or die "failed to run $cmd: $!"; + die "$cmd: failed\n" unless length $r; + return $r; +} + +sub rpm_filelist +{ + my ($file, $name) = @_; + my $cmd = "$rpm -qpl '$file'"; + open RPM, "$cmd|" or die "cannot run $cmd: $!"; + my @r = <RPM>; + chomp @r; + close RPM or die "failed to run $cmd: $!"; + die "$cmd: failed\n" unless scalar @r; + return @r; +} + + +# extract an RPM file, optionally limited to certain files. +# +sub unrpm +{ + my ($pkg, $dir, $files) = @_; + my $pattern = ''; + if ($files) + { + # we put leading dots in front of the file name list. + # This is how rpm2cpio exports the names. + # And we escape '?' and '*' because cpio reads shell globbing + # patterns, not files. + + $pattern = " '." . join("' '.", @$files) . "'" if $files; + $pattern =~ s{([\*\?])}{\\$1}g; + $pattern = $1 if $pattern =~ m{^(.*)$}; + } + run_cmd("rpm2cpio '$pkg' | (cd $dir && $cpio -uidm$pattern)"); +} + +sub collect_from_rpm +{ + my ($pkg) = @_; + my $name = rpm_header($pkg, 'name'); + $name = $1 if $name =~ m{^([^/]+)$}; # untaint, no slashes please. + my @l = rpm_filelist($pkg); + @l = grep { /$infix_pattern/i } grep { /^\Q$prefix_string\E/ } @l; + return unless scalar @l; + + my $root = sprintf $tmpdir, $name; # where created files go. + mkdir_pf("$root/."); + unrpm($pkg, $root, \@l); + collect_licenses($root, $name); + rm_rf($root); +} + +sub run_cmd +{ + my ($cmd) = @_; + print "\n$cmd\n" if $verbose > 1 or $noexec; + return if $noexec; + system "$cmd" and die "$cmd failed: $@ $!"; +} + + sub usage { my ($msg) = @_; @@ -236,16 +311,115 @@ -v Be more verbose. Default: $verbose -q Be quiet. - + -a Add files. - -c [cmd] Add files listed by cmd. Cmd defaults to - "$collect"'. + -c [prefix:infix] + Add files selected by pattern. + A case sensitive prefix string and a case insensitive + infix regexp-pattern can be specified seperated by a colon. + Defaults to "$collect". + -r rpmdir Add files found in the rpm's in rpmdir. -l logfile Append to logfile. Defaults to $logfile . -t First do -x, last do -p. -x Extract '$tarball' into ./$dir . -p Pack '$tarball' from ./$dir . + +Examples: + +Update from the current system: + $0 -t -c + +Make a fresh start for SLES10-SP1: + $0 -p -c -r /mounts/dist/install/SLP/SLES-10-SP1-Beta2/i386 + +add one file from one rpm: + $0 -t -r foobar.rpm -a /usr/lib/foobar/doc/Readme.txt + }; exit 0; } + +sub split_prefix_infix +{ + my ($colon_sep) = @_; + $colon_sep =~ m{^([^:]+):(.*)$} or + die "split_prefix_infix: pattern seperator colon(:) not found\n"; + my ($pre, $in) = ($1, $2); + $pre =~ s{^/+}{}; + my $cmd = sprintf $collect_cmd_fmt, $pre, $in; + return ("/$pre", $in, $cmd); +} + +sub collect_licenses +{ + my ($root, $pkg_name) = @_; + + if ($run_collect) + { + print L "running comand in $root: $collect_cmd\n"; + my $cwd = getcwd; + chdir($root) or die "collect_licenses: chdir($root) failed: $!"; + open C, "$collect_cmd|" or die "'$collect_cmd' failed: $! $@\n"; + + $cwd = $1 if $cwd =~ m{^(.*)$}; # untaint + chdir($cwd) or warn "collect_licenses: chdir($cwd) failed: $!"; + + while (defined (my $line = <C>)) + { + chomp $line; + my $file = ($line =~ m{^(.*)$})[0]; # force untaint + $file = "/$file" unless $file =~ m{^/}; + next if $file =~ m{$blacklist_re}; + + if (open FILE, "<", "$root$file") + { + my $md5 = Digest::MD5->new; + $md5->addfile(*FILE); + close(FILE); + my $digest = $md5->hexdigest; + my $dest = "$dir/md5/$digest"; + unless (-f $dest) + { + mkdir_pf($dest); + system "cp '$root$file' '$dest'" and die "cannot copy $root$file"; + print L "added $digest $file\n"; + print "added $file\n" if $verbose; + } + else + { + print L " have $digest $file\n"; + } + + if ($pkg_name) + { +# my $lname = ($file =~ m{([^/]+)$})[0]; + my $lname = $file; + $lname =~ s{^/+}{}; + $lname =~ s{/+}{,}g; + + $lname = "$dir/pkg/$pkg_name/$lname"; + unless (-e $lname) + { + my $rel = $dest; + $rel =~ s{^[^/]+/}{../../}; + mkdir_pf($lname); + symlink($rel, $lname); + } + } + } + else + { + warn "cannot read $root$file: $!\n"; + } + + } + close C; + } + else + { + warn "nothing done. try -c ?\n"; + } +} + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

14 years, 5 months

commit boo

by root＠Hilbert.suse.de

Hello community, here is the log from the commit of package boo checked in at Wed Jan 31 02:05:44 CET 2007. -------- --- GNOME/boo/boo.changes 2007-01-11 02:08:55.000000000 +0100 +++ /mounts/work_src_done/NOARCH/boo/boo.changes 2007-01-30 18:00:52.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Jan 30 18:00:49 CET 2007 - sbrabec(a)suse.cz + +- Prefix changed to /usr. +- Spec file cleanup. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ boo.spec ++++++ --- /var/tmp/diff_new_pack.f32763/_old 2007-01-31 02:05:18.000000000 +0100 +++ /var/tmp/diff_new_pack.f32763/_new 2007-01-31 02:05:18.000000000 +0100 @@ -13,15 +13,14 @@ Name: boo BuildRequires: gtksourceview-devel mono-devel nant shared-mime-info Version: 0.7.6.2237 -Release: 43 +Release: 44 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch URL: http://boo.codehaus.org/Home Source: %{name}-%{version}-src.tar.bz2 Summary: A CLI Scripting Language Group: Development/Languages/Other -PreReq: shared-mime-info +BuildArch: noarch %description Boo is a new object-oriented statically-typed programming language for @@ -31,45 +30,46 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q %build -nant -D:install.prefix=/usr +nant -D:install.prefix=%{_prefix} %install -nant install -D:install.prefix=/usr -D:install.destdir=${RPM_BUILD_ROOT} -cd ${RPM_BUILD_ROOT} -# SuSEize some filesystem layouts -mkdir -p ./opt/gnome/share/mime-info -mv ./usr/share/mime-info/* ./opt/gnome/share/mime-info -# Move .pc file to /usr/share instead of /usr/lib -mkdir -p ${RPM_BUILD_ROOT}/usr/share -mv ${RPM_BUILD_ROOT}/usr/lib/pkgconfig ${RPM_BUILD_ROOT}/usr/share +nant install -D:install.prefix=%{_prefix} -D:install.destdir=$RPM_BUILD_ROOT +rm -r $RPM_BUILD_ROOT%{_datadir}/mime-info +# Move platform independent .pc file to %{_datadir}/pkgconfig +mkdir -p $RPM_BUILD_ROOT%{_datadir} +mv $RPM_BUILD_ROOT%{_prefix}/lib/pkgconfig $RPM_BUILD_ROOT%{_datadir}/ # This is in gtksourceview now -rm -rf $RPM_BUILD_ROOT/opt/gnome/share/gtksourceview* -rm -rf $RPM_BUILD_ROOT/usr/share/gtksourceview* +rm -rf $RPM_BUILD_ROOT%{_datadir}/gtksourceview* %clean rm -rf "$RPM_BUILD_ROOT" %files %defattr(-, root, root) -/usr/bin/* -/usr/lib/boo -/usr/lib/mono/boo -/usr/lib/mono/gac -/usr/share/pkgconfig/*.pc -/usr/share/mime/packages/boo-mime-info.xml -#/opt/gnome/share/gtksourceview-1.0/language-specs/boo.lang -/opt/gnome/share/mime-info/* +%{_bindir}/* +%{_datadir}/pkgconfig/*.pc +%{_datadir}/mime/packages/boo-mime-info.xml +%{_prefix}/lib/boo +%{_prefix}/lib/mono/boo +%{_prefix}/lib/mono/gac %post -update-mime-database /usr/share/mime >/dev/null || : +if test -x usr/bin/update-mime-database ; then + usr/bin/update-mime-database usr/share/mime >/dev/null +fi %postun -update-mime-database /usr/share/mime >/dev/null || : +if test -x usr/bin/update-mime-database ; then + usr/bin/update-mime-database usr/share/mime >/dev/null +fi %changelog -n boo +* Tue Jan 30 2007 - sbrabec(a)suse.cz +- Prefix changed to /usr. +- Spec file cleanup. * Thu Jan 11 2007 - wberrier(a)suse.de - Also remove /usr/share/gtksourceview* to fix build * Wed Jan 03 2007 - wberrier(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

14 years, 5 months

commit libiptcdata

by root＠Hilbert.suse.de

Hello community, here is the log from the commit of package libiptcdata checked in at Wed Jan 31 01:21:11 CET 2007. -------- --- libiptcdata/libiptcdata.changes 2007-01-23 01:47:36.000000000 +0100 +++ /mounts/work_users/ro/STABLE/libiptcdata/libiptcdata.changes 2007-01-31 00:58:24.379454000 +0100 @@ -1,0 +2,5 @@ +Wed Jan 31 00:58:16 CET 2007 - ro(a)suse.de + +- GNOME moved to /usr + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libiptcdata.spec ++++++ --- /var/tmp/diff_new_pack.h22940/_old 2007-01-31 01:20:56.000000000 +0100 +++ /var/tmp/diff_new_pack.h22940/_new 2007-01-31 01:20:56.000000000 +0100 @@ -12,7 +12,7 @@ Name: libiptcdata Version: 0.2.1 -Release: 35 +Release: 36 URL: http://libiptcdata.sourceforge.net/ Group: System/Libraries License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) @@ -99,8 +99,8 @@ %build export CFLAGS="$RPM_OPT_FLAGS" ./configure\ - --prefix=/opt/gnome\ - --libdir=/opt/gnome/%{_lib} + --prefix=%{_prefix} \ + --libdir=%{_libdir} make %{?jobs:-j%jobs} %install @@ -119,21 +119,25 @@ %files %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO -/opt/gnome/%{_lib}/*.so.* -/opt/gnome/bin/* +%{_libdir}/*.so.* +%{_bindir}/* %files devel %defattr (-, root, root) -/opt/gnome/%{_lib}/*.so -/opt/gnome/%{_lib}/*.*a -/opt/gnome/%{_lib}/pkgconfig/*.pc -/opt/gnome/include/* +%{_libdir}/*.so +%{_libdir}/*.*a +%{_libdir}/pkgconfig/*.pc +%{_prefix}/include/* %files doc %defattr (-, root, root) -/opt/gnome/share/gtk-doc/html/* +%dir %{_datadir}/gtk-doc +%dir %{_datadir}/gtk-doc/html +%{_datadir}/gtk-doc/html/* %changelog -n libiptcdata +* Wed Jan 31 2007 - ro(a)suse.de +- GNOME moved to /usr * Tue Jan 23 2007 - ro(a)suse.de - drop requires for gnome-filesystem * Wed Jan 25 2006 - mls(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

14 years, 5 months

commit opensuse-manual_en

by root＠Hilbert.suse.de

Hello community, here is the log from the commit of package opensuse-manual_en checked in at Wed Jan 31 01:18:15 CET 2007. -------- --- opensuse-manual_en/opensuse-manual_en.changes 2006-11-24 16:46:09.000000000 +0100 +++ /mounts/work_users/ro/NOARCH/opensuse-manual_en/opensuse-manual_en.changes 2007-01-31 01:02:46.386506000 +0100 @@ -1,0 +2,5 @@ +Wed Jan 31 01:02:43 CET 2007 - ro(a)suse.de + +- GNOME moved to /usr + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opensuse-manual_en.spec ++++++ --- /var/tmp/diff_new_pack.N16742/_old 2007-01-31 01:18:03.000000000 +0100 +++ /var/tmp/diff_new_pack.N16742/_new 2007-01-31 01:18:03.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package opensuse-manual_en (Version 10.2) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 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. # @@ -14,7 +14,7 @@ %define my_lang en %define my_book opensuse-html Version: 10.2 -Release: 26 +Release: 32 #OBS Source00: opensuse-html_en-html.tar.bz2 Source01: opensuse-html_en-desktop.tar.bz2 @@ -48,7 +48,7 @@ %package pdf Group: Documentation/SuSE -License: GNU Free Documentation License, Version 1.1 (GFDL), Other License(s), see package +License: GNU Free Documentation License, Version 1.1 (GFDL) Summary: openSUSE Manual (English) as PDF #PDFOBS @@ -78,7 +78,7 @@ # mkdir -p desktop/{startup,reference,application,apparmor-admin-guide} ### install -d $RPM_BUILD_ROOT%{my_desktopdir}/%{name} -%define gnome_dir /opt/gnome/share/gnome/help/%{name} +%define gnome_dir /usr/share/gnome/help/%{name} install -d $RPM_BUILD_ROOT/%{gnome_dir} # if [ -d html/%my_book ]; then @@ -170,12 +170,12 @@ %{my_desktopdir} %dir %{_datadir}/susehelp %{gnome_dir} -%dir /opt/gnome -%dir /opt/gnome/share -%dir /opt/gnome/share/gnome -%dir /opt/gnome/share/gnome/help +%dir /usr/share/gnome +%dir /usr/share/gnome/help %changelog -n opensuse-manual_en +* Wed Jan 31 2007 - ro(a)suse.de +- GNOME moved to /usr * Fri Nov 24 2006 - ke(a)suse.de - Update KDE User Guide and parts of the other manuals. - Add language tag to the khelpcenter section title. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

14 years, 5 months

commit opensuse-manual_de

by root＠Hilbert.suse.de

Hello community, here is the log from the commit of package opensuse-manual_de checked in at Wed Jan 31 01:17:57 CET 2007. -------- --- opensuse-manual_de/opensuse-manual_de.changes 2006-11-27 16:36:38.000000000 +0100 +++ /mounts/work_users/ro/NOARCH/opensuse-manual_de/opensuse-manual_de.changes 2007-01-31 01:02:43.812745000 +0100 @@ -1,0 +2,5 @@ +Wed Jan 31 01:02:41 CET 2007 - ro(a)suse.de + +- GNOME moved to /usr + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opensuse-manual_de.spec ++++++ --- /var/tmp/diff_new_pack.p16047/_old 2007-01-31 01:17:46.000000000 +0100 +++ /var/tmp/diff_new_pack.p16047/_new 2007-01-31 01:17:46.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package opensuse-manual_de (Version 10.2) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 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. # @@ -14,7 +14,7 @@ %define my_lang de %define my_book opensuse-html Version: 10.2 -Release: 5 +Release: 11 #OBS Provides: locale(opensuse-manual_en:%my_lang) Source00: opensuse-html_de-html.tar.bz2 @@ -72,7 +72,7 @@ # mkdir -p desktop/{startup,reference,application,apparmor-admin-guide} ### install -d $RPM_BUILD_ROOT%{my_desktopdir}/%{name} -%define gnome_dir /opt/gnome/share/gnome/help/%{name} +%define gnome_dir /usr/share/gnome/help/%{name} install -d $RPM_BUILD_ROOT/%{gnome_dir} # if [ -d html/%my_book ]; then @@ -164,12 +164,12 @@ %{my_desktopdir} %dir %{_datadir}/susehelp %{gnome_dir} -%dir /opt/gnome -%dir /opt/gnome/share -%dir /opt/gnome/share/gnome -%dir /opt/gnome/share/gnome/help +%dir /usr/share/gnome +%dir /usr/share/gnome/help %changelog -n opensuse-manual_de +* Wed Jan 31 2007 - ro(a)suse.de +- GNOME moved to /usr * Mon Nov 27 2006 - ke(a)suse.de - Adjustments by Tanja Roth and Berthold Gunreben (XML and images). * Fri Nov 24 2006 - ke(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

14 years, 5 months

commit opensuse-gnomeuser_en

by root＠Hilbert.suse.de

Hello community, here is the log from the commit of package opensuse-gnomeuser_en checked in at Wed Jan 31 01:17:39 CET 2007. -------- --- opensuse-gnomeuser_en/opensuse-gnomeuser_en.changes 2006-11-23 11:45:46.000000000 +0100 +++ /mounts/work_users/ro/NOARCH/opensuse-gnomeuser_en/opensuse-gnomeuser_en.changes 2007-01-31 01:02:40.986089000 +0100 @@ -1,0 +2,5 @@ +Wed Jan 31 01:02:26 CET 2007 - ro(a)suse.de + +- GNOME moved to /usr + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opensuse-gnomeuser_en.spec ++++++ --- /var/tmp/diff_new_pack.Y15416/_old 2007-01-31 01:17:26.000000000 +0100 +++ /var/tmp/diff_new_pack.Y15416/_new 2007-01-31 01:17:26.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package opensuse-gnomeuser_en (Version 10.2) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 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. # @@ -14,7 +14,7 @@ %define my_lang en %define my_book opensuse-gnomeuser Version: 10.2 -Release: 20 +Release: 26 #OBS Source0: opensuse-gnomeuser_en-html.tar.bz2 Source1: opensuse-gnomeuser_en-desktop.tar.bz2 @@ -26,7 +26,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArchitectures: noarch Group: Documentation/SuSE -License: GNU Free Documentation License, Version 1.1 (GFDL), Other License(s), see package +License: GNU Free Documentation License, Version 1.1 (GFDL) Summary: openSUSE GNOME User Guide (English) %define _defaultdocdir %{_datadir}/doc/manual %define _docdir %{_datadir}/doc/manual @@ -39,7 +39,7 @@ %package pdf Group: Documentation/SuSE -License: GNU Free Documentation License, Version 1.1 (GFDL), Other License(s), see package +License: GNU Free Documentation License, Version 1.1 (GFDL) Summary: openSUSE GNOME User Guide (English) #PDFOBS @@ -66,7 +66,7 @@ # mkdir -p desktop/{startup,reference,application,apparmor-admin-guide} ### install -d $RPM_BUILD_ROOT%{my_desktopdir}/%{name} -%define gnome_dir /opt/gnome/share/gnome/help/%{name} +%define gnome_dir /usr/share/gnome/help/%{name} install -d $RPM_BUILD_ROOT/%{gnome_dir} # if [ -d html/%my_book ]; then @@ -158,12 +158,12 @@ %{my_desktopdir} %dir %{_datadir}/susehelp %{gnome_dir} -%dir /opt/gnome -%dir /opt/gnome/share -%dir /opt/gnome/share/gnome -%dir /opt/gnome/share/gnome/help +%dir /usr/share/gnome +%dir /usr/share/gnome/help %changelog -n opensuse-gnomeuser_en +* Wed Jan 31 2007 - ro(a)suse.de +- GNOME moved to /usr * Thu Nov 23 2006 - ke(a)suse.de - Enhancements by Scott Rhoades and Jana Jaeger. - Fix .directory; thanks to Cornelius Schumacher [#216108]. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

14 years, 5 months

commit vmx-manager

by root＠Hilbert.suse.de

Hello community, here is the log from the commit of package vmx-manager checked in at Wed Jan 31 01:17:12 CET 2007. -------- --- vmx-manager/vmx-manager.changes 2007-01-18 21:35:42.000000000 +0100 +++ /mounts/work_users/ro/STABLE/vmx-manager/vmx-manager.changes 2007-01-31 00:49:11.366472000 +0100 @@ -1,0 +2,5 @@ +Wed Jan 31 00:49:04 CET 2007 - ro(a)suse.de + +- GNOME moved to /usr + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vmx-manager.spec ++++++ --- /var/tmp/diff_new_pack.z14746/_old 2007-01-31 01:16:59.000000000 +0100 +++ /var/tmp/diff_new_pack.z14746/_new 2007-01-31 01:16:59.000000000 +0100 @@ -17,7 +17,7 @@ Group: Productivity/Other Autoreqprov: on Version: 0.2.3 -Release: 1 +Release: 2 Summary: Create, configure, and manage VMware virtual machines Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -46,8 +46,8 @@ %install make install DESTDIR=$RPM_BUILD_ROOT %suse_update_desktop_file vmx-manager -install -d $RPM_BUILD_ROOT/opt/gnome/share -mv $RPM_BUILD_ROOT%{_datadir}/icons $RPM_BUILD_ROOT/opt/gnome/share/ +install -d $RPM_BUILD_ROOT/%{_datadir}/pixmaps +ln -sf %{_datadir}/icons/hicolor/*/apps/vmx-manager.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ %clean rm -rf $RPM_BUILD_ROOT @@ -60,17 +60,20 @@ %{_prefix}/lib/vmx-manager/*.dll* %{_prefix}/lib/vmx-manager/*.exe* %{_datadir}/applications/vmx-manager.desktop -/opt/gnome/share/icons/hicolor/*/apps/vmx-manager.* +%{_datadir}/pixmaps/* +%{_datadir}/icons/hicolor/*/apps/vmx-manager.* %post touch --no-create %{_datadir}/icons/hicolor || : -/opt/gnome/bin/gtk-update-icon-cache --quiet /opt/gnome/share/icons/hicolor || : +/usr/bin/gtk-update-icon-cache --quiet /usr/share/icons/hicolor || : %postun touch --no-create %{_datadir}/icons/hicolor || : -/opt/gnome/bin/gtk-update-icon-cache --quiet /opt/gnome/share/icons/hicolor || : +/usr/bin/gtk-update-icon-cache --quiet /usr/share/icons/hicolor || : %changelog -n vmx-manager +* Wed Jan 31 2007 - ro(a)suse.de +- GNOME moved to /usr * Thu Jan 18 2007 - james(a)suse.de - update to 0.2.3, containing two bug fixes - #236385 and #236417 * Fri Jan 12 2007 - james(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

14 years, 5 months

Jump to page:

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

openSUSE Commits January 2007