February 2007 - openSUSE Commits - openSUSE Mailing Lists

commit kcall
by root＠Hilbert.suse.de 02 Feb '07

02 Feb '07

Hello community, here is the log from the commit of package kcall checked in at Fri Feb 2 14:19:45 CET 2007. -------- --- KDE/kcall/kcall.changes 2006-11-24 18:04:09.000000000 +0100 +++ /mounts/work_src_done/STABLE/kcall/kcall.changes 2007-02-01 13:31:30.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 1 13:31:28 CET 2007 - stbinner(a)suse.de + +- add .desktop file to make plugin work in Kontact 3.5.6 again + +------------------------------------------------------------------- New: ---- kontact-356-plugin.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcall.spec ++++++ --- /var/tmp/diff_new_pack.k24663/_old 2007-02-02 13:12:55.000000000 +0100 +++ /var/tmp/diff_new_pack.k24663/_new 2007-02-02 13:12:55.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kcall (Version 0.5.2svn20060206) # -# 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. # @@ -20,12 +20,13 @@ Group: Productivity/Telephony/SIP/Clients Summary: SIP (Voice over IP) Solution for KDE and Kontact Version: 0.5.2svn20060206 -Release: 48 +Release: 64 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) Source0: %name-%version.tar.bz2 Patch0: kcall_dont_kill_kontact.diff Patch1: fix-auth-request.diff +Patch2: kontact-356-plugin.diff %description KCall is the telephony application of Kontact. It supports computer @@ -45,6 +46,7 @@ %setup -q %patch0 %patch1 +%patch2 . /etc/opt/kde3/common_options update_admin @@ -83,8 +85,11 @@ /opt/kde3/share/icons/*/*/*/phone* /opt/kde3/share/services/kcall_part.desktop /opt/kde3/share/services/kontact/kcallplugin.desktop +/opt/kde3/share/services/kontact/kcallplugin356.desktop %changelog -n kcall +* Thu Feb 01 2007 - stbinner(a)suse.de +- add .desktop file to make plugin work in Kontact 3.5.6 again * Fri Nov 24 2006 - dmueller(a)suse.de - fix stale auth data popup (#183329) * Tue May 30 2006 - adrian(a)suse.de ++++++ kontact-356-plugin.diff ++++++ --- kcall/kcall/src/Makefile.am 2007/02/01 12:29:45 1.1 +++ kcall/kcall/src/Makefile.am 2007/02/01 12:30:00 @@ -74,4 +74,4 @@ kcall_partiface_DIR = $(top_srcdir)/kcall/src servicedir = $(kde_servicesdir)/kontact -service_DATA = kcallplugin.desktop +service_DATA = kcallplugin.desktop kcallplugin356.desktop --- kcall/kcall/src/kcallplugin356.desktop 2007/02/01 12:29:41 1.1 +++ kcall/kcall/src/kcallplugin356.desktop 2007/02/01 12:30:13 @@ -0,0 +1,48 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Service +Icon=kcall +ServiceTypes=Kontact/Plugin,KPluginInfo + +X-KDE-Library=libkontact_kcall +X-KDE-KontactPluginVersion=5 +X-KDE-KontactPartLibraryName=libkcallpart +X-KDE-KontactPartLoadOnStart=false + +X-KDE-PluginInfo-Name=kontact_kcall +X-KDE-PluginInfo-Version=0.5.2 +X-KDE-PluginInfo-License=GPL +X-KDE-PluginInfo-EnabledByDefault=true + +Name=Telephone +Name[bg]=Телефон +Name[br]=Pellgomz +Name[cy]=Ffôn +Name[da]=Telefon +Name[el]=Τηλέφωνο +Name[es]=Teléfono +Name[et]=Telefon +Name[ga]=Teileafón +Name[gl]=Teléfone +Name[it]=Telefono +Name[pt]=Telefone +Name[sr]=Телефон +Name[sr@Latn]=Telefon +Name[sv]=Telefon +Name[xx]=xxTelephonexx +Comment=KCall Plugin +Comment[bg]=Приставка за KCall +Comment[br]=Lugent KCall +Comment[da]=Kcall-plugin +Comment[el]=Πρόσθετο του KCall +Comment[es]=Complemento de KCall +Comment[et]=KCalli plugin +Comment[ga]=Breiseán KCall +Comment[gl]=Plugin de KCall +Comment[it]=Plugin di KCall +Comment[pt]='Plugin' do KCall +Comment[sr]=KCall прикључак +Comment[sr@Latn]=KCall priključak +Comment[sv]=Kcall-insticksprogram +Comment[xx]=xxKCall Pluginxx + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase3
by root＠Hilbert.suse.de 02 Feb '07

02 Feb '07

