July 2009 - openSUSE Commits - openSUSE Mailing Lists

commit perl-Class-Date for openSUSE:Factory
by root＠Hilbert.suse.de 27 Jul '09

27 Jul '09

Hello community, here is the log from the commit of package perl-Class-Date for openSUSE:Factory checked in at Mon Jul 27 23:38:51 CEST 2009. -------- --- perl-Class-Date/perl-Class-Date.changes 2009-06-28 17:29:12.000000000 +0200 +++ perl-Class-Date/perl-Class-Date.changes 2009-07-25 19:33:59.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Jul 25 19:29:20 CEST 2009 - chris(a)computersalat.de + +- spec mods + * removed ^---------- + * removed ^#--------- + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Class-Date.spec ++++++ --- /var/tmp/diff_new_pack.xCagVL/_old 2009-07-27 23:38:32.000000000 +0200 +++ /var/tmp/diff_new_pack.xCagVL/_new 2009-07-27 23:38:32.000000000 +0200 @@ -22,7 +22,7 @@ %define cpan_name %( echo %{name} | %{__sed} -e 's,perl-,,' ) Summary: Class for easy date and time manipulation Version: 1.1.9 -Release: 125 +Release: 126 License: Artistic License .. ; GPL v2 or later Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Class-Date @@ -36,7 +36,6 @@ Requires: perl(Date::Parse) ## Env::C does not compile on perl 5.10.0 #Requires: perl(Env::C) -#------------------------------------------------------------------------------- %description This module is intended to provide a general-purpose date and datetime @@ -53,37 +52,26 @@ dLux (Szabo, Bal�zs) <dlux(a)kapu.hu> %prep -#------------------------------------------------------------------------------- %setup -q -n %{cpan_name}-%{version} %patch -#------------------------------------------------------------------------------- %build -#------------------------------------------------------------------------------- CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL %{__make} %check %{__make} test -#------------------------------------------------------------------------------- %install -#------------------------------------------------------------------------------- %perl_make_install %perl_process_packlist %perl_gen_filelist -#------------------------------------------------------------------------------- %clean -#------------------------------------------------------------------------------- %{__rm} -rf $RPM_BUILD_ROOT -#------------------------------------------------------------------------------- %files -f %{name}.files -#------------------------------------------------------------------------------- %defattr(0644,root,root,0755) %doc Changes README -#------------------------------------------------------------------------------- -#------------------------------------------------------------------------------- %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Data-UUID for openSUSE:Factory
by root＠Hilbert.suse.de 27 Jul '09

27 Jul '09

Hello community, here is the log from the commit of package perl-Data-UUID for openSUSE:Factory checked in at Mon Jul 27 23:38:15 CEST 2009. -------- --- perl-Data-UUID/perl-Data-UUID.changes 2007-01-05 14:40:24.000000000 +0100 +++ perl-Data-UUID/perl-Data-UUID.changes 2009-07-25 19:38:14.000000000 +0200 @@ -1,0 +2,32 @@ +Sat Jul 25 19:36:30 CEST 2009 - chris(a)computersalat.de + +- spec mods + * removed ^---------- + * removed ^#--------- + +------------------------------------------------------------------- +Fri Jul 24 14:05:21 CEST 2009 - coolo(a)novell.com + +- merge factory changes + +------------------------------------------------------------------- +Sun Jun 21 15:44:47 CEST 2009 - chris(a)computersalat.de + +- update to 1.202 + - 1.202 Mon Jun 15 18:42:19 EDT 2009 + - localize changes to $! (thanks, Jesse Vincent!) + - 201 Sat Apr 18 14:09 2009 + - replace Data-UUID's own md5 with Digest::MD5 (thanks, RUZ!) + - apply patch from tokuhirom to avoid segmentation violation +- added perl-macros + o autogen filelist with perl_gen_filelist +- spec mods + o added header + o fixed deps + +------------------------------------------------------------------- +Thu Mar 19 12:09:42 CET 2009 - lrupp(a)suse.de + +- initial version 1.149 + +------------------------------------------------------------------- @@ -46,0 +79 @@ + calling whatdependson for head-i586 Old: ---- Data-UUID-0.148.tar.gz New: ---- Data-UUID-1.202.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Data-UUID.spec ++++++ --- /var/tmp/diff_new_pack.0U6Ns2/_old 2009-07-27 23:35:10.000000000 +0200 +++ /var/tmp/diff_new_pack.0U6Ns2/_new 2009-07-27 23:35:10.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package perl-Data-UUID (Version 0.148) +# spec file for package perl-Data-UUID (Version 1.202) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,58 +19,66 @@ Name: perl-Data-UUID -License: Artistic License +%define cpan_name %( echo %{name} | %{__sed} -e 's,perl-,,' ) +Summary: Perl extension for generating Globally/Universally Unique Identifiers +Version: 1.202 +Release: 1 +License: BSD License Group: Development/Libraries/Perl -Url: http://cpan.org/ -Requires: perl = %{perl_version} -AutoReqProv: on -Summary: Perl extension for generating Globally/Universally Unique Identifiers (GUIDs/UUIDs) -Version: 0.148 -Release: 103 -Source: http://cpan.org/modules/by-module/Data/Data-UUID-%{version}.tar.gz +Url: http://search.cpan.org/perldoc?Data::UUID +Source: %{cpan_name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: perl +BuildRequires: perl-macros +BuildRequires: perl(Digest::MD5) +Requires: perl = %{perl_version} +Requires: perl(Digest::MD5) %description -This module provides a framework for generating UUIDs (Universally -Unique Identifiers, also known as GUIDs (Globally Unique Identifiers). -A UUID is 128 bits long, and is guaranteed to be different from all -other UUIDs/GUIDs generated until 3400 A.D. UUIDs were originally used -in the Network Computing System (NCS) and later in the Open Software -Foundation's (OSF) Distributed Computing Environment. Currently many -different technologies rely on UUIDs to provide unique identity for -various software components, Microsoft COM/DCOM for instance, uses -GUIDs very extensively to uniquely identify classes, applications and -components across network-connected systems. + This module provides a framework for generating UUIDs (Universally Unique + Identifiers, also known as GUIDs (Globally Unique Identifiers). A UUID is 128 + bits long, and is guaranteed to be different from all other UUIDs/GUIDs + generated until 3400 CE. + + UUIDs were originally used in the Network Computing System (NCS) and later in + the Open Software Foundation's (OSF) Distributed Computing Environment. + Currently many different technologies rely on UUIDs to provide unique identity + for various software components. Microsoft COM/DCOM for instance, uses GUIDs + very extensively to uniquely identify classes, applications and components + across network-connected systems. + + The algorithm for UUID generation, used by this extension, is described in the + Internet Draft "UUIDs and GUIDs" by Paul J. Leach and Rich Salz + (http://hegel.ittc.ku.edu/topics/internet/internet-drafts/draft-l/draft-leac…). + It provides reasonably efficient and reliable framework for generating UUIDs + and supports fairly high allocation rates -- 10 million per second per machine + -- and therefore is suitable for identifying both extremely short-lived and + very persistent objects on a given system as well as across the network. + Author: Alexander Golomshtok <agolomsh(a)cpan.org> -Authors: --------- - Alexander Golomshtok <agolomsh at cpan dot org> - %prep -%setup -n Data-UUID-%{version} +%setup -q -n %{cpan_name}-%{version} %build -perl Makefile.PL +perl Makefile.PL OPTIMIZE="$RPM_OPT_FLAGS -Wall" %{__make} +%check +%{__make} test + %install %perl_make_install %perl_process_packlist +%perl_gen_filelist %clean -[ "${RPM_BUILD_ROOT}" != "/" -a -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT} +%{__rm} -rf $RPM_BUILD_ROOT -%files -%defattr(-, root, root) -%dir %{perl_vendorarch}/Data -%dir %{perl_vendorarch}/auto/Data -%dir %{perl_vendorarch}/auto/Data/UUID -%{perl_vendorarch}/Data/UUID.pm -%{perl_vendorarch}/auto/Data/UUID/* -%{perl_vendorarch}/auto/Data/UUID/.packlist -%{_mandir}/man3/Data::UUID.3pm.gz -/var/adm/perl-modules/%{name} +%files -f %{name}.files +# normally you only need to check for doc files +%defattr(-,root,root) +%doc Changes LICENSE README %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-FreezeThaw for openSUSE:Factory
by root＠Hilbert.suse.de 27 Jul '09

27 Jul '09

