October 2006 - openSUSE Commits - openSUSE Mailing Lists

commit scummvm
by root＠suse.de 26 Oct '06

26 Oct '06

Hello community, here is the log from the commit of package scummvm checked in at Thu Oct 26 20:30:29 CEST 2006. -------- --- scummvm/scummvm.changes 2006-10-23 03:14:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/scummvm/scummvm.changes 2006-10-25 12:03:34.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Oct 25 12:00:40 CEST 2006 - sndirsch(a)suse.de + +- updated to new 0.9.1 release + * fixes Kyra bug which made game uncompletable + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scummvm.spec ++++++ --- /var/tmp/diff_new_pack.gi0nqa/_old 2006-10-26 20:30:05.000000000 +0200 +++ /var/tmp/diff_new_pack.gi0nqa/_new 2006-10-26 20:30:05.000000000 +0200 @@ -17,7 +17,7 @@ Group: Amusements/Games/Other Autoreqprov: on Version: 0.9.1 -Release: 1 +Release: 5 Summary: Interpreter for LucasArts games Source: %name-%version.tar.bz2 Source1: %name-tools-0.9.0.tar.bz2 @@ -105,6 +105,9 @@ /usr/share/pixmaps/scummvm.xpm %changelog -n scummvm +* Wed Oct 25 2006 - sndirsch(a)suse.de +- updated to new 0.9.1 release + * fixes Kyra bug which made game uncompletable * Mon Oct 23 2006 - sndirsch(a)suse.de - updated to release 0.9.1 (2006-10-29) * New Ports: ++++++ scummvm-0.9.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scummvm-0.9.1/AUTHORS new/scummvm-0.9.1/AUTHORS --- old/scummvm-0.9.1/AUTHORS 2006-10-22 23:01:09.000000000 +0200 +++ new/scummvm-0.9.1/AUTHORS 2006-10-24 10:15:52.000000000 +0200 @@ -79,6 +79,9 @@ Dreamcast: Marcus Comstedt + GP2X: + John Willis + GP32: Won Star diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scummvm-0.9.1/doc/credits.tex new/scummvm-0.9.1/doc/credits.tex --- old/scummvm-0.9.1/doc/credits.tex 2006-10-22 23:18:11.000000000 +0200 +++ new/scummvm-0.9.1/doc/credits.tex 2006-10-24 10:15:52.000000000 +0200 @@ -126,6 +126,12 @@ Marcus Comstedt & \textit{}\\ \end{tabular} \end{list} +\item \textbf{ GP2X} +\begin{list}{}{\setlength{\leftmargin}{0.2cm}} +\item \begin{tabular}[h]{p{0.3\linewidth}p{0.6\linewidth}} + John Willis & \textit{}\\ + \end{tabular} +\end{list} \item \textbf{ GP32} \begin{list}{}{\setlength{\leftmargin}{0.2cm}} \item \begin{tabular}[h]{p{0.3\linewidth}p{0.6\linewidth}} Binary files old/scummvm-0.9.1/doc/readme.pdf and new/scummvm-0.9.1/doc/readme.pdf differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scummvm-0.9.1/engines/kyra/animator.cpp new/scummvm-0.9.1/engines/kyra/animator.cpp --- old/scummvm-0.9.1/engines/kyra/animator.cpp 2006-10-22 22:58:58.000000000 +0200 +++ new/scummvm-0.9.1/engines/kyra/animator.cpp 2006-10-24 10:15:51.000000000 +0200 @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $URL: https://svn.sourceforge.net/svnroot/scummvm/scummvm/tags/release-0-9-1/engi… $ - * $Id: animator.cpp 22707 2006-05-28 11:33:17Z lordhoto $ + * $Id: animator.cpp 24483 2006-10-24 00:46:36Z lordhoto $ * */ @@ -389,9 +389,8 @@ void ScreenAnimator::copyChangedObjectsForward(int refreshFlag) { debugC(9, kDebugLevelAnimator, "ScreenAnimator::copyChangedObjectsForward(%d)", refreshFlag); - AnimObject *curObject = _objectQueue; - while (curObject) { + for (AnimObject *curObject = _objectQueue; curObject; curObject = curObject->nextAnimObject) { if (curObject->active) { if (curObject->refreshFlag || refreshFlag) { int xpos = 0, ypos = 0, width = 0, height = 0; @@ -402,14 +401,22 @@ if (xpos < 1) { xpos = 1; - } else if (xpos + width > 39) { - width = width - (xpos + width - 39); + } else if (xpos > 39) { + continue; + } + + if (xpos + width > 39) { + width = 39 - xpos; } if (ypos < 8) { ypos = 8; - } else if (ypos + height > 135) { - height = height - (ypos + height - 136); + } else if (ypos > 136) { + continue; + } + + if (ypos + height > 136) { + height = 136 - ypos; } _screen->copyRegion(xpos << 3, ypos, xpos << 3, ypos, width << 3, height, 2, 0, Screen::CR_CLIPPED); @@ -417,8 +424,8 @@ _updateScreen = true; } } - curObject = curObject->nextAnimObject; } + if (_updateScreen) { _screen->updateScreen(); _updateScreen = false; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scummvm-0.9.1/engines/kyra/resource.cpp new/scummvm-0.9.1/engines/kyra/resource.cpp --- old/scummvm-0.9.1/engines/kyra/resource.cpp 2006-10-22 22:58:58.000000000 +0200 +++ new/scummvm-0.9.1/engines/kyra/resource.cpp 2006-10-24 10:15:51.000000000 +0200 @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $URL: https://svn.sourceforge.net/svnroot/scummvm/scummvm/tags/release-0-9-1/engi… $ - * $Id: resource.cpp 24458 2006-10-22 19:53:56Z lordhoto $ + * $Id: resource.cpp 24483 2006-10-24 00:46:36Z lordhoto $ * */ @@ -66,9 +66,9 @@ };*/ static const char *kyra1CDFilelist[] = { - "ADL.PAK", "CHAPTER1.VRM", "COL.PAK", "DRAGON1.APK", "DRAGON2.APK", "FINALE.PAK", - "INTRO1.PAK", "INTRO2.PAK", "INTRO3.PAK", "INTRO4.PAK", "MISC.PAK", "SND.PAK", - "STARTUP.PAK", "XMI.PAK", 0 + "ADL.PAK", "CHAPTER1.VRM", "COL.PAK", "FINALE.PAK", "INTRO1.PAK", "INTRO2.PAK", + "INTRO3.PAK", "INTRO4.PAK", "MISC.PAK", "SND.PAK", "STARTUP.PAK", "XMI.PAK", + "CAVE.APK", "DRAGON1.APK", "DRAGON2.APK", "LAGOON.APK", 0 }; /*static const char *kyra2CDFilelist[] = { @@ -174,6 +174,11 @@ } void Resource::unloadPakFile(const Common::String &filename) { + // never unload these! + if (scumm_stricmp(filename.c_str(), "CAVE.APK") == 0 || + scumm_stricmp(filename.c_str(), "LAGOON.APK") == 0) + return; + Common::List<PakFileEntry>::iterator start = _pakfiles.begin(); for (;start != _pakfiles.end(); ++start) { if (scumm_stricmp(start->_filename.c_str(), filename.c_str()) == 0) { @@ -181,7 +186,6 @@ break; } } - return; } bool Resource::isInPakList(const Common::String &filename) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scummvm-0.9.1/engines/kyra/screen.cpp new/scummvm-0.9.1/engines/kyra/screen.cpp --- old/scummvm-0.9.1/engines/kyra/screen.cpp 2006-10-22 22:58:58.000000000 +0200 +++ new/scummvm-0.9.1/engines/kyra/screen.cpp 2006-10-24 10:15:51.000000000 +0200 @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $URL: https://svn.sourceforge.net/svnroot/scummvm/scummvm/tags/release-0-9-1/engi… $ - * $Id: screen.cpp 23906 2006-09-17 09:54:42Z lordhoto $ + * $Id: screen.cpp 24483 2006-10-24 00:46:36Z lordhoto $ * */ @@ -2275,15 +2275,19 @@ return; } - if (w == 0 || h == 0) + if (w == 0 || h == 0 || x >= SCREEN_W || y >= SCREEN_H || x + w < 0 || y + h < 0) return; - if (x < 0) + if (x < 0) { + w += x; x = 0; + } if (x + w >= 320) w = 320 - x; - if (y < 0) + if (y < 0) { + h += y; y = 0; + } if (y + h >= 200) h = 200 - y; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scummvm-0.9.1/engines/scumm/plugin.cpp new/scummvm-0.9.1/engines/scumm/plugin.cpp --- old/scummvm-0.9.1/engines/scumm/plugin.cpp 2006-10-22 22:57:28.000000000 +0200 +++ new/scummvm-0.9.1/engines/scumm/plugin.cpp 2006-10-24 10:15:50.000000000 +0200 @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $URL: https://svn.sourceforge.net/svnroot/scummvm/scummvm/tags/release-0-9-1/engi… $ - * $Id: plugin.cpp 24096 2006-10-03 12:16:17Z kirben $ + * $Id: plugin.cpp 24482 2006-10-24 00:45:38Z kirben $ * */ @@ -114,6 +114,7 @@ { "dog", "Putt-Putt and Pep's Dog on a Stick" }, { "farm", "Let's Explore the Farm with Buzzy" }, { "football", "Backyard Football" }, + { "football2002", "Backyard Football 2002" }, { "freddi", "Freddi Fish 1: The Case of the Missing Kelp Seeds" }, { "freddi2", "Freddi Fish 2: The Case of the Haunted Schoolhouse" }, { "freddi3", "Freddi Fish 3: The Case of the Stolen Conch Shell" }, @@ -360,6 +361,7 @@ // Uses smacker in external files, for testing only {"artdemo", 0, GID_HEGAME, 6, 99, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES | GF_16BIT_COLOR, UNK}, {"readdemo", 0, GID_HEGAME, 6, 99, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES | GF_16BIT_COLOR, UNK}, + {"football2002", 0, GID_HEGAME, 6, 100, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES | GF_16BIT_COLOR, UNK}, // The following are meant to be generic HE game variants and as such do @@ -538,9 +540,10 @@ { "football", "football", kGenHEPC, UNK_LANG, UNK, 0 }, { "football", "FootBall", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 }, { "football", "FootBall Demo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 }, - { "football", "FootBall2002", kGenHEPC, UNK_LANG, UNK, 0 }, { "football", "footdemo", kGenHEPC, UNK_LANG, UNK, 0 }, + { "football2002", "FootBall2002", kGenHEPC, UNK_LANG, UNK, 0 }, + { "freddi", "freddi", kGenHEPC, UNK_LANG, UNK, 0 }, { "freddi", "freddemo", kGenHEPC, UNK_LANG, UNK, 0 }, { "freddi", "Freddi Demo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 }, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scummvm-0.9.1/engines/scumm/scumm-md5.h new/scummvm-0.9.1/engines/scumm/scumm-md5.h --- old/scummvm-0.9.1/engines/scumm/scumm-md5.h 2006-10-22 22:57:28.000000000 +0200 +++ new/scummvm-0.9.1/engines/scumm/scumm-md5.h 2006-10-24 10:15:50.000000000 +0200 @@ -1,5 +1,5 @@ /* - This file was generated by the md5table tool on Tue Oct 03 12:13:02 2006 + This file was generated by the md5table tool on Tue Oct 24 00:42:27 2006 DO NOT EDIT MANUALLY! */ @@ -352,6 +352,7 @@ { "9e5e0fb43bd22f4628719b7501adb717", "monkey", "No Adlib", "EGA", Common::FR_FRA, Common::kPlatformAtariST }, { "9fd66fb3b04703bd50da4356e4202558", "spyfox2", "", "", Common::EN_ANY, Common::kPlatformMacintosh }, { "a00554c31d623fdb9fcb0f924b89b42b", "loom", "EGA", "EGA Demo", Common::EN_ANY, Common::kPlatformPC }, + { "a095616d2d23ccf43b8e257711202cba", "football2002", "", "", Common::EN_ANY, Common::kPlatformWindows }, { "a095e33061606d231ff37dca4c64c8ac", "pajama", "HE 99", "", Common::DE_DEU, Common::kPlatformUnknown }, { "a0a7dea72003933b8b3f8b99b9f7ddeb", "loom", "No Adlib", "EGA", Common::EN_ANY, Common::kPlatformAtariST }, { "a194f15f51ee62badab74b9e7da97693", "baseball2001", "", "Demo", Common::EN_ANY, Common::kPlatformUnknown }, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scummvm-0.9.1/gui/credits.h new/scummvm-0.9.1/gui/credits.h --- old/scummvm-0.9.1/gui/credits.h 2006-10-22 22:50:13.000000000 +0200 +++ new/scummvm-0.9.1/gui/credits.h 2006-10-24 10:15:49.000000000 +0200 @@ -81,6 +81,9 @@ "\\C\\c1""Dreamcast", "\\C\\c0""Marcus Comstedt", "\\C\\c0""", +"\\C\\c1""GP2X", +"\\C\\c0""John Willis", +"\\C\\c0""", "\\C\\c1""GP32", "\\C\\c0""Won Star", "\\C\\c0""", diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scummvm-0.9.1/tools/credits.pl new/scummvm-0.9.1/tools/credits.pl --- old/scummvm-0.9.1/tools/credits.pl 2006-10-22 23:17:45.000000000 +0200 +++ new/scummvm-0.9.1/tools/credits.pl 2006-10-24 10:15:52.000000000 +0200 @@ -547,6 +547,10 @@ add_person("Marcus Comstedt", "", ""); end_section(); + begin_section("GP2X"); + add_person("John Willis", "DJWillis", ""); + end_section(); + begin_section("GP32"); add_person("Won Star", "wonst719", ""); end_section(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scummvm-0.9.1/tools/scumm-md5.txt new/scummvm-0.9.1/tools/scumm-md5.txt --- old/scummvm-0.9.1/tools/scumm-md5.txt 2006-10-22 23:17:45.000000000 +0200 +++ new/scummvm-0.9.1/tools/scumm-md5.txt 2006-10-24 10:15:52.000000000 +0200 @@ -335,6 +335,9 @@ 425205754fa749f4f0b0dd9d09fa45fd en All - Demo - Joachim Eberhard 5bd335265a61caa3d78956ad9f88ba23 en All - Demo - sev +football2002 Backyard Football 2002 + a095616d2d23ccf43b8e257711202cba en Windows - - - clone2727 + soccer Backyard Soccer 701246819d1a70573f41bf33fc19214f en All - - - sev ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 release-notes
by root＠suse.de 26 Oct '06