Hello community, here is the log from the commit of package kdebase3 checked in at Fri Feb 2 14:08:00 CET 2007. -------- --- KDE/kdebase3/kdebase3.changes 2007-01-26 10:59:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2007-01-30 14:40:20.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Jan 30 14:40:12 CET 2007 - stbinner(a)suse.de + +- show konqfilemgr.desktop in the menu + +------------------------------------------------------------------- New: ---- show-konqueror-in-menu.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.o27287/_old 2007-02-02 13:13:07.000000000 +0100 +++ /var/tmp/diff_new_pack.o27287/_new 2007-02-02 13:13:07.000000000 +0100 @@ -52,7 +52,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.6 -Release: 2 +Release: 3 %define kde_version 3.5.6 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -189,6 +189,7 @@ Patch200: kdm-use-rpmoptflags.diff Patch201: media-libhal-qstring-define.diff Patch202: no-media-backend-hack.diff +Patch203: show-konqueror-in-menu.diff %description This package contains kdebase, one of the basic packages of the K @@ -375,7 +376,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 237 +Release: 238 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -543,6 +544,7 @@ %if %suse_version < 1010 %patch202 %endif +%patch203 cp %SOURCE17 l10n/tw/flag.png . /etc/opt/kde3/common_options cd ../fileshareset2 @@ -703,6 +705,7 @@ %suse_update_desktop_file -r klipper System TrayIcon %suse_update_desktop_file kpager Utility DesktopUtility %suse_update_desktop_file -u ktip System Utility +%suse_update_desktop_file konqfilemgr System FileManager %suse_update_desktop_file konquerorsu System FileManager %suse_update_desktop_file kdeprintfax PrintingUtility %suse_update_desktop_file kjobviewer PrintingUtility @@ -1071,6 +1074,7 @@ /opt/kde3/share/applications/kde/klipper.desktop /opt/kde3/share/applications/kde/kmenuedit.desktop /opt/kde3/share/applications/kde/konqbrowser.desktop +/opt/kde3/share/applications/kde/konqfilemgr.desktop /opt/kde3/share/applications/kde/konquerorsu.desktop /opt/kde3/share/applications/kde/konsole.desktop /opt/kde3/share/applications/kde/konsolesu.desktop @@ -1507,6 +1511,8 @@ %endif %changelog -n kdebase3 +* Tue Jan 30 2007 - stbinner(a)suse.de +- show konqfilemgr.desktop in the menu * Fri Jan 26 2007 - coolo(a)suse.de - making kdmrc noreplace as genkdmconf will update the config anyway (#224505) ++++++ show-konqueror-in-menu.diff ++++++ Index: konqueror/konqfilemgr.desktop =================================================================== --- konqueror/konqfilemgr.desktop (revision 626993) +++ konqueror/konqfilemgr.desktop (working copy) @@ -5,7 +5,8 @@ Icon=kfm DocPath=konqueror/index.html -Name=File Manager +Name=Konqueror +GenericName=File Manager Name[af]=Lêer Bestuurder Name[ar]=مدبّر الملفات Name[az]=Fayl İdarəcisi Index: konqueror/Makefile.am =================================================================== --- konqueror/Makefile.am (revision 626993) +++ konqueror/Makefile.am (working copy) @@ -69,11 +69,8 @@ $(XGETTEXT) -kaliasLocal rc.cpp *.h *.cc *view/*h *view/*cc kedit*/*.cpp about/*.h about/*.cc remoteencodingplugin/*.cpp remoteencodingplugin/*.h shellcmdplugin/*.cpp -o `find sidebar -name "*.cpp"` `find sidebar -name "*.h"` -o $(podir)/konqueror.pot xdg_apps_DATA = kfmclient.desktop kfmclient_dir.desktop kfmclient_html.desktop \ - kfmclient_war.desktop konqbrowser.desktop konquerorsu.desktop Home.desktop + kfmclient_war.desktop konqbrowser.desktop konquerorsu.desktop Home.desktop konqfilemgr.desktop -konq_data4_DATA = konqfilemgr.desktop -konq_data4dir = $(kde_appsdir)/.hidden - kde_kcfg_DATA = konqueror.kcfg ####### Build rules ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-samba-server
by root＠Hilbert.suse.de 02 Feb '07

02 Feb '07

Hello community, here is the log from the commit of package yast2-samba-server checked in at Fri Feb 2 13:11:31 CET 2007. -------- --- yast2-samba-server/yast2-samba-server.changes 2006-11-14 12:59:20.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-samba-server/yast2-samba-server.changes 2007-02-01 13:22:14.000000000 +0100 @@ -1,0 +2,13 @@ +Sun Jan 28 22:38:02 CET 2007 - locilka(a)suse.cz + +- Removed some samba-client-related content confusingly left in + samba-server.rnc definition. Patch made by Uwe Gansert (#239154). +- 2.15.0 + +------------------------------------------------------------------- +Tue Jan 16 13:01:00 CET 2007 - locilka(a)suse.cz + +- Adding X-SuSE-YaST-AutoInstSchema entry into the application + desktop file (#235342). + +------------------------------------------------------------------- Old: ---- yast2-samba-server-2.14.3.tar.bz2 New: ---- yast2-samba-server-2.15.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-samba-server.spec ++++++ --- /var/tmp/diff_new_pack.m19096/_old 2007-02-02 13:10:43.000000000 +0100 +++ /var/tmp/diff_new_pack.m19096/_new 2007-02-02 13:10:43.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-samba-server (Version 2.14.3) +# spec file for package yast2-samba-server (Version 2.15.0) # -# 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,12 +11,12 @@ # norootforbuild Name: yast2-samba-server -Version: 2.14.3 +Version: 2.15.0 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-samba-server-2.14.3.tar.bz2 +Source0: yast2-samba-server-2.15.0.tar.bz2 prefix: /usr BuildRequires: libsmbclient libsmbclient-devel perl-Crypt-SmbHash perl-X500-DN perl-XML-Writer samba-client update-desktop-files yast2 yast2-devtools yast2-ldap-client yast2-network yast2-perl-bindings yast2-printer yast2-samba-client yast2-testsuite Requires: yast2-perl-bindings yast2 yast2-ldap-client yast2-samba-client yast2-pam yast2-printer perl-Crypt-SmbHash yast2-ldap yast2-network @@ -36,7 +36,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-samba-server-2.14.3 +%setup -n yast2-samba-server-2.15.0 %build %{prefix}/bin/y2tool y2autoconf @@ -71,6 +71,13 @@ %doc %{prefix}/share/doc/packages/yast2-samba-server %changelog -n yast2-samba-server +* Sun Jan 28 2007 - locilka(a)suse.cz +- Removed some samba-client-related content confusingly left in + samba-server.rnc definition. Patch made by Uwe Gansert (#239154). +- 2.15.0 +* Tue Jan 16 2007 - locilka(a)suse.cz +- Adding X-SuSE-YaST-AutoInstSchema entry into the application + desktop file (#235342). * Tue Nov 14 2006 - locilka(a)suse.cz - Fixed handling of undefined values (keys in hashes) in UsersPluginSambaGroups module (#220698). ++++++ yast2-samba-server-2.14.3.tar.bz2 -> yast2-samba-server-2.15.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.14.3/src/config/samba-server.rnc new/yast2-samba-server-2.15.0/src/config/samba-server.rnc --- old/yast2-samba-server-2.14.3/src/config/samba-server.rnc 2006-10-27 11:06:37.000000000 +0200 +++ new/yast2-samba-server-2.15.0/src/config/samba-server.rnc 2007-02-01 13:18:08.000000000 +0100 @@ -2,26 +2,6 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" namespace config = "http://www.suse.com/1.0/configns" -samba-client = element samba-client { smb_client_global? & smb_client_ad? & smb_client_join? } -smb_client_global = element smb_client_global { - element guest_access { BOOLEAN }? & - element max_shares { INTEGER }? & - element mkhomedir { BOOLEAN }? & - element shares_group { text }? & - element winbind { BOOLEAN }? & - element winbind_caching { BOOLEAN }? & - element workgroup { text }? -} -smb_client_ad = element active_directory { - element kdc { text }? -} -smb_client_join = element join { - element password { text }? & - element user { text }? -} - -winbind = - element winbind { BOOLEAN } workgroup = element workgroup { text } accounts = element accounts { attribute config:type { text }?, @@ -54,7 +34,6 @@ }* }? & samba-client? & - smb_client_global? & role? & element service { text }? & shares? & @@ -80,9 +59,8 @@ trusteddomain_password = element password { text } y2_share = samba_options | share samba_options = element options { - option* + element option { samba_option_key, samba_option_val? }* } share = element share { (text | y2_share)* } -option = element option { samba_option_key, samba_option_val? } samba_option_key = element key { text } samba_option_val = element value { text } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.14.3/src/samba-server.desktop new/yast2-samba-server-2.15.0/src/samba-server.desktop --- old/yast2-samba-server-2.14.3/src/samba-server.desktop 2006-10-09 15:51:00.000000000 +0200 +++ new/yast2-samba-server-2.15.0/src/samba-server.desktop 2007-01-16 12:57:09.000000000 +0100 @@ -17,6 +17,7 @@ X-SuSE-YaST-AutoInstResource=samba-server X-SuSE-YaST-AutoInstClonable=true X-SuSE-YaST-AutoInstRequires=lan +X-SuSE-YaST-AutoInstSchema=samba-server.rnc Icon=yast-samba-server Exec=/sbin/yast2 samba-server diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.14.3/VERSION new/yast2-samba-server-2.15.0/VERSION --- old/yast2-samba-server-2.14.3/VERSION 2006-11-14 11:25:55.000000000 +0100 +++ new/yast2-samba-server-2.15.0/VERSION 2007-02-01 13:21:40.000000000 +0100 @@ -1 +1 @@ -2.14.3 +2.15.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-online-update
by root＠Hilbert.suse.de 02 Feb '07

02 Feb '07

Hello community, here is the log from the commit of package yast2-online-update checked in at Fri Feb 2 13:10:33 CET 2007. -------- --- yast2-online-update/yast2-online-update.changes 2007-01-19 14:05:36.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-online-update/yast2-online-update.changes 2007-02-01 10:20:08.839137000 +0100 @@ -1,0 +2,12 @@ +Thu Feb 1 10:03:59 CET 2007 - jsuchome(a)suse.cz + +- check "close window" event in the UI (#241012) +- 2.15.3 + +------------------------------------------------------------------- +Wed Jan 31 14:43:52 CET 2007 - jsuchome(a)suse.cz + +- check for updater application during autoinstallation (#236928) +- 2.15.2 + +------------------------------------------------------------------- Old: ---- yast2-online-update-2.15.1.tar.bz2 New: ---- yast2-online-update-2.15.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-online-update.spec ++++++ --- /var/tmp/diff_new_pack.N16329/_old 2007-02-02 13:10:03.000000000 +0100 +++ /var/tmp/diff_new_pack.N16329/_new 2007-02-02 13:10:03.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-online-update (Version 2.15.1) +# spec file for package yast2-online-update (Version 2.15.3) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-online-update -Version: 2.15.1 +Version: 2.15.3 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-online-update-2.15.1.tar.bz2 +Source0: yast2-online-update-2.15.3.tar.bz2 prefix: /usr BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer pkg-config update-desktop-files yast2-bootloader yast2-devtools yast2-packager PreReq: grep sed @@ -48,7 +48,7 @@ gs(a)suse.de %prep -%setup -n yast2-online-update-2.15.1 +%setup -n yast2-online-update-2.15.3 %build %{prefix}/bin/y2tool y2autoconf @@ -131,6 +131,12 @@ %{prefix}/share/applications/YaST2/cd_update.desktop %changelog -n yast2-online-update +* Thu Feb 01 2007 - jsuchome(a)suse.cz +- check "close window" event in the UI (#241012) +- 2.15.3 +* Wed Jan 31 2007 - jsuchome(a)suse.cz +- check for updater application during autoinstallation (#236928) +- 2.15.2 * Fri Jan 19 2007 - jsuchome(a)suse.cz - do not wait for user input after installation of patches (#228535) - 2.15.1 ++++++ yast2-online-update-2.15.1.tar.bz2 -> yast2-online-update-2.15.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.15.1/src/AutoOnlineUpdate.ycp new/yast2-online-update-2.15.3/src/AutoOnlineUpdate.ycp --- old/yast2-online-update-2.15.1/src/AutoOnlineUpdate.ycp 2006-11-08 16:35:45.000000000 +0100 +++ new/yast2-online-update-2.15.3/src/AutoOnlineUpdate.ycp 2007-01-31 15:39:02.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Data for configuration of AutoOnlineUpdate, input and output functions. * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: AutoOnlineUpdate.ycp 34175 2006-11-08 15:35:43Z jsuchome $ + * $Id: AutoOnlineUpdate.ycp 35742 2007-01-31 14:39:00Z jsuchome $ * * Representation of the configuration of AutoOnlineUpdate. * Input and output routines. @@ -15,6 +15,7 @@ module "AutoOnlineUpdate"; textdomain "online-update"; +import "Package"; import "Report"; import "Summary"; import "Mode"; @@ -82,6 +83,9 @@ // the application that does the update (rug/zypper) global string updater = "rug"; +// packages required for installation (for autoYaST) +list required_packages = []; + /** * Function sets internal variable, which indicates, that any * settings were modified, to "true" @@ -217,6 +221,26 @@ hour = random( 24 ); minute = random( 60 ); } + + if (enabled && Mode::autoinst ()) + { + if (!Package::Installed (updater)) + { + string to_install = ""; + if (Package::Installed ("zypper")) + updater = "zypper"; + else if (Package::Installed ("zmd")) + // rug is default if zmd is present + to_install = "rug"; + else + to_install = "zypper"; + if (to_install != "") + { + updater = to_install; + required_packages = union (required_packages, [to_install]); + } + } + } return true; } @@ -296,7 +320,7 @@ */ global define map AutoPackages() { - return $[ "install":[], "remove":[] ]; + return $[ "install": required_packages , "remove":[] ]; } /* EOF */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.15.1/src/OnlineUpdateDialogs.ycp new/yast2-online-update-2.15.3/src/OnlineUpdateDialogs.ycp --- old/yast2-online-update-2.15.1/src/OnlineUpdateDialogs.ycp 2006-12-14 13:26:33.000000000 +0100 +++ new/yast2-online-update-2.15.3/src/OnlineUpdateDialogs.ycp 2007-02-01 10:03:54.000000000 +0100 @@ -270,7 +270,7 @@ SCR::Execute( .target.remove, AutoOnlineUpdate::cronfile ); } } - } until ( ret == `next || ret == `abort || ret == `back ); + } until ( ret == `next || ret == `abort || ret == `back || ret == `cancel); UI::CloseDialog(); return ret; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.15.1/src/online_update_install.ycp new/yast2-online-update-2.15.3/src/online_update_install.ycp --- old/yast2-online-update-2.15.1/src/online_update_install.ycp 2007-01-19 13:07:25.000000000 +0100 +++ new/yast2-online-update-2.15.3/src/online_update_install.ycp 2007-01-19 14:06:01.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: YOU installation page * Authors: Cornelius Schumacher <cschum(a)suse.de> * - * $Id: online_update_install.ycp 32404 2006-08-17 12:46:41Z jsuchome $ + * $Id: online_update_install.ycp 35532 2007-01-19 13:05:59Z jsuchome $ * * This is a client for installation. * It displays the dialog with a progress of the actual installation and diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.15.1/VERSION new/yast2-online-update-2.15.3/VERSION --- old/yast2-online-update-2.15.1/VERSION 2007-01-19 13:12:32.000000000 +0100 +++ new/yast2-online-update-2.15.3/VERSION 2007-02-01 10:04:15.000000000 +0100 @@ -1 +1 @@ -2.15.1 +2.15.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-ldap-server
by root＠Hilbert.suse.de 02 Feb '07

02 Feb '07

Hello community, here is the log from the commit of package yast2-ldap-server checked in at Fri Feb 2 13:09:55 CET 2007. -------- --- yast2-ldap-server/yast2-ldap-server.changes 2007-01-17 16:10:19.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-ldap-server/yast2-ldap-server.changes 2007-02-01 12:05:37.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Feb 1 12:03:15 CET 2007 - rhafer(a)suse.de + +- Close window did not work in autoyast UI (Bug #241009) + +------------------------------------------------------------------- +Thu Jan 25 17:17:28 CET 2007 - mc(a)suse.de + +- add commandline interface [Feature #120062] + +------------------------------------------------------------------- Old: ---- yast2-ldap-server-2.15.0.tar.bz2 New: ---- yast2-ldap-server-2.15.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ldap-server.spec ++++++ --- /var/tmp/diff_new_pack.D14705/_old 2007-02-02 13:09:14.000000000 +0100 +++ /var/tmp/diff_new_pack.D14705/_new 2007-02-02 13:09:14.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ldap-server (Version 2.15.0) +# spec file for package yast2-ldap-server (Version 2.15.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-ldap-server -Version: 2.15.0 +Version: 2.15.1 Release: 1 License: GNU General Public License (GPL), X11/MIT Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ldap-server-2.15.0.tar.bz2 +Source0: yast2-ldap-server-2.15.1.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer pkg-config update-desktop-files yast2 yast2-core yast2-devtools Requires: yast2 perl perl-gettext yast2-perl-bindings yast2-ca-management perl-X500-DN perl-Digest-SHA1 net-tools @@ -34,7 +34,7 @@ Andreas Bauer <abauer(a)suse.de> %prep -%setup -n yast2-ldap-server-2.15.0 +%setup -n yast2-ldap-server-2.15.1 %build %{prefix}/bin/y2tool y2autoconf @@ -73,6 +73,10 @@ %doc %{prefix}/share/doc/packages/yast2-ldap-server %changelog -n yast2-ldap-server +* Thu Feb 01 2007 - rhafer(a)suse.de +- Close window did not work in autoyast UI (Bug #241009) +* Thu Jan 25 2007 - mc(a)suse.de +- add commandline interface [Feature #120062] * Wed Jan 17 2007 - rhafer(a)suse.de - The Overlay subsection should aways be the last part of a database section (Bug #235385) ++++++ yast2-ldap-server-2.15.0.tar.bz2 -> yast2-ldap-server-2.15.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.15.0/src/dialogs.ycp new/yast2-ldap-server-2.15.1/src/dialogs.ycp --- old/yast2-ldap-server-2.15.0/src/dialogs.ycp 2007-01-17 14:38:30.000000000 +0100 +++ new/yast2-ldap-server-2.15.1/src/dialogs.ycp 2007-02-01 11:12:22.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Andreas Bauer <abauer(a)suse.de> * - * $Id: dialogs.ycp 35439 2007-01-17 13:38:29Z rhafer $ + * $Id: dialogs.ycp 35766 2007-02-01 10:12:18Z rhafer $ */ { @@ -197,7 +197,7 @@ CWMFirewallInterfaces::OpenFirewallHandle (firewall_widget, "", event); y2debug( "EnableServiceDialog: seeing return value '%1'", ret ); - if( ret == `back || ret == `abort ) break; + if( ret == `back || ret == `abort || ret == `cancel) break; else if( ret == `next || ret == `finish ) { CWMFirewallInterfaces::OpenFirewallStore (firewall_widget, "", event); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.15.0/src/ldap-server.ycp new/yast2-ldap-server-2.15.1/src/ldap-server.ycp --- old/yast2-ldap-server-2.15.0/src/ldap-server.ycp 2005-12-08 09:22:02.000000000 +0100 +++ new/yast2-ldap-server-2.15.1/src/ldap-server.ycp 2007-02-01 10:27:52.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Main file * Authors: Andreas Bauer <abauer(a)suse.de> * - * $Id: ldap-server.ycp 20346 2004-11-17 15:09:24Z schubi $ + * $Id: ldap-server.ycp 35659 2007-01-26 15:01:25Z mc $ * * Main file for ldap-server configuration. Uses all other files. */ @@ -24,10 +24,179 @@ import "Progress"; import "Report"; import "Summary"; - +import "RichText"; import "CommandLine"; include "ldap-server/wizards.ycp"; +define boolean serviceHandler (map<string, string> options ) { + + string command = CommandLine::UniqueOption( options, + ["enable", "disable" ] ); + if( command == nil ) return false; + + LdapServer::WriteServiceEnabled( command == "enable" ); + + return true; +} + +define boolean getDatabaseListHandler (map options) { + + map<string, any> edb = LdapServer::ReadDatabase(); + + string s = ""; + foreach( string suffix, any value, edb, + { + s = s + suffix + " "; + }); + + CommandLine::Print (RichText::Rich2Plain(" "+s)); + + return false; +} + +define boolean addDatabaseHandler (map options ) { + + boolean ret = false; + map<string, string> db = $[]; + + map<string, any> edb = LdapServer::ReadDatabase(); + y2milestone("DBs: %1", edb); + + + if (options["basedn"]:nil != nil && + edb[options["basedn"]:""]:nil == nil) + { + db["suffix"] = options["basedn"]:""; + } + else + { + CommandLine::Print (_("basedn exists or not available")); + return false; + } + if (options["rootdn"]:nil != nil) + { + db["rootdn"] = options["rootdn"]:""; + } + if (options["password"]:nil != nil) + { + db["passwd"] = options["password"]:""; + } + if (options["enctype"]:nil != nil) + { + db["cryptmethod"] = options["enctype"]:""; + } + if (options["dbdir"]:nil != nil) + { + db["directory"] = options["dbdir"]:""; + } + + if(LdapServer::ReadServiceEnabled() == false) + { + // Database cannot be written when the service is not enabled + LdapServer::WriteServiceEnabled(true); + } + + y2milestone("db-options : %1", db); + + ret = LdapServer::AddDatabase(db); + + if(!ret) + { + CommandLine::Print (_("Error while adding the database")); + return false; + } + return true; +} + +define boolean getSchemaListHandler (map options ) { + + string s = ""; + integer i = 0; + foreach(string v, LdapServer::ReadSchemaIncludeList (), + { + i = i + 1; + s = s + tostring(i) + " "+ v +" "; + }); + + CommandLine::Print (RichText::Rich2Plain(" "+s)); + return false; // do not call Write... +} + +define boolean addSchemaHandler (map options ) { + + boolean ret = false; + if (options["file"]:"" != "") + { + string file = options["file"]:""; + if(options["pos"]:"" != "") + { + integer pos = tointeger (options["pos"]:""); + if (pos == nil || pos < 0) + { + // error: wrong input (probably string or negative integer) + Report::Error (_("The value for pos must be a positive integer.")); + return false; + } + + list<string> l = LdapServer::ReadSchemaIncludeList (); + list<string> rl = []; + boolean added = false; + integer i = 0; + foreach(string s, l, + { + i = i + 1; + if(i == pos) + { + rl = add(rl, file); + added = true; + } + rl = add(rl, s); + }); + if(!added) + { + rl = add(rl, file); + } + LdapServer::WriteSchemaIncludeList (rl); + ret = true; + } + } + + return ret; +} + +define boolean delSchemaHandler (map options ) { + + boolean ret = false; + if(options["pos"]:"" != "") + { + integer pos = tointeger (options["pos"]:""); + if (pos == nil || pos < 0) + { + // error: wrong input (probably string or negative integer) + Report::Error (_("The value for pos must be a positive integer.")); + return false; + } + + list<string> l = LdapServer::ReadSchemaIncludeList (); + list<string> rl = []; + integer i = 0; + foreach(string s, l, + { + i = i + 1; + if(i != pos) + { + rl = add(rl, s); + } + }); + LdapServer::WriteSchemaIncludeList (rl); + ret = true; + } + + return ret; +} + + + map cmdline_description = $[ "id" : "ldap-server", /* Command line help text for the Xldap-server module */ @@ -36,13 +205,70 @@ "initialize" : LdapServer::Read, "finish" : LdapServer::Write, "actions" : $[ - // FIXME TODO: fill the functionality description here + "service" : $[ + "handler" : serviceHandler, + "help" : _("Enable/Disable the service") + ], + "addDatabase" : $[ + "handler" : addDatabaseHandler, + "help" : _("Add a new Database"), + ], + "getDatabaseList" : $[ + "handler" : getDatabaseListHandler, + "help" : _("Show a List of currently available Databases"), + ], + "getSchemaList": $[ + "handler" : getSchemaListHandler, + "help" : _("Show a List of currently configured schemas"), + ], + "addSchema": $[ + "handler" : addSchemaHandler, + "help" : _("Add a schema to the list"), + ], + "delSchema": $[ + "handler" : delSchemaHandler, + "help" : _("Delete a schema from the list"), + ], ], "options" : $[ - // FIXME TODO: fill the option descriptions here + "enable" : $[ "help" : _("Enable the service") ], + "disable" : $[ "help" : _("Disable the service") ], + "basedn" : $[ + "help" : _("Base DN for the database"), + "type" : "string" + ], + "rootdn" : $[ + "help" : _("DN for the administrator login"), + "type" : "string" + ], + "password" : $[ + "help" : _("Administrator password"), + "type" : "string" + ], + "enctype" : $[ + "help" : "SSHA, SHA, SMD5, CRYPT, PLAIN", + "type" : "string" + ], + "dbdir" : $[ + "help" : _("Directory for the database"), + "type" : "string" + ], + "file" : $[ + "help" : _("File"), + "type" : "string" + ], + "pos" : $[ + "help" : _("Position"), + "type" : "string" + ] ], - "mapping" : $[ - // FIXME TODO: fill the mappings of actions and options here + "mappings" : $[ + "service" :[ "enable", "disable" ], + "addDatabase" : [ "basedn", "rootdn", "password", "enctype", "dbdir" ], + "getDatabaseList" : [], + "getSchemaList" : [], + "addSchema": [ "file", "pos" ], + "delSchema": [ "pos" ] ] ]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-server-2.15.0/VERSION new/yast2-ldap-server-2.15.1/VERSION --- old/yast2-ldap-server-2.15.0/VERSION 2007-01-17 16:09:24.000000000 +0100 +++ new/yast2-ldap-server-2.15.1/VERSION 2007-02-01 12:03:11.000000000 +0100 @@ -1 +1 @@ -2.15.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

1 0

commit yast2-installation
by root＠Hilbert.suse.de 02 Feb '07

02 Feb '07

Hello community, here is the log from the commit of package yast2-installation checked in at Fri Feb 2 13:09:05 CET 2007. -------- --- yast2-installation/yast2-installation.changes 2007-01-22 15:06:48.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2007-02-01 12:57:29.000000000 +0100 @@ -1,0 +2,20 @@ +Thu Feb 1 12:41:36 CET 2007 - locilka(a)suse.cz + +- When an Add-On product is added and removed later, correctly + remove also cached control file of that Add-On (#238307). +- 2.15.6 + +------------------------------------------------------------------- +Wed Jan 31 09:34:11 CET 2007 - locilka(a)suse.cz + +- Rereading all SCR Agents in case of installation workflow changed + by Add-On product (#239055). +- Calling PackageLock::Check before Pkg calls (#238556). + +------------------------------------------------------------------- +Sun Jan 28 22:27:48 CET 2007 - locilka(a)suse.cz + +- Removed tv and bluetooth hardware proposals from SLES control + file. There are no such modules in that product (#238759). + +------------------------------------------------------------------- Old: ---- yast2-installation-2.15.5.tar.bz2 New: ---- yast2-installation-2.15.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.c13870/_old 2007-02-02 13:08:56.000000000 +0100 +++ /var/tmp/diff_new_pack.c13870/_new 2007-02-02 13:08:56.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.15.5) +# spec file for package yast2-installation (Version 2.15.6) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-installation -Version: 2.15.5 +Version: 2.15.6 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.15.5.tar.bz2 +Source0: yast2-installation-2.15.6.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-core-devel yast2-country yast2-devtools yast2-testsuite Requires: yast2-slp yast2-firewall @@ -69,7 +69,7 @@ Jiri Srain <jsrain(a)suse.cz> %prep -%setup -n yast2-installation-2.15.5 +%setup -n yast2-installation-2.15.6 %build %{prefix}/bin/y2tool y2autoconf @@ -133,6 +133,17 @@ %endif %changelog -n yast2-installation +* Thu Feb 01 2007 - locilka(a)suse.cz +- When an Add-On product is added and removed later, correctly + remove also cached control file of that Add-On (#238307). +- 2.15.6 +* Wed Jan 31 2007 - locilka(a)suse.cz +- Rereading all SCR Agents in case of installation workflow changed + by Add-On product (#239055). +- Calling PackageLock::Check before Pkg calls (#238556). +* Sun Jan 28 2007 - locilka(a)suse.cz +- Removed tv and bluetooth hardware proposals from SLES control + file. There are no such modules in that product (#238759). * Mon Jan 22 2007 - locilka(a)suse.cz - Correct handling of CD/DVD Add-Ons in installation (#237264). - Fixed switching between Installation Settings tabs in case of ++++++ yast2-installation-2.15.5.tar.bz2 -> yast2-installation-2.15.6.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.5/src/include/add-on-workflow.ycp new/yast2-installation-2.15.6/src/include/add-on-workflow.ycp --- old/yast2-installation-2.15.5/src/include/add-on-workflow.ycp 2007-01-22 14:57:48.000000000 +0100 +++ new/yast2-installation-2.15.6/src/include/add-on-workflow.ycp 2007-02-01 12:38:04.000000000 +0100 @@ -95,7 +95,7 @@ ret = true; } // some devices are listed - } else if (cmd_run["stdout"]:"" != nil && cmd_run["stdout"]:"" != "") { + } else if (cmd_run["stdout"]:"" != nil && cmd_run["stdout"]:"" != "" && cmd_run["stdout"]:"" != "\n") { ret = true; } @@ -937,7 +937,8 @@ }); // remove a temporary file, not needed anymore - AddOnProduct::RemoveAddOnControlFile (selected); + // bugzilla #238307 + AddOnProduct::RemoveAddOnControlFile (media); some_addon_changed = true; // remove product from list of product to register (FATE #301312) AddOnProduct::RemoveRegistrationFlag (media); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.5/src/modules/AddOnProduct.ycp new/yast2-installation-2.15.6/src/modules/AddOnProduct.ycp --- old/yast2-installation-2.15.5/src/modules/AddOnProduct.ycp 2006-12-11 16:10:14.000000000 +0100 +++ new/yast2-installation-2.15.6/src/modules/AddOnProduct.ycp 2007-02-01 12:38:07.000000000 +0100 @@ -698,6 +698,25 @@ } /** + * New add-on product might add also new agents. + * Functions Rereads all available agents. + * + * @see bugzilla #239055 + */ +global void RereadAllSCRAgents () { + y2milestone ("Rereading SCR Agents..."); + integer handle = WFM::SCRGetDefault (); + WFM::SCRClose (handle); + integer new_scr = WFM::SCROpen ("scr", true); + + if (new_scr < 1) { + y2error("Rereading SCR failed!"); + } else { + y2milestone("Rereading SCR succeeded."); + } +} + +/** * Remove the /y2update directory from the system */ void CleanY2Update() { @@ -760,6 +779,9 @@ Report::Error (_("An error occurred while preparing the installation system.")); CleanY2Update(); return nil; + } else { + // bugzilla #239055 + RereadAllSCRAgents(); } } else @@ -1096,6 +1118,14 @@ global boolean RemoveAddOnControlFile (integer srcid) { string filename = sformat("%1/%2.xml", TmpdirForControlFiles(), srcid); + // remove also from list of control files + // #238307 + string this_control_file = sformat ("%1.xml", srcid); + control_files_to_add = filter (string one_control_file, control_files_to_add, { + return one_control_file != this_control_file; + }); + y2milestone ("Control files in use now: %1", control_files_to_add); + if (FileUtils::Exists (filename)) { y2milestone ("Removing: %1", filename); if ((boolean) SCR::Execute (.target.remove, filename)) { @@ -1116,6 +1146,8 @@ global boolean ReIntegrateFromScratch () { y2milestone ("Reintegration workflows from scratch..."); ResetSystemWorkflowsAndProposals (); + // bugzilla #239055 + RereadAllSCRAgents(); foreach (map<string,any> prod, AddOnProduct::add_on_products, { integer srcid = (integer) prod["media"]:nil; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.5/src/modules/Product.ycp new/yast2-installation-2.15.6/src/modules/Product.ycp --- old/yast2-installation-2.15.5/src/modules/Product.ycp 2006-11-29 15:47:34.000000000 +0100 +++ new/yast2-installation-2.15.6/src/modules/Product.ycp 2007-01-31 14:45:29.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Product data * Authors: Klaus Kaempf <kkaempf(a)suse.de> * - * $Id: Product.ycp 34204 2006-11-09 12:32:32Z locilka $ + * $Id: Product.ycp 35736 2007-01-31 13:45:25Z locilka $ */ { @@ -12,6 +12,7 @@ import "Mode"; import "Stage"; + import "PackageLock"; /** * General product name and version @@ -71,6 +72,12 @@ global string shortlabel = ""; global list<map<string,any> > FindBaseProducts() { + // bugzilla #238556 + if (! PackageLock::Check()) { + y2error ("Locked!"); + return []; + } + y2milestone ("Looking for base products"); list<map<string,any> > products = (list<map<string,any> >) Pkg::TargetProducts (); @@ -137,6 +144,11 @@ } else if (!Mode::config ()) { + // bugzilla #238556 + if (! PackageLock::Check()) { + y2error ("Locked!"); + return; + } Pkg::TargetInitialize ("/"); // list all_products = Pkg::TargetProducts(); // get all products diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.5/VERSION new/yast2-installation-2.15.6/VERSION --- old/yast2-installation-2.15.5/VERSION 2007-01-22 15:00:16.000000000 +0100 +++ new/yast2-installation-2.15.6/VERSION 2007-02-01 12:57:19.000000000 +0100 @@ -1 +1 @@ -2.15.5 +2.15.6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-add-on-creator
by root＠Hilbert.suse.de 02 Feb '07

02 Feb '07

Hello community, here is the log from the commit of package yast2-add-on-creator checked in at Fri Feb 2 13:08:42 CET 2007. -------- --- yast2-add-on-creator/yast2-add-on-creator.changes 2006-10-23 14:04:23.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-add-on-creator/yast2-add-on-creator.changes 2007-01-31 09:22:07.707906000 +0100 @@ -1,0 +2,27 @@ +Wed Jan 31 08:58:24 CET 2007 - jsuchome(a)suse.cz + +- initial version for STABLE +- 2.15.0 + +------------------------------------------------------------------- +Tue Jan 30 10:52:26 CET 2007 - jsuchome(a)suse.cz + +- fixed pattern aggent to read language specific keys (#239828) +- do not sign theproduct when key was not provided (#238282) +- 2.13.11 + +------------------------------------------------------------------- +Thu Dec 14 11:31:53 CET 2006 - jsuchome(a)suse.cz + +- optimize the speed of reading package names (#220535) +- 2.13.10 + +------------------------------------------------------------------- +Wed Nov 15 12:31:02 CET 2006 - jsuchome(a)suse.cz + +- configure iso image file name (#220534) +- always generate ARCHIVES.gz, INDEX.gz and ls-lR.gz (#221220) +- offer additional path to packages for editing patterns (#220535) +- 2.13.9 + +------------------------------------------------------------------- Old: ---- yast2-add-on-creator-2.13.8.tar.bz2 New: ---- yast2-add-on-creator-2.15.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on-creator.spec ++++++ --- /var/tmp/diff_new_pack.kA2277/_old 2007-02-02 13:06:36.000000000 +0100 +++ /var/tmp/diff_new_pack.kA2277/_new 2007-02-02 13:06:36.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-add-on-creator (Version 2.13.8) +# spec file for package yast2-add-on-creator (Version 2.15.0) # -# 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,12 +11,12 @@ # norootforbuild Name: yast2-add-on-creator -Version: 2.13.8 +Version: 2.15.0 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-add-on-creator-2.13.8.tar.bz2 +Source0: yast2-add-on-creator-2.15.0.tar.bz2 prefix: /usr Requires: yast2 autoyast2-utils BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite @@ -33,7 +33,7 @@ Jiř� Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-add-on-creator-2.13.8 +%setup -n yast2-add-on-creator-2.15.0 %build %{prefix}/bin/y2tool y2autoconf @@ -69,6 +69,21 @@ %doc %{prefix}/share/doc/packages/yast2-add-on-creator %changelog -n yast2-add-on-creator +* Wed Jan 31 2007 - jsuchome(a)suse.cz +- initial version for STABLE +- 2.15.0 +* Tue Jan 30 2007 - jsuchome(a)suse.cz +- fixed pattern aggent to read language specific keys (#239828) +- do not sign theproduct when key was not provided (#238282) +- 2.13.11 +* Thu Dec 14 2006 - jsuchome(a)suse.cz +- optimize the speed of reading package names (#220535) +- 2.13.10 +* Wed Nov 15 2006 - jsuchome(a)suse.cz +- configure iso image file name (#220534) +- always generate ARCHIVES.gz, INDEX.gz and ls-lR.gz (#221220) +- offer additional path to packages for editing patterns (#220535) +- 2.13.9 * Mon Oct 23 2006 - jsuchome(a)suse.cz - used existing yast-addon.png icon (#213875) - 2.13.8 ++++++ yast2-add-on-creator-2.13.8.tar.bz2 -> yast2-add-on-creator-2.15.0.tar.bz2 ++++++ ++++ 7209 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-add-on-creator-2.13.8/agents/ag_pattern new/yast2-add-on-creator-2.15.0/agents/ag_pattern --- old/yast2-add-on-creator-2.13.8/agents/ag_pattern 2006-08-11 08:11:49.000000000 +0200 +++ new/yast2-add-on-creator-2.15.0/agents/ag_pattern 2007-01-31 08:57:52.000000000 +0100 @@ -29,14 +29,14 @@ my $multiline_val = ""; foreach my $line (<PATTERN>) { chomp $line; - if ($line =~ /^=([\w]+):[ \t]*(.*)/) { + if ($line =~ /^=([\w\.]+):[ \t]*(.*)/) { $pattern{$1} = $2; } - elsif ($line =~ /^\+([\w]+):.*/) { + elsif ($line =~ /^\+([\w\.]+):.*/) { $multiline_key = $1; $multiline_val = ""; } - elsif ($line =~ /^\-([\w]+):.*/) { + elsif ($line =~ /^\-([\w\.]+):.*/) { if ($multiline_key eq $1) { $pattern{$multiline_key} = $multiline_val; } 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-add-on-creator-2.13.8/autodocs-ycp.ami new/yast2-add-on-creator-2.15.0/autodocs-ycp.ami --- old/yast2-add-on-creator-2.13.8/autodocs-ycp.ami 2006-09-07 10:03:45.000000000 +0200 +++ new/yast2-add-on-creator-2.15.0/autodocs-ycp.ami 2007-01-31 09:03:22.000000000 +0100 @@ -1,18 +1,27 @@ # -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 23438 2005-05-17 16:31:21Z mvidner $ +# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $ # Builds source documentation for YCP sources # Uses ycpdoc # PARAMETERS: # AUTODOCS_YCP: Files that the ycp autodocs is built from # Optional - the default is $(srcdir)/../../src/*.ycp +# AUTODOCS_PM: Files that the perl autodocs is built from +# Optional - the default is $(srcdir)/../../src/*.pm htmldir = $(docdir)/autodocs html_DATA = index.html $(wildcard *.html) -CLEANFILES = $(html_DATA) +CLEANFILES = $(html_DATA) pod2htm*.tmp -AUTODOCS_YCP ?= $(srcdir)/../../src/*.ycp -index.html: $(AUTODOCS_YCP) - ${YCPDOC} -d. $^ +AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) +AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) +index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) +#including *.pm, for the index + ${YCPDOC} -d. $^ + for i in $(AUTODOCS_PM); do \ + b=`basename $$i`; b=$${b%.pm}; \ + pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ + echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \ + done 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-add-on-creator-2.13.8/configure.in new/yast2-add-on-creator-2.15.0/configure.in --- old/yast2-add-on-creator-2.13.8/configure.in 2006-09-07 10:03:45.000000000 +0200 +++ new/yast2-add-on-creator-2.15.0/configure.in 2007-01-31 09:03:22.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-add-on-creator dnl -dnl -- This file is generated by y2autoconf 2.13.21 - 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-add-on-creator, 2.13.3, http://bugs.opensuse.org/, yast2-add-on-creator) +AC_INIT(yast2-add-on-creator, 2.15.0, http://bugs.opensuse.org/, yast2-add-on-creator) 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.13.3" +VERSION="2.15.0" RPMNAME="yast2-add-on-creator" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" @@ -110,6 +110,8 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -142,6 +144,9 @@ if test "$YCPC" = "false"; then AC_MSG_ERROR([ycpc is not installed]) fi +AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ + AC_MSG_WARN([yast2-testsuite.rpm is not installed]) +]) AC_CONFIG_FILES(Makefile agents/Makefile 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-add-on-creator-2.13.8/Makefile.am new/yast2-add-on-creator-2.15.0/Makefile.am --- old/yast2-add-on-creator-2.13.8/Makefile.am 2006-09-07 10:03:45.000000000 +0200 +++ new/yast2-add-on-creator-2.15.0/Makefile.am 2007-01-31 09:03:22.000000000 +0100 @@ -7,8 +7,7 @@ # #where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) -Y2TOOL = $(PREFIX)/bin/y2tool +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -20,7 +19,7 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) @@ -34,7 +33,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common @@ -67,7 +66,7 @@ # because the prerequisite is made here (not anymore!) # and we don't want any paths in y2autoconf # info '(autoconf)config.status Invocation' -$(RPMNAME).pc: $(RPMNAME).pc.in +$(RPMNAME).pc: $(RPMNAME).pc.in config.status ./config.status --file=$@:$< if CREATE_PKGCONFIG_NOARCH 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-add-on-creator-2.13.8/Makefile.am.common new/yast2-add-on-creator-2.15.0/Makefile.am.common --- old/yast2-add-on-creator-2.13.8/Makefile.am.common 2006-09-07 10:03:45.000000000 +0200 +++ new/yast2-add-on-creator-2.15.0/Makefile.am.common 2007-01-31 09:03:22.000000000 +0100 @@ -29,7 +29,19 @@ dist-hook: check-syntax +CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) - if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi + @if test "$(client_DATA)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.ycp,$^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi -include .dep 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-add-on-creator-2.13.8/src/add-on-creator.ycp new/yast2-add-on-creator-2.15.0/src/add-on-creator.ycp --- old/yast2-add-on-creator-2.13.8/src/add-on-creator.ycp 2006-10-03 09:29:30.000000000 +0200 +++ new/yast2-add-on-creator-2.15.0/src/add-on-creator.ycp 2007-01-31 09:02:52.000000000 +0100 @@ -24,7 +24,7 @@ * Summary: Main file * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: add-on-creator.ycp 33241 2006-10-03 07:29:25Z jsuchome $ + * $Id: add-on-creator.ycp 35715 2007-01-31 08:02:45Z jsuchome $ * * Main file for add-on-creator configuration. Uses all other files. */ @@ -42,6 +42,8 @@ y2milestone ("AddOnCreator module started"); import "CommandLine"; +import "PackageSystem"; + include "add-on-creator/wizards.ycp"; map cmdline_description = $[ @@ -59,8 +61,12 @@ ] ]; -/* main ui function */ -any ret = CommandLine::Run(cmdline_description); +any ret = nil; + +if (!PackageSystem::CheckAndInstallPackagesInteractive (["inst-source-utils"])) + ret = `cancel; +else + ret = CommandLine::Run(cmdline_description); /* Finish */ y2milestone("AddOnCreator module finished with %1", ret); 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-add-on-creator-2.13.8/src/AddOnCreator.ycp new/yast2-add-on-creator-2.15.0/src/AddOnCreator.ycp --- old/yast2-add-on-creator-2.13.8/src/AddOnCreator.ycp 2006-10-23 11:21:43.000000000 +0200 +++ new/yast2-add-on-creator-2.15.0/src/AddOnCreator.ycp 2007-01-31 09:02:52.000000000 +0100 @@ -24,7 +24,7 @@ * Summary: AddOnCreator settings, input and output functions * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: AddOnCreator.ycp 33568 2006-10-23 09:21:40Z jsuchome $ + * $Id: AddOnCreator.ycp 35715 2007-01-31 08:02:45Z jsuchome $ * * Representation of the configuration of add-on-creator. * Input and output routines. @@ -488,6 +488,10 @@ // path to directory with RPM's global string rpm_path = ""; +// path to directory with RPM's, used only for building patterns +// and not present on AddOn +global string required_rpm_path = ""; + // path to directory with existing product global string import_path = ""; @@ -569,6 +573,9 @@ // where the iso image should be put global string iso_path = ""; +// name of the iso image file +global string iso_name = ""; + global string gpg_key = ""; // passphrase to unlock secret key @@ -576,7 +583,7 @@ global list<string> gpg_keys = []; -// packages available for the pattern +// packages from current AddOn available for the pattern global map<string,list> available_packages = $[]; // mapping of package name to full file name @@ -772,7 +779,12 @@ foreach (string key, any val, (map<string,any>) pt, { if (pattern_descr[key,"type"]:"" == "package-list") + { ret[key] = splitstring (sformat ("%1", val), "\n"); + // make the packages included in imported pattern available for UI + available_packages["ZZZ_imported"] = union ( + available_packages["ZZZ_imported"]:[], ret[key]:[]); + } else ret[key] = val; }); @@ -788,7 +800,10 @@ return ret; } -// import the data from existing add-on +/** + * import the data from existing add-on + * @param path to existing addon directory + */ global boolean ImportExistingProduct (string dir_path) { content = ReadContentFile (dir_path + "/content"); @@ -909,25 +924,6 @@ }); } - string archives_path = dir_path + "/ARCHIVES.gz"; - if (FileUtils::Exists (archives_path)) - { - SCR::Execute (.target.bash, - sformat ("/bin/cp %1 %2", archives_path, tmpdir)); - } - string index_path = dir_path + "/INDEX.gz"; - if (FileUtils::Exists (index_path)) - { - SCR::Execute (.target.bash, - sformat ("/bin/cp %1 %2", index_path, tmpdir)); - } - string lslr_path = dir_path + "/ls-lR.gz"; - if (FileUtils::Exists (lslr_path)) - { - SCR::Execute (.target.bash, - sformat ("/bin/cp %1 %2", lslr_path, tmpdir)); - } - string desc_path = dir_path + "/installation.xml"; if (FileUtils::Exists (desc_path)) { @@ -943,6 +939,37 @@ return true; } +/** + * converts the output of find command (=possibly big string with each file on one line), + * to the list of smaller strings (<128kB), each with space separated file names + * @param stdout output of find command + */ +list<string> create_argument_lists (string stdout) { + + list<string> ret = []; + // approximately maximum size of parameters list passed to rpm + integer kbytes = 120; + // looks like pre-sorting helps to fasten rpm call + list<string> found = sort (splitstring (stdout, "\n")); + if (size (stdout)/1024 <= kbytes) + ret = [ mergestring (found, " ") ]; + else + { + string line = ""; + foreach (string file, found, { + line = line + file + " "; + if (size (line) / 1024 > kbytes) + { + ret = add (ret, line); + line = ""; + } + }); + if (size (line) / 1024 <= kbytes) + ret = add (ret, line); + } + return ret; +} + // this is used during the workflow, not in the write! // TODO change name... global void FillContentDefaults () { @@ -967,7 +994,7 @@ { // 2. get the list of architectures from RPM's out = (map) SCR::Execute (.target.bash_output, - sformat ("find %1 -name *.rpm", rpm_path)); + sformat ("find %1 -name '*.rpm'", rpm_path)); y2milestone ("asking the RPM's for ARCH and NAME..."); foreach (string f, splitstring (out["stdout"]:"", "\n"), { if (f == "") return; @@ -1002,6 +1029,26 @@ content = add (content, arch_skel); }); } + + // 4. read the list of packages, not present on AddOn + if (required_rpm_path != "" && required_rpm_path != rpm_path) + { + out = (map) SCR::Execute (.target.bash_output, + sformat ("cd %1; find -name '*.rpm'", required_rpm_path)); + y2milestone ("asking the RPM's for NAME..."); + list<string> inputs = create_argument_lists (out["stdout"]:""); + string output = ""; + foreach (string input, inputs, { + string cmd = sformat ("cd %1; rpm --qf \"%%{NAME}\n\" -qp %2", + required_rpm_path, input); + out = (map) SCR::Execute (.target.bash_output, cmd); + output = output + out["stdout"]:"" + "\n"; + }); + // remove empty strings and duplicates + available_packages["ZZZ_required"] = toset (filter ( + string name, splitstring (output, "\n"), ``(name != ""))); + y2milestone ("... done"); + } } // generate tmp package descriptions... @@ -1041,6 +1088,18 @@ } /** + * Update content_map with current value of 'content' list + */ +global map<string,string> UpdateContentMap () { + + foreach (map entry, content, { + if (entry["value"]:"" != "") + content_map[entry["key"]:""] = entry["value"]:""; + }); + return content_map; +} + +/** * Write the content file * @return success */ @@ -1152,42 +1211,28 @@ return ret; } -// Write ARCHIVES.gz FIXME generate if not present! mk_listings -global boolean WriteARCHIVES (string base_path) +/** + * Generate ARCHIVES.gz, INDEX.gz and ls-lR.gz + */ +global boolean GenerateArchiveFiles (string base_path) { - string archives_path = tmpdir + "/ARCHIVES.gz"; - if (FileUtils::Exists (archives_path)) - { - SCR::Execute (.target.bash, - sformat ("/bin/cp %1 %2", archives_path, base_path)); - } - return true; -} -// TODO generate it! -global boolean WriteINDEX (string base_path) -{ - string index_path = tmpdir + "/INDEX.gz"; - if (FileUtils::Exists (index_path)) + if (!Package::Installed ("inst-source-utils") && + !FileUtils::Exists ("/usr/bin/mk_listings")) { - SCR::Execute (.target.bash, - sformat ("/bin/cp %1 %2", index_path, base_path)); + y2error ("inst-source-utils not installed and mk_listings not present"); + return false; } - return true; -} - -// TODO generate it! -global boolean WriteLslR (string base_path) -{ - string lslr_path = tmpdir + "/ls-lR.gz"; - if (FileUtils::Exists (lslr_path)) + map out = (map) SCR::Execute (.target.bash_output, + "mk_listings " + base_path); + if (out["stderr"]:"" != "") { - SCR::Execute (.target.bash, - sformat ("/bin/cp %1 %2", lslr_path, base_path)); + y2warning ("mk_listings returns %1", out); } return true; } + /** * Create the patches files * @param base_path path to base output directory @@ -1364,7 +1409,8 @@ { foreach (string arch, list pa, available_packages, { string out_dir = full_data_path + "/" + arch; - if (FileUtils::Exists (out_dir)) + if (arch != "ZZZ_imported" && arch != "ZZZ_required" && + FileUtils::Exists (out_dir)) { if (size (package2filename) > 0) { @@ -1538,6 +1584,12 @@ */ global boolean SignAddOn (string base_path, string key) { + if (key == "") + { + y2warning ("No GPG key provided - signing skipped"); + return true; + } + string command = sformat ("gpg --list-secret-keys %1|grep '^sec'|sed -e 's/.*\\///;s/ .*//g;'|head -n 1", key); map out = (map)SCR::Execute (.target.bash_output, command, $["LANG" : "C"]); string local_key = deletechars (out["stdout"]:"0","\n"); @@ -1614,14 +1666,20 @@ /** * Create an ISO image of the product */ -global boolean CreateISOImage (string dir_path, string iso_p) { +global boolean CreateISOImage (string dir_path, string iso_p, string name) { if (!iso) return true; - string name = - tolower (content_map["DISTPRODUCT"]:content_map["PRODUCT"]:"addon"); + + if (name == "") + name = sformat ("%1-%2-%3", + tolower (content_map["DISTPRODUCT"]:content_map["PRODUCT"]:"addon"), + content_map["DISTVERSION"]:"", content_map["DEFAULTBASE"]:""); + + if (!issubstring (name, ".iso")) + name = name + ".iso"; + // possible options -allow-leading-dots - string cmd = sformat ("mkisofs -r -J -l -o %1/%2.iso %3", - iso_p, name, dir_path); + string cmd = sformat("mkisofs -r -J -l -o %1/%2 %3",iso_p, name, dir_path); map out = (map) SCR::Execute (.target.bash_output, cmd); if (out["exit"]:0 != 0) { @@ -1712,10 +1770,6 @@ WriteLicensesFiles (full_media_paths[0]:"", license_files); - WriteARCHIVES (base_output_path); - WriteINDEX (base_output_path); - WriteLslR (base_output_path); - if (info != "") SCR::Write (.target.string, full_media_paths[0]:"" + "/info.txt", info); @@ -1734,6 +1788,8 @@ Progress::NextStage(); + GenerateArchiveFiles (base_output_path); + CreateMD5SUMS (base_output_path); SignAddOn (base_output_path, gpg_key); @@ -1745,7 +1801,7 @@ if (iso) { Progress::NextStage(); - CreateISOImage (base_output_path, iso_path); + CreateISOImage (base_output_path, iso_path, iso_name); } Progress::NextStage(); 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-add-on-creator-2.13.8/src/complex.ycp new/yast2-add-on-creator-2.15.0/src/complex.ycp --- old/yast2-add-on-creator-2.13.8/src/complex.ycp 2006-10-23 11:21:44.000000000 +0200 +++ new/yast2-add-on-creator-2.15.0/src/complex.ycp 2007-01-31 09:02:52.000000000 +0100 @@ -24,7 +24,7 @@ * Summary: Dialogs definitions * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: complex.ycp 33568 2006-10-23 09:21:40Z jsuchome $ + * $Id: complex.ycp 35715 2007-01-31 08:02:45Z jsuchome $ */ { @@ -205,16 +205,6 @@ string caption = _("Add-On Product Creator"); term contents = `HBox (`HSpacing (), `VBox ( - `HBox ( - // text entry label - `TextEntry (`id(`rpm_path), _("&Path to Directory with Packages"), - AddOnCreator::rpm_path), - `VBox ( - `Label (""), - `PushButton (`id(`browse_rpm), Label::BrowseButton ()) - ) - ), - `VSpacing (0.7), `Frame (_("Required Product"), `HBox (`HSpacing (0.5), `VBox ( `VSpacing (0.4), `RadioButtonGroup (`id(`rd), @@ -237,6 +227,27 @@ ), `VSpacing (0.4) ))), + `VSpacing (0.7), + `HBox ( + `TextEntry (`id(`rpm_path), + // text entry label + _("&Path to Directory with Add-On Packages"), + AddOnCreator::rpm_path), + `VBox ( + `Label (""), + `PushButton (`id(`browse_rpm), Label::BrowseButton ()) + ) + ), + `HBox ( + `TextEntry (`id(`required_rpm_path), + // text entry label + _("Path to Directory with Re&quired Product Packages"), + AddOnCreator::required_rpm_path), + `VBox ( + `Label (""), + `PushButton (`id(`browse_req_rpm), Label::BrowseButton ()) + ) + ), `VSpacing (0.7) ), `HSpacing ()); @@ -259,6 +270,9 @@ ret = UI::UserInput(); string dir = (string) UI::QueryWidget (`id(`rpm_path), `Value); + string req_dir = (string) + UI::QueryWidget (`id(`required_rpm_path), `Value); + if (ret == `browse_rpm) { dir = UI::AskForExistingDirectory (dir, ""); if (dir != nil) @@ -268,6 +282,15 @@ UI::ChangeWidget (`id(`rpm_path), `Value, dir); } } + if (ret == `browse_req_rpm) { + req_dir = UI::AskForExistingDirectory (req_dir, ""); + if (req_dir != nil) + { + if ((findlastof (req_dir, "/") + 1) == size(req_dir)) + req_dir = substring (req_dir, 0, size(req_dir)-1); + UI::ChangeWidget (`id(`required_rpm_path), `Value, req_dir); + } + } else if (ret == `sles10) { requires = "sles-release-10"; UI::ChangeWidget (`id(`other_val), `Enabled, false); @@ -284,17 +307,6 @@ requires = ""; UI::ChangeWidget (`id(`other_val), `Enabled, true); } - else if (ret == `create_key) { - Popup::Message ("FIXME: not implemented yet"); - } - else if (ret == `expert) { - // save the data... - if (requires == "") - requires = (string) UI::QueryWidget (`id(`other_val), `Value); - AddOnCreator::content_map["REQUIRES"] = requires; - AddOnCreator::rpm_path = dir; - break; - } else if (ret == `next) { if (dir == "") { @@ -306,12 +318,20 @@ if (!FileUtils::Exists (dir)) { // error popup - Popup::Error (sformat(_("Directory %1 is not accessible."),dir)); + Popup::Error(sformat(_("Directory %1 is not accessible."),dir)); UI::SetFocus (`id(`rpm_path)); continue; } - // FIXME check presence of rpms in dir - AddOnCreator::rpm_path = dir; + if (req_dir != "" && !FileUtils::Exists (req_dir)) + { + // error popup + Popup::Error (sformat (_("Directory %1 is not accessible."), + req_dir)); + UI::SetFocus (`id(`required_rpm_path)); + continue; + } + AddOnCreator::rpm_path = dir; + AddOnCreator::required_rpm_path = req_dir; if (requires == "") requires = (string) UI::QueryWidget (`id(`other_val), `Value); AddOnCreator::content_map["REQUIRES"] = requires; @@ -603,6 +623,7 @@ ], AddOnCreator::content_specials["ARCH"]:$[])); } AddOnCreator::content = content; + AddOnCreator::UpdateContentMap (); break; } else if(ret == `abort || ret == `cancel) { @@ -671,11 +692,12 @@ entry["help"]:"") : entry["help"]:""; + list all_items = []; + // generate items for MultiSelectionBox // if all is boolean, apply to each item (=> all checked or all unchecked) list get_package_items (boolean all) { list ret = []; -//FIXME too slow for many items! foreach (string a, list pa, AddOnCreator::available_packages, { ret = union (ret, maplist (string p, (list<string>) pa, { height = height + 1; @@ -739,12 +761,11 @@ } else if (type == "package-list") { + all_items = get_package_items (nil); cont = `VBox ( `HSpacing (50), // MultiSelectionBox label - `MultiSelectionBox (`id(`main), _("&Packages"), - get_package_items (nil) - ), + `MultiSelectionBox (`id(`main), _("&Packages"), all_items), `Left ( // check box label `CheckBox (`id(`all),`opt(`notify),_("Select or Deselect &All")) @@ -770,9 +791,7 @@ boolean all_checked = false; if (type == "package-list") { - all_checked = (value != [] && - (size ((list)value) == size ((list)UI::QueryWidget (`id(w_id),`SelectedItems))) - ); + all_checked = (value != [] && (size ((list)value) == size (all_items))); UI::ChangeWidget (`id(`all), `Value, all_checked); } while (true) @@ -1321,8 +1340,15 @@ // dialog caption string caption = _("Output Settings"); boolean iso = AddOnCreator::iso; - boolean bootable = AddOnCreator::bootable; //FIXME + boolean bootable = AddOnCreator::bootable; boolean autorun = false; + map<string,string> content_map = AddOnCreator::content_map; + + string iso_name = AddOnCreator::iso_name; + if (iso_name == "") + iso_name = sformat ("%1-%2-%3", + tolower (content_map["DISTPRODUCT"]:""), + content_map["DISTVERSION"]:"", content_map["DEFAULTBASE"]:""); term contents = `HBox (`HSpacing (), `VBox ( `HBox ( @@ -1335,11 +1361,18 @@ ) ), // check box label - `Left (`CheckBox (`id(`iso), _("Create &ISO Image"), iso)), - // check box label //FIXME `Left (`CheckBox (`id(`boot), _("Create B&ootable Add-On"), bootable)), // check box label //FIXME `Left (`CheckBox (`id(`autorun), _("&Autorun"), autorun)), + + + // check box label + `Left (`CheckBox (`id(`iso),`opt(`notify),_("Create &ISO Image"), iso)), + `HBox ( + `HSpacing (2), + // text entry label + `TextEntry (`id(`iso_name), _("Image File Name"), iso_name) + ), `VSpacing (4), `HBox ( `HStretch (), @@ -1353,6 +1386,7 @@ Wizard::SetContentsButtons(caption, contents, HELPS["output"]:"", Label::BackButton(), Label::NextButton()); UI::SetFocus (`id(`output_path)); + UI::ChangeWidget (`id(`iso_name), `Enabled, iso); any ret = nil; while(true) { @@ -1360,6 +1394,8 @@ ret = UI::UserInput(); string dir = (string)UI::QueryWidget (`id(`output_path), `Value); boolean iso = (boolean)UI::QueryWidget (`id(`iso), `Value); + iso_name = (string)UI::QueryWidget (`id(`iso_name), `Value); + UI::ChangeWidget (`id(`iso_name), `Enabled, iso); // boolean bootable= (boolean)UI::QueryWidget (`id(`boot), `Value); if (ret == `browse) { dir = UI::AskForExistingDirectory (dir, ""); @@ -1373,6 +1409,7 @@ else if (ret == `expert || ret == `workflow) { AddOnCreator::base_output_path = dir; AddOnCreator::iso = iso; + AddOnCreator::iso_name = iso_name; // AddOnCreator::bootable = bootable; break; } @@ -1396,10 +1433,13 @@ } AddOnCreator::base_output_path = dir; AddOnCreator::iso = iso; + AddOnCreator::iso_name = iso_name; // AddOnCreator::bootable = bootable; if (iso && !Package::Install ("mkisofs")) { - AddOnCreator::iso = false; + UI::ChangeWidget (`id(`iso), `Value, false); + ret = `notnext; + continue; } break; } 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-add-on-creator-2.13.8/src/dialogs.ycp new/yast2-add-on-creator-2.15.0/src/dialogs.ycp --- old/yast2-add-on-creator-2.13.8/src/dialogs.ycp 2006-10-23 11:21:44.000000000 +0200 +++ new/yast2-add-on-creator-2.15.0/src/dialogs.ycp 2007-01-31 09:02:52.000000000 +0100 @@ -24,7 +24,7 @@ * Summary: Dialogs definitions * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: dialogs.ycp 33568 2006-10-23 09:21:40Z jsuchome $ + * $Id: dialogs.ycp 35715 2007-01-31 08:02:45Z jsuchome $ */ { 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-add-on-creator-2.13.8/src/helps.ycp new/yast2-add-on-creator-2.15.0/src/helps.ycp --- old/yast2-add-on-creator-2.13.8/src/helps.ycp 2006-10-23 10:50:39.000000000 +0200 +++ new/yast2-add-on-creator-2.15.0/src/helps.ycp 2007-01-31 09:02:52.000000000 +0100 @@ -24,7 +24,7 @@ * Summary: Help texts of all the dialogs * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: helps.ycp 33241 2006-10-03 07:29:25Z jsuchome $ + * $Id: helps.ycp 35715 2007-01-31 08:02:45Z jsuchome $ */ { @@ -57,11 +57,22 @@ // help text for start menu, cont. _("When basing the new product on an existing product, check Generate Package Descriptions to generate new descriptions of packages in the existing product."), - // help text for initial data - "sources" : _("Choose the path to the directory containing the RPM packages that should form your add-on product.") + + // help text for initial data (paragraph title) + "sources" : _("Required Product") + // help text for initial data, cont. - _("Select the product to which the new add-on product can be applied. This selection forms the REQUIRES value of the <tt>content</tt> file."), + _("Select the product to which the new add-on product can be applied. This selection forms the REQUIRES value of the <tt>content</tt> file.") + + // help text for initial data (paragraph title), cont. + _("Add-On Packages") + + + // help text for initial data, cont. + _("Choose the path to the directory containing the RPM packages that should form your add-on product.") + + + // help text for initial data (paragraph title), cont. + _("Required Product Packages") + + + // help text for initial data, cont. + _("Optionally, choose the path to the directory containing the RPM packages from the product the add-on product should be based on. These packages will not be contained in the add-on product, but could be used for creating the patterns later in the workflow."), // help text for content file editor (<tt>content</tt> is a name of file) "content" : _("Here, edit the values of the <tt>content</tt> 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-add-on-creator-2.13.8/src/patterns.ycp new/yast2-add-on-creator-2.15.0/src/patterns.ycp --- old/yast2-add-on-creator-2.13.8/src/patterns.ycp 2006-10-03 09:14:39.000000000 +0200 +++ new/yast2-add-on-creator-2.15.0/src/patterns.ycp 2007-01-31 09:02:52.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Dialogs for patterns and selections * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: patterns.ycp 32774 2006-09-08 11:26:00Z jsuchome $ + * $Id: patterns.ycp 35715 2007-01-31 08:02:45Z jsuchome $ */ { 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-add-on-creator-2.13.8/src/wizards.ycp new/yast2-add-on-creator-2.15.0/src/wizards.ycp --- old/yast2-add-on-creator-2.13.8/src/wizards.ycp 2006-10-23 10:50:51.000000000 +0200 +++ new/yast2-add-on-creator-2.15.0/src/wizards.ycp 2007-01-31 09:02:52.000000000 +0100 @@ -24,7 +24,7 @@ * Summary: Wizards definitions * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: wizards.ycp 32551 2006-08-24 13:05:57Z jsuchome $ + * $Id: wizards.ycp 35715 2007-01-31 08:02:45Z jsuchome $ */ { 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-add-on-creator-2.13.8/VERSION new/yast2-add-on-creator-2.15.0/VERSION --- old/yast2-add-on-creator-2.13.8/VERSION 2006-10-23 14:01:29.000000000 +0200 +++ new/yast2-add-on-creator-2.15.0/VERSION 2007-01-31 08:58:21.000000000 +0100 @@ -1 +1 @@ -2.13.8 +2.15.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit inkscape
by root＠Hilbert.suse.de 02 Feb '07

02 Feb '07

Hello community, here is the log from the commit of package inkscape checked in at Fri Feb 2 13:08:19 CET 2007. -------- --- GNOME/inkscape/inkscape.changes 2007-01-23 11:24:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/inkscape/inkscape.changes 2007-01-31 14:23:53.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Jan 31 14:23:33 CET 2007 - sbrabec(a)suse.cz + +- Removed remaining references to /opt/gnome (#240571). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inkscape.spec ++++++ --- /var/tmp/diff_new_pack.XW7522/_old 2007-02-02 13:07:59.000000000 +0100 +++ /var/tmp/diff_new_pack.XW7522/_new 2007-02-02 13:07:59.000000000 +0100 @@ -18,7 +18,7 @@ Autoreqprov: on Summary: Inkscape Vector Illustration Program Version: 0.44.1 -Release: 40 +Release: 41 Provides: sodipodi Obsoletes: sodipodi PreReq: /bin/rm /bin/ln /bin/sh /usr/bin/perl @@ -141,11 +141,11 @@ cp $RPM_BUILD_ROOT%{_datadir}/inkscape/extensions/dia.inx $RPM_BUILD_ROOT%{_datadir}/inkscape/extensions-optional %triggerin -- dia -ln -f opt/gnome/share/inkscape/extensions-optional/dia.inx opt/gnome/share/inkscape/extensions/dia.inx +ln -f usr/share/inkscape/extensions-optional/dia.inx usr/share/inkscape/extensions/dia.inx %triggerpostun -- dia -if [ ! -x %{_bindir}/dia ] ; then - rm opt/gnome/share/inkscape/extensions/dia.inx +if [ ! -x usr/bin/dia ] ; then + rm usr/share/inkscape/extensions/dia.inx fi %clean @@ -171,6 +171,8 @@ %doc %{_mandir}/??/man?/*.* %changelog -n inkscape +* Wed Jan 31 2007 - sbrabec(a)suse.cz +- Removed remaining references to /opt/gnome (#240571). * Tue Jan 23 2007 - prusnak(a)suse.cz - fixed build errors * polyutil-newpoly.patch - uninitialized structure ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hypermail
by root＠Hilbert.suse.de 02 Feb '07

02 Feb '07

Hello community, here is the log from the commit of package hypermail checked in at Fri Feb 2 13:07:57 CET 2007. -------- --- hypermail/hypermail.changes 2007-01-02 15:55:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/hypermail/hypermail.changes 2007-02-01 17:16:40.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Feb 01 17:06:02 CET 2007 - mfabian(a)suse.de + +- Bugzilla #98496: fix the encoding problems by updating to + CVS HEAD (2.2.0.20070131). +- make not only "set_i18n = 1" but also "set_i18n_body = 1" + the default to get everything converted to UTF-8. +- fix crashes on 64 bit systems. + +------------------------------------------------------------------- Old: ---- hypermail-2.2.0.tar.bz2 New: ---- 64bit.patch hypermail-2.2.0.20070131.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hypermail.spec ++++++ --- /var/tmp/diff_new_pack.BH6405/_old 2007-02-02 13:07:44.000000000 +0100 +++ /var/tmp/diff_new_pack.BH6405/_new 2007-02-02 13:07:44.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package hypermail (Version 2.2.0) +# spec file for package hypermail (Version 2.2.0.20070131) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,8 +16,8 @@ Group: Productivity/Networking/Email/Utilities Obsoletes: hypemail Autoreqprov: on -Version: 2.2.0 -Release: 41 +Version: 2.2.0.20070131 +Release: 1 URL: http://www.hypermail-project.org/ Summary: Convert Mail Archives in mailbox Format to HTML Pages Source: http://www.hypermail.org/dist/%{name}-%{version}.tar.bz2 @@ -28,7 +28,8 @@ Patch4: hypermail-gcc4.diff Patch5: nonstaticpcre.patch Patch6: strip.patch -Patch7: %{name}-%{version}-comparison.diff +Patch7: %{name}-2.2.0-comparison.diff +Patch8: 64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define apache_serverroot %(/usr/sbin/apxs2 -q datadir 2>/dev/null || /usr/sbin/apxs2 -q PREFIX) @@ -57,9 +58,13 @@ %patch5 %patch6 %patch7 +%patch8 -p1 +find . -name CVS -type d | xargs rm -rf +find . -type f | xargs chmod u+w %build export CFLAGS="$RPM_OPT_FLAGS" +export CFLAGS=" -g -O0 " rm -rf src/pcre libtoolize --force aclocal @@ -95,6 +100,12 @@ %doc %{_mandir}/man4/hmrc.4.gz %changelog -n hypermail +* Thu Feb 01 2007 - mfabian(a)suse.de +- Bugzilla #98496: fix the encoding problems by updating to + CVS HEAD (2.2.0.20070131). +- make not only "set_i18n = 1" but also "set_i18n_body = 1" + the default to get everything converted to UTF-8. +- fix crashes on 64 bit systems. * Tue Jan 02 2007 - anicka(a)suse.cz - fix comparison with string literal [#231197] * Thu May 18 2006 - schwab(a)suse.de ++++++ 64bit.patch ++++++ diff -ru hypermail-2.2.0.20070131.orig/src/parse.c hypermail-2.2.0.20070131/src/parse.c --- hypermail-2.2.0.20070131.orig/src/parse.c 2005-10-25 08:19:25.000000000 +0200 +++ hypermail-2.2.0.20070131/src/parse.c 2007-02-01 16:21:32.000000000 +0100 @@ -48,6 +48,10 @@ #include <sys/dir.h> #endif +#ifdef HAVE_STRING_H +#include <string.h> +#endif + /* ** LCC doesn't have lstat() defined in sys/stat.h. We'll define it ** in lcc_extras.h, but really it just calls stat(). @@ -862,7 +866,7 @@ #ifdef HAVE_ICONV char *orig2,*output2,*output3; - int len; + size_t len; orig2=output2=malloc(strlen(string)+1); memset(output2,0,strlen(string)+1); old_output=output; @@ -3110,7 +3114,7 @@ #if HAVE_ICONV if (charset){ char *tmpptr; - int tmplen=0; + size_t tmplen=0; tmpptr=subject; subject=i18n_convstring(tmpptr,charset,"UTF-8",&tmplen); if(tmpptr) diff -ru hypermail-2.2.0.20070131.orig/src/print.c hypermail-2.2.0.20070131/src/print.c --- hypermail-2.2.0.20070131.orig/src/print.c 2006-03-28 04:00:18.000000000 +0200 +++ hypermail-2.2.0.20070131/src/print.c 2007-02-01 17:00:28.000000000 +0100 @@ -46,6 +46,10 @@ #endif #endif +#ifdef HAVE_STRING_H +#include <string.h> +#endif + static char *indextypename[NO_INDEX]; #ifdef GDBM @@ -1412,7 +1416,7 @@ fprintf(fp, "<address class=\"headers\">\n"); #ifdef HAVE_ICONV - int tmplen; + size_t tmplen; char *tmpsubject=i18n_convstring(email->subject,"UTF-8",email->charset,&tmplen); char *tmptmpname=i18n_convstring(email->name,"UTF-8",email->charset,&tmplen); char *tmpname=convchars(tmptmpname,"utf-8"); @@ -2040,7 +2044,7 @@ char *ptr; #ifdef HAVE_ICONV char *localsubject=NULL,*localname=NULL; - int convlen=0; + size_t convlen=0; #endif diff -ru hypermail-2.2.0.20070131.orig/src/proto.h hypermail-2.2.0.20070131/src/proto.h --- hypermail-2.2.0.20070131.orig/src/proto.h 2005-10-25 08:22:09.000000000 +0200 +++ hypermail-2.2.0.20070131/src/proto.h 2007-02-01 16:21:32.000000000 +0100 @@ -93,7 +93,7 @@ /* ** string.c functions */ -char *i18n_convstring(char *, char *, char *, int *); +char *i18n_convstring(char *, char *, char *, size_t *); char *i18n_utf2numref(char *, int); char *i18n_numref2utf(char *); diff -ru hypermail-2.2.0.20070131.orig/src/string.c hypermail-2.2.0.20070131/src/string.c --- hypermail-2.2.0.20070131.orig/src/string.c 2005-11-02 14:44:48.000000000 +0100 +++ hypermail-2.2.0.20070131/src/string.c 2007-02-01 16:41:10.000000000 +0100 @@ -28,6 +28,10 @@ #include "parse.h" #include "uconvert.h" +#ifdef HAVE_STRING_H +#include <string.h> +#endif + /* I18N hack */ #ifdef HAVE_ICONV_H #include <iconv.h> @@ -93,9 +97,9 @@ } -char *i18n_convstring(char *string, char *fromcharset, char *tocharset, int *len){ +char *i18n_convstring(char *string, char *fromcharset, char *tocharset, size_t *len){ - int origlen,strleft,bufleft; + size_t origlen,strleft,bufleft; char *convbuf,*origconvbuf; iconv_t iconvfd; size_t ret; @@ -1226,7 +1230,7 @@ free(newcmd2); /* put subject */ - if (strlen(subject)>0){ + if (subject && strlen(subject)>0){ newcmd2 = replace(newcmd, "$SUBJECT", convsubj); }else{ newcmd2 = replace(newcmd, "$SUBJECT", ""); ++++++ hypermail-2.2.0.tar.bz2 -> hypermail-2.2.0.20070131.tar.bz2 ++++++ ++++ 4988 lines of diff (skipped) ++++++ hypermail-setup.patch ++++++ --- /var/tmp/diff_new_pack.BH6405/_old 2007-02-02 13:07:45.000000000 +0100 +++ /var/tmp/diff_new_pack.BH6405/_new 2007-02-02 13:07:45.000000000 +0100 @@ -1,18 +1,26 @@ -diff -ru hypermail-2.2.0.orig/src/setup.c hypermail-2.2.0/src/setup.c ---- hypermail-2.2.0.orig/src/setup.c 2004-02-17 19:48:20.000000000 +0100 -+++ hypermail-2.2.0/src/setup.c 2005-07-26 17:19:34.000000000 +0200 -@@ -147,84 +147,84 @@ +diff -Nru hypermail-2.2.0.20070131/src/setup.c hypermail-2.2.0.20070131.new/src/setup.c +--- hypermail-2.2.0.20070131/src/setup.c 2005-10-25 08:15:14.000000000 +0200 ++++ hypermail-2.2.0.20070131.new/src/setup.c 2007-01-31 20:18:37.000000000 +0100 +@@ -150,90 +150,90 @@ int set_delete_level; struct Config cfg[] = { +- {"i18n", &set_i18n, BTRUE, CFG_SWITCH, ++ {"i18n", &set_i18n, BTRUE, + "# Enable I18N features, must linked with iconv().\n",FALSE}, + +- {"i18n_body", &set_i18n_body, BFALSE, CFG_SWITCH, ++ {"i18n_body", &set_i18n_body, BTRUE, + "# Translate message body into UTF-8. \"i18n\" must be enabled.\n",FALSE}, + - {"antispam_at", &set_antispam_at, ANTISPAM_AT, CFG_STRING, + {"antispam_at", &set_antispam_at, DV_STRING(ANTISPAM_AT), - "# replace any @ sign with this string, if spam flags enabled\n", FALSE}, + "# replace any @ sign with this string, if spam flags enabled.\n", FALSE}, - {"language", &set_language, LANGUAGE, CFG_STRING, + {"language", &set_language, DV_STRING(LANGUAGE), "# A two-letter string specifying the language to use!\n" - "# For example 'en' for English\n", FALSE}, + "# For example 'en' for English.\n", FALSE}, - {"htmlsuffix", &set_htmlsuffix, HTMLSUFFIX, CFG_STRING, + {"htmlsuffix", &set_htmlsuffix, DV_STRING(HTMLSUFFIX), @@ -103,7 +111,7 @@ "# Set this to -1 to have hypermail figure out whether the input\n" "# is entirely new messages to be appended or whether it contains\n" "# messages that are already in the archive. A value of -1 cannot be\n" -@@ -234,22 +234,22 @@ +@@ -243,22 +243,22 @@ "# existing archive is not empty.\n" "# Set this to 1 to append the input to existing archive.\n", FALSE}, @@ -130,7 +138,7 @@ "# Set this to 1 or 2 to always show a progress report as\n" "# Hypermail works. With a setting of 1, hypermail\n" "# overwrites the progress information relating to attachment\n" -@@ -257,12 +257,12 @@ +@@ -266,12 +266,12 @@ "# is listed individually with the number of the message the\n" "# attachments relate to. This is written to stdout.\n", FALSE}, @@ -145,7 +153,7 @@ "# Set this to 1 to show the articles in a proportionally-spaced\n" "# font rather than a fixed-width (monospace) font.\n" "# Set this to 2 for more complex conversion to html\n" -@@ -271,21 +271,21 @@ +@@ -280,21 +280,21 @@ "# showhtml = 1, and showhtml = 0 will look pretty dull, but\n" "# 1 and 2 run risks of altering the appearance in undesired ways.\n", FALSE}, @@ -171,7 +179,7 @@ "# Set this to 1 to put the individual message links at the top\n" "# of the individual message pages. Set this to 0 to produce pages\n" "# without the Next, Previous, Reply, In-Reply-To, etc. links. Set\n" -@@ -293,14 +293,14 @@ +@@ -302,14 +302,14 @@ "# pages, or 4 to produce those links only at the bottom of the\n" "# message.\n", FALSE}, @@ -188,7 +196,7 @@ "# Setting this variable to On will tell Hypermail to generate\n" "# an index menu at the top and bottom of each page in a table\n" "# format. Set to Off if you want the standard Hypermail page look\n" -@@ -308,44 +308,44 @@ +@@ -317,44 +317,44 @@ "NOTE: THIS OPTION HAS BEEN DEPRECATED BY THE WAI CHANGES. IT WILL BE\n" "IGNORED.\n", FALSE}, @@ -243,7 +251,7 @@ "# Set this to On to use gdbm to implement a header cache.\n" "# This will speed up hypermail, especially if your filesystem is slow.\n" "# It will not provide any speedup with the linkquotes option.\n" -@@ -354,20 +354,20 @@ +@@ -363,20 +363,20 @@ #endif , FALSE}, @@ -268,7 +276,7 @@ "# Set this to On to generate filenames that are not sequential, but\n" "# rather a hash of the message properties.\n" #ifndef HAVE_LIBFNV -@@ -376,214 +376,214 @@ +@@ -385,214 +385,214 @@ #endif , FALSE}, @@ -525,7 +533,7 @@ "# If nonzero, break the threads index file into multiple files,\n" "# with the initial message of each thread in the main index file\n" "# along with links to files containing the replies. Setting this\n" -@@ -595,7 +595,7 @@ +@@ -604,7 +604,7 @@ "# if the indextable option is turned on, and probably needs to\n" "# be less than thrdlevels.\n", FALSE}, @@ -534,7 +542,7 @@ "# Sets the number of the first message of an archive. This option is\n" "# only active when adding new messages to brand new archive.\n" "# If not set, the default number will be 0000.\n" -@@ -603,7 +603,7 @@ +@@ -612,7 +612,7 @@ "# rebuild your archive, you must use the same value or you'll break any\n" "# link pointing to your archive.\n", FALSE}, @@ -543,7 +551,7 @@ "# This string causes the messages to be put in subdirectories\n" "# by date. The string will be passed to strftime(3) to generate\n" "# subdirectory names based on message dates. Suggested values are\n" -@@ -613,14 +613,14 @@ +@@ -622,14 +622,14 @@ "# and update the archive incrementally (e.g. with -u), you must\n" "# use the usegdbm option.\n", FALSE}, @@ -560,7 +568,7 @@ "# Controls the labels used in folders.html to describe the\n" "# directories created by the folder_by_date or msgsperfolder\n" "# options. For folder_by_date labels, the describe_folder string\n" -@@ -632,7 +632,7 @@ +@@ -641,7 +641,7 @@ "# %M for the number of the last message that can be put in the\n" "# directory.\n", FALSE}, @@ -569,8 +577,8 @@ "# If folder_by_date or msgsperfolder are in use, create\n" "# a symbolic link by this name to the most recently created\n" "# subdirectory. Note that many web servers are configured to\n" -@@ -640,33 +640,33 @@ - "# be created in the directory specified by the 'dir' or '-d' option.", +@@ -649,33 +649,33 @@ + "# be created in the directory specified by the 'dir' or '-d' option.\n", FALSE}, - {"base_url", &set_base_url, NULL, CFG_STRING, @@ -611,7 +619,7 @@ "# 0 - remove deleted and expired files. Note that with this choice\n" "# threading may be screwed up if there are replies to deleted or\n" "# expired options and the archive is updated incrementally\n" -@@ -676,55 +676,55 @@ +@@ -685,55 +685,55 @@ "# Deleted and expired messages are removed from the index files\n" "# regardless of the delete_level selection.\n", FALSE}, @@ -676,7 +684,7 @@ "# Any characters listed in this string are removed from user-specified\n" "# attachment filenames. Those characters will be replaced by a \"_\"\n" "# (which means that specifying \"_\" here won't have any effect).\n" -@@ -735,17 +735,17 @@ +@@ -744,17 +744,17 @@ "# includes on filenames ending in something other than .shtml), but\n" "# that will prevent browsers from recognizing many file types.\n", FALSE}, @@ -690,14 +698,14 @@ + {"href_detection", &set_href_detection, BTRUE, "# Set this to On to assume that any string on the body of the message\n" "# that says <A HREF=\" ... </A> is a URL, together with its markup\n" - "# and treat it as such.", TRUE}, + "# and treat it as such.\n", TRUE}, - {"mbox_shortened", &set_mbox_shortened, BFALSE, CFG_SWITCH, + {"mbox_shortened", &set_mbox_shortened, BFALSE, "# Set this to On to enable use of mbox that has had some of its\n" "# initial messages deleted. Requires usegdbm = 1 and increment = 0.\n" "# The first message in the shortened mbox must have a Message-Id header.\n" -@@ -755,7 +755,7 @@ +@@ -764,7 +764,7 @@ "# beginning of the mbox or appending new messages to the end (unless\n" "# you rebuild the archive from scratch using a complete mbox).\n", FALSE}, @@ -706,7 +714,7 @@ "# Set this to On to have it print (on stdout) the names of any\n" "# new directories created pursuant to the folder_by_date or\n" "# msgsperfolder option, or the initial creation of the archive.\n" -@@ -763,12 +763,12 @@ +@@ -772,12 +772,12 @@ "# the archive directory. Does not print anything when attachment\n" "# or metadata directories are created.\n", FALSE}, @@ -721,7 +729,7 @@ "# Set this to On to have it use the Date: header (created by the\n" "# the system that sent the message) rather than the date/time the\n" "# message was received, for purposes such as putting in folders\n" -@@ -807,7 +807,7 @@ +@@ -823,7 +823,7 @@ fprintf(stdout, "#%s = %s\n", cfg[i].label, */ fprintf(stdout, "%s = %s\n", cfg[i].label, @@ -730,7 +738,7 @@ break; case CFG_LIST: case CFG_STRINGLIST: -@@ -821,7 +821,7 @@ +@@ -837,7 +837,7 @@ fprintf(stdout, "#%s = %s\n", cfg[i].label, */ fprintf(stdout, "%s = %s\n", cfg[i].label, @@ -739,7 +747,7 @@ } break; case CFG_OCTAL: -@@ -835,7 +835,7 @@ +@@ -851,7 +851,7 @@ fprintf(stdout, "#%s = %lo\n", cfg[i].label, */ fprintf(stdout, "%s = %lo\n", cfg[i].label, @@ -748,7 +756,7 @@ break; case CFG_INTEGER: if (cfg[i].changed) -@@ -848,7 +848,7 @@ +@@ -864,7 +864,7 @@ fprintf(stdout, "#%s = %ld\n", cfg[i].label, */ fprintf(stdout, "%s = %ld\n", cfg[i].label, @@ -757,7 +765,7 @@ break; case CFG_SWITCH: if (cfg[i].changed) -@@ -861,7 +861,7 @@ +@@ -877,7 +877,7 @@ fprintf(stdout, "#%s = %s\n", cfg[i].label, */ fprintf(stdout, "%s = %s\n", cfg[i].label, @@ -766,7 +774,7 @@ break; default: break; -@@ -878,7 +878,8 @@ +@@ -894,7 +894,8 @@ char name[128] = "HM_"; char *labp; int ind; @@ -776,7 +784,7 @@ for (i = 0; i < sizeof(cfg) / sizeof(cfg[0]); i++) { cfg[i].changed = FALSE; -@@ -890,30 +891,35 @@ +@@ -906,30 +907,35 @@ name[ind] = 0; /* we try to get a default value from an environment variable */ @@ -823,7 +831,7 @@ *(struct hmlist **)cfg[i].value = NULL; *(struct hmlist **)cfg[i].value = (void *)add_list(*(struct hmlist **)cfg[i].value, tpstr); -@@ -923,9 +929,9 @@ +@@ -939,9 +945,9 @@ *(struct hmlist **)cfg[i].value = NULL; break; case CFG_STRINGLIST: @@ -835,9 +843,9 @@ *(struct hmlist **)cfg[i].value = NULL; *(struct hmlist **)cfg[i].value = (void *)add_2_list(*(struct hmlist **)cfg[i].value, tpstr); -diff -ru hypermail-2.2.0.orig/src/setup.h hypermail-2.2.0/src/setup.h ---- hypermail-2.2.0.orig/src/setup.h 2004-02-17 18:26:52.000000000 +0100 -+++ hypermail-2.2.0/src/setup.h 2005-07-26 16:56:12.000000000 +0200 +diff -Nru hypermail-2.2.0.20070131/src/setup.h hypermail-2.2.0.20070131.new/src/setup.h +--- hypermail-2.2.0.20070131/src/setup.h 2005-10-25 08:11:26.000000000 +0200 ++++ hypermail-2.2.0.20070131.new/src/setup.h 2007-01-31 19:56:33.000000000 +0100 @@ -2,11 +2,11 @@ #define __SETUP_H ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hplip
by root＠Hilbert.suse.de 02 Feb '07

02 Feb '07

Hello community, here is the log from the commit of package hplip checked in at Fri Feb 2 13:07:52 CET 2007. -------- New Changes file: --- /dev/null 2006-06-16 15:54:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/hplip/hpijs-standalone.changes 2007-02-01 15:10:26.000000000 +0100 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Thu Feb 1 15:08:48 CET 2007 - jsmeix(a)suse.de + +- Created new package hpijs-standalone and hpijs-standalone.spec + for a special version of /usr/bin/hpijs which neither needs + a HPLIP library nor a CUPS library to run it. --- hplip/hplip.changes 2007-01-29 15:40:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/hplip/hplip.changes 2007-02-01 15:08:40.000000000 +0100 @@ -1,0 +2,19 @@ +Thu Feb 1 15:02:59 CET 2007 - jsmeix(a)suse.de + +- hplip-1.7.1-1.patch from HP fixes Deskjet D4100/D4160 + christmas-tree (firmware hangs up with flashing LEDs) + on second print job. +- Removed /usr/bin/hpijs.without-libcups from hplip-hpijs + to get rid of confusing RPM package requirements (hplip-hpijs + requires cups-libs because of /usr/bin/hpijs). +- Created new package hpijs-standalone and hpijs-standalone.spec + for a special version of /usr/bin/hpijs which neither needs + a HPLIP library nor a CUPS library to run it. + +------------------------------------------------------------------- +Wed Jan 31 13:50:12 CET 2007 - jsmeix(a)suse.de + +- Removed explicite fstack-protector-all from CFLAGS and CXXFLAGS + because fstack-protector will be enabled by default. + +------------------------------------------------------------------- New: ---- hpijs-standalone.changes hpijs-standalone.spec hplip-1.7.1-1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hpijs-standalone.spec ++++++ # # spec file for package hpijs-standalone (Version 1.7.1) # # 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. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: hpijs-standalone BuildRequires: gcc-c++ libjpeg-devel Summary: HPIJS stand-alone # HPLIP has reached 1.0 status. With this release a date encoded revision number is used: # x.y.m : x = major release number, y = year (eg: 6 = 2006), m = month (eg: 6a = second release in June) # Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc Version: 1.7.1 Release: 1 Group: Hardware/Printing License: BSD License and BSD-like URL: http://hpinkjet.sourceforge.net/ # Source0...Source9 is for sources from HP: # URL for Source0: http://superb-west.dl.sourceforge.net/sourceforge/hplip/hplip-1.7.1.tar.gz Source0: hplip-%{version}.tar.bz2 # Patch0...Patch9 is for patches from HP: # URL for Patch0: http://sourceforge.net/project/showfiles.php?group_id=149981 # Fix Deskjet D4100/D4160 christmas-tree (firmware hangs up with flashing LEDs) on second print job: Patch0: hplip-1.7.1-1.patch # Patch10...Patch99 is for Suse patches for the sources from HP: # Source100... is for special Suse sources: # Source102 is a small man page for /usr/bin/hpijs: Source102: hpijs.1.gz # Install into this non-root directory (required when norootforbuild is used): BuildRoot: %{_tmppath}/%{name}-%{version}-build # Mutual RPM package requirements are meanwhile considered to be bad because # such cyclic dependencies which makes it harder to automatically solve dependencies. # Actually the hpijs driver requires Ghostscript (i.e ghostscript_any, e.g. ghostscript-library). # But ghostscript-library must also require the hpijs driver which is the more imortant requirement # because when a user (or a printer setup tool) wants to set up a HP printer with the hpijs driver # it must be 100% sure that all what the hpijs driver needs to run is also installed. # Therefore the requirement is weakened for this package: Supplements: ghostscript_any # hplip-hpijs and hplip-hpijs-standalone both contain /usr/bin/hpijs: Conflicts: hplip-hpijs # Skip testing devel dependencies required by libtool .la files by the following comment: # skip-check-libtool-deps %description HPIJS is a Ghostscript printer driver for HP printers. This package includes a special version of the hpijs binary which neither needs a HPLIP library nor a CUPS library to run it. Therefore it conflicts with the hpijs binary in the hplip-hpijs package. For special cases (e.g. for LPRng/lpdfilter or for a minimal printing system or for printing without any printing system) it is possible to use only this hpijs binary and Ghostscript. For full documentation and license see the package hplip. Authors: -------- David Suffield <david.suffield(a)hp.com> Cory Meisch <cory.meisch(a)hp.com> Yie Shiyun <shiyun.yie(a)hp.com> Donald J. Welch <donald.welch(a)hp.com> Cauligi Raghothama S. <raghothama.cauligi(a)hp.com> %prep # Be quiet when unpacking: %setup -q -n hplip-1.7.1 # Fix Deskjet D4100/D4160 christmas-tree (firmware hangs up with flashing LEDs) on second print job: %patch0 -p1 %build # If AUTOMAKE='automake --foreign' is not set, autoreconf (in fact automake) # complains about missing files like NEWS, README, AUTHORS, ChangeLog # in each directory where a Makefile.am exists: AUTOMAKE='automake --foreign' autoreconf --force --install # Set our preferred architecture-specific flags for the compiler and linker: export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" # We build a special hpijs which does not require the CUPS library. # One of the HPLIP authors David Suffield told me in a mail: # > To: Johannes Meixner <jsmeix(a)suse.de>, <hplip-devel(a)lists.sourceforge.net> # > Subject: RE: [HPLIP-Devel] /usr/bin/hpijs requires libcups.so # > If you want to build hpijs with-out the libcups.so dependency, build # > hpijs with-out hplip support. # > For example if you want to build hpijs for use with other spoolers, # > don't use the top-level hplip makefile, use configure/make in the hpijs # > directory. There is a hpijs configure time "hplip-build" flag that # > defaults to false if you don't use the top-level make file. # To avoid that too much is built (e.g. the full documentation from higher directories) # the specific make target "make hpijs" is called. # Regarding the configure options see tech_docs/tarball_install.html (not very explanatory): # --disable-rpm-install disables sane, icon, /etc/hp and /etc/init.d install (default = disabled) # --disable-foomatic-install disables foomatic install (HPIJS option, default = enabled) # --disable-cups-install disables cups install (HPIJS option, default = enabled) # CUPS install would do: # (1) remove any old HP HPIJS PPD files from the CUPS PPD directory # (2) symlink the HP HPIJS PPD files to the CUPS PPD directory # (3) symlink foomatic-rip to the CUPS filter directory. # --disable-network-build disables network support, will not link with libsnmp (default = enabled) # --disable-pp-build disables parallel port support (default = enabled) # --enable-scan-build enable scanner build (default=yes) # --enable-gui-build enable gui build (default=yes) # --enable-fax-build enable fax build (default=yes) # rpm-install is no longer needed because "make install DESTDIR=/tmp/myhplip" works correctly now. pushd prnt/hpijs ./configure --prefix=/usr --libdir=%_libdir --disable-hplip-build --disable-cups-install --disable-foomatic-install make hpijs popd %install # Install only the hpijs binary ("make install" would install full HPLIP documentation): install -d %{buildroot}%{_bindir} install -m 755 prnt/hpijs/hpijs %{buildroot}%{_bindir} # Install the man page for /usr/bin/hpijs: install -d %{buildroot}%{_mandir}/man1 install -m 644 %{SOURCE102} %{buildroot}%{_mandir}/man1/ %post /sbin/ldconfig exit 0 %files %defattr(-, root, root) %doc doc/tech_docs/hpijs.html doc/tech_docs/device_classes.html %doc %{_mandir}/man1/hpijs.1.gz %{_bindir}/hpijs %changelog -n hpijs-standalone * Thu Feb 01 2007 - jsmeix(a)suse.de - Created new package hpijs-standalone and hpijs-standalone.spec for a special version of /usr/bin/hpijs which neither needs a HPLIP library nor a CUPS library to run it. ++++++ hplip.spec ++++++ --- /var/tmp/diff_new_pack.gr5926/_old 2007-02-02 13:07:38.000000000 +0100 +++ /var/tmp/diff_new_pack.gr5926/_new 2007-02-02 13:07:38.000000000 +0100 @@ -12,24 +12,31 @@ Name: hplip BuildRequires: cups cups-devel libdrm-devel libjpeg-devel net-snmp-devel pkgconfig python-devel python-openssl python-qt python-tk python-xml qt3-devel readline-devel sane-backends update-desktop-files -Summary: HP's Printing and Scanning Software +Summary: HP's Printing, Scanning, and Faxing Software # HPLIP has reached 1.0 status. With this release a date encoded revision number is used: # x.y.m : x = major release number, y = year (eg: 6 = 2006), m = month (eg: 6a = second release in June) # Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc Version: 1.7.1 -Release: 2 +Release: 3 %define hpijsVersion 2.7.1 Group: Hardware/Printing License: BSD License and BSD-like, GNU General Public License (GPL) URL: http://hpinkjet.sourceforge.net/ +# Source0...Source9 is for sources from HP: # URL for Source0: http://superb-west.dl.sourceforge.net/sourceforge/hplip/hplip-1.7.1.tar.gz Source0: %{name}-%{version}.tar.bz2 +# Patch0...Patch9 is for patches from HP: +# URL for Patch0: http://sourceforge.net/project/showfiles.php?group_id=149981 +# Fix Deskjet D4100/D4160 christmas-tree (firmware hangs up with flashing LEDs) on second print job: +Patch0: hplip-1.7.1-1.patch +# Patch10...Patch99 is for Suse patches for the sources from HP: # Fix "... is used uninitialized ..." warnings: Patch10: fix-uninitialized-variables.diff # Change installation directory for PPDs: Patch11: change-ppd-install-dir.diff # Change installation directory for the documentation: Patch12: change-doc-install-dir.diff +# Source100... is for special Suse sources: # Source100 is the primary source for the suse_update_desktop_file stuff. # It is found automatically in $RPM_SOURCE_DIR by 'suse_update_desktop_file -i hplip': Source100: %{name}.desktop @@ -38,6 +45,7 @@ Source101: hp-toolbox.wrapper # Source102 is a small man page for /usr/bin/hpijs: Source102: hpijs.1.gz +# Patch100... is for special Suse patches: # Patch100 changes the init script after it was installed: Patch100: %{name}-init-script.diff # Install into this non-root directory (required when norootforbuild is used): @@ -54,14 +62,23 @@ HPLIP provides unified connectivity for printing, scanning, sending faxes, photo card access, and device management and is designed to work -with CUPS. It includes the Ghostscript printer driver HPIJS for HP -printers and a special "hp" CUPS back-end that provides bidirectional -communication with the device (required for HP printer device -management). It also includes the SANE scanner back-end "hpaio" for HP -all-in-one devices and another special "hpfax" CUPS back-end that is -required to send faxes. The "hp-toolbox" program is provided for device -management. The "hp-sendfax" program must be used to send faxes. The -"hp-setup" program can be used to set up HP all-in-one devices. +with CUPS. + +It includes the Ghostscript printer driver HPIJS for HP printers and a +special "hp" CUPS back-end that provides bidirectional communication +with the device (required for HP printer device management). + +It also includes the SANE scanner driver "hpaio" for HP all-in-one +devices. + +Basic PC send fax functionality is supported on a number of devices. +The special "hpfax" CUPS back-end is required to send faxes. Direct +uploading (i.e. without print and scan) of received faxes from the +device to the PC is not supported. + +The "hp-toolbox" program is provided for device management. The +"hp-sendfax" program must be used to send faxes. The "hp-setup" program +can be used to set up HP all-in-one devices. The HPLIP project is open source software and uses GPL-compatible licenses. For more information, see: @@ -70,8 +87,6 @@ /usr/share/doc/packages/hplip/index.html -/usr/share/doc/packages/hplip/tech_docs/hpijs.html - Authors: @@ -93,18 +108,22 @@ # it must be 100% sure that all what the hpijs driver needs to run is also installed. # Therefore the requirement is weakened for this package: Supplements: ghostscript_any +# hplip-hpijs and hpijs-standalone both contain /usr/bin/hpijs: +Conflicts: hpijs-standalone %description hpijs HPIJS is a Ghostscript printer driver for HP printers. This sub-package includes only the hpijs binary and the libhpip library -which is needed to run it. Normally (in particular for CUPS) the HPIJS -driver needs the rest of HP's printing and scanning software in the -package hplip. For special cases (e.g. for LPRng/lpdfilter or for a -minimal printing system) it is possible to use only the hpijs binary +which is needed to run it. Additionally it needs at least the CUPS +library in the package cups-libs. Normally (in particular when used +with the CUPS printing system) the HPIJS driver needs the rest of HP's +printing and scanning software in the package hplip (in particular the +PPD files for CUPS). For special cases (e.g. for LPRng/lpdfilter or for +a small printing system) it is possible to use only the hpijs binary and Ghostscript. -For documentation and license see the main-package hplip. +For full documentation and license see the main-package hplip. @@ -119,6 +138,8 @@ %prep # Be quiet when unpacking: %setup -q +# Fix Deskjet D4100/D4160 christmas-tree (firmware hangs up with flashing LEDs) on second print job: +%patch0 -p1 # Fix "... is used uninitialized ..." warnings: %patch10 # Change installation directory for PPDs: @@ -132,29 +153,8 @@ # in each directory where a Makefile.am exists: AUTOMAKE='automake --foreign' autoreconf --force --install # Set our preferred architecture-specific flags for the compiler and linker: -# Set -fstack-protector-all to enable "Stack Protector" via a so called "canary" (requires gcc >= 4.1): -export CFLAGS="$RPM_OPT_FLAGS -fstack-protector-all" -export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fstack-protector-all" -# First of all build a special hpijs which does not require the CUPS library. -# One of the HPLIP authors David Suffield told me in a mail: -# > To: Johannes Meixner <jsmeix(a)suse.de>, <hplip-devel(a)lists.sourceforge.net> -# > Subject: RE: [HPLIP-Devel] /usr/bin/hpijs requires libcups.so -# > If you want to build hpijs with-out the libcups.so dependency, build -# > hpijs with-out hplip support. -# > For example if you want to build hpijs for use with other spoolers, -# > don't use the top-level hplip makefile, use configure/make in the hpijs -# > directory. There is a hpijs configure time "hplip-build" flag that -# > defaults to false if you don't use the top-level make file. -# To avoid an impact on the normal build of hpijs afterwards -# the specific make target "make hpijs" is called and afterwards -# "make distclean" removes in particular the Makefile to make sure -# it is created anew by the different configure call of the normal build. -pushd prnt/hpijs -./configure --prefix=/usr --libdir=%_libdir --disable-hplip-build --disable-cups-install --disable-foomatic-install -make hpijs -mv hpijs hpijs.without-libcups -make distclean -popd +export CFLAGS="$RPM_OPT_FLAGS" +export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" # Regarding the configure options see tech_docs/tarball_install.html (not very explanatory): # --disable-rpm-install disables sane, icon, /etc/hp and /etc/init.d install (default = disabled) # --disable-foomatic-install disables foomatic install (HPIJS option, default = enabled) @@ -175,8 +175,6 @@ %install make install DESTDIR=%{buildroot} -# Install the special hpijs which does not require the CUPS library: -install -m 755 prnt/hpijs/hpijs.without-libcups %{buildroot}%{_bindir} # Remove the installed /etc/sane.d/dll.conf # because this is provided by the sane-backends package: rm %{buildroot}%{_sysconfdir}/sane.d/dll.conf @@ -317,11 +315,24 @@ %files hpijs %defattr(-, root, root) +%doc doc/tech_docs/hpijs.html doc/tech_docs/device_classes.html %{_bindir}/hpijs -%{_bindir}/hpijs.without-libcups %{_libdir}/libhpip.* %changelog -n hplip +* Thu Feb 01 2007 - jsmeix(a)suse.de +- hplip-1.7.1-1.patch from HP fixes Deskjet D4100/D4160 + christmas-tree (firmware hangs up with flashing LEDs) + on second print job. +- Removed /usr/bin/hpijs.without-libcups from hplip-hpijs + to get rid of confusing RPM package requirements (hplip-hpijs + requires cups-libs because of /usr/bin/hpijs). +- Created new package hpijs-standalone and hpijs-standalone.spec + for a special version of /usr/bin/hpijs which neither needs + a HPLIP library nor a CUPS library to run it. +* Wed Jan 31 2007 - jsmeix(a)suse.de +- Removed explicite fstack-protector-all from CFLAGS and CXXFLAGS + because fstack-protector will be enabled by default. * Mon Jan 29 2007 - jsmeix(a)suse.de - Package 'sane' was renamed to 'sane-backends'. Adapted it so that it works with 'sane-backends' ++++++ hpijs.1.gz ++++++ Files hplip/hpijs.1.gz and /mounts/work_src_done/STABLE/hplip/hpijs.1.gz differ ++++++ hplip-1.7.1-1.patch ++++++ diff -uNr hplip-1.7.1_old/prnt/hpijs/dj3320.cpp hplip-1.7.1_new/prnt/hpijs/dj3320.cpp --- hplip-1.7.1_old/prnt/hpijs/dj3320.cpp 2007-01-24 15:42:03.000000000 -0800 +++ hplip-1.7.1_new/prnt/hpijs/dj3320.cpp 2007-01-31 13:33:42.000000000 -0800 @@ -3066,7 +3066,7 @@ } // Send Sync packet - err = pPrinterXBow->Send (pbySync, (DWORD) sizeof (pbySync)); + err = pPrinterXBow->Send (pbySync, SYNCSIZE); if(err) { return err; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0