Hello community, here is the log from the commit of package perl-FreezeThaw for openSUSE:Factory checked in at Mon Jul 27 23:34:56 CEST 2009. -------- --- perl-FreezeThaw/perl-FreezeThaw.changes 2006-01-25 21:39:42.000000000 +0100 +++ perl-FreezeThaw/perl-FreezeThaw.changes 2009-07-27 14:30:50.000000000 +0200 @@ -1,0 +2,25 @@ +Mon Jul 27 14:30:31 CEST 2009 - coolo(a)novell.com + +- merge factory and build service + +------------------------------------------------------------------- +Sat Jul 25 19:37:50 CEST 2009 - chris(a)computersalat.de + +- spec mods + * removed ^---------- + * removed ^#--------- + +------------------------------------------------------------------- +Sat Jun 27 22:52:44 CEST 2009 - chris(a)computersalat.de + +- added perl-macros + o autogen filelist with perl_gen_filelist +- some spec mods + o added header + +------------------------------------------------------------------- +Thu Mar 19 11:21:17 CET 2009 - lrupp(a)suse.de + +- initial version 0.45 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- FreezeThaw-0.43.tar.gz New: ---- FreezeThaw-0.45.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-FreezeThaw.spec ++++++ --- /var/tmp/diff_new_pack.oGRAxP/_old 2009-07-27 23:30:04.000000000 +0200 +++ /var/tmp/diff_new_pack.oGRAxP/_new 2009-07-27 23:30:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package perl-FreezeThaw (Version 0.43) +# spec file for package perl-FreezeThaw (Version 0.45) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,46 +19,48 @@ Name: perl-FreezeThaw -License: Artistic License +%define cpan_name %( echo %{name} | %{__sed} -e 's,perl-,,' ) +Summary: Converting Perl structures to strings and back +Version: 0.45 +Release: 1 +License: Artistic License .. Group: Development/Libraries/Perl -Url: http://cpan.org/ -Requires: perl = %{perl_version} -AutoReqProv: on -Summary: converting Perl structures to strings and back -Version: 0.43 -Release: 137 -Source: http://cpan.org/modules/by-module/FreezeThaw/FreezeThaw-%{version}.tar.gz +Url: http://search.cpan.org/perldoc?FreezeThaw +Source: %{cpan_name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: perl +BuildRequires: perl-macros +Requires: perl = %{perl_version} %description -Converts data to/from stringified form, appropriate for -saving-to/reading-from permanent storage. - +Converts data to/from stringified form, appropriate for saving-to/reading-from +permanent storage. +Deals with objects, circular lists, repeated appearence of the same refence. +Does not deal with overloaded stringify operator yet. -Authors: --------- - Ilya Zakharevich <cpan at ilyaz dot org> - + Author: Ilya Zakharevich %prep -%setup -n FreezeThaw-%{version} +%setup -q -n %{cpan_name}-%{version} %build -perl Makefile.PL +CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL %{__make} +%check +%{__make} test + %install %perl_make_install %perl_process_packlist +%perl_gen_filelist %clean -[ "${RPM_BUILD_ROOT}" != "/" -a -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT} +%{__rm} -rf $RPM_BUILD_ROOT -%files -%defattr(-, root, root) -%{perl_vendorlib}/FreezeThaw.pm -%{perl_vendorarch}/auto/FreezeThaw -%{_mandir}/man3/FreezeThaw.3pm.gz -/var/adm/perl-modules/%{name} +%files -f %{name}.files +# normally you only need to check for doc files +%defattr(0644,root,root,0755) +%doc Changes README %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-List-MoreUtils for openSUSE:Factory
by root＠Hilbert.suse.de 27 Jul '09

27 Jul '09

Hello community, here is the log from the commit of package perl-List-MoreUtils for openSUSE:Factory checked in at Mon Jul 27 23:29:48 CEST 2009. -------- --- perl-List-MoreUtils/perl-List-MoreUtils.changes 2007-08-20 15:55:34.000000000 +0200 +++ perl-List-MoreUtils/perl-List-MoreUtils.changes 2009-07-25 19:40:44.000000000 +0200 @@ -1,0 +2,15 @@ +Sat Jul 25 19:40:42 CEST 2009 - chris(a)computersalat.de + +- spec mods + * removed ^---------- + * removed ^#--------- + +------------------------------------------------------------------- +Fri Jun 26 10:38:40 CEST 2009 - chris(a)computersalat.de + +- added perl-macros + o autogen filelist with perl_gen_filelist +- spec mods + o added norootforbuild + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-List-MoreUtils.spec ++++++ --- /var/tmp/diff_new_pack.yhxP3V/_old 2009-07-27 23:28:22.000000000 +0200 +++ /var/tmp/diff_new_pack.yhxP3V/_new 2009-07-27 23:28:22.000000000 +0200 @@ -15,59 +15,53 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# norootforbuild Name: perl-List-MoreUtils +%define cpan_name %( echo %{name} | %{__sed} -e 's,perl-,,' ) +Summary: Provide the stuff missing in List::Util Version: 0.22 -Release: 71 -%define modname List-MoreUtils +Release: 72 # -License: Artistic License; GPL v2 only +License: Artistic License .. ; GPL v2 only Group: Development/Libraries/Perl # +Url: http://search.cpan.org/perldoc?List::MoreUtils +Source: http://search.cpan.org/CPAN/authors/id/V/VP/VPARSEVAL/List-MoreUtils-0.22.t… +# BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl +BuildRequires: perl-macros Requires: perl = %{perl_version} -# -Url: http://search.cpan.org/~vparseval/ -Source: http://search.cpan.org/CPAN/authors/id/V/VP/VPARSEVAL/List-MoreUtils-0.22.t… -Summary: Provide the missing functionality from List::Util %description -List::MoreUtils provides some trivial but commonly needed functionality -on lists which is not going to go into List::Util. - - -Authors: --------- - Tassilo von Parseval, <tassilo.von.parseval(a)rwth-aachen.de> + %{cpan_name} module for perl + List::MoreUtils provides some trivial but commonly needed functionality + on lists which is not going to go into List::Util. + Authors: Tassilo von Parseval, <tassilo.von.parseval(a)rwth-aachen.de> %prep -%setup -q -n %{modname}-%{version} +%setup -q -n %{cpan_name}-%{version} %build perl Makefile.PL OPTIMIZE="$RPM_OPT_FLAGS -Wall" -make +%{__make} %check -make test +%{__make} test %install %perl_make_install %perl_process_packlist +%perl_gen_filelist %clean -rm -rf %{buildroot} +%{__rm} -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.files %defattr(-, root, root) -%doc README -/var/adm/perl-modules/%{name} -%dir %{perl_vendorarch}/List/ -%{perl_vendorarch}/List/MoreUtils.pm -%dir %{perl_vendorarch}/auto/List/ -%{perl_vendorarch}/auto/List/MoreUtils/ -%{_mandir}/man3/List::MoreUtils.3pm* +%doc Changes README %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-PDF-API2 for openSUSE:Factory
by root＠Hilbert.suse.de 27 Jul '09

27 Jul '09

Hello community, here is the log from the commit of package perl-PDF-API2 for openSUSE:Factory checked in at Mon Jul 27 23:28:10 CEST 2009. -------- --- perl-PDF-API2/perl-PDF-API2.changes 2007-11-19 18:04:47.000000000 +0100 +++ perl-PDF-API2/perl-PDF-API2.changes 2009-07-27 14:37:24.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Jul 27 14:37:05 CEST 2009 - coolo(a)novell.com + +- merge factory and build service package + +------------------------------------------------------------------- +Sun Nov 30 06:08:31 CET 2008 - lars(a)linux-schulserver.de + +- initial version 0.72.003 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- PDF-API2-0.66.tar.bz2 New: ---- PDF-API2-0.72.003.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-PDF-API2.spec ++++++ --- /var/tmp/diff_new_pack.cBc1Cp/_old 2009-07-27 23:27:29.000000000 +0200 +++ /var/tmp/diff_new_pack.cBc1Cp/_new 2009-07-27 23:27:29.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package perl-PDF-API2 (Version 0.66) +# spec file for package perl-PDF-API2 (Version 0.72.003) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,53 +19,59 @@ Name: perl-PDF-API2 -License: Artistic License +%define real_name PDF-API2 +Summary: Perl Module Chain to faciliate the Creation and Modification of PDF Files +Url: http://search.cpan.org/perldoc?PDF::API2 Group: Development/Libraries/Perl -Url: http://cpan.org/ +License: Artistic License .. +Version: 0.72.003 +Release: 1 +Source: %{real_name}-%{version}.tar.bz2 Requires: perl = %{perl_version} -AutoReqProv: on -Summary: Create and modify high-quality PDF files. -Version: 0.66 -Release: 60 -Source: http://cpan.org/modules/by-module/PDF/PDF-API2-%{version}.tar.bz2 +%if 0%{?suse_version} < 1100 +BuildRequires: perl-Compress-Zlib +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -A Perl Module Chain to faciliate the Creation and Modification of +PDF::API2 - A Perl Module Chain to faciliate the Creation and Modification of High-Quality "Portable Document Format (aka. PDF)" Files. +Author: +------- + alfred reibenschuh -Authors: --------- - Alfred Reibenschuh <alfredreibenschuh at gmx dot net> - %prep -%setup -n PDF-API2-%{version} +%setup -n %{real_name}-%{version} %build perl Makefile.PL -%{__make} +make %{?jobs:-j%jobs} + +%check +make test %install %perl_make_install %perl_process_packlist +for filename in AUTHORS CONTACT COPYING LICENSE MANIFEST README TODO VERSION; do + perl -pi -e 's/\r\n/\n/g' $filename +done %clean -[ "${RPM_BUILD_ROOT}" != "/" -a -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT} +rm -rf %{buildroot} %files %defattr(-, root, root) -%dir %{perl_vendorlib}/PDF -%{perl_vendorlib}/PDF/API2 -%{perl_vendorlib}/PDF/API2.pm -%{perl_vendorlib}/PDF/API2/Annotation.pm -#%dir %{perl_vendorarch}/auto/PerlIO/via -#%dir %{perl_vendorarch}/auto/PerlIO/via/dynamic +%doc AUTHORS CONTACT COPYING LICENSE MANIFEST README TODO VERSION %dir %{perl_vendorarch}/auto/PDF %dir %{perl_vendorarch}/auto/PDF/API2 +%dir %{perl_vendorlib}/PDF +%dir %{perl_vendorlib}/PDF/API2 +%dir %{perl_vendorlib}/PDF/API2/fonts %{perl_vendorarch}/auto/PDF/API2/.packlist -#%{_mandir}/man3/PerlIO::via::dynamic.3pm.gz +%{perl_vendorlib}/PDF/* /var/adm/perl-modules/%{name} %changelog ++++++ PDF-API2-0.66.tar.bz2 -> PDF-API2-0.72.003.tar.bz2 ++++++ ++++ 13554 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Regexp-Common for openSUSE:Factory
by root＠Hilbert.suse.de 27 Jul '09