26 Oct '06

Hello community, here is the log from the commit of package release-notes checked in at Thu Oct 26 20:30:26 CEST 2006. -------- --- release-notes/release-notes.changes 2006-08-04 14:33:52.000000000 +0200 +++ /mounts/work_src_done/NOARCH/release-notes/release-notes.changes 2006-10-26 11:33:46.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Oct 26 11:33:14 CEST 2006 - ke(a)suse.de + +- 10.2.5: + * Preparing 10.2 beta2. + * The Standard Kernel [#205114]. + +------------------------------------------------------------------- Old: ---- release-notes-10.2.4.tar.bz2 New: ---- release-notes-10.2.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ release-notes.spec ++++++ --- /var/tmp/diff_new_pack.bJXX6U/_old 2006-10-26 20:29:57.000000000 +0200 +++ /var/tmp/diff_new_pack.bJXX6U/_new 2006-10-26 20:29:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package release-notes (Version 10.2.4) +# spec file for package release-notes (Version 10.2.5) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,13 +12,13 @@ Name: release-notes BuildRequires: docbook-xsl-stylesheets gnome-doc-utils html-dtd iso_ent libxslt openjade recode update-desktop-files xmlcharent -License: GPL +License: Other License(s), see package Group: Documentation/SuSE Summary: Most Important Changes for This SUSE Linux Release BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: kdebase-SuSE:/usr/share/doc/RELEASE_NOTES.en.html -Version: 10.2.4 +Version: 10.2.5 Release: 1 Source0: %{name}-%{version}.tar.bz2 Source8: %{name}.desktop.in @@ -81,6 +81,10 @@ %doc /usr/share/doc/release-notes %changelog -n release-notes +* Thu Oct 26 2006 - ke(a)suse.de +- 10.2.5: + * Preparing 10.2 beta2. + * The Standard Kernel [#205114]. * Fri Aug 04 2006 - ke(a)suse.de - 10.2.4: * Prepare for 10.2 alpha3. ++++++ release-notes-10.2.4.tar.bz2 -> release-notes-10.2.5.tar.bz2 ++++++ ++++ 1728 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit screen
by root＠suse.de 26 Oct '06

26 Oct '06

Hello community, here is the log from the commit of package screen checked in at Thu Oct 26 20:29:57 CEST 2006. -------- --- screen/screen.changes 2006-02-10 18:00:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/screen/screen.changes 2006-10-23 17:53:48.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Oct 23 16:11:47 CEST 2006 - mls(a)suse.de + +- fix two bugs in handling of combining characters [#214412] + +------------------------------------------------------------------- New: ---- screen-4.0.2-comb.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ screen.spec ++++++ --- /var/tmp/diff_new_pack.5copSY/_old 2006-10-26 20:29:47.000000000 +0200 +++ /var/tmp/diff_new_pack.5copSY/_new 2006-10-26 20:29:47.000000000 +0200 @@ -12,17 +12,18 @@ Name: screen BuildRequires: utempter -License: GPL +License: GNU General Public License (GPL) - all versions Group: System/Console PreReq: %install_info_prereq Autoreqprov: on Version: 4.0.2 -Release: 51 +Release: 74 Summary: A program to allow multiple screens on a VT100/ANSI Terminal Source: screen-4.0.2.tar.gz Patch: screen-4.0.2.dif Patch1: screen-__P.diff Patch2: screen-gcc4.diff +Patch3: screen-4.0.2-comb.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -45,6 +46,7 @@ %patch %patch1 %patch2 -p1 +%patch3 %build CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --infodir=%{_infodir} \ @@ -88,6 +90,8 @@ %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %changelog -n screen +* Mon Oct 23 2006 - mls(a)suse.de +- fix two bugs in handling of combining characters [#214412] * Fri Feb 10 2006 - mls(a)suse.de - enable support for 256 colors [#136684] * Thu Jan 26 2006 - sbrabec(a)suse.cz ++++++ screen-4.0.2-comb.diff ++++++ --- encoding.c.orig 2003-09-08 16:25:23.000000000 +0200 +++ encoding.c 2006-10-23 14:58:14.000000000 +0200 @@ -995,8 +995,16 @@ { /* full, recycle old entry */ if (c1 >= 0xd800 && c1 < 0xe000) - comb_tofront(root, c1); + comb_tofront(root, c1 - 0xd800); i = combchars[root]->prev; + if (c1 == i + 0xd800) + { + /* completely full, can't recycle */ + debug("utf8_handle_comp: completely full!\n"); + mc->image = '?'; + mc->font = 0; + return; + } /* FIXME: delete old char from all buffers */ } else if (!combchars[i]) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 php5-pear-mail_mime
by root＠suse.de 26 Oct '06

26 Oct '06

Hello community, here is the log from the commit of package php5-pear-mail_mime checked in at Thu Oct 26 20:29:50 CEST 2006. -------- --- php5-pear-mail_mime/php5-pear-mail_mime.changes 2006-01-25 21:47:23.000000000 +0100 +++ /mounts/work_src_done/NOARCH/php5-pear-mail_mime/php5-pear-mail_mime.changes 2006-10-26 13:52:37.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 26 13:52:25 CEST 2006 - anosek(a)suse.cz + +- fixed: pear is pulling packages from the network during autobuild + [#214347] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5-pear-mail_mime.spec ++++++ --- /var/tmp/diff_new_pack.0M4Kqp/_old 2006-10-26 20:29:25.000000000 +0200 +++ /var/tmp/diff_new_pack.0M4Kqp/_new 2006-10-26 20:29:25.000000000 +0200 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -16,7 +16,7 @@ License: Other License(s), see package, Other uncritical OpenSource License Group: Productivity/Networking/Web/Servers Version: 1.3.1 -Release: 2 +Release: 32 Summary: PEAR classes to create and decode mime messages. URL: http://pear.php.net/package/Mail_Mime Requires: php5-pear @@ -47,7 +47,7 @@ %install mv package*.xml Mail_Mime-%{version} cd Mail_Mime-%{version} -PHP_PEAR_PHP_BIN="/usr/bin/php5 -d memory_limit=50m" pear5 -v -d doc_dir=%{_docdir}/%{name} install -R "$RPM_BUILD_ROOT" package.xml +PHP_PEAR_PHP_BIN="/usr/bin/php5 -d memory_limit=50m" pear5 -v -d doc_dir=%{_docdir}/%{name} install --offline -R "$RPM_BUILD_ROOT" package.xml rm -rf "$RPM_BUILD_ROOT"/%{peardir}/.{filemap,lock,registry,channels,depdb,depdblock} %files @@ -56,6 +56,9 @@ %{peardir}/Mail/mime* %changelog -n php5-pear-mail_mime +* Thu Oct 26 2006 - anosek(a)suse.cz +- fixed: pear is pulling packages from the network during autobuild + [#214347] * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Thu Jan 19 2006 - mmarek(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-imaging
by root＠suse.de 26 Oct '06

26 Oct '06

Hello community, here is the log from the commit of package python-imaging checked in at Thu Oct 26 20:29:41 CEST 2006. -------- --- python-imaging/python-imaging.changes 2006-10-20 18:47:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-imaging/python-imaging.changes 2006-10-23 11:22:25.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Oct 23 11:22:20 CEST 2006 - meissner(a)suse.de + +- buildrequires libgphoto2-devel + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-imaging.spec ++++++ --- /var/tmp/diff_new_pack.jSdmkh/_old 2006-10-26 20:29:34.000000000 +0200 +++ /var/tmp/diff_new_pack.jSdmkh/_new 2006-10-26 20:29:34.000000000 +0200 @@ -11,11 +11,11 @@ # norootforbuild Name: python-imaging -BuildRequires: freetype2-devel giflib-devel libpng-devel libtiff-devel netpbm python-devel python-tk sane tix tk-devel xorg-x11-devel +BuildRequires: freetype2-devel giflib-devel libgphoto2-devel libpng-devel libtiff-devel netpbm python-devel python-tk sane tix tk-devel xorg-x11-devel URL: http://www.pythonware.com/products/pil/index.htm %define pyver %(python -c 'import sys; print sys.version[:3]') Version: 1.1.5 -Release: 29 +Release: 32 License: Other License(s), see package, Python Copyright Group: Development/Libraries/Python Provides: _imaging.so _imagingtk.so python_imaging_lib pyimglib @@ -113,6 +113,8 @@ %doc Sane/sanedoc.txt Sane/README Sane/CHANGES %changelog -n python-imaging +* Mon Oct 23 2006 - meissner(a)suse.de +- buildrequires libgphoto2-devel * Fri Oct 20 2006 - jmatejek(a)suse.cz - fixed minor 64bit PEP353 related problems * Thu Apr 20 2006 - jmatejek(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 pm-utils
by root＠suse.de 26 Oct '06

26 Oct '06

Hello community, here is the log from the commit of package pm-utils checked in at Thu Oct 26 20:29:28 CEST 2006. -------- --- pm-utils/pm-utils.changes 2006-10-23 18:01:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/pm-utils/pm-utils.changes 2006-10-24 17:49:13.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Oct 24 17:47:50 CEST 2006 - hmacht(a)suse.de + +- update to current CVS, some fixes incorporated upstream. +- add logging functionality +- add hook for ejecting pcmcia cards + +------------------------------------------------------------------- Old: ---- pm-utils-0.20.0.20061010-suse.diff pm-utils-0.20.0.20061010.tar.gz New: ---- pm-utils-0.20.0.20061024-suse.diff pm-utils-0.20.0.20061024.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pm-utils.spec ++++++ --- /var/tmp/diff_new_pack.p3jF5L/_old 2006-10-26 20:29:22.000000000 +0200 +++ /var/tmp/diff_new_pack.p3jF5L/_new 2006-10-26 20:29:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package pm-utils (Version 0.20.0.20061010) +# spec file for package pm-utils (Version 0.20.0.20061024) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,13 +12,13 @@ Name: pm-utils URL: http://webcvs.freedesktop.org/pm-utils/ -Version: 0.20.0.20061010 -Release: 8 +Version: 0.20.0.20061024 +Release: 1 Summary: Tools to suspend and hibernate computers. License: GNU General Public License (GPL) - all versions Group: System/Base Source: %{name}-%{version}.tar.gz -Patch0: pm-utils-0.20.0.20061010-suse.diff +Patch0: pm-utils-0.20.0.20061024-suse.diff Source1: pm-utils-suse.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build Prefix: /usr @@ -44,7 +44,7 @@ %build export CFLAGS="$RPM_OPT_FLAGS" -./configure --prefix=/usr --sysconfdir=/etc +./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man make %install @@ -68,6 +68,10 @@ %doc README COPYING ChangeLog AUTHORS %changelog -n pm-utils +* Tue Oct 24 2006 - hmacht(a)suse.de +- update to current CVS, some fixes incorporated upstream. +- add logging functionality +- add hook for ejecting pcmcia cards * Mon Oct 23 2006 - hmacht(a)suse.de - add hook to log lsmod and free * Wed Oct 11 2006 - seife(a)suse.de ++++++ pm-utils-0.20.0.20061010-suse.diff -> pm-utils-0.20.0.20061024-suse.diff ++++++ --- pm-utils/pm-utils-0.20.0.20061010-suse.diff 2006-10-11 22:32:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/pm-utils/pm-utils-0.20.0.20061024-suse.diff 2006-10-24 18:01:12.000000000 +0200 @@ -1,22 +1,21 @@ --- pm/functions +++ pm/functions -@@ -5,27 +5,30 @@ +@@ -5,7 +5,7 @@ # default values go here HIBERNATE_RESUME_POST_VIDEO=no SUSPEND_MODULES="" +-RESUME_MODULES="" +INHIBIT=/var/run/pm-utils.inhibit -+S2DISK_BIN="/usr/sbin/s2disk" -+S2DISK_CONF="/var/lib/s2disk.conf" + LOGFILE=/var/log/pm-suspend.log [ -f /etc/pm/config ] && . /etc/pm/config - +@@ -19,21 +19,20 @@ # export them all here - export HIBERNATE_RESUME_POST_VIDEO - export SUSPEND_MODULES -+export INHIBIT S2DISK_BIN S2DISK_CONF - --GLOBAL_CONFIG_VARIABLES="HIBERNATE_RESUME_POST_VIDEO SUSPEND_MODULES" -+GLOBAL_CONFIG_VARIABLES="HIBERNATE_RESUME_POST_VIDEO SUSPEND_MODULES INHIBIT" + add_global HIBERNATE_RESUME_POST_VIDEO + add_global SUSPEND_MODULES +-add_global RESUME_MODULES ++add_global INHIBIT + add_global LOGFILE source_configs() { @@ -42,7 +41,7 @@ done } -@@ -49,7 +52,7 @@ +@@ -57,7 +56,7 @@ remove_suspend_lock() { @@ -51,23 +50,33 @@ chvt 1 chvt $VT openvt -- sh -c "usleep $1 ; rm -f /.suspended >/dev/null 2>&1 0<&1" >/dev/null 2>&1 0<&1 & -@@ -60,13 +63,14 @@ +@@ -68,7 +67,7 @@ [ -z "$1" ] && return 0 [ -f /var/run/pm-suspend ] && . /var/run/pm-suspend - rm -f /var/run/pm-suspend +# rm -f /var/run/pm-suspend - files="/etc/pm/hooks/*[^~]" - if [ "$2" = "reverse" ]; then - filea=($files) - filen=${#filea[*]} - while [ "$filen" -gt 0 ]; do -+ let filen-- + echo "$(date): running $1 hooks." + +@@ -80,14 +79,14 @@ + let filen-- file="${filea[$filen]}" - [ -x $file ] && $file $1 + if [ -x $file ]; then +- echo "$i" ++ echo "===== current hook: $file =====" + $file $1 + fi done -@@ -96,20 +100,53 @@ + else + for file in $files ; do + if [ -x $file ]; then +- echo "$i" ++ echo "===== current hook: $file =====" + $file $1 + fi + done +@@ -113,24 +112,59 @@ return $RETVAL } @@ -83,8 +92,13 @@ + pm_main() { - take_suspend_lock || exit 1 + if [ -n "$LOGFILE" ]; then + [ -f "$LOGFILE" ] && rm -f "$LOGFILE" + touch "$LOGFILE" + fi ++ [ -n "$LOGFILE" ] && exec > $LOGFILE 2>&1 + + take_suspend_lock || exit 1 + rm -f $INHIBIT + run_hooks "$1" @@ -100,6 +114,7 @@ + pm-pmu --suspend || do_suspend + run_hooks resume reverse + fi ++ ;; hibernate) - echo -n "platform" > /sys/power/disk @@ -125,72 +140,23 @@ run_hooks thaw reverse ;; esac -@@ -119,13 +156,47 @@ - return 0 - } - -+# this recursively unloads the given modules and all that depend on it -+# first parameter is the module to be unloaded - modunload() - { -- lsmod 2>/dev/null | grep -q "$1" -- if [ "$?" == "0" ]; then -- echo "export ${1}_MODULE_LOAD=yes" >> /var/run/pm-suspend -- modprobe -r "$1" >/dev/null 2>&1 -- fi -+ local MOD D C USED MODS I -+ local UNL=$1 RET=1 -+ # RET is the return code. If at least one module was unloaded, return 0. -+ # if the module was not loaded, also return 0 since this is no error. -+ # if no module was unloaded successfully, return 1 -+ while read MOD D C USED D; do -+ [ "$MOD" != "$UNL" ] && continue -+ if [ "$USED" == "-" ]; then -+ if [ $C -eq 0 ]; then -+ if modprobe -r $UNL > /dev/null 2>&1; then -+ echo "export RESUME_MODULES=\"$UNL \$RESUME_MODULES\"" \ -+ >> /var/run/pm-suspend -+ RET=0 -+ else -+ echo "## could not unload '$UNL', usage count was 0" \ -+ >> /var/run/pm-suspend -+ fi -+ else -+ echo "## could not unload '$UNL', usage count: $C" \ -+ >> /var/run/pm-suspend -+ fi -+ else -+ USED=${USED//,/ } -+ MODS=($USED) -+ # it seems slightly more likely to rmmod in one pass, if we try backwards. -+ for I in `seq $[${#MODS[@]}-1] -1 0`; do -+ MOD=${MODS[$I]} -+ modunload $MOD && RET=0 -+ done -+ # if we unloaded at least one module, then let's try again! -+ [ $RET -eq 0 ] && modunload $UNL -+ RET=$? -+ fi -+ return $RET -+ done < /proc/modules -+ # if we came this far, there was nothing to do, the module is no longer loaded. -+ return 0 - } - - modreload() --- pm/hooks/50modules +++ pm/hooks/50modules -@@ -13,9 +13,8 @@ - - resume_modules() +@@ -6,6 +6,7 @@ { -- [ -z "$SUSPEND_MODULES" ] && return 0 -- for x in $SUSPEND_MODULES ; do -- modreload $x -+ for x in $RESUME_MODULES ; do -+ modprobe $x > /dev/null 2>&1 + [ -z "$SUSPEND_MODULES" ] && return 0 + for x in $SUSPEND_MODULES ; do ++ echo "trying to unload: $x" + modunload $x done return 0 +@@ -15,6 +16,7 @@ + { + [ -z "$RESUME_MODULES" ] && return 0 + for x in $RESUME_MODULES ; do ++ echo "trying to reload: $x" + modprobe $x + done } --- pm/hooks/94cpufreq +++ pm/hooks/94cpufreq @@ -199,7 +165,7 @@ savestate ${x}_governor $(cat $x/cpufreq/scaling_governor) - sh -c "echo userspace > $x/cpufreq/scaling_governor" >/dev/null 2>&1 -+ echo performance > $x/cpufreq/scaling_governor 2>/dev/null ++ sh -c "echo performance > $x/cpufreq/scaling_governor" >/dev/null 2>&1 done popd >/dev/null 2>&1 } ++++++ pm-utils-0.20.0.20061010.tar.gz -> pm-utils-0.20.0.20061024.tar.gz ++++++ ++++ 9117 lines of diff (skipped) ++++++ pm-utils-suse.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pm-utils-suse/hooks/01logging new/pm-utils-suse/hooks/01logging --- old/pm-utils-suse/hooks/01logging 1970-01-01 01:00:00.000000000 +0100 +++ new/pm-utils-suse/hooks/01logging 2006-10-24 17:44:30.000000000 +0200 @@ -0,0 +1,31 @@ +#!/bin/bash + +case "$1" in + hibernate|suspend) + # save the old loglevel + read KERNEL_LOGLEVEL DUMMY < /proc/sys/kernel/printk + echo "export KERNEL_LOGLEVEL=$KERNEL_LOGLEVEL" >> /var/run/pm-suspend + # set the loglevel so we see the progress bar. + # if the level is higher than needed, we leave it alone. + if [ $KERNEL_LOGLEVEL -lt 5 ]; then + echo 5 > /proc/sys/kernel/printk + fi + + echo "$1 initiated: `date`" + echo + echo "`lsmod`" + echo + echo "`free`" + echo + ;; + thaw|resume) + if [ -n "$KERNEL_LOGLEVEL" ] ; then + echo $KERNEL_LOGLEVEL > /proc/sys/kernel/printk + fi + ;; + *) + ;; +esac + + +exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pm-utils-suse/hooks/06autofs new/pm-utils-suse/hooks/06autofs --- old/pm-utils-suse/hooks/06autofs 1970-01-01 01:00:00.000000000 +0100 +++ new/pm-utils-suse/hooks/06autofs 2006-10-11 21:43:27.000000000 +0200 @@ -0,0 +1,16 @@ +#!/bin/bash + +. /etc/pm/functions + +case "$1" in + hibernate|suspend) + stopservice autofs + ;; + thaw|resume) + restartservice autofs + ;; + *) + ;; +esac + +exit $? diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pm-utils-suse/hooks/30s2disk-check new/pm-utils-suse/hooks/30s2disk-check --- old/pm-utils-suse/hooks/30s2disk-check 1970-01-01 01:00:00.000000000 +0100 +++ new/pm-utils-suse/hooks/30s2disk-check 2006-10-11 22:21:08.000000000 +0200 @@ -0,0 +1,100 @@ +#!/bin/bash +# +# Stefan Seyfried, SUSE Linux Products GmbH, 2006 +# mostly taken from the powersave project + +# sanity check the environment if resume will be possible after hibernate +checkhibernate() +{ + if [ -z "$IMAGE_SIZE" ]; then + IMAGE_SIZE="`awk '/^MemTotal:/ { print int($2*1024*.45) }' /proc/meminfo`" + fi + + read CMDLINE < /proc/cmdline + for CMD in $CMDLINE; do + case $CMD in + resume=*) RESUME=${CMD#*=} + break ;; + esac + done + if [ -z "$RESUME" ]; then + # DEBUG "no resume parameter" + echo "no resume parameter on kernel commandline" >> $INHIBIT + return 1 + fi + + # suspend to / resume from swap files is not yet handled. + while read DEV TYPE SIZE USED PRI; do + [ "$TYPE" != "partition" ] && continue + [ "$DEV" != "$RESUME" ] && continue + FREE=$[($SIZE-$USED)*1024] # get free space on DEV + if [ $FREE -lt $IMAGE_SIZE ]; then + IMAGE_SIZE=$[$FREE-10*1024*1024] + fi + break # we found the partition, no need to look further + done < /proc/swaps + + if [ -z "$DEV" ]; then + # DEBUG "resume partition '$RESUME' not swapon'ed" + echo "resume partition '$RESUME' not active" >> $INHIBIT + return 1 + fi + + if [ "$HIBERNATE" = "kernel" ]; then + read DEV < /sys/power/resume + if [ "$DEV" = "0:0" ]; then + # DEBUG "no resume partition set" + # maybe "resume=..." was given, but initrd did not set up + # /sys/power/resume correctly. + echo "resume device not correctly setup in /sys/power/resume" >> \ + $INHIBIT + return 1 + fi + X=$(stat -Lc '$((0x%t)):$((0x%T))' $RESUME) + RDEV=$(echo $X) + if [ "$DEV" != "$RDEV" ]; then + echo "/sys/power/resume disagrees with resume= parameter" >> \ + $INHIBIT + return 1 + fi + if [ -n "$IMAGE_SIZE" -a -w /sys/power/image_size ]; then + echo "$IMAGE_SIZE" > /sys/power/image_size 2>/dev/null + fi + fi + + if [ "$HIBERNATE" = "userspace" ]; then + rm -f $S2DISK_CONF + echo "resume device = $RESUME" >> $S2DISK_CONF + if [ -n "$IMAGE_SIZE" ]; then + echo "image size = $IMAGE_SIZE" >> $S2DISK_CONF + fi + # add the parameters from /etc/suspend.conf to /var/lib/s2disk.conf + if [ -e /etc/suspend.conf ]; then + echo "# parameters taken from /etc/suspend.conf:" >> $S2DISK_CONF + sed '/^[[:space:]]*$#\|$$/d;' /etc/suspend.conf >> $S2DISK_CONF + fi + fi + return 0 +} + +# this only makes sense on hibernate +if [ "$1" != "hibernate" ]; then + exit 0 +fi + +[ -e /etc/pm/config.d/$1 ] && . /etc/pm/config.d/$1 + +if [ -z "$HIBERNATE" ]; then + if [ -x "$S2DISK_BIN" -a -c /dev/snapshot ]; then + HIBERNATE="userspace" + else + HIBERNATE="kernel" + fi +fi + +if ! checkhibernate; then + touch $INHIBIT + exit 1 +fi + +exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pm-utils-suse/hooks/45pcmcia new/pm-utils-suse/hooks/45pcmcia --- old/pm-utils-suse/hooks/45pcmcia 1970-01-01 01:00:00.000000000 +0100 +++ new/pm-utils-suse/hooks/45pcmcia 2006-10-24 17:56:34.000000000 +0200 @@ -0,0 +1,21 @@ +#!/bin/bash + +case "$1" in + hibernate|suspend) + if [ -x "/sbin/pccardctl" ]; then + echo "ejecting PCMCIA cards..." + /sbin/pccardctl eject + fi + ;; + thaw|resume) + if [ -x "/sbin/pccardctl" ]; then + echo "inserting PCMCIA cards..." + /sbin/pccardctl insert + fi + ;; + *) + ;; +esac + + +exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pm-utils-suse/hooks/80acpi-fan new/pm-utils-suse/hooks/80acpi-fan --- old/pm-utils-suse/hooks/80acpi-fan 1970-01-01 01:00:00.000000000 +0100 +++ new/pm-utils-suse/hooks/80acpi-fan 2006-10-11 20:52:21.000000000 +0200 @@ -0,0 +1,29 @@ +#!/bin/bash +# +# Stefan Seyfried, SUSE Linux Products GmbH, 2006 +# mostly taken from the powersave project + +############################################################# +# triggers the ACPI fan(s) after resume. Since ACPI drivers +# have no suspend support, this is sometimes necessary. +# see http://article.gmane.org/gmane.linux.acpi.devel/16643 +kick-fan() +{ + local FAN DUMMY STATE + for FAN in /proc/acpi/fan/*/state; do + [ ! -e $FAN ] && continue + read DUMMY STATE < $FAN + if [ "$STATE" = "on" ]; then + echo -n 3 > $FAN + echo -n 0 > $FAN + fi + done +} + +case $1 in + thaw|resume) + kick-fan + ;; +esac + +exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pm-utils-suse/hooks/80videobios new/pm-utils-suse/hooks/80videobios --- old/pm-utils-suse/hooks/80videobios 1970-01-01 01:00:00.000000000 +0100 +++ new/pm-utils-suse/hooks/80videobios 2006-10-11 20:53:28.000000000 +0200 @@ -0,0 +1,27 @@ +#!/bin/bash +# +# Stefan Seyfried, SUSE Linux Products GmbH, 2006 +# mostly taken from the powersave project + +############################################################################# +# if the system is configured for 855resolution, we first patch the BIOS +# to avoid that the X server crashes after switching back to X +patch-bios() +{ + if [ -e /etc/sysconfig/videobios ]; then + . /etc/sysconfig/videobios + if [ "$VIDEOBIOS_PATCH" = "yes" ]; then + BIOS_INIT="/etc/init.d/boot.videobios" + # echo "patching video bios..." >> $LOGFILE + [ -x $BIOS_INIT ] && $BIOS_INIT start >/dev/null 2>&1 + fi + fi +} + +case $1 in + thaw) + patch-bios + ;; +esac + +exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pm-utils-suse/hooks/99Zgrub new/pm-utils-suse/hooks/99Zgrub --- old/pm-utils-suse/hooks/99Zgrub 1970-01-01 01:00:00.000000000 +0100 +++ new/pm-utils-suse/hooks/99Zgrub 2006-10-11 20:57:57.000000000 +0200 @@ -0,0 +1,172 @@ +#!/bin/bash +# +# Stefan Seyfried, SUSE Linux Products GmbH 2006, GPL v2 +# mostly taken from the powersave project. + +GRUBONCE="/usr/sbin/grubonce" +GRUBDEFAULT="/boot/grub/default" +GRUBDEFSAVE="/var/run/suspend.grubonce.default" +# LOGFILE="/var/log/suspend.log" + +##################################################################### +# gets a list of available kernels from /boot/grub/menu.lst +# kernels are in the array $KERNELS, output to stdout to be eval-ed. +getkernels() +{ + # DEBUG "Running getkernels()" INFO + local MENU_LST="/boot/grub/menu.lst" + local I DUMMY + declare -i I=0 J=-1 + + # build an array KERNELS with all the kernels in /boot/grub/menu.lst + # the array MENU_ENTRIES contains the corresponding menu entry numbers + # DEFAULT_BOOT contains the default entry. + while read LINE; do + case $LINE in + title*) + let J++ # increase for every menu entry, even for non-linux + # DEBUG "Found grub menu entry #${J}: '${LINE}'" INFO + ;; + default*) + DUMMY=($LINE) # "default 0 #maybe a comment" + echo "DEFAULT_BOOT=${DUMMY[1]}" # ^^[0]^^ 1 ^^[2]^ 3 ^^[4]^^ + # DEBUG "Default boot entry is '${DUMMY[1]}'" INFO + ;; + kernel*) + DUMMY=($LINE) # kernel (hd0,1)/boot/vmlinuz-ABC root=/dev/hda2 + echo "KERNELS[$I]='${DUMMY[1]##*/}'" # vmlinuz-ABC + echo "MENU_ENTRIES[$I]=$J" + # DEBUG "Found kernel entry #${I}: '${DUMMY[1]##*/}'" INFO + let I++ + ;; + *) ;; + esac + done < $MENU_LST +} + +############################################################# +# runs grubonce from the grub package to select which kernel +# to boot on next startup +grub-once() +{ + if [ -x "$GRUBONCE" ]; then + rm -f "$GRUBDEFSAVE" + if [ -e "$GRUBDEFAULT" ]; then + # echo "saving original $GRUBDEFAULT" >> $LOGFILE + cp "$GRUBDEFAULT" "$GRUBDEFSAVE" + fi + # echo "running '$GRUBONCE $1'" >> $LOGFILE + $GRUBONCE $1 + # else + # echo "$GRUBONCE not found, not preparing bootloader" >> $LOGFILE + fi +} + +############################################################# +# restore grub default after (eventually failed) resume +grub-once-restore() +{ + rm -f "$GRUBDEFAULT" + if [ -e "$GRUBDEFSAVE" ]; then + # echo "restoring original $GRUBDEFAULT" >> $LOGFILE + mv "$GRUBDEFSAVE" "$GRUBDEFAULT" + fi +} + +############################################################################# +# try to find a kernel image that matches the actually running kernel. +# We need this, if more than one kernel is installed. This works reasonably +# well with grub, if all kernels are named "vmlinuz-`uname -r`" and are +# located in /boot. If they are not, good luck ;-) +find-kernel-entry() +{ + NEXT_BOOT=-1 + ARCH=`uname -m` + declare -i I=0 + # DEBUG "running kernel: $RUNNING" DIAG + while [ -n "${KERNELS[$I]}" ]; do + BOOTING="${KERNELS[$I]}" + if IMAGE=`readlink /boot/$BOOTING` && [ -e "/boot/${IMAGE##*/}" ]; then + # DEBUG "Found kernel symlink $BOOTING => $IMAGE" INFO + BOOTING=$IMAGE + fi + case $ARCH in + ppc*) BOOTING="${BOOTING#*vmlinux-}" ;; + *) BOOTING="${BOOTING#*vmlinuz-}" ;; + esac + if [ "$RUNNING" == "$BOOTING" ]; then + NEXT_BOOT=${MENU_ENTRIES[$I]} + # DEBUG "running kernel is grub menu entry $NEXT_BOOT" DIAG + # DEBUG "kernel filename: '${KERNELS[$I]}'" DIAG + # echo "running kernel is grub menu entry $NEXT_BOOT (${KERNELS[$I]})" >> $LOGFILE + break + fi + let I++ + done + # if we have not found a kernel, issue a warning. + # if we have found a kernel, we'll do "grub-once" later, after + # prepare_suspend finished. + # if [ $NEXT_BOOT -eq -1 ]; then + # DEBUG "no kernelfile matching the running kernel found" WARN + # echo "no kernelfile matching the running kernel found" >> $LOGFILE + # fi +} + +############################################################################# +# if we did not find a kernel (or BOOT_LOADER is not GRUB) check, +# if the running kernel is still the one that will (probably) be booted for +# resume (default entry in menu.lst or, if there is none, the kernel file +# /boot/vmlinuz points to.) +# This will only work, if you use "original" SUSE kernels. +# you can always override with the config variable set to "yes" +prepare-grub() +{ + eval `getkernels` + RUNNING=`uname -r` + find-kernel-entry + + RET=0 + + if [ $NEXT_BOOT -eq -1 ]; then + # which kernel is booted with the default entry? + BOOTING="${KERNELS[$DEFAULT_BOOT]}" + # if there is no default entry (no menu.lst?) we fall back to + # the default of /boot/vmlinuz. + [ -z "$BOOTING" ] && BOOTING="vmlinuz" + if IMAGE=`readlink /boot/$BOOTING` && [ -e "/boot/${IMAGE##*/}" ]; then + BOOTING=$IMAGE + fi + BOOTING="${BOOTING#*vmlinuz-}" + # echo "running kernel: '$RUNNING', probably booting kernel: '$BOOTING'" >> $LOGFILE + if [ "$BOOTING" != "$RUNNING" ]; then + # echo "kernel version mismatch, cannot suspend to disk" >> $LOGFILE + echo "running: $RUNNING booting: $BOOTING" >> $INHIBIT + RET=1 + fi + else + # set the bootloader to the running kernel + # echo "preparing boot-loader: selecting entry $NEXT_BOOT, kernel /boot/$BOOTING" >> $LOGFILE + #T1=`date +"%s%N"` + sync; sync; sync # this is needed to speed up grub-once on reiserfs + #T2=`date +"%s%N"` + grub-once $NEXT_BOOT > /dev/null 2>&1 + #T3=`date +"%s%N"` + #S=$(((T2-T1)/100000000)); S="$((S/10)).${S:0-1}" + #G=$(((T3-T2)/100000000)); G="$((G/10)).${G:0-1}" + #echo " time needed for sync: $S seconds, time needed for grub: $G seconds." >> $LOGFILE + fi + + return $RET +} + + +###### main() + +case $1 in + hibernate) + prepare-grub + ;; + thaw) + grub-once-restore + ;; +esac ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 php5-pear-mail
by root＠suse.de 26 Oct '06

26 Oct '06

Hello community, here is the log from the commit of package php5-pear-mail checked in at Thu Oct 26 20:29:19 CEST 2006. -------- --- php5-pear-mail/php5-pear-mail.changes 2006-08-03 16:32:08.000000000 +0200 +++ /mounts/work_src_done/NOARCH/php5-pear-mail/php5-pear-mail.changes 2006-10-26 11:57:43.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 26 11:51:42 CEST 2006 - anosek(a)suse.cz + +- fixed: pear is pulling packages from the network during autobuild + [#214347] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5-pear-mail.spec ++++++ --- /var/tmp/diff_new_pack.VuBmkn/_old 2006-10-26 20:28:40.000000000 +0200 +++ /var/tmp/diff_new_pack.VuBmkn/_new 2006-10-26 20:28:40.000000000 +0200 @@ -13,10 +13,10 @@ Name: php5-pear-mail BuildRequires: php5-pear %define peardir %{_datadir}/php5/PEAR -License: BSD +License: BSD License and BSD-like Group: Productivity/Networking/Web/Servers Version: 1.1.10 -Release: 1 +Release: 19 Summary: PEAR class that provides multiple interfaces for sending emails URL: http://pear.php.net/package/Mail Requires: php5-pear @@ -48,7 +48,7 @@ %install mv package*.xml Mail-%{version} cd Mail-%{version} -PHP_PEAR_PHP_BIN="/usr/bin/php5 -d memory_limit=50m" pear5 -v -d doc_dir=%{_docdir}/%{name} install -R "$RPM_BUILD_ROOT" package.xml +PHP_PEAR_PHP_BIN="/usr/bin/php5 -d memory_limit=50m" pear5 -v -d doc_dir=%{_docdir}/%{name} install --offline -R "$RPM_BUILD_ROOT" package.xml rm -rf "$RPM_BUILD_ROOT"/%{peardir}/.{filemap,lock,registry,channels,depdb,depdblock} rm -rf "$RPM_BUILD_ROOT"/tmp @@ -60,9 +60,12 @@ %{peardir}/Mail.php %changelog -n php5-pear-mail +* Thu Oct 26 2006 - anosek(a)suse.cz +- fixed: pear is pulling packages from the network during autobuild + [#214347] * Thu Aug 03 2006 - anosek(a)suse.cz - updated to version 1.1.10 -- bugfix release + - bugfix release * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Thu Jan 19 2006 - mmarek(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-YAML
by root＠suse.de 26 Oct '06

26 Oct '06

Hello community, here is the log from the commit of package perl-YAML checked in at Thu Oct 26 20:29:16 CEST 2006. -------- --- perl-YAML/perl-YAML.changes 2006-02-17 11:17:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-YAML/perl-YAML.changes 2006-10-26 13:23:54.000000000 +0200 @@ -1,0 +2,48 @@ +Thu Oct 26 12:08:04 CEST 2006 - cwh(a)suse.de + +version: 0.62 +date: Mon Jul 3 15:41:20 PDT 2006 +changes: +- Patch from rgs for Catalyst users + +version: 0.61 +date: Sun Jul 2 15:25:08 CDT 2006 +changes: +- New CGI.pm made test fail. + +version: 0.60 +date: Fri Jun 30 21:55:55 CDT 2006 +changes: +- Changed object tag format in non backwards compatible way +- Removed support for folded scalar emission +- Added new tests +- Sync with YAML::Syck + +version: 0.58 +date: Tue Feb 14 12:42:34 PST 2006 +changes: +- Fixed bug reported by Slaven Rezic on 5.8.0 +- Fixed a ysh bug reported on rt. 17589 + +version: 0.57 +date: Wed Feb 1 23:06:25 PST 2006 +changes: +- Add obligatory '1;' to end of each module. + +version: 0.56 +date: Mon Jan 30 10:26:33 PST 2006 +change: +- Add Module::Install::TestBase support + +version: 0.55 +date: Sun Jan 29 19:03:35 PST 2006 +change: +- Load YAML::Node because Module::Build expects it to be loaded. + We can undo this when Module::Build starts loading it for itself. + +version: 0.54 +date: Sun Jan 29 17:28:46 PST 2006 +change: +- Remove dependency on Class::Spiffy (and/or Spiffy). + +------------------------------------------------------------------- Old: ---- YAML-0.53.tar.gz New: ---- YAML-0.62.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-YAML.spec ++++++ --- /var/tmp/diff_new_pack.tGKOxh/_old 2006-10-26 20:28:49.000000000 +0200 +++ /var/tmp/diff_new_pack.tGKOxh/_new 2006-10-26 20:28:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package perl-YAML (Version 0.53) +# spec file for package perl-YAML (Version 0.62) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,15 +11,15 @@ # norootforbuild Name: perl-YAML -BuildRequires: perl-Class-Spiffy perl-Test-Base +BuildRequires: perl-Test-Base URL: http://search.cpan.org/~ingy/YAML License: Artistic License Group: Development/Languages/Perl -Requires: perl = %{perl_version} perl-Class-Spiffy >= 0.12 +Requires: perl = %{perl_version} Autoreqprov: on Summary: YAML - YAML Ain't Markup Language (tm) -Version: 0.53 -Release: 3 +Version: 0.62 +Release: 1 Source: YAML-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -54,7 +54,7 @@ %files %defattr(-,root,root) -%doc README MANIFEST Changes ToDo +%doc README MANIFEST Changes %dir %{perl_vendorlib}/YAML %dir %{perl_vendorarch}/auto/YAML /usr/bin/ysh @@ -86,9 +86,48 @@ %doc %{_mandir}/man3/YAML::Node.3pm.gz %doc %{_mandir}/man3/YAML::Tag.3pm.gz %doc %{_mandir}/man3/YAML::Types.3pm.gz +%doc %{_mandir}/man3/Test::YAML.3pm.gz /var/adm/perl-modules/%{name} %changelog -n perl-YAML +* Thu Oct 26 2006 - cwh(a)suse.de + version: 0.62 + date: Mon Jul 3 15:41:20 PDT 2006 + changes: +- Patch from rgs for Catalyst users + version: 0.61 + date: Sun Jul 2 15:25:08 CDT 2006 + changes: +- New CGI.pm made test fail. + version: 0.60 + date: Fri Jun 30 21:55:55 CDT 2006 + changes: +- Changed object tag format in non backwards compatible way +- Removed support for folded scalar emission +- Added new tests +- Sync with YAML::Syck + version: 0.58 + date: Tue Feb 14 12:42:34 PST 2006 + changes: +- Fixed bug reported by Slaven Rezic on 5.8.0 +- Fixed a ysh bug reported on rt. 17589 + version: 0.57 + date: Wed Feb 1 23:06:25 PST 2006 + changes: +- Add obligatory '1;' to end of each module. + version: 0.56 + date: Mon Jan 30 10:26:33 PST 2006 + change: +- Add Module::Install::TestBase support + version: 0.55 + date: Sun Jan 29 19:03:35 PST 2006 + change: +- Load YAML::Node because Module::Build expects it to be loaded. + We can undo this when Module::Build starts loading it for itself. + version: 0.54 + date: Sun Jan 29 17:28:46 PST 2006 + change: +- Remove dependency on Class::Spiffy (and/or Spiffy). * Fri Feb 17 2006 - cwh(a)suse.de - Fixed dependency (wrong version of perl-Class-Spiffy) * Wed Jan 25 2006 - mls(a)suse.de ++++++ YAML-0.53.tar.gz -> YAML-0.62.tar.gz ++++++ ++++ 6316 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Test-Base
by root＠suse.de 26 Oct '06

26 Oct '06

Hello community, here is the log from the commit of package perl-Test-Base checked in at Thu Oct 26 20:28:44 CEST 2006. -------- --- perl-Test-Base/perl-Test-Base.changes 2006-01-25 21:39:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Test-Base/perl-Test-Base.changes 2006-10-25 15:34:24.000000000 +0200 @@ -1,0 +2,29 @@ +Wed Oct 25 15:34:00 CEST 2006 - cwh(a)suse.de + +version: 0.52 +date: Mon Jun 19 10:44:53 PDT 2006 +changes: +- Add use_ok to exports + +version: 0.51 +date: Fri Jun 16 13:05:22 PDT 2006 +changes: +- Remove build-requires dep of Spiffy for Module::Install::TestBase +- Add in a patch from the good folk at Socialtext. + +version: 0.50 +date: Mon Jan 30 10:52:52 PST 2006 +changes: +- No change. 0.49 got borked on the way to CPAN + +version: 0.49 +date: Mon Jan 30 10:52:48 PST 2006 +changes: +- Added Module::Install::TestBase + +version: 0.48 +date: Sun Jan 29 10:19:46 PST 2006 +changes: +- Fixed test failures on windows + +------------------------------------------------------------------- Old: ---- Test-Base-0.47.tar.gz New: ---- Test-Base-0.52.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Test-Base.spec ++++++ --- /var/tmp/diff_new_pack.03L48z/_old 2006-10-26 20:28:34.000000000 +0200 +++ /var/tmp/diff_new_pack.03L48z/_new 2006-10-26 20:28:34.000000000 +0200 @@ -1,24 +1,24 @@ # -# spec file for package perl-Test-Base (Version 0.47) +# spec file for package perl-Test-Base (Version 0.52) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: perl-Test-Base -BuildRequires: perl-Spiffy +BuildRequires: perl-Spiffy >= 0.3 URL: http://search.cpan.org/~ingy/Test-Base License: Artistic License Group: Development/Languages/Perl -Requires: perl = %{perl_version} perl-Spiffy +Requires: perl = %{perl_version} perl-Spiffy >= 0.3 Autoreqprov: on Summary: Perl module for easily writing own test framework base classes. -Version: 0.47 +Version: 0.52 Release: 1 Source: Test-Base-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -55,19 +55,45 @@ %files %defattr(-,root,root) -%doc README ToDo Changes +%doc README Changes %dir %{perl_vendorlib}/Test %dir %{perl_vendorlib}/Test/Base %dir %{perl_vendorarch}/auto/Test %dir %{perl_vendorarch}/auto/Test/Base %doc %{_mandir}/man3/Test::Base.3pm.gz %doc %{_mandir}/man3/Test::Base::Filter.3pm.gz +%doc %{_mandir}/man3/Module::Install::TestBase.3pm.gz %{perl_vendorlib}/Test/Base.pm %{perl_vendorlib}/Test/Base/Filter.pm +%dir %{perl_vendorlib}/Module +%dir %{perl_vendorlib}/Module/Install +%{perl_vendorlib}/Module/Install/TestBase.pm %{perl_vendorarch}/auto/Test/Base/.packlist /var/adm/perl-modules/%{name} %changelog -n perl-Test-Base +* Wed Oct 25 2006 - cwh(a)suse.de + version: 0.52 + date: Mon Jun 19 10:44:53 PDT 2006 + changes: +- Add use_ok to exports + version: 0.51 + date: Fri Jun 16 13:05:22 PDT 2006 + changes: +- Remove build-requires dep of Spiffy for Module::Install::TestBase +- Add in a patch from the good folk at Socialtext. + version: 0.50 + date: Mon Jan 30 10:52:52 PST 2006 + changes: +- No change. 0.49 got borked on the way to CPAN + version: 0.49 + date: Mon Jan 30 10:52:48 PST 2006 + changes: +- Added Module::Install::TestBase + version: 0.48 + date: Sun Jan 29 10:19:46 PST 2006 + changes: +- Fixed test failures on windows * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Fri Jan 20 2006 - cwh(a)suse.de ++++++ Test-Base-0.47.tar.gz -> Test-Base-0.52.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Test-Base-0.47/Changes new/Test-Base-0.52/Changes --- old/Test-Base-0.47/Changes 2006-01-19 20:03:23.000000000 +0100 +++ new/Test-Base-0.52/Changes 2006-06-19 19:46:15.000000000 +0200 @@ -1,4 +1,30 @@ --- +version: 0.52 +date: Mon Jun 19 10:44:53 PDT 2006 +changes: +- Add use_ok to exports +--- +version: 0.51 +date: Fri Jun 16 13:05:22 PDT 2006 +changes: +- Remove build-requires dep of Spiffy for Module::Install::TestBase +- Add in a patch from the good folk at Socialtext. +--- +version: 0.50 +date: Mon Jan 30 10:52:52 PST 2006 +changes: +- No change. 0.49 got borked on the way to CPAN +--- +version: 0.49 +date: Mon Jan 30 10:52:48 PST 2006 +changes: +- Added Module::Install::TestBase +--- +version: 0.48 +date: Sun Jan 29 10:19:46 PST 2006 +changes: +- Fixed test failures on windows +--- version: 0.47 date: Thu Jan 19 10:59:37 PST 2006 changes: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Test-Base-0.47/MANIFEST new/Test-Base-0.52/MANIFEST --- old/Test-Base-0.47/MANIFEST 2006-01-19 20:04:05.000000000 +0100 +++ new/Test-Base-0.52/MANIFEST 2006-06-16 22:08:18.000000000 +0200 @@ -7,6 +7,7 @@ inc/Module/Install/Metadata.pm inc/Module/Install/Win32.pm inc/Module/Install/WriteAll.pm +lib/Module/Install/TestBase.pm lib/Test/Base.pm lib/Test/Base/Filter.pm Makefile.PL @@ -123,4 +124,3 @@ t/xxx.t t/yaml.t t/zero-blocks.t -ToDo diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Test-Base-0.47/META.yml new/Test-Base-0.52/META.yml --- old/Test-Base-0.47/META.yml 2006-01-14 14:33:45.000000000 +0100 +++ new/Test-Base-0.52/META.yml 2006-06-19 19:46:40.000000000 +0200 @@ -5,14 +5,12 @@ - t generated_by: Module::Install version 0.54 distribution_type: module -version: 0.45 +version: 0.52 name: Test-Base author: "Ingy d\xC3\xB6t Net <ingy(a)cpan.org>" license: perl requires: - Text::Diff: 0.35 Test::More: 0.62 perl: 5.6.1 - Spiffy: 0.24 - Algorithm::Diff: 1.15 + Spiffy: 0.30 abstract: A Data Driven Testing Framework diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Test-Base-0.47/Makefile.PL new/Test-Base-0.52/Makefile.PL --- old/Test-Base-0.47/Makefile.PL 2006-01-19 20:00:51.000000000 +0100 +++ new/Test-Base-0.52/Makefile.PL 2006-04-07 04:25:02.000000000 +0200 @@ -4,7 +4,7 @@ all_from 'lib/Test/Base.pm'; requires perl => '5.6.1'; -requires Spiffy => '0.29'; +requires Spiffy => '0.30'; requires Test::More => '0.62'; clean_files 't/output'; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Test-Base-0.47/README new/Test-Base-0.52/README --- old/Test-Base-0.47/README 2006-01-10 06:03:36.000000000 +0100 +++ new/Test-Base-0.52/README 2006-04-07 04:25:02.000000000 +0200 @@ -25,11 +25,15 @@ plan tests => 1 * blocks; run_is input => 'expected'; + + sub local_filter { + s/my/your/; + } __END__ === Test one (the name of the test) - --- input my_filter + --- input my_filter local_filter my input lines @@ -561,8 +565,27 @@ The first line in "some_func" allows it to be called as either a function or a method in the test code. +DISTRIBUTION SUPPORT + You might be thinking that you do not want to use Test::Base in you + modules, because it adds an installation dependency. Fear not. + Module::Build takes care of that. + + Just write a Makefile.PL that looks something like this: + + use inc::Module::Install; + + name 'Foo'; + all_from 'lib/Foo.pm'; + + use_test_base; + + WriteAll; + + The line with "use_test_base" will automatically bundle all the code the + user needs to run Test::Base based tests. + OTHER COOL FEATURES - Test::Base automatically adds + Test::Base automatically adds: use strict; use warnings; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Test-Base-0.47/ToDo new/Test-Base-0.52/ToDo --- old/Test-Base-0.47/ToDo 2006-01-08 20:39:31.000000000 +0100 +++ new/Test-Base-0.52/ToDo 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -== 0.45 release - -- add no_diff -- allow multiple levels of module inheritance -- allow coment area after the description -- update module dependencies - - -== future release -- allow other markups (like perl) for data driven stuff diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Test-Base-0.47/lib/Module/Install/TestBase.pm new/Test-Base-0.52/lib/Module/Install/TestBase.pm --- old/Test-Base-0.47/lib/Module/Install/TestBase.pm 1970-01-01 01:00:00.000000000 +0100 +++ new/Test-Base-0.52/lib/Module/Install/TestBase.pm 2006-06-16 22:03:28.000000000 +0200 @@ -0,0 +1,67 @@ +package Module::Install::TestBase; +use strict; +use warnings; + +use Module::Install::Base; + +use vars qw($VERSION @ISA); +BEGIN { + $VERSION = '0.11'; + @ISA = 'Module::Install::Base'; +} + +sub use_test_base { + my $self = shift; + $self->include('Test::Base'); + $self->include('Test::Base::Filter'); + $self->include('Spiffy'); + $self->include('Test::More'); + $self->include('Test::Builder'); + $self->include('Test::Builder::Module'); +} + +1; + +=head1 NAME + +Module::Install::TestBase - Module::Install Support for Test::Base + +=head1 SYNOPSIS + + use inc::Module::Install; + + name 'Foo'; + all_from 'lib/Foo.pm'; + + use_test_base; + + WriteAll; + +=head1 DESCRIPTION + +This module adds the C<use_test_base> directive to Module::Install. + +Now you can get full Test-Base support for you module with no external +dependency on Test::Base. + +Just add this line to your Makefile.PL: + + use_test_base; + +That's it. Really. Now Test::Base is bundled into your module, so that +it is no longer any burden on the person installing your module. + +=head1 AUTHOR + +Ingy döt Net <ingy(a)cpan.org> + +=head1 COPYRIGHT + +Copyright (c) 2006. Ingy döt Net. All rights reserved. + +This program is free software; you can redistribute it and/or modify it +under the same terms as Perl itself. + +See L<http://www.perl.com/perl/misc/Artistic.html> + +=cut diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Test-Base-0.47/lib/Test/Base.pm new/Test-Base-0.52/lib/Test/Base.pm --- old/Test-Base-0.47/lib/Test/Base.pm 2006-01-19 19:55:34.000000000 +0100 +++ new/Test-Base-0.52/lib/Test/Base.pm 2006-06-19 19:44:43.000000000 +0200 @@ -2,9 +2,9 @@ # package Test::Base; use 5.006001; -use Spiffy 0.29 -Base; +use Spiffy 0.30 -Base; use Spiffy ':XXX'; -our $VERSION = '0.47'; +our $VERSION = '0.52'; my @test_more_exports; BEGIN { @@ -13,9 +13,11 @@ skip todo_skip pass fail eq_array eq_hash eq_set plan can_ok isa_ok diag + use_ok $TODO ); } + use Test::More import => \@test_more_exports; use Carp; @@ -75,11 +77,18 @@ # unless $default_class->isa($class); # } - if (@_ > 1 and not grep /^-base$/i, @_) { - my @args = @_; - shift @args; - Test::More->import(import => \@test_more_exports, @args); - } + unless (grep /^-base$/i, @_) { + my @args; + for (my $ii = 1; $ii <= $#_; ++$ii) { + if ($_[$ii] eq '-package') { + ++$ii; + } else { + push @args, $_[$ii]; + } + } + Test::More->import(import => \@test_more_exports, @args) + if @args; + } _strict_warnings(); goto &Spiffy::import; @@ -655,11 +664,15 @@ plan tests => 1 * blocks; run_is input => 'expected'; + + sub local_filter { + s/my/your/; + } __END__ === Test one (the name of the test) - --- input my_filter + --- input my_filter local_filter my input lines @@ -1230,9 +1243,29 @@ The first line in C<some_func> allows it to be called as either a function or a method in the test code. +=head1 DISTRIBUTION SUPPORT + +You might be thinking that you do not want to use Test::Base in you +modules, because it adds an installation dependency. Fear not. +Module::Build takes care of that. + +Just write a Makefile.PL that looks something like this: + + use inc::Module::Install; + + name 'Foo'; + all_from 'lib/Foo.pm'; + + use_test_base; + + WriteAll; + +The line with C<use_test_base> will automatically bundle all the code +the user needs to run Test::Base based tests. + =head1 OTHER COOL FEATURES -Test::Base automatically adds +Test::Base automatically adds: use strict; use warnings; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Test-Base-0.47/t/diff_is.t new/Test-Base-0.52/t/diff_is.t --- old/Test-Base-0.47/t/diff_is.t 2006-01-14 18:25:17.000000000 +0100 +++ new/Test-Base-0.52/t/diff_is.t 2006-04-07 04:25:02.000000000 +0200 @@ -1,6 +1,10 @@ use Test::Base tests => 3; SKIP: { + if ($^O eq 'MSWin32') { + skip 'Win32 doesn\'t have /tmp', 3; + } + unless (Test::Base->have_text_diff) { skip 'The autodiffing feature of Test::Base (which rocketh) requires Text-Diff-0.35 and Algorithm-Diff-1.15 (or greater).', 3; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Test-Base-0.47/t/export.t new/Test-Base-0.52/t/export.t --- old/Test-Base-0.47/t/export.t 2005-06-20 10:43:14.000000000 +0200 +++ new/Test-Base-0.52/t/export.t 2006-06-19 19:44:33.000000000 +0200 @@ -1,6 +1,6 @@ use Test::Base; -plan tests => 40; +plan tests => 41; ok(defined &plan); ok(defined &ok); @@ -20,6 +20,7 @@ ok(defined &can_ok); ok(defined &isa_ok); ok(defined &diag); +ok(defined &use_ok); ok(defined &blocks); ok(defined &next_block); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Test-Base-0.47/t/xxx.t new/Test-Base-0.52/t/xxx.t --- old/Test-Base-0.47/t/xxx.t 2005-06-20 11:48:04.000000000 +0200 +++ new/Test-Base-0.52/t/xxx.t 2006-04-07 04:25:02.000000000 +0200 @@ -7,7 +7,11 @@ my ($block) = blocks; eval { XXX($block->text) }; -is $@, $block->xxx, $block->name; + +my $error = "$@"; +$error =~ s/\\/\//g; + +is $error, $block->xxx, $block->name; __DATA__ === XXX Test ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 php5-pear-log
by root＠suse.de 26 Oct '06

26 Oct '06

Hello community, here is the log from the commit of package php5-pear-log checked in at Thu Oct 26 20:28:35 CEST 2006. -------- --- php5-pear-log/php5-pear-log.changes 2006-08-03 15:48:52.000000000 +0200 +++ /mounts/work_src_done/NOARCH/php5-pear-log/php5-pear-log.changes 2006-10-26 13:52:47.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 26 13:52:40 CEST 2006 - anosek(a)suse.cz + +- fixed: pear is pulling packages from the network during autobuild + [#214347] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5-pear-log.spec ++++++ --- /var/tmp/diff_new_pack.aUNwhR/_old 2006-10-26 20:28:13.000000000 +0200 +++ /var/tmp/diff_new_pack.aUNwhR/_new 2006-10-26 20:28:13.000000000 +0200 @@ -13,10 +13,10 @@ Name: php5-pear-log BuildRequires: php5-pear %define peardir %{_datadir}/php5/PEAR -License: Other uncritical OpenSource License, Other License(s), see package +License: Other License(s), see package Group: Productivity/Networking/Web/Servers Version: 1.9.8 -Release: 1 +Release: 19 Summary: PEAR Logging utilities URL: http://pear.php.net/package/Log Requires: php5-pear @@ -44,7 +44,7 @@ %install mv package*.xml Log-%{version} cd Log-%{version} -PHP_PEAR_PHP_BIN="/usr/bin/php5 -d memory_limit=50m" pear5 -v -d doc_dir=%{_docdir}/%{name} install -R "$RPM_BUILD_ROOT" package.xml +PHP_PEAR_PHP_BIN="/usr/bin/php5 -d memory_limit=50m" pear5 -v -d doc_dir=%{_docdir}/%{name} install --offline -R "$RPM_BUILD_ROOT" package.xml rm -rf "$RPM_BUILD_ROOT"/%{peardir}/.{filemap,lock,registry,channels,depdb,depdblock} "$RPM_BUILD_ROOT/tmp" %clean @@ -60,6 +60,9 @@ %doc %{_docdir}/%{name} %changelog -n php5-pear-log +* Thu Oct 26 2006 - anosek(a)suse.cz +- fixed: pear is pulling packages from the network during autobuild + [#214347] * Thu Aug 03 2006 - mmarek(a)suse.cz - updated to version 1.9.8 * documentation on logging PHP assertions and exceptions ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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