Hello community, here is the log from the commit of package zypper checked in at Tue Jun 5 01:17:00 CEST 2007. -------- --- zypper/zypper.changes 2007-04-10 09:34:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/zypper/zypper.changes 2007-06-04 18:08:22.000000000 +0200 @@ -1,0 +2,16 @@ +Mon Jun 4 18:06:51 CEST 2007 - jkupec@suse.cz + +- moved zypper log from /var/log/YaST2 to /var/log +- declared ownership of the log file by zypper package +- r5667 +- 0.7.2 + +------------------------------------------------------------------- +Thu Apr 26 14:16:20 CEST 2007 - jkupec@suse.cz + +- Show a user readable message when check-patches + can't acquire the lock. (#227073) (Merged from + SuSE-Linux-10_2-Branch r4814) +- r5451 + +------------------------------------------------------------------- Old: ---- zypper-0.7.1.tar.bz2 New: ---- zypper-0.7.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.e26036/_old 2007-06-05 01:16:50.000000000 +0200 +++ /var/tmp/diff_new_pack.e26036/_new 2007-06-05 01:16:50.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package zypper (Version 0.7.1) +# spec file for package zypper (Version 0.7.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -23,13 +23,15 @@ Autoreqprov: on PreReq: permissions Summary: Command Line Package Management Using Libzypp -Version: 0.7.1 +Version: 0.7.2 Release: 1 -Source: zypper-0.7.1.tar.bz2 +Source: zypper-0.7.2.tar.bz2 Prefix: /usr # zypper is not a fully featured replacement yet #Provides: y2pmsh #Obsoletes: y2pmsh +#Provides: rug +#Obsoletes: rug %description Command Line Package Management Using Libzypp @@ -69,6 +71,8 @@ rm -f ${RPM_BUILD_ROOT}%{_sbindir}/zypp-checkpatches rm -f ${RPM_BUILD_ROOT}%{_sbindir}/zypp-checkpatches-wrapper %endif +%{__install} -d -m755 %buildroot%_var/log +touch %buildroot%_var/log/zypper.log %post %run_ldconfig @@ -99,8 +103,21 @@ %doc %dir %{_datadir}/doc/packages/zypper %doc %{_datadir}/doc/packages/zypper/TODO %doc %{_datadir}/doc/packages/zypper/zypper-rug +# declare ownership of the log file but prevent +# it from being erased by rpm -e +%ghost %config(noreplace) /var/log/zypper.log %changelog +* Mon Jun 04 2007 - jkupec@suse.cz +- moved zypper log from /var/log/YaST2 to /var/log +- declared ownership of the log file by zypper package +- r5667 +- 0.7.2 +* Thu Apr 26 2007 - jkupec@suse.cz +- Show a user readable message when check-patches + can't acquire the lock. (#227073) (Merged from + SuSE-Linux-10_2-Branch r4814) +- r5451 * Thu Feb 22 2007 - mvidner@suse.cz - Use the read-only hacek for service-list (#247001). * Tue Feb 13 2007 - mvidner@suse.cz ++++++ zypper-0.7.1.tar.bz2 -> zypper-0.7.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.7.1/configure new/zypper-0.7.2/configure --- old/zypper-0.7.1/configure 2007-04-10 09:55:32.000000000 +0200 +++ new/zypper-0.7.2/configure 2007-06-04 18:09:31.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for zypper 0.7.1. +# Generated by GNU Autoconf 2.61 for zypper 0.7.2. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -726,8 +726,8 @@ # Identity of this package. PACKAGE_NAME='zypper' PACKAGE_TARNAME='zypper' -PACKAGE_VERSION='0.7.1' -PACKAGE_STRING='zypper 0.7.1' +PACKAGE_VERSION='0.7.2' +PACKAGE_STRING='zypper 0.7.2' PACKAGE_BUGREPORT='' ac_unique_file="src/Makefile.am" @@ -1420,7 +1420,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -`configure' configures zypper 0.7.1 to adapt to many kinds of systems. +`configure' configures zypper 0.7.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1491,7 +1491,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of zypper 0.7.1:";; + short | recursive ) echo "Configuration of zypper 0.7.2:";; esac cat <<_ACEOF @@ -1604,7 +1604,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<_ACEOF -zypper configure 0.7.1 +zypper configure 0.7.2 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1618,7 +1618,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by zypper $as_me 0.7.1, which was +It was created by zypper $as_me 0.7.2, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2439,7 +2439,7 @@ # Define the identity of the package. PACKAGE='zypper' - VERSION='0.7.1' + VERSION='0.7.2' cat >>confdefs.h <<_ACEOF @@ -22922,7 +22922,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by zypper $as_me 0.7.1, which was +This file was extended by zypper $as_me 0.7.2, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22975,7 +22975,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\ -zypper config.status 0.7.1 +zypper config.status 0.7.2 configured by $0, generated by GNU Autoconf 2.61, with options \"`echo "$ac_configure_args" | sed 's/^ //; s/[\""`$]/\\&/g'`\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.7.1/m4/ChangeLog new/zypper-0.7.2/m4/ChangeLog --- old/zypper-0.7.1/m4/ChangeLog 2007-04-10 09:45:14.000000000 +0200 +++ new/zypper-0.7.2/m4/ChangeLog 2007-04-24 22:36:42.000000000 +0200 @@ -1,3 +1,7 @@ +2007-04-24 gettextize <bug-gnu-gettext@gnu.org> + + * gettext.m4: Upgrade to gettext-0.16. + 2007-04-10 gettextize <bug-gnu-gettext@gnu.org> * gettext.m4: New file, from gettext-0.16. Files old/zypper-0.7.1/po/cs.gmo and new/zypper-0.7.2/po/cs.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.7.1/po/cs.po new/zypper-0.7.2/po/cs.po --- old/zypper-0.7.1/po/cs.po 2007-04-10 09:56:12.000000000 +0200 +++ new/zypper-0.7.2/po/cs.po 2007-06-04 17:46:40.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: zypper 0.5.0\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2007-04-10 09:53+0200\n" +"POT-Creation-Date: 2007-04-26 11:12+0200\n" "PO-Revision-Date: 2007-02-01 10:24+0100\n" "Last-Translator: Martin Vidner <mvidner@suse.cz>\n" "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n" @@ -437,6 +437,26 @@ msgid "Use rug or yast2 for that." msgstr "" +#: src/zypp-checkpatches.cc:127 +msgid "" +"The updater could not access the package manager engine. This usually " +"happens when you have another application (like YaST) using it at the same " +"time. Please close other applications and check again for updates." +msgstr "" + +#: src/zypp-checkpatches.cc:213 +#, c-format +msgid "" +"Couldn't restore source.\n" +"Detail: %s" +msgstr "" + +#: src/zypp-checkpatches.cc:262 +msgid "" +"There are no update sources defined. Please add one or more update sources " +"in order to be notified of updates." +msgstr "" + #: src/zypper-callbacks.cc:23 msgid "(A)bort, (R)etry, (I)gnore?" msgstr "" @@ -585,7 +605,6 @@ "\t--terse, -t\t\tTerse output for machine consumption\n" "\t--table-style, -s\tTable style (integer)\n" "\t--rug-compatible, -r\tTurn on rug compatibility\n" -"\t--rug-compatible, -r\tTurn on rug compatibility\n" "\t--non-interactive\tDon't ask anything, use default answers automatically. " "(under development)\n" "\t--root, -R <dir>\tOperate on a different root directory\n" @@ -598,33 +617,33 @@ "\t--table-style, -s\tStyl tabulek (celé číslo)\n" "\t--rug-compatible, -r\tZapnout kompatibilitu s rugem\n" -#: src/zypper.cc:140 +#: src/zypper.cc:139 msgid "Verbosity " msgstr "" -#: src/zypper.cc:159 +#: src/zypper.cc:158 msgid "Invalid table style " msgstr "" -#: src/zypper.cc:202 +#: src/zypper.cc:201 msgid "Try -h for help" msgstr "" -#: src/zypper.cc:220 +#: src/zypper.cc:219 msgid "" " Source options:\n" "\t--disable-system-sources, -D\t\tDo not read the system sources\n" "\t--source, -S\t\tRead additional source\n" msgstr "" -#: src/zypper.cc:225 +#: src/zypper.cc:224 msgid "" " Target options:\n" "\t--disable-system-resolvables, -T\t\tDo not read system installed " "resolvables\n" msgstr "" -#: src/zypper.cc:239 +#: src/zypper.cc:238 msgid "" " Command options:\n" "\t--catalog,-c\t\tOnly from this catalog (under development)\n" @@ -632,14 +651,14 @@ "\t--no-confirm,-y\tDo not require user confirmation\n" msgstr "" -#: src/zypper.cc:254 +#: src/zypper.cc:253 msgid "" " Command options:\n" "\t--type,-t\t\tType of resolvable (default: package)\n" "\t--no-confirm,-y\tDo not require user confirmation\n" msgstr "" -#: src/zypper.cc:270 +#: src/zypper.cc:269 msgid "" "service-add [options] URI [alias]\n" "\n" @@ -652,7 +671,7 @@ "\t--no-refresh,-n\t\tDo not automatically refresh the metadata\n" msgstr "" -#: src/zypper.cc:289 +#: src/zypper.cc:288 msgid "" "service-list\n" "\n" @@ -660,7 +679,7 @@ "This command has no options.\n" msgstr "" -#: src/zypper.cc:303 +#: src/zypper.cc:302 msgid "" "service-delete [options] <URI|alias>\n" "\n" @@ -668,7 +687,7 @@ "This command has no options.\n" msgstr "" -#: src/zypper.cc:317 +#: src/zypper.cc:316 msgid "" "service-rename [options] <URI|alias> <new-alias>\n" "\n" @@ -676,14 +695,14 @@ "This command has no options.\n" msgstr "" -#: src/zypper.cc:331 +#: src/zypper.cc:330 msgid "" "zypper refresh\n" "\n" "Refresh all installation sources found in the system.\n" msgstr "" -#: src/zypper.cc:344 +#: src/zypper.cc:343 msgid "" "list-updates [options]\n" "\n" @@ -693,7 +712,7 @@ "\t--type,-t\t\tType of resolvable (default: patch)\n" msgstr "" -#: src/zypper.cc:362 +#: src/zypper.cc:361 msgid "" " Command options:\n" "\t--type,-t\t\tType of resolvable (default: patch)\n" @@ -701,7 +720,7 @@ "\t--skip-interactive\t\tSkip interactive updates\n" msgstr "" -#: src/zypper.cc:387 +#: src/zypper.cc:386 msgid "" "zypper [global-options] search [options] [querystring...]\n" "\n" @@ -729,7 +748,7 @@ "* and ? wildcards can also be used within search strings.\n" msgstr "" -#: src/zypper.cc:415 +#: src/zypper.cc:414 msgid "" "patch-check\n" "\n" @@ -738,7 +757,7 @@ "This command has no options.\n" msgstr "" -#: src/zypper.cc:429 +#: src/zypper.cc:428 msgid "" "patches\n" "\n" @@ -747,73 +766,73 @@ "This command has no options.\n" msgstr "" -#: src/zypper.cc:443 +#: src/zypper.cc:442 msgid "" "zypper [global-options] info [name...]\n" "\n" "'info' -- Show full information for packages\n" msgstr "" -#: src/zypper.cc:455 +#: src/zypper.cc:454 msgid "" "zypper [global-options] patch-info [patchname...]\n" "\n" "'patch-info' -- Show detailed information for patches\n" msgstr "" -#: src/zypper.cc:467 +#: src/zypper.cc:466 msgid "" "zypper [global-options] moo\n" "\n" "'moo' - Show an animal\n" msgstr "" -#: src/zypper.cc:474 +#: src/zypper.cc:473 msgid "Unknown command" msgstr "" -#: src/zypper.cc:489 +#: src/zypper.cc:488 msgid "Non-Option Program Arguments: " msgstr "" -#: src/zypper.cc:501 +#: src/zypper.cc:500 msgid "Ignoring --terse (provided only for rug compatibility)" msgstr "" -#: src/zypper.cc:517 +#: src/zypper.cc:516 msgid "Ignoring installed resolvables..." msgstr "" -#: src/zypper.cc:542 +#: src/zypper.cc:541 msgid "A ZYpp transaction is already in progress." msgstr "" -#: src/zypper.cc:569 +#: src/zypper.cc:568 msgid "Root privileges are required for viewing system sources." msgstr "" -#: src/zypper.cc:587 +#: src/zypper.cc:586 msgid "Warning: Unknown metadata type " msgstr "" -#: src/zypper.cc:724 src/zypper.cc:782 src/zypper.cc:868 src/zypper.cc:896 +#: src/zypper.cc:723 src/zypper.cc:781 src/zypper.cc:867 src/zypper.cc:895 msgid "Unknown resolvable type " msgstr "" -#: src/zypper.cc:737 +#: src/zypper.cc:736 msgid "" "Warning: No sources. Operating only with the installed resolvables. Nothing " "can be installed." msgstr "" -#: src/zypper.cc:939 +#: src/zypper.cc:938 msgid "Please file a bug report about this." msgstr "" -#: src/zypper.cc:942 +#: src/zypper.cc:941 msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions." msgstr "" -#: src/zypper.cc:955 +#: src/zypper.cc:954 msgid "Unexpected exception." msgstr "" Files old/zypper-0.7.1/po/hu.gmo and new/zypper-0.7.2/po/hu.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.7.1/po/hu.po new/zypper-0.7.2/po/hu.po --- old/zypper-0.7.1/po/hu.po 2007-04-10 09:56:13.000000000 +0200 +++ new/zypper-0.7.2/po/hu.po 2007-06-04 17:46:40.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2007-04-10 09:53+0200\n" +"POT-Creation-Date: 2007-04-26 11:12+0200\n" "PO-Revision-Date: 2007-01-26 19:44+0100\n" "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n" "Language-Team: Hungarian <gnome@gnome.hu>\n" @@ -443,6 +443,26 @@ msgid "Use rug or yast2 for that." msgstr "" +#: src/zypp-checkpatches.cc:127 +msgid "" +"The updater could not access the package manager engine. This usually " +"happens when you have another application (like YaST) using it at the same " +"time. Please close other applications and check again for updates." +msgstr "" + +#: src/zypp-checkpatches.cc:213 +#, c-format +msgid "" +"Couldn't restore source.\n" +"Detail: %s" +msgstr "" + +#: src/zypp-checkpatches.cc:262 +msgid "" +"There are no update sources defined. Please add one or more update sources " +"in order to be notified of updates." +msgstr "" + #: src/zypper-callbacks.cc:23 msgid "(A)bort, (R)etry, (I)gnore?" msgstr "" @@ -595,7 +615,6 @@ "\t--terse, -t\t\tTerse output for machine consumption\n" "\t--table-style, -s\tTable style (integer)\n" "\t--rug-compatible, -r\tTurn on rug compatibility\n" -"\t--rug-compatible, -r\tTurn on rug compatibility\n" "\t--non-interactive\tDon't ask anything, use default answers automatically. " "(under development)\n" "\t--root, -R <dir>\tOperate on a different root directory\n" @@ -608,19 +627,19 @@ "\t--table-style, -s\tTáblastílus (egész)\n" "\t--rug-compatible, -r\tA rug kompatibilitás engedélyezése\n" -#: src/zypper.cc:140 +#: src/zypper.cc:139 msgid "Verbosity " msgstr "Bőbeszédűség " -#: src/zypper.cc:159 +#: src/zypper.cc:158 msgid "Invalid table style " msgstr "Érvénytelen táblázatstílus " -#: src/zypper.cc:202 +#: src/zypper.cc:201 msgid "Try -h for help" msgstr "A súgóhoz használja a -h kapcsolót" -#: src/zypper.cc:220 +#: src/zypper.cc:219 msgid "" " Source options:\n" "\t--disable-system-sources, -D\t\tDo not read the system sources\n" @@ -630,7 +649,7 @@ "\t--disable-system-sources, -D\t\tNe olvassa be a rendszerforrásokat\n" "\t--source, -S\t\tKiegészítő forrás beolvasása\n" -#: src/zypper.cc:225 +#: src/zypper.cc:224 msgid "" " Target options:\n" "\t--disable-system-resolvables, -T\t\tDo not read system installed " @@ -640,7 +659,7 @@ "\t--disable-system-resolvables, -T\t\tNe olvassa be a rendszer által " "telepített feloldhatókat\n" -#: src/zypper.cc:239 +#: src/zypper.cc:238 msgid "" " Command options:\n" "\t--catalog,-c\t\tOnly from this catalog (under development)\n" @@ -652,7 +671,7 @@ "\t--type,-t\t\tA feloldható típusa (alapértelmezett: csomag)\n" "\t--no-confirm,-y\tNe kérjen felhasználói megerősítést\n" -#: src/zypper.cc:254 +#: src/zypper.cc:253 msgid "" " Command options:\n" "\t--type,-t\t\tType of resolvable (default: package)\n" @@ -662,7 +681,7 @@ "\t--type,-t\t\tA feloldható típusa (alapértelmezett: csomag)\n" "\t--no-confirm,-y\tNe kérjen felhasználói megerősítést\n" -#: src/zypper.cc:270 +#: src/zypper.cc:269 msgid "" "service-add [options] URI [alias]\n" "\n" @@ -684,7 +703,7 @@ "\t--disabled,-d\t\tA szolgáltatás felvétele letiltottként\n" "\t--no-refresh,-n\t\tNe frissítse automatikusan a metaadatokat\n" -#: src/zypper.cc:289 +#: src/zypper.cc:288 msgid "" "service-list\n" "\n" @@ -696,7 +715,7 @@ "Az összes megadott rendszerszolgáltatás (telepítési források) felsorolása.\n" "Ennek a parancsnak nincsenek kapcsolói.\n" -#: src/zypper.cc:303 +#: src/zypper.cc:302 msgid "" "service-delete [options] <URI|alias>\n" "\n" @@ -708,7 +727,7 @@ "Szolgáltatás (telepítési forrás) eltávolítása a rendszerről.\n" "Ennek a parancsnak nincsenek kapcsolói.\n" -#: src/zypper.cc:317 +#: src/zypper.cc:316 msgid "" "service-rename [options] <URI|alias> <new-alias>\n" "\n" @@ -721,7 +740,7 @@ "szolgáltatáshoz.\n" "Ennek a parancsnak nincsenek kapcsolói.\n" -#: src/zypper.cc:331 +#: src/zypper.cc:330 msgid "" "zypper refresh\n" "\n" @@ -731,7 +750,7 @@ "\n" "A rendszeren található összes telepítési forrás frissítése.\n" -#: src/zypper.cc:344 +#: src/zypper.cc:343 msgid "" "list-updates [options]\n" "\n" @@ -747,7 +766,7 @@ " Parancs kapcsolói:\n" "\t--type,-t\t\tA feloldható típusa (alapértelmezés: javítás)\n" -#: src/zypper.cc:362 +#: src/zypper.cc:361 msgid "" " Command options:\n" "\t--type,-t\t\tType of resolvable (default: patch)\n" @@ -759,7 +778,7 @@ "\t--no-confirm,-y\t\tNe igényeljen felhasználói megerősítést\n" "\t--skip-interactive\t\tInteraktív frissítések kihagyása\n" -#: src/zypper.cc:387 +#: src/zypper.cc:386 msgid "" "zypper [global-options] search [options] [querystring...]\n" "\n" @@ -810,7 +829,7 @@ "\n" "A * és ? helyettesítő karakterek is használhatók a keresőkifejezésekben.\n" -#: src/zypper.cc:415 +#: src/zypper.cc:414 msgid "" "patch-check\n" "\n" @@ -824,7 +843,7 @@ "\n" "Ennek a parancsnak nincsenek kapcsolói.\n" -#: src/zypper.cc:429 +#: src/zypper.cc:428 msgid "" "patches\n" "\n" @@ -838,7 +857,7 @@ "\n" "Ennek a parancsnak nincsenek kapcsolói.\n" -#: src/zypper.cc:443 +#: src/zypper.cc:442 msgid "" "zypper [global-options] info [name...]\n" "\n" @@ -848,7 +867,7 @@ "\n" "'info' -- Csomagok teljes információinak megjelenítése\n" -#: src/zypper.cc:455 +#: src/zypper.cc:454 msgid "" "zypper [global-options] patch-info [patchname...]\n" "\n" @@ -858,7 +877,7 @@ "\n" "'patch-info' -- Javítások részletes információinak megjelenítése\n" -#: src/zypper.cc:467 +#: src/zypper.cc:466 msgid "" "zypper [global-options] moo\n" "\n" @@ -868,39 +887,39 @@ "\n" "'moo' - Egy állat megjelenítése\n" -#: src/zypper.cc:474 +#: src/zypper.cc:473 msgid "Unknown command" msgstr "Ismeretlen parancs" -#: src/zypper.cc:489 +#: src/zypper.cc:488 msgid "Non-Option Program Arguments: " msgstr "Nem kapcsoló programargumentumok: " -#: src/zypper.cc:501 +#: src/zypper.cc:500 msgid "Ignoring --terse (provided only for rug compatibility)" msgstr "A --terse figyelmen kívül hagyva (csak a rug kompatibilitás miatt van)" -#: src/zypper.cc:517 +#: src/zypper.cc:516 msgid "Ignoring installed resolvables..." msgstr "Telepített feloldhatók figyelmen kívül hagyása..." -#: src/zypper.cc:542 +#: src/zypper.cc:541 msgid "A ZYpp transaction is already in progress." msgstr "Egy ZYpp tranzakció már folyamatban van." -#: src/zypper.cc:569 +#: src/zypper.cc:568 msgid "Root privileges are required for viewing system sources." msgstr "A rendszerforrások megjelenítéséhez root jogosultság szükséges." -#: src/zypper.cc:587 +#: src/zypper.cc:586 msgid "Warning: Unknown metadata type " msgstr "Figyelmeztetés: Ismeretlen metaadattípus: " -#: src/zypper.cc:724 src/zypper.cc:782 src/zypper.cc:868 src/zypper.cc:896 +#: src/zypper.cc:723 src/zypper.cc:781 src/zypper.cc:867 src/zypper.cc:895 msgid "Unknown resolvable type " msgstr "Ismeretlen feloldhatótípus: " -#: src/zypper.cc:737 +#: src/zypper.cc:736 msgid "" "Warning: No sources. Operating only with the installed resolvables. Nothing " "can be installed." @@ -908,16 +927,16 @@ "Figyelmeztetés: Nincsenek források. Csak a telepített feloldhatókkal lehet " "dolgozni. Semmi sem telepíthető." -#: src/zypper.cc:939 +#: src/zypper.cc:938 msgid "Please file a bug report about this." msgstr "Küldjön erről egy hibajelentést." -#: src/zypper.cc:942 +#: src/zypper.cc:941 msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions." msgstr "" "Utasításokért tekintse meg a http://en.opensuse.org/Zypper#Troubleshooting " "oldalt" -#: src/zypper.cc:955 +#: src/zypper.cc:954 msgid "Unexpected exception." msgstr "Váratlan kivétel." Files old/zypper-0.7.1/po/sk.gmo and new/zypper-0.7.2/po/sk.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.7.1/po/sk.po new/zypper-0.7.2/po/sk.po --- old/zypper-0.7.1/po/sk.po 2007-04-10 09:56:13.000000000 +0200 +++ new/zypper-0.7.2/po/sk.po 2007-06-04 17:46:40.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: zypper.sk\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2007-04-10 09:53+0200\n" +"POT-Creation-Date: 2007-04-26 11:12+0200\n" "PO-Revision-Date: 2007-01-25 17:27+0100\n" "Last-Translator: Ján Kupec <jkupec@suse.cz>\n" "Language-Team: Slovak <i18n@suse.de>\n" @@ -442,6 +442,26 @@ msgid "Use rug or yast2 for that." msgstr "" +#: src/zypp-checkpatches.cc:127 +msgid "" +"The updater could not access the package manager engine. This usually " +"happens when you have another application (like YaST) using it at the same " +"time. Please close other applications and check again for updates." +msgstr "" + +#: src/zypp-checkpatches.cc:213 +#, c-format +msgid "" +"Couldn't restore source.\n" +"Detail: %s" +msgstr "" + +#: src/zypp-checkpatches.cc:262 +msgid "" +"There are no update sources defined. Please add one or more update sources " +"in order to be notified of updates." +msgstr "" + #: src/zypper-callbacks.cc:23 msgid "(A)bort, (R)etry, (I)gnore?" msgstr "" @@ -593,7 +613,6 @@ "\t--terse, -t\t\tTerse output for machine consumption\n" "\t--table-style, -s\tTable style (integer)\n" "\t--rug-compatible, -r\tTurn on rug compatibility\n" -"\t--rug-compatible, -r\tTurn on rug compatibility\n" "\t--non-interactive\tDon't ask anything, use default answers automatically. " "(under development)\n" "\t--root, -R <dir>\tOperate on a different root directory\n" @@ -606,21 +625,21 @@ "\t--table-style, -s\tŠtýl výstupnej tabuľky (celé číslo)\n" "\t--rug-compatible, -r\tZapnutie kompatibility s programom rug\n" -#: src/zypper.cc:140 +#: src/zypper.cc:139 msgid "Verbosity " msgstr "Úroveň podrobnosti výstupu " -#: src/zypper.cc:159 +#: src/zypper.cc:158 msgid "Invalid table style " msgstr "Nesprávny typ tabuľky " -#: src/zypper.cc:202 +#: src/zypper.cc:201 msgid "Try -h for help" msgstr "" "Skús -h pre zobrazenie nápovede. Pri použití voľby -h za konkrétnym príkazom " "sa zobrazí nápoveda k tomuto príkazu." -#: src/zypper.cc:220 +#: src/zypper.cc:219 msgid "" " Source options:\n" "\t--disable-system-sources, -D\t\tDo not read the system sources\n" @@ -631,7 +650,7 @@ "nainštalovaných balíčkov)\n" "\t--source, -S\t\tNačítaj prídavný inštalačný zdroj\n" -#: src/zypper.cc:225 +#: src/zypper.cc:224 msgid "" " Target options:\n" "\t--disable-system-resolvables, -T\t\tDo not read system installed " @@ -641,7 +660,7 @@ "\t--disable-system-resolvables, -T\t\tIgnoruj systémové balíčky (RPM " "databáza nainštalovaných balíčkov)\n" -#: src/zypper.cc:239 +#: src/zypper.cc:238 msgid "" " Command options:\n" "\t--catalog,-c\t\tOnly from this catalog (under development)\n" @@ -653,7 +672,7 @@ "\t--type,-t\t\tTyp balíčka (prednastavená hodnota: package)\n" "\t--no-confirm,-y\tNevyžaduj potvrdenie užívateľa\n" -#: src/zypper.cc:254 +#: src/zypper.cc:253 msgid "" " Command options:\n" "\t--type,-t\t\tType of resolvable (default: package)\n" @@ -663,7 +682,7 @@ "\t--type,-t\t\tTyp balíčka (prednastavená hodnota: package [balíček])\n" "\t--no-confirm,-y\tNevyžaduj potvrdenie\n" -#: src/zypper.cc:270 +#: src/zypper.cc:269 msgid "" "service-add [options] URI [alias]\n" "\n" @@ -685,7 +704,7 @@ "\t--disabled,-d\t\tPridať inštalačný zdroj ako vypnutý\n" "\t--no-refresh,-n\t\tVypnúť automatické obnovovanie/aktualizáciu zdroja\n" -#: src/zypper.cc:289 +#: src/zypper.cc:288 msgid "" "service-list\n" "\n" @@ -697,7 +716,7 @@ "Zobraz zoznam všetkých definovaných inštalačných zdrojov.\n" "Tento príkaz nemá žiadne ďalšie možnosti.\n" -#: src/zypper.cc:303 +#: src/zypper.cc:302 msgid "" "service-delete [options] <URI|alias>\n" "\n" @@ -710,7 +729,7 @@ "\n" "Tento príkaz nemá žiadne ďalšie možnosti.\n" -#: src/zypper.cc:317 +#: src/zypper.cc:316 msgid "" "service-rename [options] <URI|alias> <new-alias>\n" "\n" @@ -724,7 +743,7 @@ "\n" "Tento príkaz nemá žiadne ďalšie možnosti.\n" -#: src/zypper.cc:331 +#: src/zypper.cc:330 msgid "" "zypper refresh\n" "\n" @@ -734,7 +753,7 @@ "\n" "Obnov/aktualizuj všetky inštalačné zdroje v systéme.\n" -#: src/zypper.cc:344 +#: src/zypper.cc:343 msgid "" "list-updates [options]\n" "\n" @@ -750,7 +769,7 @@ " Možnosti príkazu:\n" "\t--type,-t\t\tTyp balíčka (prednastavená hodnota: patch [záplata])\n" -#: src/zypper.cc:362 +#: src/zypper.cc:361 msgid "" " Command options:\n" "\t--type,-t\t\tType of resolvable (default: patch)\n" @@ -762,7 +781,7 @@ "\t--no-confirm,-y\t\tNevyžaduj potvrdenie užívateľa\n" "\t--skip-interactive\t\tVynechaj interaktívne aktualizácie\n" -#: src/zypper.cc:387 +#: src/zypper.cc:386 msgid "" "zypper [global-options] search [options] [querystring...]\n" "\n" @@ -814,7 +833,7 @@ "Znaky * a ? môžu byt v hľadaných výrazoch použité ako náhrada ľubovoľného " "reťazca alebo znaku.\n" -#: src/zypper.cc:415 +#: src/zypper.cc:414 msgid "" "patch-check\n" "\n" @@ -828,7 +847,7 @@ "\n" "Tento príkaz nemá žiadne ďalšie možnosti.\n" -#: src/zypper.cc:429 +#: src/zypper.cc:428 msgid "" "patches\n" "\n" @@ -842,7 +861,7 @@ "\n" "Tento príkaz nemá žiadne ďalšie možnosti.\n" -#: src/zypper.cc:443 +#: src/zypper.cc:442 msgid "" "zypper [global-options] info [name...]\n" "\n" @@ -854,7 +873,7 @@ "\n" "Tento príkaz nemá žiadne ďalšie možnosti.\n" -#: src/zypper.cc:455 +#: src/zypper.cc:454 msgid "" "zypper [global-options] patch-info [patchname...]\n" "\n" @@ -866,7 +885,7 @@ "\n" "Tento príkaz nemá žiadne ďalšie možnosti.\n" -#: src/zypper.cc:467 +#: src/zypper.cc:466 msgid "" "zypper [global-options] moo\n" "\n" @@ -876,42 +895,42 @@ "\n" "'moo' - Zobraz zviera.\n" -#: src/zypper.cc:474 +#: src/zypper.cc:473 msgid "Unknown command" msgstr "Neznámy príkaz" -#: src/zypper.cc:489 +#: src/zypper.cc:488 msgid "Non-Option Program Arguments: " msgstr "Argumenty programu (okrem volieb): " -#: src/zypper.cc:501 +#: src/zypper.cc:500 msgid "Ignoring --terse (provided only for rug compatibility)" msgstr "" "Ignorujem voľbu --terse (voľba je súčasne k dispozícii len kvôli " "kompatibilite s programom rug)" -#: src/zypper.cc:517 +#: src/zypper.cc:516 msgid "Ignoring installed resolvables..." msgstr "Ignorujem nainštalované balíčky..." -#: src/zypper.cc:542 +#: src/zypper.cc:541 msgid "A ZYpp transaction is already in progress." msgstr "Práve beží iná aplikácia používajúca ZYpp." -#: src/zypper.cc:569 +#: src/zypper.cc:568 msgid "Root privileges are required for viewing system sources." msgstr "" "Pre prácu so systémovými zdrojmi sú potrebné práva správcu systému (root)." -#: src/zypper.cc:587 +#: src/zypper.cc:586 msgid "Warning: Unknown metadata type " msgstr "Pozor: neznámy typ inštalačného zdroja " -#: src/zypper.cc:724 src/zypper.cc:782 src/zypper.cc:868 src/zypper.cc:896 +#: src/zypper.cc:723 src/zypper.cc:781 src/zypper.cc:867 src/zypper.cc:895 msgid "Unknown resolvable type " msgstr "Neznámy typ balíčka " -#: src/zypper.cc:737 +#: src/zypper.cc:736 msgid "" "Warning: No sources. Operating only with the installed resolvables. Nothing " "can be installed." @@ -919,16 +938,16 @@ "Pozor: Nie sú dostupné žiadne inštalačné zdroje. Pracujem len s " "nainštalovanými balíčkami. Nové balíčky nebude možné inštalovať." -#: src/zypper.cc:939 +#: src/zypper.cc:938 msgid "Please file a bug report about this." msgstr "Prosím, pošlite správu o tejto chybe." -#: src/zypper.cc:942 +#: src/zypper.cc:941 msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions." msgstr "" "Na adrese http://en.opensuse.org/Zypper#Troubleshooting nájdete návod ako na " "to." -#: src/zypper.cc:955 +#: src/zypper.cc:954 msgid "Unexpected exception." msgstr "Neočakávaná výnimka. " diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.7.1/po/zypper.pot new/zypper-0.7.2/po/zypper.pot --- old/zypper-0.7.1/po/zypper.pot 2007-04-10 09:53:14.000000000 +0200 +++ new/zypper-0.7.2/po/zypper.pot 2007-04-26 11:12:35.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2007-04-10 09:53+0200\n" +"POT-Creation-Date: 2007-04-26 11:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -437,6 +437,26 @@ msgid "Use rug or yast2 for that." msgstr "" +#: src/zypp-checkpatches.cc:127 +msgid "" +"The updater could not access the package manager engine. This usually " +"happens when you have another application (like YaST) using it at the same " +"time. Please close other applications and check again for updates." +msgstr "" + +#: src/zypp-checkpatches.cc:213 +#, c-format +msgid "" +"Couldn't restore source.\n" +"Detail: %s" +msgstr "" + +#: src/zypp-checkpatches.cc:262 +msgid "" +"There are no update sources defined. Please add one or more update sources " +"in order to be notified of updates." +msgstr "" + #: src/zypper-callbacks.cc:23 msgid "(A)bort, (R)etry, (I)gnore?" msgstr "" @@ -567,39 +587,38 @@ "\t--terse, -t\t\tTerse output for machine consumption\n" "\t--table-style, -s\tTable style (integer)\n" "\t--rug-compatible, -r\tTurn on rug compatibility\n" -"\t--rug-compatible, -r\tTurn on rug compatibility\n" "\t--non-interactive\tDon't ask anything, use default answers automatically. " "(under development)\n" "\t--root, -R <dir>\tOperate on a different root directory\n" msgstr "" -#: src/zypper.cc:140 +#: src/zypper.cc:139 msgid "Verbosity " msgstr "" -#: src/zypper.cc:159 +#: src/zypper.cc:158 msgid "Invalid table style " msgstr "" -#: src/zypper.cc:202 +#: src/zypper.cc:201 msgid "Try -h for help" msgstr "" -#: src/zypper.cc:220 +#: src/zypper.cc:219 msgid "" " Source options:\n" "\t--disable-system-sources, -D\t\tDo not read the system sources\n" "\t--source, -S\t\tRead additional source\n" msgstr "" -#: src/zypper.cc:225 +#: src/zypper.cc:224 msgid "" " Target options:\n" "\t--disable-system-resolvables, -T\t\tDo not read system installed " "resolvables\n" msgstr "" -#: src/zypper.cc:239 +#: src/zypper.cc:238 msgid "" " Command options:\n" "\t--catalog,-c\t\tOnly from this catalog (under development)\n" @@ -607,14 +626,14 @@ "\t--no-confirm,-y\tDo not require user confirmation\n" msgstr "" -#: src/zypper.cc:254 +#: src/zypper.cc:253 msgid "" " Command options:\n" "\t--type,-t\t\tType of resolvable (default: package)\n" "\t--no-confirm,-y\tDo not require user confirmation\n" msgstr "" -#: src/zypper.cc:270 +#: src/zypper.cc:269 msgid "" "service-add [options] URI [alias]\n" "\n" @@ -627,7 +646,7 @@ "\t--no-refresh,-n\t\tDo not automatically refresh the metadata\n" msgstr "" -#: src/zypper.cc:289 +#: src/zypper.cc:288 msgid "" "service-list\n" "\n" @@ -635,7 +654,7 @@ "This command has no options.\n" msgstr "" -#: src/zypper.cc:303 +#: src/zypper.cc:302 msgid "" "service-delete [options] <URI|alias>\n" "\n" @@ -643,7 +662,7 @@ "This command has no options.\n" msgstr "" -#: src/zypper.cc:317 +#: src/zypper.cc:316 msgid "" "service-rename [options] <URI|alias> <new-alias>\n" "\n" @@ -651,14 +670,14 @@ "This command has no options.\n" msgstr "" -#: src/zypper.cc:331 +#: src/zypper.cc:330 msgid "" "zypper refresh\n" "\n" "Refresh all installation sources found in the system.\n" msgstr "" -#: src/zypper.cc:344 +#: src/zypper.cc:343 msgid "" "list-updates [options]\n" "\n" @@ -668,7 +687,7 @@ "\t--type,-t\t\tType of resolvable (default: patch)\n" msgstr "" -#: src/zypper.cc:362 +#: src/zypper.cc:361 msgid "" " Command options:\n" "\t--type,-t\t\tType of resolvable (default: patch)\n" @@ -676,7 +695,7 @@ "\t--skip-interactive\t\tSkip interactive updates\n" msgstr "" -#: src/zypper.cc:387 +#: src/zypper.cc:386 msgid "" "zypper [global-options] search [options] [querystring...]\n" "\n" @@ -704,7 +723,7 @@ "* and ? wildcards can also be used within search strings.\n" msgstr "" -#: src/zypper.cc:415 +#: src/zypper.cc:414 msgid "" "patch-check\n" "\n" @@ -713,7 +732,7 @@ "This command has no options.\n" msgstr "" -#: src/zypper.cc:429 +#: src/zypper.cc:428 msgid "" "patches\n" "\n" @@ -722,73 +741,73 @@ "This command has no options.\n" msgstr "" -#: src/zypper.cc:443 +#: src/zypper.cc:442 msgid "" "zypper [global-options] info [name...]\n" "\n" "'info' -- Show full information for packages\n" msgstr "" -#: src/zypper.cc:455 +#: src/zypper.cc:454 msgid "" "zypper [global-options] patch-info [patchname...]\n" "\n" "'patch-info' -- Show detailed information for patches\n" msgstr "" -#: src/zypper.cc:467 +#: src/zypper.cc:466 msgid "" "zypper [global-options] moo\n" "\n" "'moo' - Show an animal\n" msgstr "" -#: src/zypper.cc:474 +#: src/zypper.cc:473 msgid "Unknown command" msgstr "" -#: src/zypper.cc:489 +#: src/zypper.cc:488 msgid "Non-Option Program Arguments: " msgstr "" -#: src/zypper.cc:501 +#: src/zypper.cc:500 msgid "Ignoring --terse (provided only for rug compatibility)" msgstr "" -#: src/zypper.cc:517 +#: src/zypper.cc:516 msgid "Ignoring installed resolvables..." msgstr "" -#: src/zypper.cc:542 +#: src/zypper.cc:541 msgid "A ZYpp transaction is already in progress." msgstr "" -#: src/zypper.cc:569 +#: src/zypper.cc:568 msgid "Root privileges are required for viewing system sources." msgstr "" -#: src/zypper.cc:587 +#: src/zypper.cc:586 msgid "Warning: Unknown metadata type " msgstr "" -#: src/zypper.cc:724 src/zypper.cc:782 src/zypper.cc:868 src/zypper.cc:896 +#: src/zypper.cc:723 src/zypper.cc:781 src/zypper.cc:867 src/zypper.cc:895 msgid "Unknown resolvable type " msgstr "" -#: src/zypper.cc:737 +#: src/zypper.cc:736 msgid "" "Warning: No sources. Operating only with the installed resolvables. Nothing " "can be installed." msgstr "" -#: src/zypper.cc:939 +#: src/zypper.cc:938 msgid "Please file a bug report about this." msgstr "" -#: src/zypper.cc:942 +#: src/zypper.cc:941 msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions." msgstr "" -#: src/zypper.cc:955 +#: src/zypper.cc:954 msgid "Unexpected exception." msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.7.1/src/zmart.h new/zypper-0.7.2/src/zmart.h --- old/zypper-0.7.1/src/zmart.h 2007-02-01 15:21:20.000000000 +0100 +++ new/zypper-0.7.2/src/zmart.h 2007-06-04 16:42:56.000000000 +0200 @@ -23,7 +23,7 @@ #include <zypp/Digest.h> #include <zypp/CapFactory.h> -#define ZYPP_CHECKPATCHES_LOG "/var/log/YaST2/zypper.log" +#define ZYPP_CHECKPATCHES_LOG "/var/log/zypper.log" #undef ZYPP_BASE_LOGGER_LOGGROUP #define ZYPP_BASE_LOGGER_LOGGROUP "zypper" #define RANDOM_TOKEN "sad987432JJDJD948394DDDxxx22" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.7.1/src/zypp-checkpatches.cc new/zypper-0.7.2/src/zypp-checkpatches.cc --- old/zypper-0.7.1/src/zypp-checkpatches.cc 2006-11-04 15:17:51.000000000 +0100 +++ new/zypper-0.7.2/src/zypp-checkpatches.cc 2007-04-26 11:10:16.000000000 +0200 @@ -14,6 +14,7 @@ #include <fstream> #include <sstream> +#include <zypp/base/Gettext.h> #include <zypp/target/store/PersistentStorage.h> #include "checkpatches-keyring-callbacks.h" @@ -89,6 +90,23 @@ using zypp::source::SourceInfo; #endif +int exit_with_error( const std::string &error_str ) +{ + gData.errors.push_back(Error(error_str)); + + std::ofstream os(RESULT_FILE); + if ( os.good() ) + { + render_error( Edition(XML_FORMAT_VERSION), os ); + render_error( Edition(XML_FORMAT_VERSION), cout ); + os.close(); + } + // save a random token so we try again next time + save_token(utils::randomString(48)); + save_version(Edition(XML_FORMAT_VERSION)); + return -1; +} + int main(int argc, char **argv) { const char *logfile = getenv("ZYPP_LOGFILE"); @@ -103,23 +121,16 @@ { God = zypp::getZYpp(); } - catch (Exception & excpt_r) + catch ( const ZYppFactoryException & excpt_r ) { ZYPP_CAUGHT (excpt_r); - - gData.errors.push_back(Error(excpt_r.msg())); - - std::ofstream os(RESULT_FILE); - if ( os.good() ) - { - render_error( Edition(XML_FORMAT_VERSION), os ); - render_error( Edition(XML_FORMAT_VERSION), cout ); - os.close(); - } - // save a random token so we try again next time - save_token(utils::randomString(48)); - save_version(Edition(XML_FORMAT_VERSION)); - return -1; + string error_str( _("The updater could not access the package manager engine. This usually happens when you have another application (like YaST) using it at the same time. Please close other applications and check again for updates." ) ); + return exit_with_error( error_str ); + } + catch ( const Exception & excpt_r) + { + ZYPP_CAUGHT (excpt_r); + return exit_with_error(excpt_r.msg()); } SourceManager_Ptr manager; @@ -197,7 +208,9 @@ } catch (const Exception &excpt_r ) { - gData.errors.push_back("Couldn't restore source" + ( excpt_r.msg().empty() ? "\n" : (":\n" + excpt_r.msg()))); + // TranslatorExplanation %s = detailed low level (unstranslated) error message + string error = excpt_r.msg(); + gData.errors.push_back(str::form(_("Couldn't restore source.\nDetail: %s"), error.c_str())); } } @@ -244,6 +257,11 @@ God->addResolvables(it->resolvables()); } + if ( gData.sources.size() == 0 ) + { + gData.errors.push_back( str::form( _( "There are no update sources defined. Please add one or more update sources in order to be notified of updates.") ) ); + } + God->addResolvables( God->target()->resolvables(), true); God->resolver()->establishPool(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.7.1/src/zypper.cc new/zypper-0.7.2/src/zypper.cc --- old/zypper-0.7.1/src/zypper.cc 2007-04-10 09:23:40.000000000 +0200 +++ new/zypper-0.7.2/src/zypper.cc 2007-05-10 19:25:10.000000000 +0200 @@ -130,7 +130,6 @@ "\t--terse, -t\t\tTerse output for machine consumption\n" "\t--table-style, -s\tTable style (integer)\n" "\t--rug-compatible, -r\tTurn on rug compatibility\n" - "\t--rug-compatible, -r\tTurn on rug compatibility\n" "\t--non-interactive\tDon't ask anything, use default answers automatically. (under development)\n" "\t--root, -R <dir>\tOperate on a different root directory\n"); ; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.7.1/VERSION new/zypper-0.7.2/VERSION --- old/zypper-0.7.1/VERSION 2007-04-10 09:44:00.000000000 +0200 +++ new/zypper-0.7.2/VERSION 2007-06-04 18:08:32.000000000 +0200 @@ -10,5 +10,5 @@ dnl ================================================== m4_define([ZYPPER_MAJOR], [0]) m4_define([ZYPPER_MINOR], [7]) -m4_define([ZYPPER_PATCH], [1]) +m4_define([ZYPPER_PATCH], [2]) dnl ================================================== diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.7.1/zypper.spec.in new/zypper-0.7.2/zypper.spec.in --- old/zypper-0.7.1/zypper.spec.in 2007-04-10 09:44:00.000000000 +0200 +++ new/zypper-0.7.2/zypper.spec.in 2007-06-04 18:06:45.000000000 +0200 @@ -29,6 +29,8 @@ # zypper is not a fully featured replacement yet #Provides: y2pmsh #Obsoletes: y2pmsh +#Provides: rug +#Obsoletes: rug %description Command Line Package Management Using Libzypp @@ -66,6 +68,8 @@ rm -f ${RPM_BUILD_ROOT}%{_sbindir}/zypp-checkpatches rm -f ${RPM_BUILD_ROOT}%{_sbindir}/zypp-checkpatches-wrapper %endif +%{__install} -d -m755 %buildroot%_var/log +touch %buildroot%_var/log/zypper.log %post %run_ldconfig @@ -96,3 +100,6 @@ %doc %dir %{_datadir}/doc/packages/zypper %doc %{_datadir}/doc/packages/zypper/TODO %doc %{_datadir}/doc/packages/zypper/zypper-rug +# declare ownership of the log file but prevent +# it from being erased by rpm -e +%ghost %config(noreplace) /var/log/zypper.log ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org