27 Jul '09

Hello community, here is the log from the commit of package perl-Regexp-Common for openSUSE:Factory checked in at Mon Jul 27 23:27:15 CEST 2009. -------- --- perl-Regexp-Common/perl-Regexp-Common.changes 2008-09-12 13:38:57.000000000 +0200 +++ perl-Regexp-Common/perl-Regexp-Common.changes 2009-07-25 19:41:58.000000000 +0200 @@ -1,0 +2,15 @@ +Sat Jul 25 19:41:55 CEST 2009 - chris(a)computersalat.de + +- spec mods + * removed ^---------- + * removed ^#--------- + +------------------------------------------------------------------- +Sat Jun 27 20:58:15 CEST 2009 - chris(a)computersalat.de + +- added perl-macros + o autogen filelist with perl_gen_filelist +- spec mods + o fixed desc (from README) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Regexp-Common.spec ++++++ --- /var/tmp/diff_new_pack.5VBi93/_old 2009-07-27 23:25:47.000000000 +0200 +++ /var/tmp/diff_new_pack.5VBi93/_new 2009-07-27 23:25:47.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Regexp-Common (Version 2.122) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 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 @@ -19,70 +19,58 @@ Name: perl-Regexp-Common +%define cpan_name %( echo %{name} | %{__sed} -e 's,perl-,,' ) +Summary: Provide commonly requested regular expressions Version: 2.122 -Release: 1 -Requires: perl = %{perl_version} -AutoReqProv: on +Release: 3 +License: Artistic License .. Group: Development/Libraries/Perl -License: Artistic License -Url: http://search.cpan.org/~abigail/Regexp-Common-2.120/ -Summary: Provide commonly requested regular expressions -Source: Regexp-Common-%{version}.tar.bz2 +AutoReqProv: on +Url: http://search.cpan.org/dist/Regexp-Common +Source: %{cpan_name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: perl +BuildRequires: perl-macros +Requires: perl = %{perl_version} %description -Provides regular expression patterns useful for validating all sorts of -data. - -E.g.: - strings with balanced parenthesized delimiters or arbitrary - delimiter - -- IPv4 addresses - -- numbers (int, float, etc.) +By default, this module exports a single hash (`%RE') that stores or +generates commonly needed regular expressions. Patterns currently +provided include: + + * balanced parentheses and brackets + * delimited text (with escapes) + * integers and floating-point numbers in any base (up to 36) + * comments in 44 languages + * offensive language + * lists of any pattern + * IPv4 addresses + * URIs. + * Zip codes. -- palindromes - -- comments in many different programming languages - -- deleting leading or trailing whitespace - -and much more. - - - -Authors: --------- + Authors: Damian Conway <damian(a)conway.org> Abigail <regexp-common(a)abigail.nl> - %prep -%setup -n Regexp-Common-%{version} +%setup -q -n %{cpan_name}-%{version} %build -perl Makefile.PL -make +CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL +%{__make} + +%check +%{__make} test %install -make DESTDIR=$RPM_BUILD_ROOT install_vendor +%perl_make_install %perl_process_packlist +%perl_gen_filelist %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT -%files -%defattr(-, root, root) -%doc MANIFEST README -%doc %{_mandir}/man?/* -%dir %{perl_vendorlib}/Regexp -%{perl_vendorlib}/Regexp/Common.pm -%dir %{perl_vendorlib}/Regexp/Common -%{perl_vendorlib}/Regexp/Common/*.pm -%dir %{perl_vendorlib}/Regexp/Common/URI -%{perl_vendorlib}/Regexp/Common/URI/*.pm -%dir %{perl_vendorarch}/auto/Regexp -%dir %{perl_vendorarch}/auto/Regexp/Common -%{perl_vendorarch}/auto/Regexp/Common/.packlist -/var/adm/perl-modules/%{name} +%files -f %{name}.files +%defattr(-,root,root) +%doc README %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Template-Toolkit for openSUSE:Factory
by root＠Hilbert.suse.de 27 Jul '09

27 Jul '09

