March 2016 - openSUSE Commits - openSUSE Mailing Lists

commit perl-Data-OptList for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '16

31 Mar '16

Hello community, here is the log from the commit of package perl-Data-OptList for openSUSE:Factory checked in at 2016-03-31 13:03:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Data-OptList (Old) and /work/SRC/openSUSE:Factory/.perl-Data-OptList.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Data-OptList" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Data-OptList/perl-Data-OptList.changes 2013-12-22 19:37:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Data-OptList.new/perl-Data-OptList.changes 2016-03-31 13:03:05.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Mar 29 09:13:48 UTC 2016 - coolo(a)suse.com + +- updated to 0.110 + see /usr/share/doc/packages/perl-Data-OptList/Changes + + 0.110 2016-03-24 21:20:54-04:00 America/New_York + - major optimization to mkopt (thanks, Olivier Mengué) + +------------------------------------------------------------------- Old: ---- Data-OptList-0.109.tar.gz New: ---- Data-OptList-0.110.tar.gz cpanspec.yml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Data-OptList.spec ++++++ --- /var/tmp/diff_new_pack.YvWLQ4/_old 2016-03-31 13:03:06.000000000 +0200 +++ /var/tmp/diff_new_pack.YvWLQ4/_new 2016-03-31 13:03:06.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Data-OptList # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,15 @@ Name: perl-Data-OptList -Version: 0.109 +Version: 0.110 Release: 0 %define cpan_name Data-OptList -Summary: parse and validate simple name/value option pairs +Summary: Parse and Validate Simple Name/Value Option Pairs License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Data-OptList/ -Source: http://www.cpan.org/authors/id/R/RJ/RJBS/%{cpan_name}-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/R/RJ/RJBS/%{cpan_name}-%{version}.tar.gz +Source1: cpanspec.yml BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl @@ -32,7 +33,6 @@ BuildRequires: perl(Params::Util) BuildRequires: perl(Sub::Install) >= 0.921 BuildRequires: perl(Test::More) >= 0.96 - Requires: perl(Params::Util) Requires: perl(Sub::Install) >= 0.921 %{perl_requires} @@ -73,12 +73,6 @@ %prep %setup -q -n %{cpan_name}-%{version} -# MANUAL -%if 0%{?suse_version} < 1120 -for i in `find t -type f` ; do - sed -i -e "s@^\s*use\s\s*Test::More@use lib '%{perl_vendorlib}';\nuse Test::More@" $i -done -%endif %build %{__perl} Makefile.PL INSTALLDIRS=vendor ++++++ Data-OptList-0.109.tar.gz -> Data-OptList-0.110.tar.gz ++++++ ++++ 1876 lines of diff (skipped) ++++++ cpanspec.yml ++++++ --- #description_paragraphs: 3 #description: |- # override description from CPAN #summary: override summary from CPAN #no_testing: broken upstream #sources: # - source1 # - source2 #patches: # foo.patch: -p1 # bar.patch: #preamble: |- # BuildRequires: gcc-c++ #post_prep: |- # hunspell=`pkg-config --libs hunspell | sed -e 's,-l,,; s, *,,g'` # sed -i -e "s,hunspell-X,$hunspell," t/00-prereq.t Makefile.PL #post_build: |- # rm unused.files #post_install: |- # sed on %{name}.files #license: SUSE-NonFree #skip_noarch: 1 #custom_build: |- #./Build build flags=%{?_smp_mflags} --myflag #custom_test: |- #startserver && make test #ignore_requires: Bizarre::Module

1 0

commit perl-DateTime-Locale for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '16

31 Mar '16

Hello community, here is the log from the commit of package perl-DateTime-Locale for openSUSE:Factory checked in at 2016-03-31 13:03:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-DateTime-Locale (Old) and /work/SRC/openSUSE:Factory/.perl-DateTime-Locale.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-DateTime-Locale" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-DateTime-Locale/perl-DateTime-Locale.changes 2015-12-16 17:42:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-DateTime-Locale.new/perl-DateTime-Locale.changes 2016-03-31 13:03:01.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Mar 29 09:16:32 UTC 2016 - coolo(a)suse.com + +- updated to 1.03 + see /usr/share/doc/packages/perl-DateTime-Locale/Changes + + 1.03 2016-03-25 + + - Rebuilt all locale data with CLDR 29, released on 2016-03-19. + +------------------------------------------------------------------- Old: ---- DateTime-Locale-1.02.tar.gz New: ---- DateTime-Locale-1.03.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-DateTime-Locale.spec ++++++ --- /var/tmp/diff_new_pack.KYKTKs/_old 2016-03-31 13:03:02.000000000 +0200 +++ /var/tmp/diff_new_pack.KYKTKs/_new 2016-03-31 13:03:02.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-DateTime-Locale # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,10 +17,10 @@ Name: perl-DateTime-Locale -Version: 1.020000 +Version: 1.030000 Release: 0 -%define cpan_version 1.02 -Provides: perl(DateTime::Locale) = 1.020000 +%define cpan_version 1.03 +Provides: perl(DateTime::Locale) = 1.030000 %define cpan_name DateTime-Locale Summary: Localization support for DateTime.pm License: Artistic-1.0 or GPL-1.0+ @@ -70,6 +70,6 @@ %files -f %{name}.files %defattr(-,root,root,755) -%doc Changes LICENSE LICENSE.cldr MANIFEST.base README README.md +%doc Changes CONTRIBUTING.md LICENSE LICENSE.cldr README.md %changelog ++++++ DateTime-Locale-1.02.tar.gz -> DateTime-Locale-1.03.tar.gz ++++++ ++++ 42153 lines of diff (skipped)

