February 2012 - openSUSE Commits - openSUSE Mailing Lists

commit stardict-dic-enru-mueller7 for openSUSE:Factory
by root＠hilbert.suse.de 29 Feb '12

29 Feb '12

Hello community, here is the log from the commit of package stardict-dic-enru-mueller7 for openSUSE:Factory checked in at 2012-02-29 14:11:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/stardict-dic-enru-mueller7 (Old) and /work/SRC/openSUSE:Factory/.stardict-dic-enru-mueller7.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "stardict-dic-enru-mueller7", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/stardict-dic-enru-mueller7/stardict-dic-enru-mueller7.changes 2011-09-23 12:46:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.stardict-dic-enru-mueller7.new/stardict-dic-enru-mueller7.changes 2012-02-29 14:11:44.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 28 14:47:48 UTC 2012 - kkirill(a)opensuse.org + +- Removed "Provides: locale(stardict:en)" line to avoid installing + the dictionary for English environment. Fixed bnc#693083 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ stardict-dic-enru-mueller7.spec ++++++ --- /var/tmp/diff_new_pack.eFwCt8/_old 2012-02-29 14:11:45.000000000 +0100 +++ /var/tmp/diff_new_pack.eFwCt8/_new 2012-02-29 14:11:45.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package stardict-dic-enru-mueller7 (Version 1.2) +# spec file for package stardict-dic-enru-mueller7 # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,6 @@ License: GPL-2.0+ Group: Productivity/Office/Dictionary Url: http://mueller-dic.chat.ru/ -Provides: locale(stardict:en) Provides: locale(stardict:ru) BuildArch: noarch %if 0%{?suse_version} > 1020 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sound-juicer for openSUSE:Factory
by root＠hilbert.suse.de 29 Feb '12

29 Feb '12

Hello community, here is the log from the commit of package sound-juicer for openSUSE:Factory checked in at 2012-02-29 14:11:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sound-juicer (Old) and /work/SRC/openSUSE:Factory/.sound-juicer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sound-juicer", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/sound-juicer/sound-juicer.changes 2011-09-23 12:46:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sound-juicer.new/sound-juicer.changes 2012-02-29 14:11:35.000000000 +0100 @@ -1,0 +2,19 @@ +Sun Feb 19 14:39:30 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 3.3.90: + + Use libmusicbrainz4, fixing lookup problems + + Use GstEncodingProfile instead of GnomeMediaProfile + + Complete port to GTK+ 3, don't build on GTK+ 2 + + High resolution icon + + Work on Solaris + + Lots of cleanups and crashes fixes + + Updated translations +- Drop sound-juicer-g3.patch: Upstream moved completely to gtk3. +- Remove gnome-common BuildRequires and call to autogen.sh, as we + no longer carry any patches. +- Remove now unneeded BuildRequires: dbus-1-glib-devel, gcc-c++ and + pkgconfig(libgnome-media-profiles-3.0). +- Add sound-juicer-no-dbus.patch: Remove last reference to dbus in + test binaries. + +------------------------------------------------------------------- Old: ---- sound-juicer-2.32.0.tar.bz2 sound-juicer-g3.patch New: ---- sound-juicer-3.3.90.tar.xz sound-juicer-no-dbus.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sound-juicer.spec ++++++ --- /var/tmp/diff_new_pack.oslCuW/_old 2012-02-29 14:11:38.000000000 +0100 +++ /var/tmp/diff_new_pack.oslCuW/_new 2012-02-29 14:11:38.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package sound-juicer # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,24 +16,20 @@ # - Name: sound-juicer -Version: 2.32.0 -Release: 11 -License: GPL-2.0+ +Version: 3.3.90 +Release: 0 +# FIXME: move to libmusicbrainz4 when it enters Factory (sr#107049) Summary: Clean and Lean GNOME CD Ripper -Url: http://www.burtonini.com/blog/computers/sound-juicer/ +License: GPL-2.0+ Group: Productivity/Multimedia/CD/Grabbers -Source0: ftp://ftp.gnome.org/pub/gnome/sources/sound-juicer/2.32/%{name}-%{version}.… -# PATCH-FIX-UPSTREAM sound-juicer-g3.patch dimstar(a)opensuse.org -- Fix build against GNOME3, patches collected from git. Contain all relevant fixes until d548a011 (May 23 2011) -Patch0: sound-juicer-g3.patch +Url: http://www.burtonini.com/blog/computers/sound-juicer/ +Source0: http://download.gnome.org/sources/sound-juicer/3.3/%{name}-%{version}.tar.xz +#PATCH-FIX-UPSTREAM sound-juicer-no-dbus.patch bgo#670397 dimstar(a)opensuse.org -- Don't reference dbus anymore. Patch taken from upstream git, limited to the actual code changes, so no rebootstrap is needed (DBUS_LIBS is undefined anyway). +Patch0: sound-juicer-no-dbus.patch BuildRequires: brasero-devel -BuildRequires: dbus-1-glib-devel BuildRequires: fdupes -BuildRequires: gcc-c++ BuildRequires: gconf2-devel -# Needed for Patch0 -BuildRequires: gnome-common BuildRequires: gnome-doc-utils-devel BuildRequires: gstreamer010-plugins-base-devel BuildRequires: gstreamer010-plugins-good @@ -42,7 +38,6 @@ BuildRequires: libmusicbrainz3-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -BuildRequires: pkgconfig(libgnome-media-profiles-3.0) Requires: gstreamer010-plugins-good Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -58,7 +53,6 @@ translation-update-upstream %build -NOCONFIGURE=1 ./autogen.sh %configure\ --disable-schemas-install\ --disable-scrollkeeper ++++++ sound-juicer-no-dbus.patch ++++++ Index: sound-juicer-3.3.90/tests/mb-test.c =================================================================== --- sound-juicer-3.3.90.orig/tests/mb-test.c +++ sound-juicer-3.3.90/tests/mb-test.c @@ -2,7 +2,6 @@ #include <brasero-medium-monitor.h> #include <glib.h> #include <gconf/gconf-client.h> -#include <dbus/dbus.h> #include <stdlib.h> #include "sj-structures.h" #include "sj-metadata.h" @@ -98,8 +97,6 @@ int main (int argc, char** argv) GError *error = NULL; BraseroMediumMonitor *monitor; - dbus_threads_init_default (); - g_type_init (); g_thread_init (NULL); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-thor for openSUSE:Factory
by root＠hilbert.suse.de 29 Feb '12

29 Feb '12

Hello community, here is the log from the commit of package rubygem-thor for openSUSE:Factory checked in at 2012-02-29 14:11:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-thor (Old) and /work/SRC/openSUSE:Factory/.rubygem-thor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-thor", Maintainer is "MRueckert(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-thor/rubygem-thor.changes 2011-11-07 14:29:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-thor.new/rubygem-thor.changes 2012-02-29 14:11:24.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 20 23:58:46 UTC 2012 - mrueckert(a)suse.de + +- added missing provides + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-thor.spec ++++++ --- /var/tmp/diff_new_pack.bQ7wbe/_old 2012-02-29 14:11:25.000000000 +0100 +++ /var/tmp/diff_new_pack.bQ7wbe/_new 2012-02-29 14:11:25.000000000 +0100 @@ -30,6 +30,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: rubygems_with_buildroot_patch %rubygems_requires +Provides: rubygem-%{mod_name}-0 = %{version}-%{release} Provides: rubygem-%{mod_name}-0_14 = %{version}-%{release} # Url: http://github.com/wycats/thor -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit redis for openSUSE:Factory
by root＠hilbert.suse.de 29 Feb '12

29 Feb '12

Hello community, here is the log from the commit of package redis for openSUSE:Factory checked in at 2012-02-29 14:11:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/redis (Old) and /work/SRC/openSUSE:Factory/.redis.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "redis", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/redis/redis.changes 2011-11-28 18:27:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.redis.new/redis.changes 2012-02-29 14:11:13.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Nov 24 09:56:41 UTC 2011 - saschpe(a)suse.de + +- Correct the 'how to get it running' comment in %post + +------------------------------------------------------------------- +Thu Nov 24 09:48:13 UTC 2011 - saschpe(a)suse.de + +- Don't use runlevel 4 in init script +- Compile with RPM_OPT_FLAGS (PROG env var didn't cut it) +- Remove outdated %clean section, bogus doc package (there are none) + and netcat runtime dependency (for init script?) +- Set license to SDPX style + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ redis.spec ++++++ --- /var/tmp/diff_new_pack.onIDC8/_old 2012-02-29 14:11:14.000000000 +0100 +++ /var/tmp/diff_new_pack.onIDC8/_new 2012-02-29 14:11:14.000000000 +0100 @@ -1,3 +1,4 @@ +# # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties @@ -12,35 +13,30 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -%define _data_dir %{_var}/lib/%{name} -%define _log_dir %{_var}/log/%{name} +%define _data_dir %{_localstatedir}/lib/%{name} +%define _log_dir %{_localstatedir}/log/%{name} Name: redis Version: 2.4.1 -Release: 1 -# -License: BSD License -Group: Productivity/Databases/Servers +Release: 0 +License: BSD-3-Clause Summary: Persistent key-value database Url: http://redis.io/ -# +Group: Productivity/Databases/Servers Source: http://redis.googlecode.com/files/%{name}-%{version}.tar.gz Source1: %{name}.logrotate Source4: redis.sysconfig -# +# PATCH-FIX-OPENSUSE -- openSUSE-style init script Patch0: %{name}-initscript.patch +# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch1: %{name}-conf.patch +# PATCH-FIX-UPSTREAM -- Fixed AOF: Server should have been started: Expected '1' to equal or match '0' Patch2: skip-aof-test.patch -# -BuildRoot: %{_tmppath}/%{name}-%{version}-build -# for init script -Requires: netcat -Requires: logrotate - # for make test BuildRequires: tcl +Requires: logrotate +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Redis is an advanced key-value store. It is similar to memcached but the dataset @@ -50,61 +46,38 @@ side union, intersection, difference between sets, and so forth. Redis supports different kind of sorting abilities. -%package doc -Summary: HTML documentation for redis -Group: Productivity/Databases/Servers -Requires: redis = %{version} - -%description doc -HTML documentation for redis database. - %prep %setup -q %patch0 %patch1 - -# skip-aof-test.patch -# Failures: - Fixed AOF: Server should have been started: Expected '1' to equal or match '0' %patch2 -p1 -# Documents are not available in this build -#mv doc html - %build -make PROF="%{optflags}" %{?jobs:-j%jobs} +CFLAGS="%{optflags}" make %{?_smp_mflags} %install -%{__install} -Dd -m 0755 \ - %{buildroot}%{_sysconfdir}/init.d \ - %{buildroot}%{_sysconfdir}/logrotate.d \ - %{buildroot}%{_bindir} \ - %{buildroot}%{_libdir} \ - %{buildroot}%{_sbindir} \ - %{buildroot}%{_log_dir} \ - %{buildroot}%{_data_dir} - -%{__install} -m 0755 src/redis-benchmark %{buildroot}%{_bindir}/redis-benchmark -%{__install} -m 0755 src/redis-cli %{buildroot}%{_bindir}/redis-cli -%{__install} -m 0755 src/redis-check-dump %{buildroot}%{_bindir}/redis-check-dump -%{__install} -m 0755 src/redis-check-aof %{buildroot}%{_bindir}/redis-check-aof -%{__install} -m 0755 src/redis-server %{buildroot}%{_sbindir}/redis-server -%{__install} -m 0640 redis.conf %{buildroot}%{_sysconfdir}/redis.conf -## %{__install} -Dp -m 0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/redis +install -d %{buildroot}%{_log_dir} %{buildroot}%{_data_dir} + +install -D -m 0755 src/redis-benchmark %{buildroot}%{_bindir}/redis-benchmark +install -m 0755 src/redis-cli %{buildroot}%{_bindir}/redis-cli +install -m 0755 src/redis-check-dump %{buildroot}%{_bindir}/redis-check-dump +install -m 0755 src/redis-check-aof %{buildroot}%{_bindir}/redis-check-aof +install -D -m 0755 src/redis-server %{buildroot}%{_sbindir}/redis-server +install -D -m 0640 redis.conf %{buildroot}%{_sysconfdir}/redis.conf +## install -Dp -m 0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/redis # # init # -%{__install} -m 0755 utils/redis_init_script %{buildroot}%{_sysconfdir}/init.d/redis -%{__ln_s} %{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} +install -D -m 0755 utils/redis_init_script %{buildroot}%{_sysconfdir}/init.d/redis +ln -s %{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} # # logrotate # -%{__install} -m 0644 %{S:1} \ - %{buildroot}%{_sysconfdir}/logrotate.d/%{name} +install -D -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} %check - cat <<EOF --------------------------------------------------- The test suite often fails to start a server, with @@ -113,9 +86,6 @@ EOF make test && true -%clean -rm -rf %{buildroot} - %pre /usr/sbin/groupadd -r %{name} &>/dev/null || : /usr/sbin/useradd -o -g %{name} -s /bin/false -r -c "User for Redis key-value store" -d %{_data_dir} %{name} &>/dev/null || : @@ -124,16 +94,17 @@ %fillup_and_insserv %{name} %restart_on_update %{name} echo "To start the database server, do:" -echo " sudo rcredis start; insserv redis" +echo " sudo rcredis start; sudo insserv redis" %preun %stop_on_removal %{name} %postun +%restart_on_update %insserv_cleanup %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc 00-RELEASENOTES BUGS CONTRIBUTING COPYING Changelog README TODO %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %{_bindir}/redis-* @@ -144,8 +115,4 @@ %dir %attr(0750, %{name}, %{name}) %{_data_dir} %dir %attr(0750, %{name}, %{name}) %{_log_dir} -%files doc -%defattr(-,root,root) -%doc 00-RELEASENOTES BUGS CONTRIBUTING COPYING Changelog README TODO - %changelog ++++++ redis-initscript.patch ++++++ --- /var/tmp/diff_new_pack.onIDC8/_old 2012-02-29 14:11:14.000000000 +0100 +++ /var/tmp/diff_new_pack.onIDC8/_new 2012-02-29 14:11:14.000000000 +0100 @@ -15,7 +15,7 @@ +# Should-Start: +# Required-Stop: $syslog $remote_fs +# Should-Stop: -+# Default-Start: 3 4 5 ++# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Short-Description: Redis server +# Description: Starts and stops the Redis daemon -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit qemu for openSUSE:Factory
by root＠hilbert.suse.de 29 Feb '12