Hello community, here is the log from the commit of package perl-Template-Toolkit for openSUSE:Factory checked in at Mon Jul 27 23:25:32 CEST 2009. -------- --- perl-Template-Toolkit/perl-Template-Toolkit.changes 2008-09-10 17:44:33.000000000 +0200 +++ perl-Template-Toolkit/perl-Template-Toolkit.changes 2009-07-25 19:42:33.000000000 +0200 @@ -1,0 +2,91 @@ +Sat Jul 25 19:42:30 CEST 2009 - chris(a)computersalat.de + +- spec mods + * removed ^---------- + * removed ^#--------- + +------------------------------------------------------------------- +Wed Jul 15 22:17:14 CEST 2009 - chris(a)computersalat.de + +- update to 2.21 + * Fixed a PRE_CHOMP bug that left \r characters lying around when + confronted with templates with DOS \r\n line endings. + https://rt.cpan.org/Ticket/Display.html?id=43345 + * Applied patch from Bradley Baetz to fix defblock #line numbers + http://rt.cpan.org/Public/Bug/Display.html?id=47024 +- Version 2.20_4 (2.21 candidate) - 21st May 2009 + * Added the even(), odd() and parity() methods to Template::Iterator to + assist in making zebra tables. + * Removed a post-5.6 perlism in Template::Context that broke on 5.6.2 + https://rt.cpan.org/Ticket/Display.html?id=46250 + * Replaced a whole bunch of UNIVERSAL::isa() calls with blessed/isa + * Applied a patch from Norbert Buchmüller to prevent the #line markers + from being whitespaced away from the first column. + https://rt.cpan.org/Ticket/Display.html?id=46269 + * Applied a patch from Denis F. Latypoff to fix uri/url filters with + utf8 text + https://rt.cpan.org/Ticket/Display.html?id=41173 +- Version 2.20_3 (2.21 candidate) - 20th May 2009 + * Fixed the XS Stash to compile properly in threaded Perls. + https://rt.cpan.org/Public/Bug/Display.html?id=46240 + * Applied a patch to the XS Stash from Alexey A. Kiritchun to make the + scalar.length vmethod work correctly with utf8 strings. + http://lists.tt2.org/pipermail/templates/2009-May/010803.html +- Version 2.20_2 (2.21 candidate) - 17th May 2009 + * Applied a patch to Template::Test from Andrew Ford to make it skip + properly. + http://lists.tt2.org/pipermail/templates/2009-March/010678.html + * Changed the ttree -v/--verbose option so be less verbose and only + report on things that have changed. To make it more verbose (like + previous versions), add a second -v/--verbose flag, e.g. + $ ttree -v -v + * Also added the --summary option to tree to print a summary of what it + did, and the --color/--colour option to make it print its verbose + messages in colour (on ANSI terminals). + * Applied a ttree patch from Lyle Brooks to allow ttree to accept a + directory name as a command line argument. + * Added the define_view() and define_views() method to Template::Context + and added the VIEWS option to pre-define views when the Template object + is created. Thanks to Timmy Chan for providing the groundwork on this. + http://lists.tt2.org/pipermail/templates/2009-April/010689.html + * Retrospectively fixed the Changes for 2.20 to mention the ttree + --encoding option. + * Applied a patch from Chisel Wright, changing uses of UNIVERSAL::can() + to use blessed() and ->can(). + http://lists.tt2.org/pipermail/templates/2009-May/010790.html + * Fixed a memory leak in the XS Stash introduced in 2.20. + Thanks to Breno G. de Oliveira for reporting the problem and helping to + narrow it down. + https://rt.cpan.org/Public/Bug/Display.html?id=46058 +- Version 2.20_1 (2.21 candidate) - 7th April 2009 + * Deleted all the old HTML documentation (now available separately from + http://tt2.org/download/index.html#html_docs), examples, libraries and + other cruft that was way out of date and badly unloved. + * Tweaked Template::Parser to work better with the ANYCASE option. It + now knows that anything following a dotop cannot be a keyword so that + you can write data.last without the 'last' bit being interpreted as the + LAST keyword. Thanks to Sean McAfee for the post that inspired it. + http://lists.tt2.org/pipermail/templates/2008-September/010462.html + * Fixed a broken test for Apache::Util in the html_entity filter. Added + the use_html_entities() and use_apache_util() class methods to + Template::Filters to allow end-user selection of one or the other. + http://rt.cpan.org/Public/Bug/Display.html?id=40870 + http://template-toolkit.org/svnweb/Template2/revision/?rev=1177 + * Tweaked Template::Context to recognise Badger::Exception objects and + convert them to Template::Exception objects. This is a temporary + measure to keep things working during the transition to Badger-based + modules. + * Added the STRICT option which will cause the stash to throw an + exception on encountering an undefined value. Thanks to Ben Tilly + for the prod. + * Applied a patch to Template::Iterator from Jonathon Padfield to make + get_all() do the right thing if get_first() hasn't been called. + * Applied a patch to Template::Stash::Context from Ben Tilly to make + it easier to subclass. + * Applied a patch from Robin Berjon to add the xml filter. +- added perl-macros + o autogen filelist with perl_gen_filelist +- spec mods + o fixed deps + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Template-Toolkit-2.20.tar.bz2 New: ---- Template-Toolkit-2.21.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Template-Toolkit.spec ++++++ --- /var/tmp/diff_new_pack.pROVC8/_old 2009-07-27 23:24:34.000000000 +0200 +++ /var/tmp/diff_new_pack.pROVC8/_new 2009-07-27 23:24:34.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package perl-Template-Toolkit (Version 2.20) +# spec file for package perl-Template-Toolkit (Version 2.21) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 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 @@ -19,61 +19,77 @@ Name: perl-Template-Toolkit -BuildRequires: perl-AppConfig perl-DBI perl-Date-Calc perl-XML-DOM perl-XML-Parser -Version: 2.20 +%define cpan_name %( echo %{name} | %{__sed} -e 's,perl-,,' ) +Summary: Template Processing System +Version: 2.21 Release: 1 -Requires: perl = %{perl_version} -Requires: perl-AppConfig -AutoReqProv: on +License: Artistic License .. Group: Development/Libraries/Perl -License: Artistic License -Url: http://cpan.org/modules/by-module/Template/ -Summary: Fast and/ Powerful Template System for Perl -Source: Template-Toolkit-%{version}.tar.bz2 +Url: http://cpan.org/dist/Template-Toolkit +Source: %{cpan_name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build +#BuildRequires: perl-AppConfig perl-DBI perl-Date-Calc perl-XML-DOM perl-XML-Parser +BuildRequires: perl +BuildRequires: perl-macros +BuildRequires: perl(Date::Calc) +BuildRequires: perl(DBI) +BuildRequires: perl(Image::Size) +BuildRequires: perl(Pod::POM) +BuildRequires: perl(Test::Pod) >= 1.00 +BuildRequires: perl(Test::Pod::Coverage) >= 1.00 +BuildRequires: perl(Text::Autoformat) +BuildRequires: perl(XML::DOM) +# +BuildRequires: perl(AppConfig) >= 1.56 +BuildRequires: perl(File::Spec) >= 0.8 +BuildRequires: perl(File::Temp) >= 0.12 +BuildRequires: perl(Scalar::Util) +# +Requires: perl = %{perl_version} +Requires: perl(AppConfig) >= 1.56 +Requires: perl(File::Spec) >= 0.8 +Requires: perl(Scalar::Util) +# not defined but needed +Requires: perl(Data::Dumper) +Requires: perl(Pod::POM) %description -The Template Toolkit is a fast, powerful, and easily extensible -template processing system written in Perl with certain key elements -coded in C for maximum speed. It is ideally suited (but not limited) to -the creation of static and dynamic web content, and incorporates -various modules and tools to simplify this process. - - +The Template Toolkit is a collection of modules which implement a +fast, flexible, powerful and extensible template processing system. +It was originally designed and remains primarily useful for generating +dynamic web content, but it can be used equally well for processing +any other kind of text based documents: HTML, XML, POD, PostScript, +LaTeX, and so on. + +It can be used as a stand-alone Perl module or embedded within an +Apache/mod_perl server for generating highly configurable dynamic web +content. A number of Perl scripts are also provided which can greatly +simplify the process of creating and managing static web content and +other offline document systems. -Authors: --------- - Andy Wardley <abw(a)kfs.org> + Authors: Andy Wardley <abw(a)kfs.org> %prep -%setup -q -n Template-Toolkit-%{version} +%setup -q -n %{cpan_name}-%{version} %build perl Makefile.PL -make +%{__make} %check -make test +%{__make} test %install %perl_make_install %perl_process_packlist -mkdir $RPM_BUILD_ROOT/%{_datadir}/tt2 -cp -R images templates $RPM_BUILD_ROOT/%{_datadir}/tt2 -find $RPM_BUILD_ROOT/%{_datadir}/tt2 -type d -exec chmod 755 '{}' \; -find $RPM_BUILD_ROOT/%{_datadir}/tt2 -type f -exec chmod 644 '{}' \; +%perl_gen_filelist %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.files +# normally you only need to check for doc files %defattr(-,root,root) -%doc TODO MANIFEST Changes README INSTALL HACKING examples docs -%doc %{_mandir}/man?/* -%{_bindir}/* -%{perl_vendorarch}/Template* -%{perl_vendorarch}/auto/Template -%{_datadir}/tt2 -/var/adm/perl-modules/perl-Template-Toolkit +%doc Changes HACKING INSTALL README TODO %changelog ++++++ Template-Toolkit-2.20.tar.bz2 -> Template-Toolkit-2.21.tar.bz2 ++++++ ++++ 46608 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit snd for openSUSE:Factory
by root＠Hilbert.suse.de 27 Jul '09

27 Jul '09

Hello community, here is the log from the commit of package snd for openSUSE:Factory checked in at Mon Jul 27 23:24:18 CEST 2009. -------- --- snd/snd.changes 2009-04-27 14:41:59.000000000 +0200 +++ snd/snd.changes 2009-07-27 17:21:40.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jul 27 17:15:12 CEST 2009 - tiwai(a)suse.de + +- updated to version 10.7: + * default audio to ALSA + * Some improvements in generators.scm, dlocsig.scm. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- snd-10.5.tar.bz2 New: ---- snd-10.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snd.spec ++++++ --- /var/tmp/diff_new_pack.SHBUyk/_old 2009-07-27 23:23:22.000000000 +0200 +++ /var/tmp/diff_new_pack.SHBUyk/_new 2009-07-27 23:23:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package snd (Version 10.5) +# spec file for package snd (Version 10.7) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,7 +21,7 @@ Name: snd BuildRequires: alsa-devel fftw3-devel freeglut-devel gsl gsl-devel gtk2-devel guile-devel ladspa-devel libdrm-devel libjack-devel libsamplerate-devel update-desktop-files Summary: Powerful Sound File Editor -Version: 10.5 +Version: 10.7 Release: 1 License: LGPL v2.1 or later Group: Productivity/Multimedia/Sound/Editors and Convertors ++++++ snd-10.5.tar.bz2 -> snd-10.7.tar.bz2 ++++++ snd/snd-10.5.tar.bz2 snd/snd-10.7.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tellico for openSUSE:Factory
by root＠Hilbert.suse.de 27 Jul '09

27 Jul '09