1 0

commit perl-DateTime-TimeZone for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '16

31 Mar '16

Hello community, here is the log from the commit of package perl-DateTime-TimeZone for openSUSE:Factory checked in at 2016-03-31 13:02:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-DateTime-TimeZone (Old) and /work/SRC/openSUSE:Factory/.perl-DateTime-TimeZone.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-DateTime-TimeZone" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-DateTime-TimeZone/perl-DateTime-TimeZone.changes 2016-03-17 16:49:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-DateTime-TimeZone.new/perl-DateTime-TimeZone.changes 2016-03-31 13:02:59.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Mar 29 09:17:15 UTC 2016 - coolo(a)suse.com + +- updated to 1.97 + see /usr/share/doc/packages/perl-DateTime-TimeZone/Changes + + 1.97 2016-03-23 + + - This release is based on version 2016c of the Olson database. This release + includes contemporary changes for Azerbaijan and Chile. + +------------------------------------------------------------------- Old: ---- DateTime-TimeZone-1.96.tar.gz New: ---- DateTime-TimeZone-1.97.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-DateTime-TimeZone.spec ++++++ --- /var/tmp/diff_new_pack.WDQicY/_old 2016-03-31 13:03:00.000000000 +0200 +++ /var/tmp/diff_new_pack.WDQicY/_new 2016-03-31 13:03:00.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-DateTime-TimeZone -Version: 1.96 +Version: 1.97 Release: 0 %define cpan_name DateTime-TimeZone Summary: Time zone object base class and factory @@ -74,6 +74,6 @@ %files -f %{name}.files %defattr(-,root,root,755) -%doc Changes LICENSE README.md +%doc Changes CONTRIBUTING.md LICENSE README.md %changelog ++++++ DateTime-TimeZone-1.96.tar.gz -> DateTime-TimeZone-1.97.tar.gz ++++++ ++++ 18625 lines of diff (skipped)

1 0

commit perl-Params-Validate for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '16

31 Mar '16

Hello community, here is the log from the commit of package perl-Params-Validate for openSUSE:Factory checked in at 2016-03-31 13:02:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Params-Validate (Old) and /work/SRC/openSUSE:Factory/.perl-Params-Validate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Params-Validate" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Params-Validate/perl-Params-Validate.changes 2016-02-26 00:39:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Params-Validate.new/perl-Params-Validate.changes 2016-03-31 13:02:58.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Mar 29 09:55:50 UTC 2016 - coolo(a)suse.com + +- updated to 1.23 + see /usr/share/doc/packages/perl-Params-Validate/Changes + + 1.23 2016-03-26 + + - Fixed some Perl stack corruption bugs. Based on a proposed PR from Tony Cook + plus some additional changes. GH #8. + + - Fixed tests with Carp 1.01 (shipped with Perl 5.8.3). Patch by Andreas + Koenig. RT #113318. + +------------------------------------------------------------------- Old: ---- Params-Validate-1.22.tar.gz New: ---- Params-Validate-1.23.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Params-Validate.spec ++++++ --- /var/tmp/diff_new_pack.tpKRCk/_old 2016-03-31 13:02:59.000000000 +0200 +++ /var/tmp/diff_new_pack.tpKRCk/_new 2016-03-31 13:02:59.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-Params-Validate -Version: 1.22 +Version: 1.23 Release: 0 %define cpan_name Params-Validate Summary: Validate method/function parameters @@ -29,13 +29,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -BuildRequires: perl(JSON::PP) >= 2.27300 BuildRequires: perl(Module::Build) >= 0.280000 BuildRequires: perl(Module::Implementation) BuildRequires: perl(Test::Fatal) BuildRequires: perl(Test::More) >= 0.96 BuildRequires: perl(Test::Requires) -Requires: perl(JSON::PP) >= 2.27300 Requires: perl(Module::Implementation) %{perl_requires} @@ -65,6 +63,6 @@ %files -f %{name}.files %defattr(-,root,root,755) -%doc Changes LICENSE README.md TODO +%doc Changes CONTRIBUTING.md LICENSE README.md TODO %changelog ++++++ Params-Validate-1.22.tar.gz -> Params-Validate-1.23.tar.gz ++++++ ++++ 8465 lines of diff (skipped)

1 0

commit dstat for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '16

31 Mar '16