29 Feb '12

Hello community, here is the log from the commit of package qemu for openSUSE:Factory checked in at 2012-02-29 14:11:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qemu (Old) and /work/SRC/openSUSE:Factory/.qemu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qemu", Maintainer is "BROGERS(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2012-02-24 06:54:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/qemu.changes 2012-02-29 14:11:03.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 28 11:49:55 UTC 2012 - idonmez(a)suse.com + +- Enable spice support + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemu.spec ++++++ --- /var/tmp/diff_new_pack.xrwkU5/_old 2012-02-29 14:11:07.000000000 +0100 +++ /var/tmp/diff_new_pack.xrwkU5/_new 2012-02-29 14:11:07.000000000 +0100 @@ -92,18 +92,25 @@ BuildRequires: zlib-devel %endif %if 0%{?suse_version} >= 1210 -BuildRequires: libattr-devel-static BuildRequires: glibc-devel-static +BuildRequires: libattr-devel-static BuildRequires: libfdt1-devel %endif %if 0%{?suse_version} >= 1140 BuildRequires: glib2-devel-static %endif -BuildRequires: libvdeplug3-devel +%if 0%{?suse_version} >= 1130 +%ifarch %ix86 x86_64 +BuildRequires: libspice-server-devel +BuildRequires: spice-protocol-devel +%endif +%endif +BuildRequires: fdupes BuildRequires: glib2-devel +BuildRequires: libvdeplug3-devel BuildRequires: python -BuildRequires: fdupes -Requires: timezone virt-utils +Requires: timezone +Requires: virt-utils %description QEMU is an extremely well-performing CPU emulator that allows you to @@ -181,7 +188,20 @@ # build QEMU mkdir -p dynamic # build qemu-system -./configure --prefix=%_prefix --sysconfdir=%_sysconfdir --interp-prefix=%_datadir/%name/qemu-i386 --audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" --audio-drv-list="alsa sdl" --enable-mixemu --enable-vde --extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user +./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ +--interp-prefix=%_datadir/%name/qemu-i386 \ +--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" \ +--audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \ +--extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user \ +%if 0%{?suse_version} >= 1130 +%ifarch %ix86 x86_64 +--enable-spice +%else +--disable-spice +%endif +%else +--disable-spice +%endif # curl test fails for no reason in build system echo "CONFIG_CURL=y" >> config-host.mak echo "CURL_LIBS=-lcurl" >> config-host.mak @@ -191,7 +211,12 @@ mv */qemu */qemu-* qemu-io dynamic || true make clean # build userland emus -./configure --prefix=%_prefix --sysconfdir=%_sysconfdir --interp-prefix=%_datadir/%name/qemu-i386 --enable-linux-user --disable-system --static --disable-linux-aio --extra-cflags="$QEMU_OPT_FLAGS" +./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ +--interp-prefix=%_datadir/%name/qemu-i386 \ +--enable-linux-user \ +--disable-system \ +--static --disable-linux-aio \ +--extra-cflags="$QEMU_OPT_FLAGS" make %{?jobs:-j%jobs} V=1 %install ++++++ qemu.spec.in ++++++ --- /var/tmp/diff_new_pack.xrwkU5/_old 2012-02-29 14:11:07.000000000 +0100 +++ /var/tmp/diff_new_pack.xrwkU5/_new 2012-02-29 14:11:07.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package qemu # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,20 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: qemu Url: http://fabrice.bellard.free.fr/qemu/ -License: BSD3c(or similar) ; GPLv2+ ; LGPLv2.1+ ; MIT License (or similar) -Group: System/Emulators/PC Summary: Universal CPU emulator -Version: 1.0 +License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ ; MIT +Group: System/Emulators/PC +Version: 1.0.1 Release: 0 Source: %name-%version.tar.bz2 PATCH_FILES # this is to make lint happy Source300: rpmlintrc +Source400: update_git.sh BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL-devel BuildRequires: bison @@ -55,11 +54,18 @@ %if 0%{?suse_version} >= 1140 BuildRequires: glib2-devel-static %endif +%if 0%{?suse_version} >= 1130 +%ifarch %ix86 x86_64 +BuildRequires: libspice-server-devel +BuildRequires: spice-protocol-devel +%endif +%endif BuildRequires: libvdeplug3-devel BuildRequires: glib2-devel BuildRequires: python BuildRequires: fdupes -Requires: timezone virt-utils +Requires: timezone +Requires: virt-utils %description QEMU is an extremely well-performing CPU emulator that allows you to @@ -92,11 +98,20 @@ # build QEMU mkdir -p dynamic # build qemu-system -./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ - --interp-prefix=%_datadir/%name/qemu-i386 \ - --audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" \ - --audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \ - --extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user +./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \\ + --interp-prefix=%_datadir/%name/qemu-i386 \\ + --audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" \\ + --audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \\ + --extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user \\ +%if 0%{?suse_version} >= 1130 +%ifarch %ix86 x86_64 + --enable-spice +%else + --disable-spice +%endif +%else + --disable-spice +%endif # curl test fails for no reason in build system echo "CONFIG_CURL=y" >> config-host.mak echo "CURL_LIBS=-lcurl" >> config-host.mak @@ -106,11 +121,11 @@ mv */qemu */qemu-* qemu-io dynamic || true make clean # build userland emus -./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ - --interp-prefix=%_datadir/%name/qemu-i386 \ - --enable-linux-user \ - --disable-system \ - --static --disable-linux-aio \ +./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \\ + --interp-prefix=%_datadir/%name/qemu-i386 \\ + --enable-linux-user \\ + --disable-system \\ + --static --disable-linux-aio \\ --extra-cflags="$QEMU_OPT_FLAGS" make %{?jobs:-j%jobs} V=1 ++++++ update_git.sh ++++++ --- /var/tmp/diff_new_pack.xrwkU5/_old 2012-02-29 14:11:07.000000000 +0100 +++ /var/tmp/diff_new_pack.xrwkU5/_new 2012-02-29 14:11:07.000000000 +0100 @@ -38,7 +38,7 @@ if [ "$line" = "PATCH_FILES" ]; then for i in 0*; do NUM=${i%%-*} - echo "Patch$NUM: $i" + echo -e "Patch$NUM:\t$i" done elif [ "$line" = "PATCH_EXEC" ]; then for i in 0*; do -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit qbittorrent for openSUSE:Factory
by root＠hilbert.suse.de 29 Feb '12

29 Feb '12

Hello community, here is the log from the commit of package qbittorrent for openSUSE:Factory checked in at 2012-02-29 14:10:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qbittorrent (Old) and /work/SRC/openSUSE:Factory/.qbittorrent.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qbittorrent", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/qbittorrent/qbittorrent.changes 2012-02-08 17:20:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qbittorrent.new/qbittorrent.changes 2012-02-29 14:10:52.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 20 15:17:07 UTC 2012 - fisiu(a)opensuse.org + +- Upstream update to 2.9.5, bugfix release. + +------------------------------------------------------------------- Old: ---- qbittorrent-2.9.3.tar.gz New: ---- qbittorrent-2.9.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qbittorrent.spec ++++++ --- /var/tmp/diff_new_pack.IYYRsY/_old 2012-02-29 14:10:56.000000000 +0100 +++ /var/tmp/diff_new_pack.IYYRsY/_new 2012-02-29 14:10:56.000000000 +0100 @@ -16,14 +16,13 @@ # - Name: qbittorrent -Version: 2.9.3 -Release: 1 -License: GPL-2.0+ +Version: 2.9.5 +Release: 0 Summary: A Bittorrent Client built with C++ / Qt4 -Url: http://sourceforge.net/projects/qbittorrent +License: GPL-2.0+ Group: Productivity/Networking/File-Sharing +Url: http://sourceforge.net/projects/qbittorrent Source: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar… BuildRequires: boost-devel >= 1.35 BuildRequires: update-desktop-files ++++++ qbittorrent-2.9.3.tar.gz -> qbittorrent-2.9.5.tar.gz ++++++ ++++ 17805 lines of diff (skipped) -- 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-phpunit-Text_Template for openSUSE:Factory
by root＠hilbert.suse.de 29 Feb '12

29 Feb '12

Hello community, here is the log from the commit of package php5-pear-phpunit-Text_Template for openSUSE:Factory checked in at 2012-02-29 14:10:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5-pear-phpunit-Text_Template (Old) and /work/SRC/openSUSE:Factory/.php5-pear-phpunit-Text_Template.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5-pear-phpunit-Text_Template", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/php5-pear-phpunit-Text_Template/php5-pear-phpunit-Text_Template.changes 2011-12-21 12:19:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.php5-pear-phpunit-Text_Template.new/php5-pear-phpunit-Text_Template.changes 2012-02-29 14:10:41.000000000 +0100 @@ -6,0 +7,6 @@ +Mon Dec 5 21:14:19 UTC 2011 - robert.munteanu(a)gmail.com + +- Updated to version 1.1.1 + - no changes listed by the upstream version + +------------------------------------------------------------------- Old: ---- Text_Template-1.1.0.tgz New: ---- Text_Template-1.1.1.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5-pear-phpunit-Text_Template.spec ++++++ --- /var/tmp/diff_new_pack.GVdg6q/_old 2012-02-29 14:10:42.000000000 +0100 +++ /var/tmp/diff_new_pack.GVdg6q/_new 2012-02-29 14:10:42.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package php5-pear-phpunit-Text_Template # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,14 +16,15 @@ # + Name: php5-pear-phpunit-Text_Template %define pear_name Text_Template %define pear_sname text_template Summary: Simple template engine +Version: 1.1.1 +Release: 1 License: BSD-3-Clause Group: Development/Libraries/PHP -Version: 1.1.0 -Release: 0 Source0: http://pear.phpunit.de/get/%{pear_name}-%{version}.tgz Url: http://pear.phpunit.de/ Requires: php5-pear-channel-phpunit @@ -95,5 +96,9 @@ %files -f %{name}.files %defattr(-,root,root) +/%{_docdir}/%{pear_name} +/%{_docdir}/%{pear_name}/ChangeLog.markdown +/%{_docdir}/%{pear_name}/LICENSE +/%{_docdir}/%{pear_name}/README.markdown %changelog ++++++ Text_Template-1.1.0.tgz -> Text_Template-1.1.1.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text_Template-1.1.0/Text/Template/Autoload.php new/Text_Template-1.1.0/Text/Template/Autoload.php --- old/Text_Template-1.1.0/Text/Template/Autoload.php 2010-12-04 16:43:14.000000000 +0100 +++ new/Text_Template-1.1.0/Text/Template/Autoload.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,65 +0,0 @@ -<?php -/** - * Text_Template - * - * Copyright (c) 2009-2010, Sebastian Bergmann <sb(a)sebastian-bergmann.de>. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * * Neither the name of Sebastian Bergmann nor the names of his - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - * @category Text - * @package Template - * @author Sebastian Bergmann <sb(a)sebastian-bergmann.de> - * @copyright 2009-2010 Sebastian Bergmann <sb(a)sebastian-bergmann.de> - * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * @link http://github.com/sebastianbergmann/php-text-template - * @since File available since Release 1.1.0 - */ - -function text_template_autoload($class) { - static $classes = NULL; - static $path = NULL; - - if ($classes === NULL) { - $classes = array( - 'text_template' => '/Template.php' - ); - - $path = dirname(dirname(__FILE__)); - } - - $cn = strtolower($class); - - if (isset($classes[$cn])) { - require $path . $classes[$cn]; - } -} - -spl_autoload_register('text_template_autoload'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text_Template-1.1.0/Text/Template.php new/Text_Template-1.1.0/Text/Template.php --- old/Text_Template-1.1.0/Text/Template.php 2010-12-04 16:43:14.000000000 +0100 +++ new/Text_Template-1.1.0/Text/Template.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,153 +0,0 @@ -<?php -/** - * Text_Template - * - * Copyright (c) 2009-2010, Sebastian Bergmann <sb(a)sebastian-bergmann.de>. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * * Neither the name of Sebastian Bergmann nor the names of his - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - * @category Text - * @package Template - * @author Sebastian Bergmann <sb(a)sebastian-bergmann.de> - * @copyright 2009-2010 Sebastian Bergmann <sb(a)sebastian-bergmann.de> - * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * @link http://github.com/sebastianbergmann/php-text-template - * @since File available since Release 1.0.0 - */ - -/** - * A simple template engine. - * - * @category Text - * @package Template - * @author Sebastian Bergmann <sb(a)sebastian-bergmann.de> - * @copyright 2009-2010 Sebastian Bergmann <sb(a)sebastian-bergmann.de> - * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * @version Release: 1.1.0 - * @link http://github.com/sebastianbergmann/php-text-template - * @since Class available since Release 1.0.0 - */ -class Text_Template -{ - /** - * @var string - */ - protected $template = ''; - - /** - * @var array - */ - protected $values = array(); - - /** - * Constructor. - * - * @param string $file - * @throws InvalidArgumentException - */ - public function __construct($file = '') - { - $this->setFile($file); - } - - /** - * Sets the template file. - * - * @param string $file - * @throws InvalidArgumentException - */ - public function setFile($file) - { - $distFile = $file . '.dist'; - - if (file_exists($file)) { - $this->template = file_get_contents($file); - } - - else if (file_exists($distFile)) { - $this->template = file_get_contents($distFile); - } - - else { - throw new InvalidArgumentException( - 'Template file could not be loaded.' - ); - } - } - - /** - * Sets one or more template variables. - * - * @param array $values - * @param boolean $merge - */ - public function setVar(array $values, $merge = TRUE) - { - if (!$merge || empty($this->values)) { - $this->values = $values; - } else { - $this->values = array_merge($this->values, $values); - } - } - - /** - * Renders the template and returns the result. - * - * @return string - */ - public function render() - { - $keys = array(); - - foreach ($this->values as $key => $value) { - $keys[] = '{' . $key . '}'; - } - - return str_replace($keys, $this->values, $this->template); - } - - /** - * Renders the template and writes the result to a file. - * - * @param string $target - */ - public function renderTo($target) - { - $fp = @fopen($target, 'wt'); - - if ($fp) { - fwrite($fp, $this->render()); - fclose($fp); - } else { - throw new RuntimeException('Could not write to ' . $target . '.'); - } - } -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text_Template-1.1.1/ChangeLog.markdown new/Text_Template-1.1.1/ChangeLog.markdown --- old/Text_Template-1.1.1/ChangeLog.markdown 1970-01-01 01:00:00.000000000 +0100 +++ new/Text_Template-1.1.1/ChangeLog.markdown 2011-11-22 14:00:08.000000000 +0100 @@ -0,0 +1,9 @@ +Text_Template 1.1 +================= + +This is the list of changes for the Text_Template 1.1 release series. + +Text_Template 1.1.1 +------------------- + +* No changes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text_Template-1.1.1/LICENSE new/Text_Template-1.1.1/LICENSE --- old/Text_Template-1.1.1/LICENSE 1970-01-01 01:00:00.000000000 +0100 +++ new/Text_Template-1.1.1/LICENSE 2011-11-22 14:00:08.000000000 +0100 @@ -0,0 +1,33 @@ +Text_Template + +Copyright (c) 2009-2011, Sebastian Bergmann <sb(a)sebastian-bergmann.de>. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + + * Neither the name of Sebastian Bergmann nor the names of his + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text_Template-1.1.1/README.markdown new/Text_Template-1.1.1/README.markdown --- old/Text_Template-1.1.1/README.markdown 1970-01-01 01:00:00.000000000 +0100 +++ new/Text_Template-1.1.1/README.markdown 2011-11-22 14:00:08.000000000 +0100 @@ -0,0 +1,23 @@ +Text_Template +============= + +Installation +------------ + +Text_Template should be installed using the [PEAR Installer](http://pear.php.net/). This installer is the backbone of PEAR, which provides a distribution system for PHP packages, and is shipped with every release of PHP since version 4.3.0. + +The PEAR channel (`pear.phpunit.de`) that is used to distribute Text_Template needs to be registered with the local PEAR environment: + + sb@ubuntu ~ % pear channel-discover pear.phpunit.de + Adding Channel "pear.phpunit.de" succeeded + Discovery of channel "pear.phpunit.de" succeeded + +This has to be done only once. Now the PEAR Installer can be used to install packages from the PHPUnit channel: + + sb@vmware ~ % pear install phpunit/Text_Template + downloading Text_Template-1.0.0.tgz ... + Starting to download Text_Template-1.0.0.tgz (2,493 bytes) + ....done: 2,493 bytes + install ok: channel://pear.phpunit.de/Text_Template-1.0.0 + +After the installation you can find the Text_Template source files inside your local PEAR directory; the path is usually `/usr/lib/php/Text`. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text_Template-1.1.1/Text/Template/Autoload.php new/Text_Template-1.1.1/Text/Template/Autoload.php --- old/Text_Template-1.1.1/Text/Template/Autoload.php 1970-01-01 01:00:00.000000000 +0100 +++ new/Text_Template-1.1.1/Text/Template/Autoload.php 2011-11-22 14:00:08.000000000 +0100 @@ -0,0 +1,75 @@ +<?php +/** + * Text_Template + * + * Copyright (c) 2009-2010, Sebastian Bergmann <sb(a)sebastian-bergmann.de>. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * * Neither the name of Sebastian Bergmann nor the names of his + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * @category Text + * @package Template + * @author Sebastian Bergmann <sb(a)sebastian-bergmann.de> + * @copyright 2009-2010 Sebastian Bergmann <sb(a)sebastian-bergmann.de> + * @license http://www.opensource.org/licenses/bsd-license.php BSD License + * @link http://github.com/sebastianbergmann/php-text-template + * @since File available since Release 1.1.0 + */ + +function text_template_autoload($class = NULL) { + static $classes = NULL; + static $path = NULL; + + if ($classes === NULL) { + $classes = array( + 'text_template' => '/Template.php' + ); + + $path = dirname(dirname(__FILE__)); + } + + if ($class === NULL) { + $result = array(__FILE__); + + foreach ($classes as $file) { + $result[] = $path . $file; + } + + return $result; + } + + $cn = strtolower($class); + + if (isset($classes[$cn])) { + require $path . $classes[$cn]; + } +} + +spl_autoload_register('text_template_autoload'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text_Template-1.1.1/Text/Template.php new/Text_Template-1.1.1/Text/Template.php --- old/Text_Template-1.1.1/Text/Template.php 1970-01-01 01:00:00.000000000 +0100 +++ new/Text_Template-1.1.1/Text/Template.php 2011-11-22 14:00:08.000000000 +0100 @@ -0,0 +1,153 @@ +<?php +/** + * Text_Template + * + * Copyright (c) 2009-2011, Sebastian Bergmann <sb(a)sebastian-bergmann.de>. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * * Neither the name of Sebastian Bergmann nor the names of his + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * @category Text + * @package Template + * @author Sebastian Bergmann <sb(a)sebastian-bergmann.de> + * @copyright 2009-2011 Sebastian Bergmann <sb(a)sebastian-bergmann.de> + * @license http://www.opensource.org/licenses/bsd-license.php BSD License + * @link http://github.com/sebastianbergmann/php-text-template + * @since File available since Release 1.0.0 + */ + +/** + * A simple template engine. + * + * @category Text + * @package Template + * @author Sebastian Bergmann <sb(a)sebastian-bergmann.de> + * @copyright 2009-2011 Sebastian Bergmann <sb(a)sebastian-bergmann.de> + * @license http://www.opensource.org/licenses/bsd-license.php BSD License + * @version Release: 1.1.1 + * @link http://github.com/sebastianbergmann/php-text-template + * @since Class available since Release 1.0.0 + */ +class Text_Template +{ + /** + * @var string + */ + protected $template = ''; + + /** + * @var array + */ + protected $values = array(); + + /** + * Constructor. + * + * @param string $file + * @throws InvalidArgumentException + */ + public function __construct($file = '') + { + $this->setFile($file); + } + + /** + * Sets the template file. + * + * @param string $file + * @throws InvalidArgumentException + */ + public function setFile($file) + { + $distFile = $file . '.dist'; + + if (file_exists($file)) { + $this->template = file_get_contents($file); + } + + else if (file_exists($distFile)) { + $this->template = file_get_contents($distFile); + } + + else { + throw new InvalidArgumentException( + 'Template file could not be loaded.' + ); + } + } + + /** + * Sets one or more template variables. + * + * @param array $values + * @param boolean $merge + */ + public function setVar(array $values, $merge = TRUE) + { + if (!$merge || empty($this->values)) { + $this->values = $values; + } else { + $this->values = array_merge($this->values, $values); + } + } + + /** + * Renders the template and returns the result. + * + * @return string + */ + public function render() + { + $keys = array(); + + foreach ($this->values as $key => $value) { + $keys[] = '{' . $key . '}'; + } + + return str_replace($keys, $this->values, $this->template); + } + + /** + * Renders the template and writes the result to a file. + * + * @param string $target + */ + public function renderTo($target) + { + $fp = @fopen($target, 'wt'); + + if ($fp) { + fwrite($fp, $this->render()); + fclose($fp); + } else { + throw new RuntimeException('Could not write to ' . $target . '.'); + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/package.sig new/package.sig --- old/package.sig 2010-12-04 16:43:23.000000000 +0100 +++ new/package.sig 2011-11-22 14:00:25.000000000 +0100 @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.10 (GNU/Linux) +Version: GnuPG v1.4.11 (GNU/Linux) -iEYEABECAAYFAkz6YZsACgkQaGfFFLhbXWm9bACghbX3Kg1DvMbdQho0TIzvpbNh -g+YAniNVz9wXiZyb9qj2mbCfCoUTQNgQ -=1ne0 +iEYEABECAAYFAk7LnOkACgkQaGfFFLhbXWkLmgCbBd8sMCM9B3AReA+C4N/IJL3z +JOcAn3vkGZA1o/200i3DM6P1nM5Vo+vE +=CYsz -----END PGP SIGNATURE----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/package.xml new/package.xml --- old/package.xml 2010-12-04 16:43:14.000000000 +0100 +++ new/package.xml 2011-11-22 14:00:09.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<package packagerversion="1.9.1" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd"> +<package packagerversion="1.9.4" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd"> <name>Text_Template</name> <channel>pear.phpunit.de</channel> <summary>Simple template engine.</summary> @@ -10,10 +10,10 @@ <email>sb(a)sebastian-bergmann.de</email> <active>yes</active> </lead> - <date>2010-12-04</date> - <time>16:43:14</time> + <date>2011-11-22</date> + <time>13:00:08</time> <version> - <release>1.1.0</release> + <release>1.1.1</release> <api>1.1.0</api> </version> <stability> @@ -26,21 +26,24 @@ </notes> <contents> <dir name="/"> - <file baseinstalldir="/" md5sum="bb2393513859b28f10cb5e7f2b710652" name="Text/Template/Autoload.php" role="php"> + <file baseinstalldir="/" md5sum="2c7d566eb901074864ea92c436d729b3" name="Text/Template/Autoload.php" role="php"> <tasks:replace from="@package_version@" to="version" type="package-info" /> </file> - <file baseinstalldir="/" md5sum="2be834b98666489df05d5ba7a6bcc111" name="Text/Template.php" role="php"> + <file baseinstalldir="/" md5sum="aea0d8e6d5ee9cfabc3441471ed08d91" name="Text/Template.php" role="php"> <tasks:replace from="@package_version@" to="version" type="package-info" /> </file> + <file baseinstalldir="/" md5sum="e3976e367d3ebb37530c5e1cd43a67e1" name="ChangeLog.markdown" role="doc" /> + <file baseinstalldir="/" md5sum="adae9e141011fb398db7af14223cb1d7" name="LICENSE" role="doc" /> + <file baseinstalldir="/" md5sum="0fe5865860d9d76ffb01a4fb31daf518" name="README.markdown" role="doc" /> </dir> </contents> <dependencies> <required> <php> - <min>5.1.4</min> + <min>5.2.7</min> </php> <pearinstaller> - <min>1.8.1</min> + <min>1.9.4</min> </pearinstaller> </required> </dependencies> -- 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-phpunit-PHPUnit_MockObject for openSUSE:Factory
by root＠hilbert.suse.de 29 Feb '12

29 Feb '12

Hello community, here is the log from the commit of package php5-pear-phpunit-PHPUnit_MockObject for openSUSE:Factory checked in at 2012-02-29 14:10:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5-pear-phpunit-PHPUnit_MockObject (Old) and /work/SRC/openSUSE:Factory/.php5-pear-phpunit-PHPUnit_MockObject.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5-pear-phpunit-PHPUnit_MockObject", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/php5-pear-phpunit-PHPUnit_MockObject/php5-pear-phpunit-PHPUnit_MockObject.changes 2011-12-21 12:18:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.php5-pear-phpunit-PHPUnit_MockObject.new/php5-pear-phpunit-PHPUnit_MockObject.changes 2012-02-29 14:10:19.000000000 +0100 @@ -6,0 +7,12 @@ +Mon Dec 5 21:20:01 UTC 2011 - robert.munteanu(a)gmail.com + +- Updated to version 1.1.0 + - Added `getObjectForTrait()` to support the testing of traits. + - Added `PHPUnit_Framework_MockObject_Stub_ReturnSelf` to support + the stubbing of fluent interfaces. + - Added `PHPUnit_Framework_MockObject_Stub_ReturnValueMap` to + support stubbing a method by returning a value from a map. + - getMockForAbstractClass()` now supports the stubbing and mocking + of concrete methods in abstract classes. + +------------------------------------------------------------------- Old: ---- PHPUnit_MockObject-1.0.9.tgz New: ---- PHPUnit_MockObject-1.1.0.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5-pear-phpunit-PHPUnit_MockObject.spec ++++++ --- /var/tmp/diff_new_pack.BIpZtH/_old 2012-02-29 14:10:24.000000000 +0100 +++ /var/tmp/diff_new_pack.BIpZtH/_new 2012-02-29 14:10:24.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package php5-pear-phpunit-PHPUnit_MockObject # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,14 +16,15 @@ # + Name: php5-pear-phpunit-PHPUnit_MockObject %define pear_name PHPUnit_MockObject %define pear_sname phpunit_mockobject Summary: Mock Object library for PHPUnit +Version: 1.1.0 +Release: 1 License: BSD-3-Clause Group: Development/Libraries/PHP -Version: 1.0.9 -Release: 0 Source0: http://pear.phpunit.de/get/%{pear_name}-%{version}.tgz Url: http://pear.phpunit.de/ Requires: php5-pear-channel-phpunit ++++++ PHPUnit_MockObject-1.0.9.tgz -> PHPUnit_MockObject-1.1.0.tgz ++++++ ++++ 9684 lines of diff (skipped) -- 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-phpunit-PHP_Timer for openSUSE:Factory
by root＠hilbert.suse.de 29 Feb '12

29 Feb '12

Hello community, here is the log from the commit of package php5-pear-phpunit-PHP_Timer for openSUSE:Factory checked in at 2012-02-29 14:10:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5-pear-phpunit-PHP_Timer (Old) and /work/SRC/openSUSE:Factory/.php5-pear-phpunit-PHP_Timer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5-pear-phpunit-PHP_Timer", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/php5-pear-phpunit-PHP_Timer/php5-pear-phpunit-PHP_Timer.changes 2011-12-21 12:18:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.php5-pear-phpunit-PHP_Timer.new/php5-pear-phpunit-PHP_Timer.changes 2012-02-29 14:10:11.000000000 +0100 @@ -4,0 +5,2 @@ +------------------------------------------------------------------- +Mon Dec 5 21:29:43 UTC 2011 - robert.munteanu(a)gmail.com @@ -5,0 +8,2 @@ +- Updated to version 1.0.2 + - $_SERVER['REQUEST_TIME_FLOAT'] is used when available Old: ---- PHP_Timer-1.0.0.tgz New: ---- PHP_Timer-1.0.2.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5-pear-phpunit-PHP_Timer.spec ++++++ --- /var/tmp/diff_new_pack.1wN937/_old 2012-02-29 14:10:15.000000000 +0100 +++ /var/tmp/diff_new_pack.1wN937/_new 2012-02-29 14:10:15.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package php5-pear-phpunit-PHP_Timer # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,14 +16,15 @@ # + Name: php5-pear-phpunit-PHP_Timer %define pear_name PHP_Timer %define pear_sname php_timer Summary: Utility class for timing +Version: 1.0.2 +Release: 1 License: BSD-3-Clause Group: Development/Libraries/PHP -Version: 1.0.0 -Release: 0 Source0: http://pear.phpunit.de/get/%{pear_name}-%{version}.tgz Url: http://pear.phpunit.de/ Requires: php5-pear-channel-phpunit @@ -95,5 +96,6 @@ %files -f %{name}.files %defattr(-,root,root) +%{_docdir}/%{pear_name} %changelog ++++++ PHP_Timer-1.0.0.tgz -> PHP_Timer-1.0.2.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PHP_Timer-1.0.0/PHP/Timer.php new/PHP_Timer-1.0.0/PHP/Timer.php --- old/PHP_Timer-1.0.0/PHP/Timer.php 2010-05-08 18:26:35.000000000 +0200 +++ new/PHP_Timer-1.0.0/PHP/Timer.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,139 +0,0 @@ -<?php -/** - * PHP_Timer - * - * Copyright (c) 2010, Sebastian Bergmann <sb(a)sebastian-bergmann.de>. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * * Neither the name of Sebastian Bergmann nor the names of his - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - * @package PHP - * @subpackage Timer - * @author Sebastian Bergmann <sb(a)sebastian-bergmann.de> - * @copyright 2010 Sebastian Bergmann <sb(a)sebastian-bergmann.de> - * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * @link http://github.com/sebastianbergmann/php-timer - * @since File available since Release 1.0.0 - */ - -/** - * Utility class for timing. - * - * @package PHP - * @subpackage Timer - * @author Sebastian Bergmann <sb(a)sebastian-bergmann.de> - * @copyright 2002-2010 Sebastian Bergmann <sb(a)sebastian-bergmann.de> - * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * @version Release: 1.0.0 - * @link http://github.com/sebastianbergmann/php-timer - * @since Class available since Release 1.0.0 - */ -class PHP_Timer -{ - protected static $startTimes = array(); - - /** - * Starts the timer. - */ - public static function start() - { - array_push(self::$startTimes, microtime(TRUE)); - } - - /** - * Stops the timer and returns the elapsed time. - * - * @return float - */ - public static function stop() - { - return microtime(TRUE) - array_pop(self::$startTimes); - } - - /** - * Formats the elapsed time as a string. - * - * @param float $time - * @return string - */ - public static function secondsToTimeString($time) - { - $buffer = ''; - - $hours = sprintf('%02d', ($time >= 3600) ? floor($time / 3600) : 0); - $minutes = sprintf( - '%02d', - ($time >= 60) ? floor($time / 60) - 60 * $hours : 0 - ); - $seconds = sprintf('%02d', $time - 60 * 60 * $hours - 60 * $minutes); - - if ($hours == 0 && $minutes == 0) { - $seconds = sprintf('%1d', $seconds); - - $buffer .= $seconds . ' second'; - - if ($seconds != '1') { - $buffer .= 's'; - } - } else { - if ($hours > 0) { - $buffer = $hours . ':'; - } - - $buffer .= $minutes . ':' . $seconds; - } - - return $buffer; - } - - /** - * Formats the elapsed time since the start of the request as a string. - * - * @return string - */ - public static function timeSinceStartOfRequest() - { - return self::secondsToTimeString(time() - $_SERVER['REQUEST_TIME']); - } - - /** - * Returns the resources (time, memory) of the request as a string. - * - * @return string - */ - public static function resourceUsage() - { - return sprintf( - 'Time: %s, Memory: %4.2fMb', - self::timeSinceStartOfRequest(), - memory_get_peak_usage(TRUE) / 1048576 - ); - } -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PHP_Timer-1.0.2/ChangeLog.markdown new/PHP_Timer-1.0.2/ChangeLog.markdown --- old/PHP_Timer-1.0.2/ChangeLog.markdown 1970-01-01 01:00:00.000000000 +0100 +++ new/PHP_Timer-1.0.2/ChangeLog.markdown 2011-09-07 13:38:14.000000000 +0200 @@ -0,0 +1,9 @@ +PHP_Timer 1.0 +============= + +This is the list of changes for the PHP_Timer 1.0 release series. + +PHP_Timer 1.0.1 +--------------- + +* No changes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PHP_Timer-1.0.2/LICENSE new/PHP_Timer-1.0.2/LICENSE --- old/PHP_Timer-1.0.2/LICENSE 1970-01-01 01:00:00.000000000 +0100 +++ new/PHP_Timer-1.0.2/LICENSE 2011-09-07 13:38:14.000000000 +0200 @@ -0,0 +1,33 @@ +PHP_Timer + +Copyright (c) 2010-2011, Sebastian Bergmann <sebastian(a)phpunit.de>. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + + * Neither the name of Sebastian Bergmann nor the names of his + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PHP_Timer-1.0.2/PHP/Timer/Autoload.php new/PHP_Timer-1.0.2/PHP/Timer/Autoload.php --- old/PHP_Timer-1.0.2/PHP/Timer/Autoload.php 1970-01-01 01:00:00.000000000 +0100 +++ new/PHP_Timer-1.0.2/PHP/Timer/Autoload.php 2011-09-07 13:38:14.000000000 +0200 @@ -0,0 +1,75 @@ +<?php +/** + * PHP_Timer + * + * Copyright (c) 2010-2011, Sebastian Bergmann <sb(a)sebastian-bergmann.de>. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * * Neither the name of Sebastian Bergmann nor the names of his + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * @package PHP + * @subpackage Timer + * @author Sebastian Bergmann <sb(a)sebastian-bergmann.de> + * @copyright 2010-2011 Sebastian Bergmann <sb(a)sebastian-bergmann.de> + * @license http://www.opensource.org/licenses/bsd-license.php BSD License + * @link http://github.com/sebastianbergmann/php-timer + * @since File available since Release 1.1.0 + */ + +function php_timer_autoload($class = NULL) { + static $classes = NULL; + static $path = NULL; + + if ($classes === NULL) { + $classes = array( + 'php_timer' => '/Timer.php' + ); + + $path = dirname(dirname(__FILE__)); + } + + if ($class === NULL) { + $result = array(__FILE__); + + foreach ($classes as $file) { + $result[] = $path . $file; + } + + return $result; + } + + $cn = strtolower($class); + + if (isset($classes[$cn])) { + require $path . $classes[$cn]; + } +} + +spl_autoload_register('php_timer_autoload'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PHP_Timer-1.0.2/PHP/Timer.php new/PHP_Timer-1.0.2/PHP/Timer.php --- old/PHP_Timer-1.0.2/PHP/Timer.php 1970-01-01 01:00:00.000000000 +0100 +++ new/PHP_Timer-1.0.2/PHP/Timer.php 2011-09-07 13:38:14.000000000 +0200 @@ -0,0 +1,153 @@ +<?php +/** + * PHP_Timer + * + * Copyright (c) 2010-2011, Sebastian Bergmann <sb(a)sebastian-bergmann.de>. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * * Neither the name of Sebastian Bergmann nor the names of his + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * @package PHP + * @subpackage Timer + * @author Sebastian Bergmann <sb(a)sebastian-bergmann.de> + * @copyright 2010-2011 Sebastian Bergmann <sb(a)sebastian-bergmann.de> + * @license http://www.opensource.org/licenses/bsd-license.php BSD License + * @link http://github.com/sebastianbergmann/php-timer + * @since File available since Release 1.0.0 + */ + +/** + * Utility class for timing. + * + * @package PHP + * @subpackage Timer + * @author Sebastian Bergmann <sb(a)sebastian-bergmann.de> + * @copyright 2010-2011 Sebastian Bergmann <sb(a)sebastian-bergmann.de> + * @license http://www.opensource.org/licenses/bsd-license.php BSD License + * @version Release: 1.0.2 + * @link http://github.com/sebastianbergmann/php-timer + * @since Class available since Release 1.0.0 + */ +class PHP_Timer +{ + /** + * @var array + */ + protected static $startTimes = array(); + + /** + * @var float + */ + public static $requestTime; + + /** + * Starts the timer. + */ + public static function start() + { + array_push(self::$startTimes, microtime(TRUE)); + } + + /** + * Stops the timer and returns the elapsed time. + * + * @return float + */ + public static function stop() + { + return microtime(TRUE) - array_pop(self::$startTimes); + } + + /** + * Formats the elapsed time as a string. + * + * @param float $time + * @return string + */ + public static function secondsToTimeString($time) + { + $buffer = ''; + + $hours = sprintf('%02d', ($time >= 3600) ? floor($time / 3600) : 0); + $minutes = sprintf( + '%02d', + ($time >= 60) ? floor($time / 60) - 60 * $hours : 0 + ); + $seconds = sprintf('%02d', $time - 60 * 60 * $hours - 60 * $minutes); + + if ($hours == 0 && $minutes == 0) { + $seconds = sprintf('%1d', $seconds); + + $buffer .= $seconds . ' second'; + + if ($seconds != '1') { + $buffer .= 's'; + } + } else { + if ($hours > 0) { + $buffer = $hours . ':'; + } + + $buffer .= $minutes . ':' . $seconds; + } + + return $buffer; + } + + /** + * Formats the elapsed time since the start of the request as a string. + * + * @return string + */ + public static function timeSinceStartOfRequest() + { + return self::secondsToTimeString(time() - self::$requestTime); + } + + /** + * Returns the resources (time, memory) of the request as a string. + * + * @return string + */ + public static function resourceUsage() + { + return sprintf( + 'Time: %s, Memory: %4.2fMb', + self::timeSinceStartOfRequest(), + memory_get_peak_usage(TRUE) / 1048576 + ); + } +} + +if (isset($_SERVER['REQUEST_TIME'])) { + PHP_Timer::$requestTime = $_SERVER['REQUEST_TIME']; +} else { + PHP_Timer::$requestTime = time(); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PHP_Timer-1.0.2/README.markdown new/PHP_Timer-1.0.2/README.markdown --- old/PHP_Timer-1.0.2/README.markdown 1970-01-01 01:00:00.000000000 +0100 +++ new/PHP_Timer-1.0.2/README.markdown 2011-09-07 13:38:14.000000000 +0200 @@ -0,0 +1,23 @@ +PHP_Timer +========= + +Installation +------------ + +PHP_Timer should be installed using the [PEAR Installer](http://pear.php.net/). This installer is the backbone of PEAR, which provides a distribution system for PHP packages, and is shipped with every release of PHP since version 4.3.0. + +The PEAR channel (`pear.phpunit.de`) that is used to distribute PHP_Timer needs to be registered with the local PEAR environment: + + sb@ubuntu ~ % pear channel-discover pear.phpunit.de + Adding Channel "pear.phpunit.de" succeeded + Discovery of channel "pear.phpunit.de" succeeded + +This has to be done only once. Now the PEAR Installer can be used to install packages from the PHPUnit channel: + + sb@vmware ~ % pear install phpunit/PHP_Timer + downloading PHP_Timer-1.0.0.tgz ... + Starting to download PHP_Timer-1.0.0.tgz (2,536 bytes) + ....done: 2,536 bytes + install ok: channel://pear.phpunit.de/PHP_Timer-1.0.0 + +After the installation you can find the PHP_Timer source files inside your local PEAR directory; the path is usually `/usr/lib/php/PHP`. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/package.sig new/package.sig --- old/package.sig 2010-05-08 18:26:41.000000000 +0200 +++ new/package.sig 2011-09-07 13:38:25.000000000 +0200 @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) -iEYEABECAAYFAkvlkMEACgkQaGfFFLhbXWl01gCfWKmmUaZgrPtYU23t7JIEvEfz -AlYAn3FPXMOW/8NWq2AIDvEM6GtfZ7bh -=0M2x +iEYEABECAAYFAk5nV7EACgkQaGfFFLhbXWl0IQCfWT/2Uw7HqTgWfa7r4WQ/7tMD +gk4AnArN3rLfZqj/UwHBGmgMPebI+Lki +=LjcT -----END PGP SIGNATURE----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/package.xml new/package.xml --- old/package.xml 2010-05-08 18:26:35.000000000 +0200 +++ new/package.xml 2011-09-07 13:38:14.000000000 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<package packagerversion="1.9.0" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd"> +<package packagerversion="1.9.4" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd"> <name>PHP_Timer</name> <channel>pear.phpunit.de</channel> <summary>Utility class for timing</summary> @@ -10,10 +10,10 @@ <email>sb(a)sebastian-bergmann.de</email> <active>yes</active> </lead> - <date>2010-05-08</date> - <time>18:26:35</time> + <date>2011-09-07</date> + <time>11:38:14</time> <version> - <release>1.0.0</release> + <release>1.0.2</release> <api>1.0.0</api> </version> <stability> @@ -26,9 +26,15 @@ </notes> <contents> <dir name="/"> - <file baseinstalldir="/" md5sum="0f3e1c315c9ad0eb1c38348f7826dad4" name="PHP/Timer.php" role="php"> + <file baseinstalldir="/" md5sum="373bbb5f3fce44d82646b25cdf58e7dd" name="PHP/Timer/Autoload.php" role="php"> <tasks:replace from="@package_version@" to="version" type="package-info" /> </file> + <file baseinstalldir="/" md5sum="f69722829638a2d1fabdab4dd2b6c854" name="PHP/Timer.php" role="php"> + <tasks:replace from="@package_version@" to="version" type="package-info" /> + </file> + <file baseinstalldir="/" md5sum="a3f8a544a1b539cee54a07e3ec7afa5d" name="ChangeLog.markdown" role="doc" /> + <file baseinstalldir="/" md5sum="ee64ef6972cbb7aff5bf2211726fd750" name="LICENSE" role="doc" /> + <file baseinstalldir="/" md5sum="5bfbe245c2c30b5f6e140f930a96e4c6" name="README.markdown" role="doc" /> </dir> </contents> <dependencies> @@ -37,7 +43,7 @@ <min>5.2.7</min> </php> <pearinstaller> - <min>1.9.0</min> + <min>1.9.2</min> </pearinstaller> </required> </dependencies> -- 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-phpunit-File_Iterator for openSUSE:Factory
by root＠hilbert.suse.de 29 Feb '12

29 Feb '12

Hello community, here is the log from the commit of package php5-pear-phpunit-File_Iterator for openSUSE:Factory checked in at 2012-02-29 14:09:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5-pear-phpunit-File_Iterator (Old) and /work/SRC/openSUSE:Factory/.php5-pear-phpunit-File_Iterator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5-pear-phpunit-File_Iterator", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/php5-pear-phpunit-File_Iterator/php5-pear-phpunit-File_Iterator.changes 2011-12-20 10:55:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.php5-pear-phpunit-File_Iterator.new/php5-pear-phpunit-File_Iterator.changes 2012-02-29 14:09:45.000000000 +0100 @@ -6,0 +7,9 @@ +Mon Dec 5 21:08:07 UTC 2011 - robert.munteanu(a)gmail.com + +- Updated to version 1.3.0 + - Added `File_Iterator_Facade` for the most common use case. + - Moved `File_Iterator_Factory::getFilesAsArray()` to + `File_Iterator_Facade::getFilesAsArray()`. + - `File_Iterator_Factory` is no longer static. + +------------------------------------------------------------------- Old: ---- File_Iterator-1.2.6.tgz New: ---- File_Iterator-1.3.0.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5-pear-phpunit-File_Iterator.spec ++++++ --- /var/tmp/diff_new_pack.0oqFhW/_old 2012-02-29 14:09:47.000000000 +0100 +++ /var/tmp/diff_new_pack.0oqFhW/_new 2012-02-29 14:09:47.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package php5-pear-phpunit-File_Iterator # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,14 +16,15 @@ # + Name: php5-pear-phpunit-File_Iterator %define pear_name File_Iterator %define pear_sname file_iterator Summary: Filters files based on a list of suffixes +Version: 1.3.0 +Release: 1 License: BSD-3-Clause Group: Development/Libraries/PHP -Version: 1.2.6 -Release: 0 Source0: http://pear.phpunit.de/get/File_Iterator-%{version}.tgz Url: http://pear.phpunit.de/ Requires: php5-pear-channel-phpunit @@ -94,5 +95,9 @@ %files -f %{name}.files %defattr(-,root,root) +/%{_docdir}/%{pear_name} +/%{_docdir}/%{pear_name}/ChangeLog.markdown +/%{_docdir}/%{pear_name}/LICENSE +/%{_docdir}/%{pear_name}/README.markdown %changelog ++++++ File_Iterator-1.2.6.tgz -> File_Iterator-1.3.0.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File_Iterator-1.2.6/File/Iterator/Factory.php new/File_Iterator-1.2.6/File/Iterator/Factory.php --- old/File_Iterator-1.2.6/File/Iterator/Factory.php 2011-03-03 12:09:06.000000000 +0100 +++ new/File_Iterator-1.2.6/File/Iterator/Factory.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,159 +0,0 @@ -<?php -/** - * php-file-iterator - * - * Copyright (c) 2009-2011, Sebastian Bergmann <sb(a)sebastian-bergmann.de>. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * * Neither the name of Sebastian Bergmann nor the names of his - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - * @package File - * @author Sebastian Bergmann <sb(a)sebastian-bergmann.de> - * @copyright 2009-2011 Sebastian Bergmann <sb(a)sebastian-bergmann.de> - * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * @since File available since Release 1.1.0 - */ - -require_once 'File/Iterator.php'; - -/** - * Factory Method implementation that creates a File_Iterator that operates on - * an AppendIterator that contains an RecursiveDirectoryIterator for each given - * path. - * - * @author Sebastian Bergmann <sb(a)sebastian-bergmann.de> - * @copyright 2009-2011 Sebastian Bergmann <sb(a)sebastian-bergmann.de> - * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * @version Release: 1.2.6 - * @link http://github.com/sebastianbergmann/php-file-iterator/tree - * @since Class available since Release 1.1.0 - */ -class File_Iterator_Factory -{ - /** - * @param array|string $paths - * @param array|string $suffixes - * @param array|string $prefixes - * @param array $exclude - * @return AppendIterator - */ - public static function getFileIterator($paths, $suffixes = '', $prefixes = '', array $exclude = array()) - { - if (is_string($paths)) { - $paths = array($paths); - } - - $_paths = array(); - - foreach ($paths as $path) { - if ($locals = glob($path, GLOB_ONLYDIR)) { - $_paths = array_merge($_paths, $locals); - } else { - $_paths[] = $path; - } - } - - $paths = $_paths; - unset($_paths); - - if (is_string($prefixes)) { - if ($prefixes != '') { - $prefixes = array($prefixes); - } else { - $prefixes = array(); - } - } - - if (is_string($suffixes)) { - if ($suffixes != '') { - $suffixes = array($suffixes); - } else { - $suffixes = array(); - } - } - - $iterator = new AppendIterator; - - foreach ($paths as $path) { - if (is_dir($path)) { - $iterator->append( - new File_Iterator( - new RecursiveIteratorIterator( - new RecursiveDirectoryIterator($path) - ), - $suffixes, - $prefixes, - $exclude, - $path - ) - ); - } - } - - return $iterator; - } - - /** - * @param array|string $paths - * @param array|string $suffixes - * @param array|string $prefixes - * @param array $exclude - * @return array - */ - public static function getFilesAsArray($paths, $suffixes = '', $prefixes = '', array $exclude = array()) - { - if (is_string($paths)) { - $paths = array($paths); - } - - $result = array(); - - $iterator = self::getFileIterator( - $paths, $suffixes, $prefixes, $exclude - ); - - foreach ($iterator as $file) { - $file = $file->getRealPath(); - - if ($file) { - $result[] = $file; - } - } - - foreach ($paths as $path) { - if (is_file($path)) { - $result[] = realpath($path); - } - } - - return array_unique($result); - } -} -?> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File_Iterator-1.2.6/File/Iterator.php new/File_Iterator-1.2.6/File/Iterator.php --- old/File_Iterator-1.2.6/File/Iterator.php 2011-03-03 12:09:06.000000000 +0100 +++ new/File_Iterator-1.2.6/File/Iterator.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,197 +0,0 @@ -<?php -/** - * php-file-iterator - * - * Copyright (c) 2009-2011, Sebastian Bergmann <sb(a)sebastian-bergmann.de>. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * * Neither the name of Sebastian Bergmann nor the names of his - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - * @package File - * @author Sebastian Bergmann <sb(a)sebastian-bergmann.de> - * @copyright 2009-2011 Sebastian Bergmann <sb(a)sebastian-bergmann.de> - * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * @since File available since Release 1.0.0 - */ - -/** - * FilterIterator implementation that filters files based on prefix(es) and/or - * suffix(es). Hidden files and files from hidden directories are also filtered. - * - * @author Sebastian Bergmann <sb(a)sebastian-bergmann.de> - * @copyright 2009-2011 Sebastian Bergmann <sb(a)sebastian-bergmann.de> - * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * @version Release: 1.2.6 - * @link http://github.com/sebastianbergmann/php-file-iterator/tree - * @since Class available since Release 1.0.0 - */ -class File_Iterator extends FilterIterator -{ - const PREFIX = 0; - const SUFFIX = 1; - - /** - * @var array - */ - protected $suffixes = array(); - - /** - * @var array - */ - protected $prefixes = array(); - - /** - * @var array - */ - protected $exclude = array(); - - /** - * @var string - */ - protected $basepath; - - /** - * @param Iterator $iterator - * @param array $suffixes - * @param array $prefixes - * @param array $exclude - * @param string $basepath - */ - public function __construct(Iterator $iterator, array $suffixes = array(), array $prefixes = array(), array $exclude = array(), $basepath = NULL) - { - $exclude = array_filter(array_map('realpath', $exclude)); - - if ($basepath !== NULL) { - $basepath = realpath($basepath); - } - - if ($basepath === FALSE) { - $basepath = NULL; - } else { - foreach ($exclude as &$_exclude) { - $_exclude = str_replace($basepath, '', $_exclude); - } - } - - $this->prefixes = $prefixes; - $this->suffixes = $suffixes; - $this->exclude = $exclude; - $this->basepath = $basepath; - - parent::__construct($iterator); - } - - /** - * @return boolean - */ - public function accept() - { - $current = $this->getInnerIterator()->current(); - $filename = $current->getFilename(); - $realpath = $current->getRealPath(); - - if ($this->basepath !== NULL) { - $realpath = str_replace($this->basepath, '', $realpath); - } - - // Filter files in hidden directories. - if (preg_match('=/\.[^/]*/=', $realpath)) { - return FALSE; - } - - return $this->acceptPath($realpath) && - $this->acceptPrefix($filename) && - $this->acceptSuffix($filename); - } - - /** - * @param string $path - * @return boolean - * @since Method available since Release 1.1.0 - */ - protected function acceptPath($path) - { - foreach ($this->exclude as $exclude) { - if (strpos($path, $exclude) === 0) { - return FALSE; - } - } - - return TRUE; - } - - /** - * @param string $filename - * @return boolean - * @since Method available since Release 1.1.0 - */ - protected function acceptPrefix($filename) - { - return $this->acceptSubString($filename, $this->prefixes, self::PREFIX); - } - - /** - * @param string $filename - * @return boolean - * @since Method available since Release 1.1.0 - */ - protected function acceptSuffix($filename) - { - return $this->acceptSubString($filename, $this->suffixes, self::SUFFIX); - } - - /** - * @param string $filename - * @param array $subString - * @param integer $type - * @return boolean - * @since Method available since Release 1.1.0 - */ - protected function acceptSubString($filename, array $subStrings, $type) - { - if (empty($subStrings)) { - return TRUE; - } - - $matched = FALSE; - - foreach ($subStrings as $string) { - if (($type == self::PREFIX && strpos($filename, $string) === 0) || - ($type == self::SUFFIX && - substr($filename, -1 * strlen($string)) == $string)) { - $matched = TRUE; - break; - } - } - - return $matched; - } -} -?> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File_Iterator-1.3.0/ChangeLog.markdown new/File_Iterator-1.3.0/ChangeLog.markdown --- old/File_Iterator-1.3.0/ChangeLog.markdown 1970-01-01 01:00:00.000000000 +0100 +++ new/File_Iterator-1.3.0/ChangeLog.markdown 2011-10-31 08:35:20.000000000 +0100 @@ -0,0 +1,11 @@ +File_Iterator 1.3 +================= + +This is the list of changes for the File_Iterator 1.3 release series. + +File_Iterator 1.3.0 +------------------- + +* Added `File_Iterator_Facade` for the most common use case. +* Moved `File_Iterator_Factory::getFilesAsArray()` to `File_Iterator_Facade::getFilesAsArray()`. +* `File_Iterator_Factory` is no longer static. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File_Iterator-1.3.0/File/Iterator/Autoload.php new/File_Iterator-1.3.0/File/Iterator/Autoload.php --- old/File_Iterator-1.3.0/File/Iterator/Autoload.php 1970-01-01 01:00:00.000000000 +0100 +++ new/File_Iterator-1.3.0/File/Iterator/Autoload.php 2011-10-31 08:35:20.000000000 +0100 @@ -0,0 +1,75 @@ +<?php +/** + * php-file-iterator + * + * Copyright (c) 2009-2011, Sebastian Bergmann <sb(a)sebastian-bergmann.de>. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * * Neither the name of Sebastian Bergmann nor the names of his + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * @package File + * @author Sebastian Bergmann <sb(a)sebastian-bergmann.de> + * @copyright 2009-2011 Sebastian Bergmann <sb(a)sebastian-bergmann.de> + * @license http://www.opensource.org/licenses/bsd-license.php BSD License + * @since File available since Release 1.3.0 + */ + +function file_iterator_autoload($class = NULL) { + static $classes = NULL; + static $path = NULL; + + if ($classes === NULL) { + $classes = array( + 'file_iterator' => '/Iterator.php', + 'file_iterator_facade' => '/Iterator/Facade.php', + 'file_iterator_factory' => '/Iterator/Factory.php' + ); + + $path = dirname(dirname(__FILE__)); + } + + if ($class === NULL) { + $result = array(__FILE__); + + foreach ($classes as $file) { + $result[] = $path . $file; + } + + return $result; + } + + $cn = strtolower($class); + + if (isset($classes[$cn])) { + require $path . $classes[$cn]; + } +} + +spl_autoload_register('file_iterator_autoload'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File_Iterator-1.3.0/File/Iterator/Facade.php new/File_Iterator-1.3.0/File/Iterator/Facade.php --- old/File_Iterator-1.3.0/File/Iterator/Facade.php 1970-01-01 01:00:00.000000000 +0100 +++ new/File_Iterator-1.3.0/File/Iterator/Facade.php 2011-10-31 08:35:20.000000000 +0100 @@ -0,0 +1,157 @@ +<?php +/** + * php-file-iterator + * + * Copyright (c) 2009-2011, Sebastian Bergmann <sb(a)sebastian-bergmann.de>. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * * Neither the name of Sebastian Bergmann nor the names of his + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * @package File + * @author Sebastian Bergmann <sb(a)sebastian-bergmann.de> + * @copyright 2009-2011 Sebastian Bergmann <sb(a)sebastian-bergmann.de> + * @license http://www.opensource.org/licenses/bsd-license.php BSD License + * @since File available since Release 1.3.0 + */ + +/** + * Façade implementation that uses File_Iterator_Factory to create a + * File_Iterator that operates on an AppendIterator that contains an + * RecursiveDirectoryIterator for each given path. The list of unique + * files is returned as an array. + * + * @author Sebastian Bergmann <sb(a)sebastian-bergmann.de> + * @copyright 2009-2011 Sebastian Bergmann <sb(a)sebastian-bergmann.de> + * @license http://www.opensource.org/licenses/bsd-license.php BSD License + * @version Release: 1.3.0 + * @link http://github.com/sebastianbergmann/php-file-iterator/tree + * @since Class available since Release 1.3.0 + */ +class File_Iterator_Facade +{ + /** + * @param array|string $paths + * @param array|string $suffixes + * @param array|string $prefixes + * @param array $exclude + * @param boolean $commonPath + * @return array + */ + public function getFilesAsArray($paths, $suffixes = '', $prefixes = '', array $exclude = array(), $commonPath = FALSE) + { + if (is_string($paths)) { + $paths = array($paths); + } + + $factory = new File_Iterator_Factory; + $iterator = $factory->getFileIterator( + $paths, $suffixes, $prefixes, $exclude + ); + + $files = array(); + + foreach ($iterator as $file) { + $file = $file->getRealPath(); + + if ($file) { + $files[] = $file; + } + } + + foreach ($paths as $path) { + if (is_file($path)) { + $files[] = realpath($path); + } + } + + $files = array_unique($files); + sort($files); + + if ($commonPath) { + return array( + 'commonPath' => $this->getCommonPath($files), + 'files' => $files + ); + } else { + return $files; + } + } + + /** + * Returns the common path of a set of files. + * + * @param array $files + * @return string + */ + protected function getCommonPath(array $files) + { + $count = count($files); + + if ($count == 1) { + return dirname($files[0]) . DIRECTORY_SEPARATOR; + } + + $_files = array(); + + foreach ($files as $file) { + $_files[] = $_fileParts = explode(DIRECTORY_SEPARATOR, $file); + + if (empty($_fileParts[0])) { + $_fileParts[0] = DIRECTORY_SEPARATOR; + } + } + + $common = ''; + $done = FALSE; + $j = 0; + $count--; + + while (!$done) { + for ($i = 0; $i < $count; $i++) { + if ($_files[$i][$j] != $_files[$i+1][$j]) { + $done = TRUE; + break; + } + } + + if (!$done) { + $common .= $_files[0][$j]; + + if ($j > 0) { + $common .= DIRECTORY_SEPARATOR; + } + } + + $j++; + } + + return $common; + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File_Iterator-1.3.0/File/Iterator/Factory.php new/File_Iterator-1.3.0/File/Iterator/Factory.php --- old/File_Iterator-1.3.0/File/Iterator/Factory.php 1970-01-01 01:00:00.000000000 +0100 +++ new/File_Iterator-1.3.0/File/Iterator/Factory.php 2011-10-31 08:35:20.000000000 +0100 @@ -0,0 +1,120 @@ +<?php +/** + * php-file-iterator + * + * Copyright (c) 2009-2011, Sebastian Bergmann <sb(a)sebastian-bergmann.de>. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * * Neither the name of Sebastian Bergmann nor the names of his + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * @package File + * @author Sebastian Bergmann <sb(a)sebastian-bergmann.de> + * @copyright 2009-2011 Sebastian Bergmann <sb(a)sebastian-bergmann.de> + * @license http://www.opensource.org/licenses/bsd-license.php BSD License + * @since File available since Release 1.1.0 + */ + +/** + * Factory Method implementation that creates a File_Iterator that operates on + * an AppendIterator that contains an RecursiveDirectoryIterator for each given + * path. + * + * @author Sebastian Bergmann <sb(a)sebastian-bergmann.de> + * @copyright 2009-2011 Sebastian Bergmann <sb(a)sebastian-bergmann.de> + * @license http://www.opensource.org/licenses/bsd-license.php BSD License + * @version Release: 1.3.0 + * @link http://github.com/sebastianbergmann/php-file-iterator/tree + * @since Class available since Release 1.1.0 + */ +class File_Iterator_Factory +{ + /** + * @param array|string $paths + * @param array|string $suffixes + * @param array|string $prefixes + * @param array $exclude + * @return AppendIterator + */ + public function getFileIterator($paths, $suffixes = '', $prefixes = '', array $exclude = array()) + { + if (is_string($paths)) { + $paths = array($paths); + } + + $_paths = array(); + + foreach ($paths as $path) { + if ($locals = glob($path, GLOB_ONLYDIR)) { + $_paths = array_merge($_paths, $locals); + } else { + $_paths[] = $path; + } + } + + $paths = $_paths; + unset($_paths); + + if (is_string($prefixes)) { + if ($prefixes != '') { + $prefixes = array($prefixes); + } else { + $prefixes = array(); + } + } + + if (is_string($suffixes)) { + if ($suffixes != '') { + $suffixes = array($suffixes); + } else { + $suffixes = array(); + } + } + + $iterator = new AppendIterator; + + foreach ($paths as $path) { + if (is_dir($path)) { + $iterator->append( + new File_Iterator( + new RecursiveIteratorIterator( + new RecursiveDirectoryIterator($path) + ), + $suffixes, + $prefixes, + $exclude, + $path + ) + ); + } + } + + return $iterator; + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File_Iterator-1.3.0/File/Iterator.php new/File_Iterator-1.3.0/File/Iterator.php --- old/File_Iterator-1.3.0/File/Iterator.php 1970-01-01 01:00:00.000000000 +0100 +++ new/File_Iterator-1.3.0/File/Iterator.php 2011-10-31 08:35:20.000000000 +0100 @@ -0,0 +1,196 @@ +<?php +/** + * php-file-iterator + * + * Copyright (c) 2009-2011, Sebastian Bergmann <sb(a)sebastian-bergmann.de>. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * * Neither the name of Sebastian Bergmann nor the names of his + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * @package File + * @author Sebastian Bergmann <sb(a)sebastian-bergmann.de> + * @copyright 2009-2011 Sebastian Bergmann <sb(a)sebastian-bergmann.de> + * @license http://www.opensource.org/licenses/bsd-license.php BSD License + * @since File available since Release 1.0.0 + */ + +/** + * FilterIterator implementation that filters files based on prefix(es) and/or + * suffix(es). Hidden files and files from hidden directories are also filtered. + * + * @author Sebastian Bergmann <sb(a)sebastian-bergmann.de> + * @copyright 2009-2011 Sebastian Bergmann <sb(a)sebastian-bergmann.de> + * @license http://www.opensource.org/licenses/bsd-license.php BSD License + * @version Release: 1.3.0 + * @link http://github.com/sebastianbergmann/php-file-iterator/tree + * @since Class available since Release 1.0.0 + */ +class File_Iterator extends FilterIterator +{ + const PREFIX = 0; + const SUFFIX = 1; + + /** + * @var array + */ + protected $suffixes = array(); + + /** + * @var array + */ + protected $prefixes = array(); + + /** + * @var array + */ + protected $exclude = array(); + + /** + * @var string + */ + protected $basepath; + + /** + * @param Iterator $iterator + * @param array $suffixes + * @param array $prefixes + * @param array $exclude + * @param string $basepath + */ + public function __construct(Iterator $iterator, array $suffixes = array(), array $prefixes = array(), array $exclude = array(), $basepath = NULL) + { + $exclude = array_filter(array_map('realpath', $exclude)); + + if ($basepath !== NULL) { + $basepath = realpath($basepath); + } + + if ($basepath === FALSE) { + $basepath = NULL; + } else { + foreach ($exclude as &$_exclude) { + $_exclude = str_replace($basepath, '', $_exclude); + } + } + + $this->prefixes = $prefixes; + $this->suffixes = $suffixes; + $this->exclude = $exclude; + $this->basepath = $basepath; + + parent::__construct($iterator); + } + + /** + * @return boolean + */ + public function accept() + { + $current = $this->getInnerIterator()->current(); + $filename = $current->getFilename(); + $realpath = $current->getRealPath(); + + if ($this->basepath !== NULL) { + $realpath = str_replace($this->basepath, '', $realpath); + } + + // Filter files in hidden directories. + if (preg_match('=/\.[^/]*/=', $realpath)) { + return FALSE; + } + + return $this->acceptPath($realpath) && + $this->acceptPrefix($filename) && + $this->acceptSuffix($filename); + } + + /** + * @param string $path + * @return boolean + * @since Method available since Release 1.1.0 + */ + protected function acceptPath($path) + { + foreach ($this->exclude as $exclude) { + if (strpos($path, $exclude) === 0) { + return FALSE; + } + } + + return TRUE; + } + + /** + * @param string $filename + * @return boolean + * @since Method available since Release 1.1.0 + */ + protected function acceptPrefix($filename) + { + return $this->acceptSubString($filename, $this->prefixes, self::PREFIX); + } + + /** + * @param string $filename + * @return boolean + * @since Method available since Release 1.1.0 + */ + protected function acceptSuffix($filename) + { + return $this->acceptSubString($filename, $this->suffixes, self::SUFFIX); + } + + /** + * @param string $filename + * @param array $subString + * @param integer $type + * @return boolean + * @since Method available since Release 1.1.0 + */ + protected function acceptSubString($filename, array $subStrings, $type) + { + if (empty($subStrings)) { + return TRUE; + } + + $matched = FALSE; + + foreach ($subStrings as $string) { + if (($type == self::PREFIX && strpos($filename, $string) === 0) || + ($type == self::SUFFIX && + substr($filename, -1 * strlen($string)) == $string)) { + $matched = TRUE; + break; + } + } + + return $matched; + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File_Iterator-1.3.0/LICENSE new/File_Iterator-1.3.0/LICENSE --- old/File_Iterator-1.3.0/LICENSE 1970-01-01 01:00:00.000000000 +0100 +++ new/File_Iterator-1.3.0/LICENSE 2011-10-31 08:35:20.000000000 +0100 @@ -0,0 +1,33 @@ +File_Iterator + +Copyright (c) 2009-2011, Sebastian Bergmann <sebastian(a)phpunit.de>. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + + * Neither the name of Sebastian Bergmann nor the names of his + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File_Iterator-1.3.0/README.markdown new/File_Iterator-1.3.0/README.markdown --- old/File_Iterator-1.3.0/README.markdown 1970-01-01 01:00:00.000000000 +0100 +++ new/File_Iterator-1.3.0/README.markdown 2011-10-31 08:35:20.000000000 +0100 @@ -0,0 +1,23 @@ +File_Iterator +============= + +Installation +------------ + +File_Iterator should be installed using the [PEAR Installer](http://pear.php.net/). This installer is the backbone of PEAR, which provides a distribution system for PHP packages, and is shipped with every release of PHP since version 4.3.0. + +The PEAR channel (`pear.phpunit.de`) that is used to distribute File_Iterator needs to be registered with the local PEAR environment: + + sb@ubuntu ~ % pear channel-discover pear.phpunit.de + Adding Channel "pear.phpunit.de" succeeded + Discovery of channel "pear.phpunit.de" succeeded + +This has to be done only once. Now the PEAR Installer can be used to install packages from the PHPUnit channel: + + sb@vmware ~ % pear install phpunit/File_Iterator + downloading File_Iterator-1.1.1.tgz ... + Starting to download File_Iterator-1.1.1.tgz (3,173 bytes) + ....done: 3,173 bytes + install ok: channel://pear.phpunit.de/File_Iterator-1.1.1 + +After the installation you can find the File_Iterator source files inside your local PEAR directory; the path is usually `/usr/lib/php/File`. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/package.sig new/package.sig --- old/package.sig 2011-03-03 12:09:15.000000000 +0100 +++ new/package.sig 2011-10-31 08:35:26.000000000 +0100 @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.10 (GNU/Linux) +Version: GnuPG v1.4.11 (GNU/Linux) -iEYEABECAAYFAk1vdtsACgkQaGfFFLhbXWnv5ACdGkjNKgna7FN5i1fartBwf7a5 -KuAAoJTYU+JgX55GCHOS3vNJGS/cCMv+ -=xFYJ +iEYEABECAAYFAk6uT74ACgkQaGfFFLhbXWlC4gCfUizXzyBYaVDtmLbiSMplwtL9 +UjwAn3yn3JauEBw1CI/zXTMC4dQcibnm +=V4o5 -----END PGP SIGNATURE----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/package.xml new/package.xml --- old/package.xml 2011-03-03 12:09:06.000000000 +0100 +++ new/package.xml 2011-10-31 08:35:20.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<package packagerversion="1.9.2" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd"> +<package packagerversion="1.9.4" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd"> <name>File_Iterator</name> <channel>pear.phpunit.de</channel> <summary>FilterIterator implementation that filters files based on a list of suffixes.</summary> @@ -10,11 +10,11 @@ <email>sb(a)sebastian-bergmann.de</email> <active>yes</active> </lead> - <date>2011-03-03</date> - <time>12:09:06</time> + <date>2011-10-31</date> + <time>07:35:20</time> <version> - <release>1.2.6</release> - <api>1.2.0</api> + <release>1.3.0</release> + <api>1.3.0</api> </version> <stability> <release>stable</release> @@ -26,12 +26,21 @@ </notes> <contents> <dir name="/"> - <file baseinstalldir="/" md5sum="b94f61ba396a93cac79139385ea342f1" name="File/Iterator/Factory.php" role="php"> + <file baseinstalldir="/" md5sum="c29a6f674e13239a00e06a1e0f430f51" name="File/Iterator/Autoload.php" role="php"> <tasks:replace from="@package_version@" to="version" type="package-info" /> </file> - <file baseinstalldir="/" md5sum="bb658523802be16147124d4ea764675b" name="File/Iterator.php" role="php"> + <file baseinstalldir="/" md5sum="9d41185dfdf864314f115833016b9cbd" name="File/Iterator/Facade.php" role="php"> <tasks:replace from="@package_version@" to="version" type="package-info" /> </file> + <file baseinstalldir="/" md5sum="50afc594ba86e47c301d6479c8eb9d8c" name="File/Iterator/Factory.php" role="php"> + <tasks:replace from="@package_version@" to="version" type="package-info" /> + </file> + <file baseinstalldir="/" md5sum="145c4c9879405574527a85d7493a02b6" name="File/Iterator.php" role="php"> + <tasks:replace from="@package_version@" to="version" type="package-info" /> + </file> + <file baseinstalldir="/" md5sum="afdc0b086464c741eee235b891522e84" name="ChangeLog.markdown" role="doc" /> + <file baseinstalldir="/" md5sum="967973d16b0a888f75df537da1374266" name="LICENSE" role="doc" /> + <file baseinstalldir="/" md5sum="9b631fc7945bad76a8f367e7bb7504cf" name="README.markdown" role="doc" /> </dir> </contents> <dependencies> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0