Hello community, here is the log from the commit of package tellico for openSUSE:Factory checked in at Mon Jul 27 23:23:07 CEST 2009. -------- --- KDE/tellico/tellico.changes 2009-03-12 14:30:11.000000000 +0100 +++ tellico/tellico.changes 2009-07-25 19:04:51.000000000 +0200 @@ -1,0 +2,13 @@ +Sat Jul 25 18:49:08 CEST 2009 - tittiatcoke(a)gmail.com + +- updated to newer SVN snapshot + * add alexandria importer test + * add referencer import test + * cleanup some of the freedb code + * Remove all support for insertin citations in OpenOffice.org. + * Use Qt4 headers + * add action to hide all columns in tree view + * many bugfixes. +- Change of license to GPL2 or GPL3 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- fix-compile.diff tellico-1.9_SVN20090219.tar.bz2 New: ---- tellico-svn1002315.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tellico.spec ++++++ --- /var/tmp/diff_new_pack.4mcIXP/_old 2009-07-27 23:20:02.000000000 +0200 +++ /var/tmp/diff_new_pack.4mcIXP/_new 2009-07-27 23:20:02.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package tellico (Version 1.9_SVN20090219) +# spec file for package tellico (Version 1.9_SVN20090725) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,21 +17,21 @@ # norootforbuild +%define sversion svn1002315 Name: tellico BuildRequires: cmake kdemultimedia4 kdepim4-devel libkde4-devel libpoppler-qt4-devel libqimageblitz-devel Summary: A book collection manager -Version: 1.9_SVN20090219 -Release: 2 +Version: 1.9_SVN20090725 +Release: 1 License: GPL v2 or later Group: Productivity/Other -Source: %{name}-%{version}.tar.bz2 +Source: %{name}-%{sversion}.tar.bz2 Provides: bookcase Obsoletes: bookcase BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.periapsis.org/tellico/ # PATCH-FIX-UPSTREAM fix-compile.diff pgajdos(a)suse.cz -Patch: fix-compile.diff Requires: %{name}-lang = %{version} %kde4_pimlibs_requires %kde4_runtime_requires @@ -45,8 +45,7 @@ %lang_package %prep -%setup -q -%patch +%setup -q -n %{name} %build %cmake_kde4 -d build @@ -57,7 +56,6 @@ %makeinstall cd .. rm $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/fr/tellico/fr/common -rm $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/en/tellico/en/common rm -r $RPM_BUILD_ROOT/nogo %suse_update_desktop_file %name Office Database %find_lang %{name} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit convmv for openSUSE:Factory
by root＠Hilbert.suse.de 27 Jul '09

27 Jul '09