Hello community, here is the log from the commit of package dstat for openSUSE:Factory checked in at 2016-03-31 13:02:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dstat (Old) and /work/SRC/openSUSE:Factory/.dstat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dstat" Changes: -------- --- /work/SRC/openSUSE:Factory/dstat/dstat.changes 2015-08-01 11:36:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dstat.new/dstat.changes 2016-03-31 13:02:56.000000000 +0200 @@ -1,0 +2,32 @@ +Tue Mar 29 11:10:58 UTC 2016 - mpluskal(a)suse.com + +- Update url + +------------------------------------------------------------------- +Mon Mar 21 00:00:00 CET 2016 - dsterba(a)suse.cz + +- update to 0.7.3 + - Provide kernel configuration options to error mesages where possible + - Added external dstat_md_dstat plugin to show the resync progress of SWRAID + - Changed color of 100% to white to make it stand out + - Added new --bits option to force bit-values on screen + - Fix to allow internal plugins to use underscores/dashes too + - Improve internal dstat_vm plugin to use globs for matching/adding counters + - Added internal dstat_vm_adv plugin to show advanced VM counters + - Added internal dstat_zones plugin to show zoneinfo counters + - Fix warning message when colors are disabled because TERM is not found + - Fix typo in dstat_nfs3_ops and dstat_nfsd3_ops (Chris Larsson) + - Added external dstat_mem_adv plugin so show advanced memory counters (Damon + Snyder) + - Allow more variables (self.vars) than nicknames (self.nick) to simplify + plugins + - Using -f/--full does not impact -c/--cpu anymore, most systems ship with 2 + or more CPUs + - Added counter 'parent' when printing CSV subtitles of list-counters + - Print decimal values as decimals where possible (so 0 instead of 0.0) + - Added external dstat_ddwrt_* plugins using DD-WRT counters using SNMP + infrastructure + - Fixed improper process names using spaces instead of \0 + - Added --cpu-use plugin with onlu CPU usage per CPU + +------------------------------------------------------------------- Old: ---- dstat-0.7.2.tar.bz2 New: ---- 0.7.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dstat.spec ++++++ --- /var/tmp/diff_new_pack.ZJNzYY/_old 2016-03-31 13:02:57.000000000 +0200 +++ /var/tmp/diff_new_pack.ZJNzYY/_new 2016-03-31 13:02:57.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package dstat # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,21 +17,22 @@ Name: dstat -Version: 0.7.2 +Version: 0.7.3 Release: 0 Summary: Versatile vmstat, iostat and ifstat Replacement License: GPL-2.0 Group: System/Monitoring Url: http://dag.wieers.com/home-made/dstat/ -Source: http://dag.wieers.com/home-made/dstat/dstat-%{version}.tar.bz2 +Source: https://github.com/dagwieers/dstat/archive/%{version}.tar.gz Source1: dstat.desktop BuildRequires: make Requires: python BuildArch: noarch %if 0%{?suse_version} -Recommends: python-utmp +BuildRequires: fdupes BuildRequires: update-desktop-files Requires: python-curses +Recommends: python-utmp %endif %description @@ -55,12 +56,13 @@ %build %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +make %{?_smp_mflags} DESTDIR=%{buildroot} install install -D -m 0644 docs/dstat.1 "%{buildroot}%{_mandir}/man1/dstat.1" install -D -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.desktop" %if 0%{?suse_update_desktop_file:1} %suse_update_desktop_file -r "%{name}" System Monitor +%fdupes -s %{buildroot} %endif rm docs/Makefile @@ -75,8 +77,8 @@ %files %defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING README TODO WISHLIST -%doc docs/*.html docs/*.txt examples/ proc/ +%doc AUTHORS ChangeLog COPYING README.md TODO +%doc docs/*.html docs/*.adoc examples/ proc/ %{_bindir}/dstat %dir %{_datadir}/dstat %{_datadir}/dstat/*

1 0

commit grsync for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '16

31 Mar '16

Hello community, here is the log from the commit of package grsync for openSUSE:Factory checked in at 2016-03-31 13:02:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grsync (Old) and /work/SRC/openSUSE:Factory/.grsync.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "grsync" Changes: -------- --- /work/SRC/openSUSE:Factory/grsync/grsync.changes 2015-01-20 12:34:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.grsync.new/grsync.changes 2016-03-31 13:02:55.000000000 +0200 @@ -1,0 +2,19 @@ +Wed Mar 23 00:12:41 UTC 2016 - lazy.kent(a)opensuse.org + +- Update to 1.2.6. + * Don't save "default" session to ini file when "remember last + used session" is off. + * Better "before command" error notification. + * Added "overwrite logs" preferences option. + * Updated Norwegian, Russian, German, Swedish, Simplified Chinese + * translations. + * Enhanced and translated desktop file. + * Updated README file. +- Split off and Recommend a -lang package, +- Drop fix-desktop-file.patch: the action is done running + %suse_update_desktop_file macro. +- Drop grsync-link-libm.patch: fixed upstream. +- Rebase fix-invalid-lc-messages-dir.patch: add "hu", don't touch + pt_BR, zh_CN, zh_TW, as they are in their own. + +------------------------------------------------------------------- Old: ---- fix-desktop-file.patch grsync-1.2.5.tar.gz grsync-link-libm.patch New: ---- grsync-1.2.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grsync.spec ++++++ --- /var/tmp/diff_new_pack.drVgMU/_old 2016-03-31 13:02:56.000000000 +0200 +++ /var/tmp/diff_new_pack.drVgMU/_new 2016-03-31 13:02:56.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package grsync # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,14 @@ Name: grsync -Version: 1.2.5 +Version: 1.2.6 Release: 0 Summary: GUI for rsync License: GPL-2.0 Group: Productivity/Archiving/Backup Url: http://www.opbyte.it/grsync/ Source: http://www.opbyte.it/release/%{name}-%{version}.tar.gz -Patch0: fix-desktop-file.patch Patch1: fix-invalid-lc-messages-dir.patch -Patch2: grsync-link-libm.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: dos2unix @@ -35,6 +33,7 @@ BuildRequires: update-desktop-files BuildRequires: pkgconfig(gtk+-2.0) >= 2.16 Requires: rsync +Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -45,11 +44,11 @@ a music collection with removable devices, backup personal files to a networked drive, replication of a partition to another one, mirroring of files, etc. +%lang_package + %prep %setup -q -%patch0 -p1 %patch1 -p1 -%patch2 -p1 %build autoreconf -fi @@ -63,27 +62,23 @@ mv fr_FR.po fr.po mv gl_ES.po gl.po mv hr_HR.po hr.po +mv hu_HU.po hu.po mv id_ID.po id.po mv it_IT.po it.po mv nb_NO.po nb.po mv nl_NL.po nl.po -mv pt_BR.po pt.po mv ru_RU.po ru.po mv sv_SE.po sv.po mv tr_TR.po tr.po -mv zh_CN.po zh.po popd dos2unix README NEWS AUTHORS %install %make_install -%find_lang %{name} -%suse_update_desktop_file -i %{name} Utility Archiving - -%clean -rm -rf %{buildroot} +%find_lang %{name} %{?no_lang_C} +%suse_update_desktop_file -r %{name} Utility Archiving GTK -%files -f %{name}.lang +%files %defattr(-,root,root) %doc AUTHORS COPYING README NEWS %{_bindir}/grsync @@ -91,9 +86,11 @@ %{_datadir}/applications/grsync.desktop %{_datadir}/pixmaps/grsync.png %{_datadir}/pixmaps/grsync-busy.png -%{_datadir}/%{name} -%{_datadir}/mime/packages/grsync.xml +%{_datadir}/%{name}/ %{_datadir}/icons/hicolor/48x48/mimetypes/application-x-grsync-session.png +%{_datadir}/mime/packages/grsync.xml %{_mandir}/man1/grsync* +%files lang -f %{name}.lang + %changelog ++++++ fix-invalid-lc-messages-dir.patch ++++++ --- /var/tmp/diff_new_pack.drVgMU/_old 2016-03-31 13:02:56.000000000 +0200 +++ /var/tmp/diff_new_pack.drVgMU/_new 2016-03-31 13:02:56.000000000 +0200 @@ -11,7 +11,7 @@ dnl Add the languages which your application supports here. -ALL_LINGUAS="nl_NL it_IT zh_CN fr_FR sv_SE nb_NO tr_TR ru_RU de_DE es_ES cs_CZ gl_ES ca_ES pt_BR id_ID hr_HR zh_TW hu_HU" -+ALL_LINGUAS="nl it zh fr sv nb tr ru de es cs gl ca pt id hr zh" ++ALL_LINGUAS="ca cs de es fr gl hr hu id it nb nl pt_BR ru sv tr zh_CN zh_TW" AM_GLIB_GNU_GETTEXT AC_OUTPUT([ ++++++ grsync-1.2.5.tar.gz -> grsync-1.2.6.tar.gz ++++++ ++++ 9300 lines of diff (skipped)

1 0

commit gphoto for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '16

31 Mar '16

Hello community, here is the log from the commit of package gphoto for openSUSE:Factory checked in at 2016-03-31 13:02:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gphoto (Old) and /work/SRC/openSUSE:Factory/.gphoto.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gphoto" Changes: -------- --- /work/SRC/openSUSE:Factory/gphoto/gphoto.changes 2015-11-26 17:01:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gphoto.new/gphoto.changes 2016-03-31 13:02:53.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Mar 23 21:14:03 UTC 2016 - meissner(a)suse.com + +- updated to 2.5.10 release +* use new single configuration set/get if possible +* updated translations: serbian, russian, hungarian, vietnamese, ukrainian, polish, swedish, brazilian portuguese +* require libgphoto2 2.5.10 or newer + +------------------------------------------------------------------- Old: ---- gphoto2-2.5.9.tar.bz2 gphoto2-2.5.9.tar.bz2.asc New: ---- gphoto2-2.5.10.tar.bz2 gphoto2-2.5.10.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gphoto.spec ++++++ --- /var/tmp/diff_new_pack.za3aPP/_old 2016-03-31 13:02:54.000000000 +0200 +++ /var/tmp/diff_new_pack.za3aPP/_new 2016-03-31 13:02:54.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gphoto # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,7 @@ Summary: A Digital Camera Utility License: GPL-2.0+ Group: Hardware/Camera -Version: 2.5.9 +Version: 2.5.10 Release: 0 Source0: https://downloads.sourceforge.net/project/gphoto/gphoto/%{version}/%{name}2… Source1: https://downloads.sourceforge.net/project/gphoto/gphoto/%{version}/%{name}2… ++++++ gphoto2-2.5.9.tar.bz2 -> gphoto2-2.5.10.tar.bz2 ++++++ ++++ 7178 lines of diff (skipped)

1 0

commit texmath for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '16

31 Mar '16

Hello community, here is the log from the commit of package texmath for openSUSE:Factory checked in at 2016-03-31 13:02:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texmath (Old) and /work/SRC/openSUSE:Factory/.texmath.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texmath" Changes: -------- --- /work/SRC/openSUSE:Factory/texmath/texmath.changes 2016-03-26 15:26:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.texmath.new/texmath.changes 2016-03-31 13:02:51.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Mar 29 07:40:14 UTC 2016 - mimi.vx(a)gmail.com + +- update to 0.8.5.1 +* OMML writer: Fixed order of elements in nary formulas to conform + to OMML spec (#88, Niko Weh). `<e>` must follow the `<sup>` and `<sub>` + parts of `<nary>`. This fixes rendering issues in LibreOffice + (though Word copes with the incorrect order). +* Added Paths_texmath to Other-Modules for texmath executable. + +------------------------------------------------------------------- Old: ---- texmath-0.8.5.tar.gz New: ---- texmath-0.8.5.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texmath.spec ++++++ --- /var/tmp/diff_new_pack.Zo9u0m/_old 2016-03-31 13:02:51.000000000 +0200 +++ /var/tmp/diff_new_pack.Zo9u0m/_new 2016-03-31 13:02:51.000000000 +0200 @@ -19,7 +19,7 @@ %global pkg_name texmath Name: texmath -Version: 0.8.5 +Version: 0.8.5.1 Release: 0 Summary: Conversion of LaTeX math formulas to MathML or OMML License: GPL-2.0 ++++++ texmath-0.8.5.tar.gz -> texmath-0.8.5.1.tar.gz ++++++ ++++ 3430 lines of diff (skipped)

1 0

commit ghc-wai-extra for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '16

31 Mar '16

Hello community, here is the log from the commit of package ghc-wai-extra for openSUSE:Factory checked in at 2016-03-31 13:02:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-wai-extra (Old) and /work/SRC/openSUSE:Factory/.ghc-wai-extra.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-wai-extra" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-wai-extra/ghc-wai-extra.changes 2016-03-26 15:26:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-wai-extra.new/ghc-wai-extra.changes 2016-03-31 13:02:45.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Mar 23 08:24:05 UTC 2016 - mimi.vx(a)gmail.com + +- update to 3.0.15 +* add requestSizeCheck + +------------------------------------------------------------------- Old: ---- wai-extra-3.0.14.3.tar.gz New: ---- wai-extra-3.0.15.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-wai-extra.spec ++++++ --- /var/tmp/diff_new_pack.CMbPSh/_old 2016-03-31 13:02:48.000000000 +0200 +++ /var/tmp/diff_new_pack.CMbPSh/_new 2016-03-31 13:02:48.000000000 +0200 @@ -21,7 +21,7 @@ %bcond_with tests Name: ghc-wai-extra -Version: 3.0.14.3 +Version: 3.0.15 Release: 0 Summary: Provides some basic WAI handlers and middleware License: MIT ++++++ wai-extra-3.0.14.3.tar.gz -> wai-extra-3.0.15.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-extra-3.0.14.3/ChangeLog.md new/wai-extra-3.0.15/ChangeLog.md --- old/wai-extra-3.0.14.3/ChangeLog.md 2016-03-16 13:47:43.000000000 +0100 +++ new/wai-extra-3.0.15/ChangeLog.md 2016-03-22 10:15:32.000000000 +0100 @@ -1,3 +1,7 @@ +## 3.0.15 + +* add requestSizeCheck [#525](https://github.com/yesodweb/wai/pull/525) + ## 3.0.14.3 * Add missing `requestHeaderReferer` and `requestHeaderUserAgent` fields to CGI [yesod#1186](https://github.com/yesodweb/yesod/issues/1186) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-extra-3.0.14.3/Network/Wai/Request.hs new/wai-extra-3.0.15/Network/Wai/Request.hs --- old/wai-extra-3.0.14.3/Network/Wai/Request.hs 2016-03-16 13:47:43.000000000 +0100 +++ new/wai-extra-3.0.15/Network/Wai/Request.hs 2016-03-22 10:15:32.000000000 +0100 @@ -1,17 +1,25 @@ +{-# LANGUAGE DeriveDataTypeable #-} -- | Some helpers for interrogating a WAI 'Request'. module Network.Wai.Request ( appearsSecure , guessApproot + , RequestSizeException(..) + , requestSizeCheck ) where import Data.ByteString (ByteString) import Data.Maybe (fromMaybe) import Network.HTTP.Types (HeaderName) -import Network.Wai (Request, isSecure, requestHeaders, requestHeaderHost) +import Network.Wai import qualified Data.ByteString as S import qualified Data.ByteString.Char8 as C +import Control.Exception (Exception, throwIO) +import Data.Typeable (Typeable) +import Data.Word (Word64) +import Data.IORef (atomicModifyIORef', newIORef) + -- | Does this request appear to have been made over an SSL connection? -- @@ -24,7 +32,7 @@ -- force a non-SSL request to SSL by redirect. One can safely choose not to -- redirect when the request /appears/ secure, even if it's actually not. -- --- Since 3.0.7 +-- @since 3.0.7 appearsSecure :: Request -> Bool appearsSecure request = isSecure request || any (uncurry matchHeader) [ ("HTTPS" , (== "on")) @@ -44,8 +52,50 @@ -- application. For more information and relevant caveats, please see -- "Network.Wai.Middleware.Approot". -- --- Since 3.0.7 +-- @since 3.0.7 guessApproot :: Request -> ByteString guessApproot req = (if appearsSecure req then "https://" else "http://") `S.append` (fromMaybe "localhost" $ requestHeaderHost req) + +-- | see 'requestSizeCheck' +-- +-- @since 3.0.15 +data RequestSizeException + = RequestSizeException Word64 + deriving (Eq, Ord, Typeable) + +instance Exception RequestSizeException + +instance Show RequestSizeException where + showsPrec p (RequestSizeException limit) = + showString ("Request Body is larger than ") . showsPrec p limit . showString " bytes." + +-- | Check request body size to avoid server crash when request is too large. +-- +-- This function first checks @'requestBodyLength'@, if content-length is known +-- but larger than limit, or it's unknown but we have received too many chunks, +-- a 'RequestSizeException' are thrown when user use @'requestBody'@ to extract +-- request body inside IO. +-- +-- @since 3.0.15 +requestSizeCheck :: Word64 -> Request -> IO Request +requestSizeCheck maxSize req = + case requestBodyLength req of + KnownLength len -> + if len > maxSize + then return $ req { requestBody = throwIO (RequestSizeException maxSize) } + else return req + ChunkedBody -> do + currentSize <- newIORef 0 + return $ req + { requestBody = do + bs <- requestBody req + total <- + atomicModifyIORef' currentSize $ \sz -> + let nextSize = sz + fromIntegral (S.length bs) + in (nextSize, nextSize) + if total > maxSize + then throwIO (RequestSizeException maxSize) + else return bs + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-extra-3.0.14.3/test/Network/Wai/RequestSpec.hs new/wai-extra-3.0.15/test/Network/Wai/RequestSpec.hs --- old/wai-extra-3.0.14.3/test/Network/Wai/RequestSpec.hs 2016-03-16 13:47:43.000000000 +0100 +++ new/wai-extra-3.0.15/test/Network/Wai/RequestSpec.hs 2016-03-22 10:15:32.000000000 +0100 @@ -8,52 +8,82 @@ import Data.ByteString (ByteString) import Network.HTTP.Types (HeaderName) -import Network.Wai (Request(..), defaultRequest) +import Network.Wai (Request(..), defaultRequest, RequestBodyLength(..)) import Network.Wai.Request +import Control.Exception (try) +import Control.Monad (forever) main :: IO () main = hspec spec spec :: Spec -spec = describe "appearsSecure" $ do - let insecureRequest = defaultRequest - { isSecure = False - , requestHeaders = - [ ("HTTPS", "off") - , ("HTTP_X_FORWARDED_SSL", "off") - , ("HTTP_X_FORWARDED_SCHEME", "http") - , ("HTTP_X_FORWARDED_PROTO", "http,xyz") - ] - } +spec = do + describe "requestSizeCheck" $ do + it "too large content length should throw RequestSizeException" $ do + let limit = 1024 + largeRequest = defaultRequest + { isSecure = False + , requestBodyLength = KnownLength (limit + 1) + , requestBody = return "repeat this chunk" + } + checkedRequest <- requestSizeCheck limit largeRequest + body <- try (requestBody checkedRequest) + case body of + Left (RequestSizeException l) -> l `shouldBe` limit + Right _ -> expectationFailure "request size check failed" + + it "too many chunks should throw RequestSizeException" $ do + let limit = 1024 + largeRequest = defaultRequest + { isSecure = False + , requestBodyLength = ChunkedBody + , requestBody = return "repeat this chunk" + } + checkedRequest <- requestSizeCheck limit largeRequest + body <- try (forever $ requestBody checkedRequest) + case body of + Left (RequestSizeException l) -> l `shouldBe` limit + Right _ -> expectationFailure "request size check failed" + + describe "appearsSecure" $ do + let insecureRequest = defaultRequest + { isSecure = False + , requestHeaders = + [ ("HTTPS", "off") + , ("HTTP_X_FORWARDED_SSL", "off") + , ("HTTP_X_FORWARDED_SCHEME", "http") + , ("HTTP_X_FORWARDED_PROTO", "http,xyz") + ] + } + + it "returns False for an insecure request" $ + insecureRequest `shouldSatisfy` not . appearsSecure + + it "checks if the Request is actually secure" $ do + let req = insecureRequest { isSecure = True } + + req `shouldSatisfy` appearsSecure + + it "checks for HTTP: on" $ do + let req = addHeader "HTTPS" "on" insecureRequest + + req `shouldSatisfy` appearsSecure + + it "checks for HTTP_X_FORWARDED_SSL: on" $ do + let req = addHeader "HTTP_X_FORWARDED_SSL" "on" insecureRequest + + req `shouldSatisfy` appearsSecure + + it "checks for HTTP_X_FORWARDED_SCHEME: https" $ do + let req = addHeader "HTTP_X_FORWARDED_SCHEME" "https" insecureRequest - it "returns False for an insecure request" $ - insecureRequest `shouldSatisfy` not . appearsSecure + req `shouldSatisfy` appearsSecure - it "checks if the Request is actually secure" $ do - let req = insecureRequest { isSecure = True } + it "checks for HTTP_X_FORWARDED_PROTO: https,..." $ do + let req = addHeader "HTTP_X_FORWARDED_PROTO" "https,xyz" insecureRequest - req `shouldSatisfy` appearsSecure - - it "checks for HTTP: on" $ do - let req = addHeader "HTTPS" "on" insecureRequest - - req `shouldSatisfy` appearsSecure - - it "checks for HTTP_X_FORWARDED_SSL: on" $ do - let req = addHeader "HTTP_X_FORWARDED_SSL" "on" insecureRequest - - req `shouldSatisfy` appearsSecure - - it "checks for HTTP_X_FORWARDED_SCHEME: https" $ do - let req = addHeader "HTTP_X_FORWARDED_SCHEME" "https" insecureRequest - - req `shouldSatisfy` appearsSecure - - it "checks for HTTP_X_FORWARDED_PROTO: https,..." $ do - let req = addHeader "HTTP_X_FORWARDED_PROTO" "https,xyz" insecureRequest - - req `shouldSatisfy` appearsSecure + req `shouldSatisfy` appearsSecure addHeader :: HeaderName -> ByteString -> Request -> Request addHeader name value req = req diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-extra-3.0.14.3/wai-extra.cabal new/wai-extra-3.0.15/wai-extra.cabal --- old/wai-extra-3.0.14.3/wai-extra.cabal 2016-03-16 13:47:43.000000000 +0100 +++ new/wai-extra-3.0.15/wai-extra.cabal 2016-03-22 10:15:32.000000000 +0100 @@ -1,5 +1,5 @@ Name: wai-extra -Version: 3.0.14.3 +Version: 3.0.15 Synopsis: Provides some basic WAI handlers and middleware. description: Provides basic WAI handler and middleware functionality: @@ -71,7 +71,7 @@ Homepage: http://github.com/yesodweb/wai Category: Web Build-Type: Simple -Cabal-Version: >=1.8 +Cabal-Version: >=1.10 Stability: Stable extra-source-files: test/requests/dalvik-request @@ -119,7 +119,7 @@ else build-depends: unix - extensions: OverloadedStrings + default-extensions: OverloadedStrings Exposed-modules: Network.Wai.Handler.CGI Network.Wai.Handler.SCGI @@ -151,6 +151,7 @@ Network.Wai.EventSource Network.Wai.EventSource.EventStream other-modules: Network.Wai.Middleware.RequestLogger.Internal + default-language: Haskell2010 ghc-options: -Wall test-suite spec @@ -182,6 +183,7 @@ , time , case-insensitive ghc-options: -Wall + default-language: Haskell2010 source-repository head type: git

1 0

commit ghc-shakespeare for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '16

31 Mar '16

Hello community, here is the log from the commit of package ghc-shakespeare for openSUSE:Factory checked in at 2016-03-31 13:02:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-shakespeare (Old) and /work/SRC/openSUSE:Factory/.ghc-shakespeare.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-shakespeare" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-shakespeare/ghc-shakespeare.changes 2015-11-26 17:00:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-shakespeare.new/ghc-shakespeare.changes 2016-03-31 13:02:43.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Mar 29 07:37:55 UTC 2016 - mimi.vx(a)gmail.com + +- update to 2.0.8 +* Improve docs in Text.Hamlet + +------------------------------------------------------------------- Old: ---- shakespeare-2.0.7.tar.gz New: ---- shakespeare-2.0.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-shakespeare.spec ++++++ --- /var/tmp/diff_new_pack.7FRZWj/_old 2016-03-31 13:02:45.000000000 +0200 +++ /var/tmp/diff_new_pack.7FRZWj/_new 2016-03-31 13:02:45.000000000 +0200 @@ -20,7 +20,7 @@ %bcond_with tests Name: ghc-shakespeare -Version: 2.0.7 +Version: 2.0.8 Release: 0 Summary: A toolkit for making compile-time interpolated templates Group: System/Libraries ++++++ shakespeare-2.0.7.tar.gz -> shakespeare-2.0.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shakespeare-2.0.7/ChangeLog.md new/shakespeare-2.0.8/ChangeLog.md --- old/shakespeare-2.0.7/ChangeLog.md 2015-10-18 07:20:07.000000000 +0200 +++ new/shakespeare-2.0.8/ChangeLog.md 2016-03-27 13:00:15.000000000 +0200 @@ -1,3 +1,7 @@ +### 2.0.8 + +* Improve docs in Text.Hamlet [#180](https://github.com/yesodweb/shakespeare/pull/180) + ### 2.0.7 * Include aeson's JSON encoding and escape `<`, `>` and `&` to avoid XSS attacks diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shakespeare-2.0.7/Text/Hamlet.hs new/shakespeare-2.0.8/Text/Hamlet.hs --- old/shakespeare-2.0.7/Text/Hamlet.hs 2015-10-18 07:20:07.000000000 +0200 +++ new/shakespeare-2.0.8/Text/Hamlet.hs 2016-03-27 13:00:15.000000000 +0200 @@ -12,16 +12,18 @@ , xshamletFile -- * Hamlet , HtmlUrl + , Render , hamlet , hamletFile , hamletFileReload - , ihamletFileReload , xhamlet , xhamletFile -- * I18N Hamlet , HtmlUrlI18n + , Translate , ihamlet , ihamletFile + , ihamletFileReload -- * Type classes , ToAttributes (..) -- * Internal, for making more @@ -275,9 +277,18 @@ html <- [|attrsToHtml . toAttributes|] return $ hrFromHtml hr `AppE` (html `AppE` derefToExp scope d) +-- | "Simple Hamlet" quasi-quoter. May only be used to generate expressions. +-- +-- Generated expressions have type 'Html'. +-- +-- @ +-- >>> 'putStrLn' ('Text.Blaze.Html.Renderer.renderHtml' ['shamlet'|\<div\>Hello, world!|]) +-- \<div\>Hello, world!\</div\> +-- @ shamlet :: QuasiQuoter shamlet = hamletWithSettings htmlRules defaultHamletSettings +-- | Like 'shamlet', but produces XHTML. xshamlet :: QuasiQuoter xshamlet = hamletWithSettings htmlRules xhtmlHamletSettings @@ -286,9 +297,23 @@ i <- [|id|] return $ HamletRules i ($ (Env Nothing Nothing)) (\_ b -> return b) +-- | Hamlet quasi-quoter. May only be used to generate expressions. +-- +-- Generated expression have type @'HtmlUrl' url@, for some @url@. +-- +-- @ +-- data MyRoute = Home +-- +-- render :: 'Render' MyRoute +-- render Home _ = \"/home\" +-- +-- >>> 'putStrLn' ('Text.Blaze.Html.Renderer.String.renderHtml' (['hamlet'|\<a href=@{Home}\>Home|] render)) +-- \<a href="\/home"\>Home\<\/a\> +-- @ hamlet :: QuasiQuoter hamlet = hamletWithSettings hamletRules defaultHamletSettings +-- | Like 'hamlet', but produces XHTML. xhamlet :: QuasiQuoter xhamlet = hamletWithSettings hamletRules xhtmlHamletSettings @@ -313,6 +338,27 @@ urender $ \ur' -> return ((asHtmlUrl' `AppE` e) `AppE` ur') em _ _ = error "bad Env" +-- | Hamlet quasi-quoter with internationalization. May only be used to generate +-- expressions. +-- +-- Generated expressions have type @'HtmlUrlI18n' msg url@, for some @msg@ and +-- @url@. +-- +-- @ +-- data MyMsg = Hi | Bye +-- +-- data MyRoute = Home +-- +-- renderEnglish :: 'Translate' MyMsg +-- renderEnglish Hi = \"hi\" +-- renderEnglish Bye = \"bye\" +-- +-- renderUrl :: 'Render' MyRoute +-- renderUrl Home _ = \"/home\" +-- +-- >>> 'putStrLn' ('Text.Blaze.Html.Renderer.renderHtml' (['ihamlet'|@{Home} _{Hi} _{Bye}|] renderEnglish renderUrl)) +-- \<div\>/home hi bye \<div\> +-- @ ihamlet :: QuasiQuoter ihamlet = hamletWithSettings ihamletRules defaultHamletSettings @@ -370,26 +416,47 @@ contents <- fmap TL.unpack $ qRunIO $ readUtf8File fp hamletFromString qhr set contents +-- | Like 'hamlet', but reads an external file at compile time. +-- +-- @ +-- $('hamletFile' \"foo.hamlet\") :: 'HtmlUrl' MyRoute +-- @ hamletFile :: FilePath -> Q Exp hamletFile = hamletFileWithSettings hamletRules defaultHamletSettings +-- | Like 'hamletFile', but the external file is parsed at runtime. Allows for +-- more rapid development, but should not be used in production. hamletFileReload :: FilePath -> Q Exp hamletFileReload = hamletFileReloadWithSettings runtimeRules defaultHamletSettings where runtimeRules = HamletRuntimeRules { hrrI18n = False } +-- | Like 'ihamletFile', but the external file is parsed at runtime. Allows for +-- more rapid development, but should not be used in production. ihamletFileReload :: FilePath -> Q Exp ihamletFileReload = hamletFileReloadWithSettings runtimeRules defaultHamletSettings where runtimeRules = HamletRuntimeRules { hrrI18n = True } +-- | Like 'hamletFile', but produces XHTML. xhamletFile :: FilePath -> Q Exp xhamletFile = hamletFileWithSettings hamletRules xhtmlHamletSettings +-- | Like 'shamlet', but reads an external file at compile time. +-- +-- @ +-- $('shamletFile' \"foo.hamlet\") :: 'Html' +-- @ shamletFile :: FilePath -> Q Exp shamletFile = hamletFileWithSettings htmlRules defaultHamletSettings +-- | Like 'shamletFile', but produces XHTML. xshamletFile :: FilePath -> Q Exp xshamletFile = hamletFileWithSettings htmlRules xhtmlHamletSettings +-- | Like 'ihamlet', but reads an external file at compile time. +-- +-- @ +-- $('ihamletFile' \"foo.hamlet\") :: 'HtmlUrlI18n' MyMsg MyRoute +-- @ ihamletFile :: FilePath -> Q Exp ihamletFile = hamletFileWithSettings ihamletRules defaultHamletSettings diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shakespeare-2.0.7/shakespeare.cabal new/shakespeare-2.0.8/shakespeare.cabal --- old/shakespeare-2.0.7/shakespeare.cabal 2015-10-18 07:20:07.000000000 +0200 +++ new/shakespeare-2.0.8/shakespeare.cabal 2016-03-27 13:00:15.000000000 +0200 @@ -1,5 +1,5 @@ name: shakespeare -version: 2.0.7 +version: 2.0.8 license: MIT license-file: LICENSE author: Michael Snoyman <michael(a)snoyman.com> @@ -12,7 +12,7 @@ . Note there is no dependency on haskell-src-extras. Instead Shakespeare believes logic should stay out of templates and has its own minimal Haskell parser. . - Packages that use this: shakespeare-js, shakespeare-css, shakespeare-text, hamlet, and xml-hamlet + Packages that use this: xml-hamlet . Please see the documentation at <http://www.yesodweb.com/book/shakespearean-templates> for more details. @@ -51,7 +51,7 @@ , transformers , vector , unordered-containers - , scientific + , scientific >= 0.3.0.0 exposed-modules: Text.Shakespeare.I18N Text.Shakespeare.Text @@ -106,29 +106,6 @@ -- cabal configure --enable-tests -ftest_coffee && cabal build && dist/build/test/test default: False --- Commented out due to concerns that the Hackage page looks too intimidating. - --- flag servius --- description: build the servius web server --- default: True --- --- Executable servius --- Main-is: servius.hs --- hs-source-dirs: app --- if flag(servius) --- buildable: True --- else --- buildable: False --- Build-depends: base >= 4 && < 5 --- , wai-app-static >= 2.0.1 && < 2.1 --- , bytestring >= 0.9.1.4 --- , text >= 0.7 --- , http-types --- , shakespeare --- , wai >= 1.3 && < 2.2 --- , blaze-html >= 0.5 --- , blaze-builder - test-suite test hs-source-dirs: test main-is: Spec.hs

1 0