Hello community, here is the log from the commit of package convmv for openSUSE:Factory checked in at Mon Jul 27 23:19:10 CEST 2009. -------- --- convmv/convmv.changes 2008-01-31 23:50:07.000000000 +0100 +++ convmv/convmv.changes 2009-07-27 17:37:01.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jul 27 17:34:23 CEST 2009 - tiwai(a)suse.de + +- updated to version 1.14: + see Changes file for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- convmv-1.12.tar.bz2 New: ---- convmv-1.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ convmv.spec ++++++ --- /var/tmp/diff_new_pack.reFuja/_old 2009-07-27 23:18:22.000000000 +0200 +++ /var/tmp/diff_new_pack.reFuja/_new 2009-07-27 23:18:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package convmv (Version 1.12) +# spec file for package convmv (Version 1.14) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,8 +22,8 @@ License: GPL v2 or later Group: Productivity/File utilities AutoReqProv: on -Version: 1.12 -Release: 46 +Version: 1.14 +Release: 1 Url: http://j3e.de/linux/convmv/ Source: http://j3e.de/linux/convmv/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -76,7 +76,7 @@ %files %defattr(-, root, root) -%doc GPL2 Changes VERSION MD5sums +%doc GPL2 Changes CREDITS TODO VERSION %{_bindir}/* %{_mandir}/man1/* ++++++ convmv-1.12.tar.bz2 -> convmv-1.14.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/convmv-1.12/CREDITS new/convmv-1.14/CREDITS --- old/convmv-1.12/CREDITS 2004-02-01 00:13:17.000000000 +0100 +++ new/convmv-1.14/CREDITS 2008-01-24 21:12:03.000000000 +0100 @@ -5,3 +5,4 @@ Mike FABIAN Philipp JOCHAM Kuang-che Wu +Hansjörg MAURER diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/convmv-1.12/Changes new/convmv-1.14/Changes --- old/convmv-1.12/Changes 2008-01-23 18:55:56.000000000 +0100 +++ new/convmv-1.14/Changes 2008-12-11 22:59:53.000000000 +0100 @@ -1,3 +1,17 @@ +1.14 +- this release is once more dedicated to Perl::Encode. There is no way to do a check for valid UTF-8 which works with all Perl releases from 5.8.0 up to 5.10.0. We now have to test which code works in our Perl's Encode version and then decide which code path to go. + +1.13 +- move non fatal Perl bug checks into the help screen output +- fix Perl warnings when wrong/unknown charset is used +- run check for some essential Encode functionality at every startup +- add --fixdouble option to only fix files that are double-UTF-8 encoded +- add --parsable option to allow convmv output parsable suggestions for external tools to to something with it +- add --preserve-mtimes option to restore mtimes of parent directories +- allow an argv to be a symlink +- don't checksum deleted files in tar ball and use sha256 now +- allow skippig of certain test suite tests, useful for OS X to skip NFC/NFD related stuff, for example "make test SKIPTESTS=nfd-test,someothertest" will skip that test(s) + 1.12 - now work with Perl 5.10 using an eval block - GPL v2 and v3 now diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/convmv-1.12/MD5sums new/convmv-1.14/MD5sums --- old/convmv-1.12/MD5sums 2008-01-23 18:58:13.000000000 +0100 +++ new/convmv-1.14/MD5sums 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -2559b77cb012f1a3b7bcae81eddf0f31 ./Changes -e7335cf8e03119c353aa45efdc49b94b ./convmv -8bed1a74d53b68c1bce15d32309bdb52 ./CREDITS -e0dc2bf8cde8e56d69cef5d30c702da3 ./GPL2 -0a83f741ea9a5492a403b0287cea7375 ./Makefile -7d862266a4794aee21f731946a82d4bb ./testsuite.tar -2001efa90039013edb43ba1b6b784bd5 ./TODO -81d99f84fe599419c14b271f7dfc262e ./VERSION -d41d8cd98f00b204e9800998ecf8427e ./.MD5sums ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.8 (GNU/Linux) - -iEYEARECAAYFAkeXgDUACgkQdoo0s+hIejmofgCg7X8B4pwlHtuGqAfeKX1m4BhX -pN4An2YK1L9tfOaIUeJThQAi60jlBwDZ -=AtEk ------END PGP SIGNATURE----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/convmv-1.12/Makefile new/convmv-1.14/Makefile --- old/convmv-1.12/Makefile 2006-06-27 16:38:01.000000000 +0200 +++ new/convmv-1.14/Makefile 2008-11-29 14:49:38.000000000 +0100 @@ -1,6 +1,9 @@ DESTDIR= PREFIX=/usr/local MANDIR=$(PREFIX)/share/man +TAR=tar +FIND=find +SED=sed all: manpage @@ -14,21 +17,21 @@ pod2man --section 1 --center=" " convmv | gzip > convmv.1.gz clean: - rm -f convmv.1.gz convmv-*.tar.gz MD5sums .files .name + rm -f convmv.1.gz convmv-*.tar.gz MD5sums SHA256sums .files .name rm -rf suite test: - test -d suite || tar -xf testsuite.tar + test -d suite || $(TAR) xf testsuite.tar cd suite ; ./dotests.sh dist: clean - sed -n "2,2p" convmv |sed "s/.*convmv $[^ ]*$.*/\1/" > VERSION - md5sum `find . -name "*" -type f` |gpg --clearsign >.MD5sums - mv .MD5sums MD5sums + $(SED) -n "2,2p" convmv |$(SED) "s/.*convmv $[^ ]*$.*/\1/" > VERSION + $(FIND) . -name "*" ! -name ".*" -type f -print | xargs sha256sum | gpg --clearsign > .SHA256sums + mv .SHA256sums SHA256sums ls > .files echo convmv-`cat VERSION` >.name mkdir `cat .name` mv `cat .files` `cat .name` - tar -cv * |gzip > `cat .name`.tar.gz + $(TAR) cvf - * |gzip > `cat .name`.tar.gz mv `cat .name`/* . rmdir `cat .name` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/convmv-1.12/SHA256sums new/convmv-1.14/SHA256sums --- old/convmv-1.12/SHA256sums 1970-01-01 01:00:00.000000000 +0100 +++ new/convmv-1.14/SHA256sums 2008-12-12 01:38:47.000000000 +0100 @@ -0,0 +1,18 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +f4f57466afa9a51ea85eca7b08e8ad0ab679a9a8e9e05d42e620ea12f98e44a6 ./Changes +c8dcb65e389bf4a0960fbb1caaa4808f8da28a9cdbf62f131235e82d04d28516 ./CREDITS +a2a9cfa48ba7f7453edf1c43bb8bb1aef5fcd1b87dde11420edceee2e2528db0 ./GPL2 +10f96f4cf2f61333c289f603cedd4c0f5e523d2da05486d9bea670f3877d8592 ./Makefile +31a04f0b0584237d6f81fab7e77b0d43e307230102f09db947e20b2a3103a108 ./testsuite.tar +6cd57b452e9e2be5a9ca992831f96e4a8317c1bc37171f237094d8dc0a6e0d27 ./TODO +b28d3e4bc89658ab4c8d768f013ddf92a3612e20edf922a81d177f1bd8c35b25 ./VERSION +53e30ee37a975d466c34f3a3bead8bcdd32baa75a527e32282fbb81a70254e04 ./convmv +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAklBspcACgkQdoo0s+hIejlHwgCcCAzv8wB2TPklGlcNSCS7z8zy +hVgAoIKa2LGBSepDfGZuKZoRj5Y1Msz4 +=/mPW +-----END PGP SIGNATURE----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/convmv-1.12/TODO new/convmv-1.14/TODO --- old/convmv-1.12/TODO 2008-01-22 13:54:03.000000000 +0100 +++ new/convmv-1.14/TODO 2008-11-10 15:09:55.000000000 +0100 @@ -7,11 +7,8 @@ - --null option for "find -print0 | xargs convmv --null" usage - map illegal ntfs characters away: " / \ * ? < > | : - map "most" strange chracters to ASCII equivalences -- parsable column mode \0..\0..\0\0 terminated - keep/restore old ctime - difficult to do! No Perl module, not even a ctime option in standard "touch" command :-| -- add option for a parsable mode, writing in null byte separated columns what to do with which files. This is to allow people more easily to write gui frontends for convmv. Feedback for this option is very welcome - any other suggestions? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/convmv-1.12/VERSION new/convmv-1.14/VERSION --- old/convmv-1.12/VERSION 2008-01-23 18:58:11.000000000 +0100 +++ new/convmv-1.14/VERSION 2008-12-12 01:38:39.000000000 +0100 @@ -1 +1 @@ -1.12 +1.14 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/convmv-1.12/convmv new/convmv-1.14/convmv --- old/convmv-1.12/convmv 2008-01-23 18:55:19.000000000 +0100 +++ new/convmv-1.14/convmv 2008-12-12 01:38:34.000000000 +0100 @@ -1,5 +1,5 @@ #!/usr/bin/perl -# convmv 1.12 - converts filenames from one encoding to another +# convmv 1.14 - converts filenames from one encoding to another # Copyright © 2003-2008 Bjoern JACKE <bjoern(a)j3e.de> # # This program comes with ABSOLUTELY NO WARRANTY; it may be copied or modified @@ -83,13 +83,35 @@ C<--nosmart> will also force conversion to UTF-8 for such files, which might result in "double encoded UTF-8" (see section below). +=item B<--fixdouble> + +using the C<--fixdouble> option convmv does only convert files which will still +be UTF-8 encoded after conversion. That's useful for fixing double-encoded +UTF-8 files. All files which are not UTF-8 or will not result in UTF-8 after +conversion will not be touched. Also see chapter "How to undo double UTF-8 ..." +below. + =item B<--notest> Needed to actually rename the files. By default convmv will just print what it wants to do. =item B<--parsable> -This is not implemented yet. + +This is an advanced option that people who want to write a GUI front end will +find useful (some others maybe, too). It will convmv make print out what it +would do in an easy parsable way. The first column contains the action or some +kind of information, the second column mostly contains the file that is to be +modified and if appropriate the third column contains the modified value. Each +column is separated by \0\n (nullbyte newline). Each row (one action) is +separated by \0\0\n (nullbyte nullbyte newline). + +=item B<--preserve-mtimes> + +modifying filenames usually causes the parent directory's mtime being updated. +This option allows to reset the mtime to the old value. If your filesystem +supports sub-second resolution the sub-second part of the atime and mtime +will be lost as Perl does not yet support that. =item B<--replace> @@ -191,14 +213,16 @@ example the file names already were UTF-8 encoded and you accidently did another conversion from some charset to UTF-8. You can simply undo that by converting that the other way round. The from-charset has to be UTF-8 and the -to-charset has to be the from-charset you previously accidently used. You -should check to get the correct results by doing the conversion without -C<--notest> before, also the C<--qfrom> option might be helpful, because the -double utf-8 file names might screw up your terminal if they are being -printed - they often contain control sequences which do funny things with your -terminal window. If you are not sure about the charset which was accidently -converted from, using C<--qfrom> is a good way to fiddle out the required -encoding without destroying the file names finally. +to-charset has to be the from-charset you previously accidently used. If you +use the C<--fixdouble> option convmv will make sure that only files will be +processed that will still be UTF-8 encoded after conversion and it will leave +non-UTF-8 files untouched. You should check to get the correct results by doing +the conversion without C<--notest> before, also the C<--qfrom> option might be +helpful, because the double utf-8 file names might screw up your terminal if +they are being printed - they often contain control sequences which do funny +things with your terminal window. If you are not sure about the charset which +was accidently converted from, using C<--qfrom> is a good way to fiddle out the +required encoding without destroying the file names finally. =head2 How to repair Samba files @@ -272,6 +296,8 @@ 'lower'=>\$opt_lower, 'dotlessi'=>\$opt_dotlessi, 'parsable'=>\$opt_parsable, + 'fixdouble'=>\$opt_fixdouble, + 'preserve-mtimes'=>\$opt_mtimes, ) or exit 1; use File::Compare; $errors_occurred=0; @@ -279,14 +305,24 @@ $maxfilenamelength=255; # $maxpathlength=4096; # this might be used somehow, somewhere? +%dir_time_hash=(); +my $this_is_valid_utf8; + +# delimiter and final delimiter for parsable mode: +$del = "\0\n"; +$fin_del = "\0\0\n"; + &listvalidencodings and exit 0 if ($opt_list); &printusage and exit 1 if (!@ARGV or $opt_help); &check_for_broken_perl_release(); -if ($opt_parsable and ($opt_notest or $opt_exec or $opt_i)) { - die "--parsable mode cannot be used with --notest, --exec or -i\n"; +if ($opt_parsable) { + if ($opt_notest or $opt_exec or $opt_i) { + die "--parsable mode cannot be used with --notest, --exec or -i\n"; + } } + if ($opt_unescape) { die "No charset conversion when unescaping!\n" if ($opt_f or $opt_t); $checkenc=\&unescape_checkenc; @@ -298,9 +334,17 @@ $get_newname=\&upperlower_get_newname; $opt_f="ascii" unless ($opt_f); } else { - $opt_f=Encode::resolve_alias($opt_f) or die "wrong/unknown \"from\" encoding!\n"; - $opt_t=Encode::resolve_alias($opt_t) or die "wrong/unknown \"to\" encoding!\n"; - $checkenc=\&char_checkenc; + if (not ($opt_f and $opt_f=Encode::resolve_alias($opt_f))) { + die "wrong/unknown \"from\" encoding!\n"; + } + if (not ($opt_t and $opt_t=Encode::resolve_alias($opt_t))) { + die "wrong/unknown \"to\" encoding!\n"; + } + if ($opt_fixdouble) { + $checkenc=\&fixdouble_checkenc; + } else { + $checkenc=\&char_checkenc; + } $get_newname=\&char_get_newname; } $to_is_utf8 = lc($opt_t) =~ m/^utf-?8/; @@ -311,6 +355,7 @@ } else { $from_print=\&dummy; } + if ($opt_qto) { $to_print=\&to_ascii; } else { @@ -327,6 +372,10 @@ $norm=\&dummy; } +if ($opt_fixdouble) { + die "--fixdouble requires UTF-8 as source and non-UTF-8 as target charset\n" unless ($from_is_utf8 and $opt_t and not $to_is_utf8); +} + $opt_lowmem=1 if ($opt_exec); $pwd=cwd(); @@ -334,55 +383,73 @@ undef @ARGV; for (@args) { - die "file or directory not found: $_\n" unless (-e); + die "file or directory not found: $_\n" unless (-e or -l); +} + +if ($opt_parsable) { + $outerr=NUL; +} else { + $outerr=STDERR; } ## do {print ord($_)."_" for (split(//,$_));print "\n"; } for (@args); # debug print -print STDERR "Starting a dry run without changes...\n" unless ($opt_notest); +print $outerr "Starting a dry run without changes...\n" unless ($opt_notest); if ($opt_r) { - find({wanted=>\&scan,bydepth=>1,no_chdir=>1}, @args); - if (not $errors_occurred and $warnings_occurred) { - $errors_occurred=1 if (not &print_ask ("WARNINGS occurred. Do you really want to continue?",1)); - } - die "To prevent damage to your files, we won't continue.\nFirst fix this or correct options!\n" if ($errors_occurred); - unless ($opt_exec) { find({wanted=>\&process_symlink_targets,bydepth=>1,no_chdir=>1}, @args); } - find({wanted=>\&process_main,bydepth=>1,no_chdir=>1}, @args); + $myfind=\&find; } else { - for (@args) { &scan; } - if (not $errors_occurred and $warnings_occurred) { - $errors_occurred=1 if (not &print_ask ("WARNINGS occurred. Do you really want to continue?",1)); - } - die "To prevent damage to your files, we won't continue.\nFirst fix errors or correct options!\n" if ($errors_occurred); - unless ($opt_exec) { for (@args) { &process_symlink_targets; } } - for (@args) { &process_main; } + $myfind=\&find0depth; +} + +&$myfind({wanted=>\&scan,bydepth=>1,no_chdir=>1}, @args); +if (not $errors_occurred and $warnings_occurred) { + $errors_occurred=1 if (not &print_ask ("WARNINGS occurred. Do you really want to continue?",1)); +} + +die "To prevent damage to your files, we won't continue.\nFirst fix this or correct options!\n" if ($errors_occurred); +unless ($opt_exec) { + &$myfind({wanted=>\&process_symlink_targets,bydepth=>1,no_chdir=>1}, @args); +} +&$myfind({wanted=>\&process_main,bydepth=>1,no_chdir=>1}, @args); + +# check for unintentionally left files +for (keys %dir_time_hash) { + print $outerr "error: left in %dir_time_hash: $_\n"; } if ($opt_notest) { - print STDERR "Ready!\n", + print $outerr "Ready!\n", } else { - print STDERR "No changes to your files done. Use --notest to finally rename the files.\n"; + print $outerr "No changes to your files done. Use --notest to finally rename the files.\n"; } ##### ## subs ### +# find-like function but without any depth search for not recursive mode: +sub find0depth() { + my $opts = shift; + for (@_) { + $$opts{'wanted'}($_); + } +} + # scan for real files and check charset first: sub scan { - $arg=$_; + $arg = $_; &get_dir_base_change; if (-l $arg) { # print "link: $arg in $dir\n"; if (not defined(&$checkenc($arg))) { $errors_occurred=1 }; } elsif (-d $arg) { # print "dir: $arg in $dir\n"; - $inod_fullname{(stat $arg)[1]}=$dir.$arg if (!$opt_lowmem); + $inod_fullname{(stat $arg)[1]}=$dir."/".$arg if (!$opt_lowmem); if (not defined(&$checkenc($arg))) { $errors_occurred=1 }; } elsif (-f $arg) { # print "file: $arg in $dir\n"; - $inod_fullname{(stat $arg)[1]}=$dir.$arg if (!$opt_lowmem); + $inod_fullname{(stat $arg)[1]}=$dir."/".$arg if (!$opt_lowmem); if (not defined(&$checkenc($arg))) { $errors_occurred=1 }; } chdir $pwd; @@ -399,15 +466,19 @@ if ( $inod_fullname{(stat $oldlink)[1]} or $opt_lowmem) { # = if (symlink target scanned before) #print is_utf8($oldlink) ? 1 : 0; #print is_utf8($newname) ? 1 : 0; - print "symlink \"".&$from_print($File::Find::name)."\": \""; - print &$from_print($oldlink)."\" >> \""; + print $outerr "symlink \"".&$from_print($File::Find::name)."\": \""; + print $outerr "".&$from_print($oldlink)."\" >> \""; &print_ask (&$to_print($newname)."\"",$opt_i) or return; + &save_parent_mtime($dir) if ($opt_mtimes); if ($opt_notest) { unlink $arg; symlink ($newname, $arg); + } elsif ($opt_parsable) { + print "unlink".$del.$File::Find::name.$fin_del; + print "symlink".$del.$newname.$del.$File::Find::name.$fin_del; } } else { - print STDERR "link target \"",&$from_print($oldlink),"\" of \"",&$from_print($dir.$arg),"\" not in subtree, left untouched!\n"; + print $outerr "link target \"",&$from_print($oldlink),"\" of \"",&$from_print($dir."/".$arg),"\" not in subtree, left untouched!\n"; } } # else { print "no need to convert link target: $oldlink to $newname\n"; } } @@ -438,24 +509,41 @@ &renameit($arg,$newname); } } + &restore_times_if_any($dir,$arg,$newname) if ($opt_mtimes); + chdir $pwd; } sub char_get_newname { -# retuns undef on error and string otherwise. +# returns undef on error and string otherwise. my $oldfile=shift; my $newname; + my $lets_die = 0; if (!$from_is_utf8 and $to_is_utf8 and !$opt_nosmart and &looks_like_utf8($oldfile)) { - print STDERR "Skipping, already UTF-8: ",&$from_print($dir.$oldfile),"\n"; + if ($opt_parsable) { + print "іnfomsg".$del."skipalreadyutf8".$del.$dir."/".$oldfile.$fin_del; + } else { + print $outerr "Skipping, already UTF-8: ",&$from_print($dir."/".$oldfile),"\n"; + } return $oldfile; } else { + if ($opt_fixdouble and not looks_like_utf8($oldfile)) { + # this is legacy encoding which we ignore in fixdouble mode + return $oldfile; + } if ($from_is_utf8 and ! $to_is_utf8) { # from_to can't convert from NFD to non-UTF-8! $newname=encode_utf8(NFC(decode_utf8($oldfile))); } else { $newname=$oldfile; } - from_to($newname, $opt_f, $opt_t, Encode::FB_QUIET) or die "SHOULD NOT HAPPEN HERE: conversion error, so suitable charset used?: \"$oldfile\"\nTo prevent damage to your files, we won't continue. First fix this!\n"; + from_to($newname, $opt_f, $opt_t, Encode::FB_QUIET) or $lets_die = 1; + if ($opt_fixdouble and not looks_like_utf8($newname)) { + return $oldfile; + } + if ($lets_die) { + die "SHOULD NOT HAPPEN HERE: conversion error, no suitable charset used?: \"$oldfile\"\nTo prevent damage to your files, we won't continue. First fix this!\n"; + } $newname=&$norm(decode_utf8($newname)) if ($to_is_utf8); return $newname; } @@ -464,7 +552,7 @@ sub get_dir_base_change() { $arg =~ s/\/*$//; - $dir=dirname($arg)."/"; + $dir=dirname($arg); $arg=basename($arg); chdir $dir; } @@ -483,39 +571,85 @@ } else { #print is_utf8($oldfile) ? 1 : 0; #print is_utf8($newname) ? 1 : 0; - &print_ask ("mv \"". &$from_print($dir.$oldfile)."\"\t\"".&$from_print($dir).&$to_print($newname)."\"",$opt_i) or return; + &print_ask ("mv \"". &$from_print($dir."/".$oldfile)."\"\t\"".&$from_print($dir)."/".&$to_print($newname)."\"",$opt_i) or return; } + &save_parent_mtime($dir) if ($opt_mtimes); if (-e $newname and !$opt_exec) { if ($opt_replace and !&compare($oldfile,$newname)) { if ($opt_notest) { - unlink $newname or print STDERR "Error: $!\n"; - rename ($oldfile, $newname) or print STDERR "Error: $!\n"; + unlink $newname or print $outerr "Error: $!\n"; + rename ($oldfile, $newname) or print $outerr "Error: $!\n"; + } elsif ($opt_parsable) { + print "unlink".$del.$dir."/".$oldfile.$fin_del; + print "rename".$del.$dir."/".$oldfile.$del.$dir."/".$newname.$fin_del; } } else { - print STDERR &$to_print($newname)," exists and differs or --replace option missing - skipped\n"; + if ($opt_parsable) { + print "errormsg".$del."fileexists".$del.$newname.$fin_del; + } else { + print $outerr "".&$to_print($newname)," exists and differs or --replace option missing - skipped\n"; + } } } else { if ($opt_notest) { if ($opt_exec) { system($cmd); } else { - rename ($oldfile, $newname) or print STDERR "Error: $!\n"; + rename ($oldfile, $newname) or print $outerr "Error: $!\n"; } + } elsif ($opt_parsable) { + print "rename".$del.$dir."/".$oldfile.$del.$dir."/".$newname.$fin_del; } } } +sub save_parent_mtime() { + my $dir=shift; + return if (exists $dir_time_hash{$dir}); + #print $outerr "Putting $dir in %dir_time_hash\n"; + @{$dir_time_hash{$dir}}=(stat("."))[8..10]; +} + +sub restore_times_if_any() { + my $dir=shift; + my $old=shift; + my $new=shift; + if ($dir eq ".") { + $dir = ""; + } else { + $dir .= "/"; + } + $dir .= $old; + ## print $outerr "Trying to delete $dir now $new from %dir_time_hash\n"; # debug print + if (exists $dir_time_hash{$dir}) { + if ($opt_notest) { + utime ${$dir_time_hash{$dir}}[0], ${$dir_time_hash{$dir}}[1], $new or print $outerr "Could not run utime() on $new: $!\n"; + } elsif ($opt_parsable) { + print "utime".$del.$dir.$del.${$dir_time_hash{$dir}}[0].$del.${$dir_time_hash{$dir}}[1].$del.${$dir_time_hash{$dir}}[2].$fin_del; + } + delete $dir_time_hash{$dir}; + } +} + sub listvalidencodings() { print "$_\n" for (Encode->encodings(":all")); return 1; } +sub fixdouble_checkenc() { + return 1; +} + sub char_checkenc() { my $oldfile=shift; my $new=$oldfile; if ($from_is_utf8) { - if (! &this_is_valid_utf8($new)) { - print STDERR "this file was not validly encoded in UTF-8: \"". &$from_print($dir.$oldfile) ."\"\n"; + if (! &$this_is_valid_utf8($new)) { + if ($opt_parsable) { + print "errormsg".$del."filenotutf8".$del.$oldfile.$fin_del; + } else { + print $outerr "this file was not validly encoded in UTF-8: \"". &$from_print($dir."/".$oldfile) ."\"\n"; + } return undef; } } else { @@ -524,7 +658,11 @@ # be "smart-skipped" if to_enc is utf-8 and not produce no error here. } elsif (! from_to($new,$opt_f, "utf8", Encode::FB_QUIET) ) { - print STDERR "this file was not validly encoded in $opt_f: \"". &$from_print($dir.$oldfile) ."\"\n"; + if ($opt_parsable) { + print "errormsg".$del."fileencodedinvalid".$del.$dir."/".$oldfile.$fin_del; + } else { + print $outerr "this file was not validly encoded in $opt_f: \"". &$from_print($dir."/".$oldfile) ."\"\n"; + } return undef; } } @@ -539,10 +677,14 @@ } ## print "$oldfile|$utf8oldfile|$new|$filenamelength\n"; if (! $filenamelength) { - print STDERR "$opt_t doesn't cover all needed characters for: \"". &$from_print($dir.$oldfile) ."\"\n"; + if ($opt_parsable) { + print "errormsg".$del."charsetdoesntcoverneededcharacters".$del.$dir."/".$oldfile.$fin_del; + } else { + print $outerr "$opt_t doesn't cover all needed characters for: \"". &$from_print($dir."/".$oldfile) ."\"\n"; + } return undef; } elsif ($filenamelength > $maxfilenamelength) { - print STDERR &$from_print($dir.$oldfile).": resulting filename is $filenamelength bytes long (max: $maxfilenamelength)\n"; + print $outerr "".&$from_print($dir."/".$oldfile).": resulting filename is $filenamelength bytes long (max: $maxfilenamelength)\n"; return undef; } &posix_check($new); @@ -550,8 +692,9 @@ } sub printusage { + &check_for_perl_bugs; print <<END; -convmv 1.12 - converts filenames from one encoding to another +convmv 1.14 - converts filenames from one encoding to another Copyright (C) 2003-2008 Bjoern JACKE <bjoern\(a)j3e.de> This program comes with ABSOLUTELY NO WARRANTY; it may be copied or modified @@ -584,14 +727,23 @@ sub looks_like_utf8() { my $string = shift; - if ($string =~ m/[^[:ascii:]]/ and &this_is_valid_utf8($string)) { + if ($string =~ m/[^[:ascii:]]/ and &$this_is_valid_utf8($string)) { return 1; } else { return undef; } } -sub this_is_valid_utf8() { +sub this_is_valid_utf8_decode { + my $string = shift; + if (not defined(decode_utf8($string))) { + return undef; + } else { + return 1; + } +} + +sub this_is_valid_utf8_decode_CROAK() { my $string = shift; # until 1.08 I used to use decode_utf8() but see perl bug #37757 (perl 5.8.7/8) #if (not defined(decode_utf8($string)) ) { @@ -608,9 +760,9 @@ # see perl bug #49830. convmv 1.10 and Perl 5.10 will again only work with # --nosmart. # - #okay now perluniintro suggests to do this: + # okay, now perluniintro suggests to do this: - eval { decode_utf8($string, Encode::FB_CROAK); }; + eval 'decode_utf8($string, Encode::FB_CROAK);'; if ($@) { return undef; } else { @@ -630,6 +782,9 @@ } sub print_ask() { # takes 2 arguments, string and askornot + if ($opt_parsable) { + return 1; + } my $a=""; print shift; my $ask = shift; @@ -651,7 +806,11 @@ &posix_check(&unescape_get_newname($name)); return 1; } else { - print STDERR "\"",&$from_print($name),"\" not ASCII - this does not seem to be an escaped filename.\n"; + if ($opt_parsable) { + print "errormsg".$del."notanescapedfile".$del.$name.$fin_del; + } else { + print $outerr "\"",&$from_print($name),"\" not ASCII - this does not seem to be an escaped filename.\n"; + } return undef; } } @@ -680,7 +839,7 @@ my $oldname = shift; my $name=$oldname; if (! from_to($name, $opt_f, "utf8", Encode::FB_QUIET)) { # should also leave NFD as it is ... - print STDERR "\"",&$from_print($oldname),"\" not encoded in $opt_f ? Supply the correct encoding via -f option!\n"; + print $outerr "\"",&$from_print($oldname),"\" not encoded in $opt_f ? Supply the correct encoding via -f option!\n"; return undef; } _utf8_on($name); # Unicode in Perl can be a real pain ... @@ -690,7 +849,11 @@ $name =~ s/ı/I/g; $name =~ s/i/İ/g; } - # we do not want to upper ß to SS ! Let's substitute it with NUL+DWSLQH (NUL may not be part of filename) and get it back after uc() + # we do not want to upper ß to SS ! Let's substitute it with + # NUL+DWSLQH (NUL may not be part of filename) and get it back after uc(). + # Unicode 5.1(draft) news: Uppercasing U+00DF (ß) LATIN SMALL LETTER SHARP S + # to the new U+1E9E LATIN CAPITAL LETTER SHARP S. + # but until now I don't see use for this in filenames ... $name =~ s/ß/\000DWSLQH/g; $name = uc($name); $name =~ s/\000DWSLQH/ß/g; @@ -707,7 +870,7 @@ # the problems that arise with this letter are endless ... # $name =~ s/i\314\207/i/g if ($from_is_utf8); if (! from_to($name, "utf8", $opt_f, Encode::FB_QUIET)) { - print STDERR $opt_upper?"Upper":"Lower","case of \"",&$from_print($oldname),"\" not possible in $opt_f ! Maybe supply different encoding via -f option.\n"; + print $outerr $opt_upper?"Upper":"Lower","case of \"",&$from_print($oldname),"\" not possible in $opt_f ! Maybe supply different encoding via -f option.\n"; return undef; } return $name; @@ -716,7 +879,7 @@ sub posix_check() { my $name=shift; if ($name =~ m/[\000\/]/) { - print STDERR "WARNING: new filename \"",&$to_print($name),"\" contains characters, which are not POSIX filesystem conform! This may result in data loss.\n"; + print $outerr "WARNING: new filename \"",&$to_print($name),"\" contains characters, which are not POSIX filesystem conform! This may result in data loss.\n"; $warnings_occurred=1; } } @@ -731,10 +894,52 @@ } sub check_for_broken_perl_release() { + # Check that most basic Perl Encode features we use work reliably + # and decide which code path we use for &this_is_valid_utf8(): + my $test = ""."\366"; + my $error = ""; + + if (not defined(decode_utf8($test))) { + $this_is_valid_utf8=\&this_is_valid_utf8_decode; + return 0; + } + $error .= "decode_utf8(\$test) check failed\n"; + + eval 'decode_utf8($test, Encode::FB_CROAK);'; + if (not $@) { + $error .= "eval 'decode_utf8(\$non-utf8, Encode::FB_CROAK);'; check failed.\n"; + } else { + $test = ""."ö"; + eval 'decode_utf8($test, Encode::FB_CROAK);'; + if ($@) { + $error .= "eval 'decode_utf8(\$utf8, Encode::FB_CROAK);'; check failed.\n"; + } else { + $this_is_valid_utf8=\&this_is_valid_utf8_decode_CROAK; + return 0; + } + } + print "Your Perl release is too broken to make convmv work reliably:\n",$error; + exit 1; +} + +sub check_for_perl_bugs() { + # Check for certain Perl fleas that we more or less have to work around: # until 1.08 I used to use decode_utf8() but see perl bug #37757 (perl 5.8.7/8) #if (not defined(decode_utf8($string)) ) my $bugs = ""; my $test = "\366"; + + my $u8test = NFD(""."ö"); # "". is intended as only so we have _utf8_off set + # otherwise from_to doesn't convert the $data to + # something else. + # print "DEBUG: string is UTF-8 flagged: ",is_utf8($u8test) ? "yes" : "no","\n"; + eval "from_to($u8test, 'utf8', 'iso-8859-1');"; + if ($u8test ne "\366") { + # Perl::Encode guys think that conversion from decomposed UTF-8 + # to any other charset does not have to be supported by from_to. + # Why, when NFC or NFD this is both perfectly valid UTF-8? + $bugs .= "#22111 "; + } if (decode_utf8($test)) { $bugs .= "#37757 "; # Convmv 1.08 and below would not work here! Files old/convmv-1.12/testsuite.tar and new/convmv-1.14/testsuite.tar differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0