September 2011 - openSUSE Commits - openSUSE Mailing Lists

commit libreoffice-languagetool for openSUSE:Factory
by root＠hilbert.suse.de 05 Sep '11

05 Sep '11

Hello community, here is the log from the commit of package libreoffice-languagetool for openSUSE:Factory checked in at Mon Sep 5 16:36:43 CEST 2011. -------- --- libreoffice-languagetool/libreoffice-languagetool.changes 2011-02-13 22:11:40.000000000 +0100 +++ /mounts/work_src_done/STABLE/libreoffice-languagetool/libreoffice-languagetool.changes 2011-09-01 14:59:41.000000000 +0200 @@ -1,0 +2,23 @@ +Thu Sep 1 09:36:12 UTC 2011 - pmladek(a)suse.com + +- updated to version 1.4: + * add support for Khmer + * update rules and dictionaries for almost all languages + * pressing [CTRL+Ret] will check the current text + * fix pre-selection of user's language + * use localized screen messages and buttons +- updated License tag to mention also 3rd party stuff +- removed obsolete Jaminid and jdic sources +- called unopkg-sync-bundled in post install scripts; added + libreoffice-3.4.2.4 into PreReq (bnc#712358) +- renamed lo-LanguageTool* helper scripts to lo-languagetool to better match + the package name +- disabled help content that was not displayed; unopkg complained about it + in the %%posttrans script + +------------------------------------------------------------------- +Mon Mar 7 14:54:51 CET 2011 - pmladek(a)suse.cz + +- fixed handling of the architecture dependant symlinks (bnc#677354) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- JLanguageTool-0.9.9-ignore-jre-1.5.diff JLanguageTool-1.2-find-junit-jar.diff JLanguageTool-1.2-package-dicts-separately.diff JLanguageTool-1.2.tar.bz2 Jaminid-0.99.tar.bz2 jdic-20061102-src.tar.bz2 lo-LanguageTool-data lo-LanguageTool-gen-spec New: ---- JLanguageTool-1.4-no-broken-help.diff JLanguageTool-1.4-package-dicts-separately.diff JLanguageTool-1.4.tar.bz2 lo-languagetool-data lo-languagetool-gen-spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-languagetool.spec ++++++ --- /var/tmp/diff_new_pack.Ffaysc/_old 2011-09-05 16:36:16.000000000 +0200 +++ /var/tmp/diff_new_pack.Ffaysc/_new 2011-09-05 16:36:16.000000000 +0200 @@ -19,7 +19,7 @@ Name: libreoffice-languagetool -Version: 1.2 +Version: 1.4 Release: 1 BuildRequires: ant java-devel libreoffice-ure unzip #!BuildIgnore: libreoffice @@ -28,12 +28,12 @@ # ignore cs because of an unlclear license; also unsupported # ignore sk unknown license; almost empty dictionary # ignore uk (unsupported) -%define langtool_langs ca de en es fr gl it pl nl ro ru sk sv -License: GPL +%define langtool_langs ca de en es fr gl it km pl nl ro ru sk sv +License: LGPLv2.1, Apachev2.0, CPLv1.0, BSD3c, BSD4c, EPLv1.0 Group: Productivity/Office/Suite AutoReqProv: on -PreReq: libreoffice >= 3.0.99 -Requires: libreoffice >= 3.0.99 +PreReq: libreoffice >= 3.4.2.4 +Requires: libreoffice >= 3.4 Requires: jre >= 1.6 # the Czech stuff newer worked; the package was created by mistake Obsoletes: OpenOffice_org-LanguageTool-cs < 0.9.9 @@ -42,33 +42,25 @@ Obsoletes: OpenOffice_org-LanguageTool <= %version Summary: Language Checker for LibreOffice Url: http://www.languagetool.org/ -# cvs -z3 -d:pserver:anonymous@languagetool.cvs.sourceforge.net:/cvsroot/languagetool co -r V_0_9_9 -P JLanguageTool +# svn co https://languagetool.svn.sourceforge.net/svnroot/languagetool languagetool +# cd tags/V_1_4/JLanguageTool # rm src/resource/cs/{*.dict,*.info} because of unclear licese; also it is not longer supported (only a bachelor's thesis) # rm src/resource/uk/{*.dict,*.info} because of unclear licese # rm src/resource/ml/{*.dict,*.info} because of unclear licese # rm -rf libs/ooo # + we use these jars from our libreoffice packages -# rm libs/{activation.jar,jaxb-api.jar,jaxb-impl.jar,jsr173_1.0_api.jar}: -# + part of JDK 1.6 => not needed -# + under CDDL or GPL => remove them to avoid necessity to include the related sources # FIXME: wanted to remove libs/commons-logging-1.1.1.jar but it was not available on SLED11 # it is small file (60kB) => it is not worth doing special hacks for SLED11 and other distros +# NOTE: jakarta-regexp-1.4.jar uses the Apache License, v2.0, see http://archive.apache.org/dist/jakarta/regexp/jakarta-regexp-1.4.tar.gz Source0: JLanguageTool-%version.tar.bz2 -# the Jaminid and jdic sources are unused during build but they should be in -# the package sources according to LGPL (bnc#487807) -# URL: http://jaminid.sourceforge.net/ -# Version 0.99 is mentioned in libs/README -Source1: Jaminid-0.99.tar.bz2 -# URL: http://jdic.dev.java.net/ -# Version 20061102 is mentioned in the cvs log -Source2: jdic-20061102-src.tar.bz2 # helper script and data file to create pieces of the spec file -Source100: lo-LanguageTool-data -Source101: lo-LanguageTool-gen-spec -Patch0: JLanguageTool-1.2-package-dicts-separately.diff +Source100: lo-languagetool-data +Source101: lo-languagetool-gen-spec +Patch0: JLanguageTool-1.4-package-dicts-separately.diff Patch1: JLanguageTool-0.9.3-system-ooo-jars.diff -Patch2: JLanguageTool-1.2-find-junit-jar.diff -Patch3: JLanguageTool-0.9.9-ignore-jre-1.5.diff +# do not use the broken help; unopkg complained about it when registering extensions +# FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files +Patch2: JLanguageTool-1.4-no-broken-help.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -83,7 +75,7 @@ ######################################################## -# Start of a section generated by lo-langtool-gen-spec +# Start of a section generated by lo-languagetool-gen-spec # Do not edit! ######################################################## @@ -210,6 +202,23 @@ +%package -n libreoffice-languagetool-km +License: BSD, CCA-SA3.0 +Summary: Khmer Dictionary for LibreOffice Language Tool +Group: Productivity/Office/Dictionary +Provides: locale(libreoffice-languagetool:km) +PreReq: libreoffice-ure >= 2.99 +Requires: libreoffice-languagetool = %version +# compat stuff +Provides: OpenOffice_org-LanguageTool-km = %version +Obsoletes: OpenOffice_org-LanguageTool-km <= %version + +%description -n libreoffice-languagetool-km +The Khmer dictionary that can be used to check grammar and other more +complex mistakes using the LibreOffice language tool extension. + + + %package -n libreoffice-languagetool-nl License: LGPL Summary: Dutch Dictionary for LibreOffice Language Tool @@ -313,18 +322,15 @@ ###################################################### -# End of a section generated by lo-langtool-gen-spec +# End of a section generated by lo-languagetool-gen-spec ###################################################### %prep -%setup -q -a1 -n JLanguageTool-%version +%setup -q -n JLanguageTool-%version %patch0 %patch1 %patch2 -%patch3 -mkdir jdic -tar -xjf %{S:2} -C jdic cp libs/README libs/README-libs.txt %build @@ -360,17 +366,26 @@ # common README.txt echo "%doc README.txt" >>files-langtool-$lang.txt done +# we need to create architecture dependent symlinks even for the main package +# create file list for link-to-ooo-home script +find $RPM_BUILD_ROOT%_datadir/%ooo_home/share/extensions/languagetool-%version/ -type d \ + -printf "%%%%dir %_datadir/%ooo_home/share/extensions/languagetool-%version/%%P\n" \ + >files-langtool.txt +find $RPM_BUILD_ROOT%_datadir/%ooo_home/share/extensions/languagetool-%version/ -type f \ + -printf "%_datadir/%ooo_home/share/extensions/languagetool-%version/%%P\n" \ + >>files-langtool.txt +cp files-langtool.txt $RPM_BUILD_ROOT%_datadir/%ooo_home +echo "%_datadir/%ooo_home/files-langtool.txt" >>files-langtool.txt %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f files-langtool.txt %defattr(-,root,root) %doc CHANGES.txt COPYING.txt README.txt libs/*.txt libs/build/junit-license.txt %dir %_datadir/%ooo_home %dir %_datadir/%ooo_home/share %dir %_datadir/%ooo_home/share/extensions -%_datadir/%ooo_home/share/extensions/languagetool-%version %pre if test -f %_datadir/ooo3/share/extension/install/LanguageTool-*.oxt ; then @@ -387,19 +402,31 @@ echo "WARNING: works with the LO cache. The LO installation will be correct!" echo fi +# the initial libreoffice packages symlinked the whole directory a wrong way (bnc#677354) +home_path="%ooo_home/share/extensions/languagetool-%version" +for link in "/usr/lib/$home_path" "/usr/lib64/$home_path" ; do + test -L "$link" && rm "$link" || true +done %post # link to the directory where the extenisons is automatically detected -mkdir -p %ooo_prefix/%ooo_home/share/extensions || exit 0; -ln -sf %_datadir/%ooo_home/share/extensions/languagetool-%version %ooo_prefix/%ooo_home/share/extensions/languagetool-%version || exit 0; +%_datadir/%ooo_home/link-to-ooo-home %_datadir/%ooo_home/files-langtool.txt || true + +%posttrans +# update UNO cache for bundled extensions +%_prefix/sbin/unopkg-sync-bundled || true + +%preun +test "$1" = "0" && cp %_datadir/%ooo_home/files-langtool.txt %_datadir/%ooo_home/files-langtool.txt.postun || true %postun -# remove the arch-dependent link from /usr/lib(64) -link=%ooo_prefix/%ooo_home/share/extensions/languagetool-%version -test -L "$link" -a ! -r "$link" && rm "$link" || exit 0; +test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool.txt.postun || true +rm -f %_datadir/%ooo_home/files-langtool.txt.postun 2>/dev/null +# update UNO cache for bundled extensions +%_prefix/sbin/unopkg-sync-bundled || true ######################################################## -# Start of a section generated by lo-langtool-gen-spec +# Start of a section generated by lo-languagetool-gen-spec # Do not edit! ######################################################## @@ -413,91 +440,154 @@ %_datadir/%ooo_home/link-to-ooo-home %_datadir/%ooo_home/files-langtool-ca.txt || true %preun -n libreoffice-languagetool-ca -test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-ca.txt || true +test "$1" = "0" && cp %_datadir/%ooo_home/files-langtool-ca.txt %_datadir/%ooo_home/files-langtool-ca.txt.postun || true + +%postun -n libreoffice-languagetool-ca +test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-ca.txt.postun || true +rm -f %_datadir/%ooo_home/files-langtool-ca.txt.postun 2>/dev/null # de %posttrans -n libreoffice-languagetool-de %_datadir/%ooo_home/link-to-ooo-home %_datadir/%ooo_home/files-langtool-de.txt || true %preun -n libreoffice-languagetool-de -test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-de.txt || true +test "$1" = "0" && cp %_datadir/%ooo_home/files-langtool-de.txt %_datadir/%ooo_home/files-langtool-de.txt.postun || true + +%postun -n libreoffice-languagetool-de +test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-de.txt.postun || true +rm -f %_datadir/%ooo_home/files-langtool-de.txt.postun 2>/dev/null # en %posttrans -n libreoffice-languagetool-en %_datadir/%ooo_home/link-to-ooo-home %_datadir/%ooo_home/files-langtool-en.txt || true %preun -n libreoffice-languagetool-en -test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-en.txt || true +test "$1" = "0" && cp %_datadir/%ooo_home/files-langtool-en.txt %_datadir/%ooo_home/files-langtool-en.txt.postun || true + +%postun -n libreoffice-languagetool-en +test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-en.txt.postun || true +rm -f %_datadir/%ooo_home/files-langtool-en.txt.postun 2>/dev/null # es %posttrans -n libreoffice-languagetool-es %_datadir/%ooo_home/link-to-ooo-home %_datadir/%ooo_home/files-langtool-es.txt || true %preun -n libreoffice-languagetool-es -test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-es.txt || true +test "$1" = "0" && cp %_datadir/%ooo_home/files-langtool-es.txt %_datadir/%ooo_home/files-langtool-es.txt.postun || true + +%postun -n libreoffice-languagetool-es +test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-es.txt.postun || true +rm -f %_datadir/%ooo_home/files-langtool-es.txt.postun 2>/dev/null # fr %posttrans -n libreoffice-languagetool-fr %_datadir/%ooo_home/link-to-ooo-home %_datadir/%ooo_home/files-langtool-fr.txt || true %preun -n libreoffice-languagetool-fr -test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-fr.txt || true +test "$1" = "0" && cp %_datadir/%ooo_home/files-langtool-fr.txt %_datadir/%ooo_home/files-langtool-fr.txt.postun || true + +%postun -n libreoffice-languagetool-fr +test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-fr.txt.postun || true +rm -f %_datadir/%ooo_home/files-langtool-fr.txt.postun 2>/dev/null # gl %posttrans -n libreoffice-languagetool-gl %_datadir/%ooo_home/link-to-ooo-home %_datadir/%ooo_home/files-langtool-gl.txt || true %preun -n libreoffice-languagetool-gl -test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-gl.txt || true +test "$1" = "0" && cp %_datadir/%ooo_home/files-langtool-gl.txt %_datadir/%ooo_home/files-langtool-gl.txt.postun || true + +%postun -n libreoffice-languagetool-gl +test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-gl.txt.postun || true +rm -f %_datadir/%ooo_home/files-langtool-gl.txt.postun 2>/dev/null # it %posttrans -n libreoffice-languagetool-it %_datadir/%ooo_home/link-to-ooo-home %_datadir/%ooo_home/files-langtool-it.txt || true %preun -n libreoffice-languagetool-it -test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-it.txt || true +test "$1" = "0" && cp %_datadir/%ooo_home/files-langtool-it.txt %_datadir/%ooo_home/files-langtool-it.txt.postun || true + +%postun -n libreoffice-languagetool-it +test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-it.txt.postun || true +rm -f %_datadir/%ooo_home/files-langtool-it.txt.postun 2>/dev/null +# km + +%posttrans -n libreoffice-languagetool-km +%_datadir/%ooo_home/link-to-ooo-home %_datadir/%ooo_home/files-langtool-km.txt || true + +%preun -n libreoffice-languagetool-km +test "$1" = "0" && cp %_datadir/%ooo_home/files-langtool-km.txt %_datadir/%ooo_home/files-langtool-km.txt.postun || true + +%postun -n libreoffice-languagetool-km +test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-km.txt.postun || true +rm -f %_datadir/%ooo_home/files-langtool-km.txt.postun 2>/dev/null # nl %posttrans -n libreoffice-languagetool-nl %_datadir/%ooo_home/link-to-ooo-home %_datadir/%ooo_home/files-langtool-nl.txt || true %preun -n libreoffice-languagetool-nl -test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-nl.txt || true +test "$1" = "0" && cp %_datadir/%ooo_home/files-langtool-nl.txt %_datadir/%ooo_home/files-langtool-nl.txt.postun || true + +%postun -n libreoffice-languagetool-nl +test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-nl.txt.postun || true +rm -f %_datadir/%ooo_home/files-langtool-nl.txt.postun 2>/dev/null # pl %posttrans -n libreoffice-languagetool-pl %_datadir/%ooo_home/link-to-ooo-home %_datadir/%ooo_home/files-langtool-pl.txt || true %preun -n libreoffice-languagetool-pl -test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-pl.txt || true +test "$1" = "0" && cp %_datadir/%ooo_home/files-langtool-pl.txt %_datadir/%ooo_home/files-langtool-pl.txt.postun || true + +%postun -n libreoffice-languagetool-pl +test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-pl.txt.postun || true +rm -f %_datadir/%ooo_home/files-langtool-pl.txt.postun 2>/dev/null # ro %posttrans -n libreoffice-languagetool-ro %_datadir/%ooo_home/link-to-ooo-home %_datadir/%ooo_home/files-langtool-ro.txt || true %preun -n libreoffice-languagetool-ro -test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-ro.txt || true +test "$1" = "0" && cp %_datadir/%ooo_home/files-langtool-ro.txt %_datadir/%ooo_home/files-langtool-ro.txt.postun || true + +%postun -n libreoffice-languagetool-ro +test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-ro.txt.postun || true +rm -f %_datadir/%ooo_home/files-langtool-ro.txt.postun 2>/dev/null # ru %posttrans -n libreoffice-languagetool-ru %_datadir/%ooo_home/link-to-ooo-home %_datadir/%ooo_home/files-langtool-ru.txt || true %preun -n libreoffice-languagetool-ru -test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-ru.txt || true +test "$1" = "0" && cp %_datadir/%ooo_home/files-langtool-ru.txt %_datadir/%ooo_home/files-langtool-ru.txt.postun || true + +%postun -n libreoffice-languagetool-ru +test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-ru.txt.postun || true +rm -f %_datadir/%ooo_home/files-langtool-ru.txt.postun 2>/dev/null # sk %posttrans -n libreoffice-languagetool-sk %_datadir/%ooo_home/link-to-ooo-home %_datadir/%ooo_home/files-langtool-sk.txt || true %preun -n libreoffice-languagetool-sk -test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-sk.txt || true +test "$1" = "0" && cp %_datadir/%ooo_home/files-langtool-sk.txt %_datadir/%ooo_home/files-langtool-sk.txt.postun || true + +%postun -n libreoffice-languagetool-sk +test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-sk.txt.postun || true +rm -f %_datadir/%ooo_home/files-langtool-sk.txt.postun 2>/dev/null # sv %posttrans -n libreoffice-languagetool-sv %_datadir/%ooo_home/link-to-ooo-home %_datadir/%ooo_home/files-langtool-sv.txt || true %preun -n libreoffice-languagetool-sv -test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-sv.txt || true +test "$1" = "0" && cp %_datadir/%ooo_home/files-langtool-sv.txt %_datadir/%ooo_home/files-langtool-sv.txt.postun || true + +%postun -n libreoffice-languagetool-sv +test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-sv.txt.postun || true +rm -f %_datadir/%ooo_home/files-langtool-sv.txt.postun 2>/dev/null # # langtool dictionaries # @@ -530,6 +620,10 @@ %defattr(-,root,root) %doc src/resource/it/readme-morph-it.txt +%files -f files-langtool-km.txt -n libreoffice-languagetool-km +%defattr(-,root,root) +%doc src/resource/km/README.txt + %files -f files-langtool-nl.txt -n libreoffice-languagetool-nl %defattr(-,root,root) @@ -550,7 +644,7 @@ %defattr(-,root,root) ###################################################### -# End of a section generated by lo-langtool-gen-spec +# End of a section generated by lo-languagetool-gen-spec ###################################################### %changelog ++++++ JLanguageTool-1.4-no-broken-help.diff ++++++ --- openoffice/META-INF/manifest.xml +++ openoffice/META-INF/manifest.xml @@ -7,5 +7,4 @@ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" manifest:full-path="Linguistic.xcu" /> - <manifest:file-entry manifest:full-path="help" manifest:media-type="application/vnd.sun.star.help"/> </manifest:manifest> \ No newline at end of file ++++++ JLanguageTool-1.2-package-dicts-separately.diff -> JLanguageTool-1.4-package-dicts-separately.diff ++++++ --- libreoffice-languagetool/JLanguageTool-1.2-package-dicts-separately.diff 2011-02-13 22:11:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/libreoffice-languagetool/JLanguageTool-1.4-package-dicts-separately.diff 2011-09-01 14:59:34.000000000 +0200 @@ -1,111 +1,119 @@ --- build.xml +++ build.xml -@@ -443,105 +443,56 @@ - <copy file="${resource.dir}/segment.srx" todir="${dist.dir}/resource" /> +@@ -438,113 +438,62 @@ + <copy file="${resource.dir}/segment.srx" todir="${dist.dir}/resource" /> - <copy file="${resource.dir}/en/tagset.txt" todir="${dist.dir}/resource/en" /> --<copy file="${resource.dir}/en/english.dict" todir="${dist.dir}/resource/en" /> --<copy file="${resource.dir}/en/english.info" todir="${dist.dir}/resource/en" /> --<copy file="${resource.dir}/en/english_synth.dict" todir="${dist.dir}/resource/en" /> --<copy file="${resource.dir}/en/english_synth.info" todir="${dist.dir}/resource/en" /> - <copy file="${resource.dir}/en/english_tags.txt" todir="${dist.dir}/resource/en" /> - <copy file="${resource.dir}/en/disambiguation.xml" todir="${dist.dir}/resource/en" /> - <copy file="${resource.dir}/en/compounds.txt" todir="${dist.dir}/resource/en" /> - - <copy file="${resource.dir}/eo/etikedoj.txt" todir="${dist.dir}/resource/eo" /> - --<copy file="${resource.dir}/it/italian.dict" todir="${dist.dir}/resource/it" /> --<copy file="${resource.dir}/it/italian.info" todir="${dist.dir}/resource/it" /> - <copy file="${resource.dir}/it/readme-morph-it.txt" todir="${dist.dir}/resource/it" /> - --<copy file="${resource.dir}/fr/french.dict" todir="${dist.dir}/resource/fr" /> --<copy file="${resource.dir}/fr/french.info" todir="${dist.dir}/resource/fr" /> - <copy file="${resource.dir}/fr/README_lexique.txt" todir="${dist.dir}/resource/fr" /> - <copy file="${resource.dir}/fr/tagset.LT.txt" todir="${dist.dir}/resource/fr" /> - <copy file="${resource.dir}/fr/disambiguation.xml" todir="${dist.dir}/resource/fr" /> - --<copy file="${resource.dir}/gl/galician.dict" todir="${dist.dir}/resource/gl" /> --<copy file="${resource.dir}/gl/galician.info" todir="${dist.dir}/resource/gl" /> - <copy file="${resource.dir}/gl/README" todir="${dist.dir}/resource/gl" /> - --<copy file="${resource.dir}/es/spanish.dict" todir="${dist.dir}/resource/es" /> --<copy file="${resource.dir}/es/spanish.info" todir="${dist.dir}/resource/es" /> - <copy file="${resource.dir}/es/etiquetas-eagles.txt" todir="${dist.dir}/resource/es" /> --<copy file="${resource.dir}/es/spanish_synth.dict" todir="${dist.dir}/resource/es" /> --<copy file="${resource.dir}/es/spanish_synth.info" todir="${dist.dir}/resource/es" /> - <copy file="${resource.dir}/es/spanish_tags.txt" todir="${dist.dir}/resource/es" /> - <copy file="${resource.dir}/es/README" todir="${dist.dir}/resource/es" /> - - <copy file="${resource.dir}/da/danish_tags.txt" todir="${dist.dir}/resource/da" /> --<copy file="${resource.dir}/da/danish.dict" todir="${dist.dir}/resource/da" /> --<copy file="${resource.dir}/da/danish.info" todir="${dist.dir}/resource/da" /> - --<copy file="${resource.dir}/de/german.dict" todir="${dist.dir}/resource/de" /> --<copy file="${resource.dir}/de/german.info" todir="${dist.dir}/resource/de" /> - <copy file="${resource.dir}/de/compounds.txt" todir="${dist.dir}/resource/de" /> - <copy file="${resource.dir}/de/added.txt" todir="${dist.dir}/resource/de" /> - <copy file="${resource.dir}/de/tagset.txt" todir="${dist.dir}/resource/de" /> - --<copy file="${resource.dir}/pl/polish.dict" todir="${dist.dir}/resource/pl" /> --<copy file="${resource.dir}/pl/polish.info" todir="${dist.dir}/resource/pl" /> --<copy file="${resource.dir}/pl/polish_synth.dict" todir="${dist.dir}/resource/pl" /> --<copy file="${resource.dir}/pl/polish_synth.info" todir="${dist.dir}/resource/pl" /> - <copy file="${resource.dir}/pl/polish_tags.txt" todir="${dist.dir}/resource/pl" /> - <copy file="${resource.dir}/pl/compounds.txt" todir="${dist.dir}/resource/pl" /> - <copy file="${resource.dir}/pl/multiwords.txt" todir="${dist.dir}/resource/pl" /> - <copy file="${resource.dir}/pl/disambiguation.xml" todir="${dist.dir}/resource/pl" /> - --<copy file="${resource.dir}/nl/dutch.dict" todir="${dist.dir}/resource/nl" /> --<copy file="${resource.dir}/nl/dutch.info" todir="${dist.dir}/resource/nl" /> --<copy file="${resource.dir}/nl/dutch_synth.dict" todir="${dist.dir}/resource/nl" /> --<copy file="${resource.dir}/nl/dutch_synth.info" todir="${dist.dir}/resource/nl" /> - <copy file="${resource.dir}/nl/dutch_tags.txt" todir="${dist.dir}/resource/nl" /> - <copy file="${resource.dir}/nl/disambiguation.xml" todir="${dist.dir}/resource/nl" /> - --<copy file="${resource.dir}/sv/swedish.info" todir="${dist.dir}/resource/sv" /> --<copy file="${resource.dir}/sv/swedish.dict" todir="${dist.dir}/resource/sv" /> - <copy file="${resource.dir}/sv/compounds.txt" todir="${dist.dir}/resource/sv" /> + <copy file="${resource.dir}/en/tagset.txt" todir="${dist.dir}/resource/en" /> +- <copy file="${resource.dir}/en/english.dict" todir="${dist.dir}/resource/en" /> +- <copy file="${resource.dir}/en/english.info" todir="${dist.dir}/resource/en" /> +- <copy file="${resource.dir}/en/english_synth.dict" todir="${dist.dir}/resource/en" /> +- <copy file="${resource.dir}/en/english_synth.info" todir="${dist.dir}/resource/en" /> + <copy file="${resource.dir}/en/english_tags.txt" todir="${dist.dir}/resource/en" /> + <copy file="${resource.dir}/en/disambiguation.xml" todir="${dist.dir}/resource/en" /> + <copy file="${resource.dir}/en/compounds.txt" todir="${dist.dir}/resource/en" /> + + <copy file="${resource.dir}/eo/etikedoj.txt" todir="${dist.dir}/resource/eo" /> + +- <copy file="${resource.dir}/it/italian.dict" todir="${dist.dir}/resource/it" /> +- <copy file="${resource.dir}/it/italian.info" todir="${dist.dir}/resource/it" /> + <copy file="${resource.dir}/it/readme-morph-it.txt" todir="${dist.dir}/resource/it" /> + +- <copy file="${resource.dir}/fr/french.dict" todir="${dist.dir}/resource/fr" /> +- <copy file="${resource.dir}/fr/french.info" todir="${dist.dir}/resource/fr" /> + <copy file="${resource.dir}/fr/README_lexique.txt" todir="${dist.dir}/resource/fr" /> + <copy file="${resource.dir}/fr/tagset.LT.txt" todir="${dist.dir}/resource/fr" /> + <copy file="${resource.dir}/fr/multiwords.txt" todir="${dist.dir}/resource/fr" /> + <copy file="${resource.dir}/fr/disambiguation.xml" todir="${dist.dir}/resource/fr" /> + +- <copy file="${resource.dir}/gl/galician.dict" todir="${dist.dir}/resource/gl" /> +- <copy file="${resource.dir}/gl/galician.info" todir="${dist.dir}/resource/gl" /> + <copy file="${resource.dir}/gl/README" todir="${dist.dir}/resource/gl" /> + +- <copy file="${resource.dir}/es/spanish.dict" todir="${dist.dir}/resource/es" /> +- <copy file="${resource.dir}/es/spanish.info" todir="${dist.dir}/resource/es" /> + <copy file="${resource.dir}/es/etiquetas-eagles.txt" todir="${dist.dir}/resource/es" /> +- <copy file="${resource.dir}/es/spanish_synth.dict" todir="${dist.dir}/resource/es" /> +- <copy file="${resource.dir}/es/spanish_synth.info" todir="${dist.dir}/resource/es" /> + <copy file="${resource.dir}/es/spanish_tags.txt" todir="${dist.dir}/resource/es" /> + <copy file="${resource.dir}/es/disambiguation.xml" todir="${dist.dir}/resource/es" /> + <copy file="${resource.dir}/es/README" todir="${dist.dir}/resource/es" /> + + <copy file="${resource.dir}/da/danish_tags.txt" todir="${dist.dir}/resource/da" /> +- <copy file="${resource.dir}/da/danish.dict" todir="${dist.dir}/resource/da" /> +- <copy file="${resource.dir}/da/danish.info" todir="${dist.dir}/resource/da" /> + +- <copy file="${resource.dir}/de/german.dict" todir="${dist.dir}/resource/de" /> +- <copy file="${resource.dir}/de/german.info" todir="${dist.dir}/resource/de" /> + <copy file="${resource.dir}/de/compounds.txt" todir="${dist.dir}/resource/de" /> + <copy file="${resource.dir}/de/added.txt" todir="${dist.dir}/resource/de" /> + <copy file="${resource.dir}/de/tagset.txt" todir="${dist.dir}/resource/de" /> + +- <copy file="${resource.dir}/pl/polish.dict" todir="${dist.dir}/resource/pl" /> +- <copy file="${resource.dir}/pl/polish.info" todir="${dist.dir}/resource/pl" /> +- <copy file="${resource.dir}/pl/polish_synth.dict" todir="${dist.dir}/resource/pl" /> +- <copy file="${resource.dir}/pl/polish_synth.info" todir="${dist.dir}/resource/pl" /> + <copy file="${resource.dir}/pl/polish_tags.txt" todir="${dist.dir}/resource/pl" /> + <copy file="${resource.dir}/pl/compounds.txt" todir="${dist.dir}/resource/pl" /> + <copy file="${resource.dir}/pl/multiwords.txt" todir="${dist.dir}/resource/pl" /> + <copy file="${resource.dir}/pl/disambiguation.xml" todir="${dist.dir}/resource/pl" /> + +- <copy file="${resource.dir}/nl/dutch.dict" todir="${dist.dir}/resource/nl" /> +- <copy file="${resource.dir}/nl/dutch.info" todir="${dist.dir}/resource/nl" /> +- <copy file="${resource.dir}/nl/dutch_synth.dict" todir="${dist.dir}/resource/nl" /> +- <copy file="${resource.dir}/nl/dutch_synth.info" todir="${dist.dir}/resource/nl" /> + <copy file="${resource.dir}/nl/dutch_tags.txt" todir="${dist.dir}/resource/nl" /> + <copy file="${resource.dir}/nl/disambiguation.xml" todir="${dist.dir}/resource/nl" /> + +- <copy file="${resource.dir}/sv/swedish.info" todir="${dist.dir}/resource/sv" /> +- <copy file="${resource.dir}/sv/swedish.dict" todir="${dist.dir}/resource/sv" /> + <copy file="${resource.dir}/sv/compounds.txt" todir="${dist.dir}/resource/sv" /> --<copy file="${resource.dir}/uk/ukrainian.dict" todir="${dist.dir}/resource/uk" /> +- <copy file="${resource.dir}/uk/ukrainian.dict" todir="${dist.dir}/resource/uk" /> - --<copy file="${resource.dir}/ru/russian.dict" todir="${dist.dir}/resource/ru" /> --<copy file="${resource.dir}/ru/russian.info" todir="${dist.dir}/resource/ru" /> - <copy file="${resource.dir}/ru/russian_tags.txt" todir="${dist.dir}/resource/ru" /> --<copy file="${resource.dir}/ru/russian_synth.dict" todir="${dist.dir}/resource/ru" /> --<copy file="${resource.dir}/ru/russian_synth.info" todir="${dist.dir}/resource/ru" /> - <copy file="${resource.dir}/ru/tags_russian.txt" todir="${dist.dir}/resource/ru" /> - <copy file="${resource.dir}/ru/compounds_ru.txt" todir="${dist.dir}/resource/ru" /> - <copy file="${resource.dir}/ru/disambiguation.xml" todir="${dist.dir}/resource/ru" /> - --<copy file="${resource.dir}/ro/romanian.dict" todir="${dist.dir}/resource/ro" /> --<copy file="${resource.dir}/ro/romanian.info" todir="${dist.dir}/resource/ro" /> --<copy file="${resource.dir}/ro/romanian_synth.dict" todir="${dist.dir}/resource/ro" /> --<copy file="${resource.dir}/ro/romanian_synth.info" todir="${dist.dir}/resource/ro" /> - <copy file="${resource.dir}/ro/romanian_tags.txt" todir="${dist.dir}/resource/ro" /> - <copy file="${resource.dir}/ro/disambiguation.xml" todir="${dist.dir}/resource/ro" /> - --<copy file="${resource.dir}/sk/slovak.dict" todir="${dist.dir}/resource/sk" /> --<copy file="${resource.dir}/sk/slovak.info" todir="${dist.dir}/resource/sk" /> - <copy file="${resource.dir}/sk/compounds.txt" todir="${dist.dir}/resource/sk" /> - <copy file="${resource.dir}/sk/README" todir="${dist.dir}/resource/sk" /> --<copy file="${resource.dir}/sk/slovak_synth.dict" todir="${dist.dir}/resource/sk" /> --<copy file="${resource.dir}/sk/slovak_synth.info" todir="${dist.dir}/resource/sk" /> - <copy file="${resource.dir}/sk/slovak_tags.txt" todir="${dist.dir}/resource/sk" /> - --<copy file="${resource.dir}/ml/malayalam.dict" todir="${dist.dir}/resource/ml" /> --<copy file="${resource.dir}/ml/malayalam.info" todir="${dist.dir}/resource/ml" /> -- - <copy file="${resource.dir}/ca/catalan_synth.dict" todir="${dist.dir}/resource/ca" /> - <copy file="${resource.dir}/ca/catalan_tags.txt" todir="${dist.dir}/resource/ca" /> --<copy file="${resource.dir}/ca/catalan.dict" todir="${dist.dir}/resource/ca" /> --<copy file="${resource.dir}/ca/catalan.info" todir="${dist.dir}/resource/ca" /> - <copy file="${resource.dir}/ca/README" todir="${dist.dir}/resource/ca" /> - --<copy file="${resource.dir}/xx/dummy.dict" tofile="${dist.dir}/resource/cs/czech.dict" /> -- -  - <javac encoding="${encoding}" srcdir="${src.dir}/dev" includes="de/danielnaber/languagetool/dev/PrintLocales.java" destdir="${build.classes}" target="${target}" debug="${debug}"> - </javac> +- <copy file="${resource.dir}/ru/russian.dict" todir="${dist.dir}/resource/ru" /> +- <copy file="${resource.dir}/ru/russian.info" todir="${dist.dir}/resource/ru" /> + <copy file="${resource.dir}/ru/russian_tags.txt" todir="${dist.dir}/resource/ru" /> +- <copy file="${resource.dir}/ru/russian_synth.dict" todir="${dist.dir}/resource/ru" /> +- <copy file="${resource.dir}/ru/russian_synth.info" todir="${dist.dir}/resource/ru" /> + <copy file="${resource.dir}/ru/tags_russian.txt" todir="${dist.dir}/resource/ru" /> + <copy file="${resource.dir}/ru/compounds.txt" todir="${dist.dir}/resource/ru" /> + <copy file="${resource.dir}/ru/disambiguation.xml" todir="${dist.dir}/resource/ru" /> + +- <copy file="${resource.dir}/ro/romanian.dict" todir="${dist.dir}/resource/ro" /> +- <copy file="${resource.dir}/ro/romanian.info" todir="${dist.dir}/resource/ro" /> +- <copy file="${resource.dir}/ro/romanian_synth.dict" todir="${dist.dir}/resource/ro" /> +- <copy file="${resource.dir}/ro/romanian_synth.info" todir="${dist.dir}/resource/ro" /> + <copy file="${resource.dir}/ro/romanian_tags.txt" todir="${dist.dir}/resource/ro" /> + <copy file="${resource.dir}/ro/disambiguation.xml" todir="${dist.dir}/resource/ro" /> + <copy file="${resource.dir}/ro/compounds.txt" todir="${dist.dir}/resource/ro" /> + +- <copy file="${resource.dir}/sk/slovak.dict" todir="${dist.dir}/resource/sk" /> +- <copy file="${resource.dir}/sk/slovak.info" todir="${dist.dir}/resource/sk" /> + <copy file="${resource.dir}/sk/compounds.txt" todir="${dist.dir}/resource/sk" /> + <copy file="${resource.dir}/sk/README" todir="${dist.dir}/resource/sk" /> +- <copy file="${resource.dir}/sk/slovak_synth.dict" todir="${dist.dir}/resource/sk" /> +- <copy file="${resource.dir}/sk/slovak_synth.info" todir="${dist.dir}/resource/sk" /> + <copy file="${resource.dir}/sk/slovak_tags.txt" todir="${dist.dir}/resource/sk" /> + +- <copy file="${resource.dir}/ml/malayalam.dict" todir="${dist.dir}/resource/ml" /> +- <copy file="${resource.dir}/ml/malayalam.info" todir="${dist.dir}/resource/ml" /> + +- <copy file="${resource.dir}/km/khmer.dict" todir="${dist.dir}/resource/km" /> +- <copy file="${resource.dir}/km/khmer.info" todir="${dist.dir}/resource/km" /> + <copy file="${resource.dir}/km/khmertags.txt" todir="${dist.dir}/resource/km" /> + <copy file="${resource.dir}/km/tagset.txt" todir="${dist.dir}/resource/km" /> + <copy file="${resource.dir}/km/disambiguation.xml" todir="${dist.dir}/resource/km" /> + +- <copy file="${resource.dir}/ca/catalan_synth.dict" todir="${dist.dir}/resource/ca" /> +- <copy file="${resource.dir}/ca/catalan_tags.txt" todir="${dist.dir}/resource/ca" /> +- <copy file="${resource.dir}/ca/catalan.dict" todir="${dist.dir}/resource/ca" /> +- <copy file="${resource.dir}/ca/catalan.info" todir="${dist.dir}/resource/ca" /> + <copy file="${resource.dir}/ca/README" todir="${dist.dir}/resource/ca" /> + +- <copy file="${resource.dir}/xx/dummy.dict" tofile="${dist.dir}/resource/cs/czech.dict" /> + <copy todir="${dist.dir}/rules"> + <fileset dir="src/rules" excludes="CVS" /> + </copy> --- src/java/de/danielnaber/languagetool/openoffice/Main.java +++ src/java/de/danielnaber/languagetool/openoffice/Main.java @@ -23,6 +23,7 @@ @@ -116,41 +124,75 @@ import java.io.File; import java.util.ArrayList; import java.util.Arrays; -@@ -476,9 +477,18 @@ - * The Locale to check. +@@ -481,9 +482,18 @@ */ + @Override public final boolean hasLocale(final Locale locale) { + List<String> dummyList = new ArrayList<String>(); try { for (final Language element : Language.LANGUAGES) { - if (element.getShortName().equals(locale.Language)) { -+ // FIXME: dirty hack that checks whether the dictionary is really installed -+ // it is better to have dictionaries in optional packages -+ boolean dictionaryExists = true; -+ try { -+ element.getTagger().tag(dummyList); -+ } catch (IOException e) { -+ dictionaryExists = false; -+ } -+ if (dictionaryExists && element.getShortName().equals(locale.Language)) { ++ // FIXME: dirty hack that checks whether the dictionary is really installed ++ // it is better to have dictionaries in optional packages ++ boolean dictionaryExists = true; ++ try { ++ element.getTagger().tag(dummyList); ++ } catch (IOException e) { ++ dictionaryExists = false; ++ } ++ if (dictionaryExists && element.getShortName().equals(locale.Language)) { return true; } } +--- src/java/de/danielnaber/languagetool/databroker/DefaultResourceDataBroker.java.old 2011-08-30 16:34:02.000000000 +0200 ++++ src/java/de/danielnaber/languagetool/databroker/DefaultResourceDataBroker.java 2011-08-31 17:23:08.000000000 +0200 +@@ -138,7 +138,6 @@ public class DefaultResourceDataBroker i + public InputStream getFromResourceDirAsStream(final String path) { + final String completePath = this.getCompleteResourceUrl(path); + final InputStream resourceAsStream = ResourceDataBroker.class.getResourceAsStream(completePath); +- assertNotNull(resourceAsStream, path, completePath); + return resourceAsStream; + } + +@@ -158,7 +157,6 @@ public class DefaultResourceDataBroker i + public URL getFromResourceDirAsUrl(final String path) { + final String completePath = this.getCompleteResourceUrl(path); + final URL resource = ResourceDataBroker.class.getResource(completePath); +- assertNotNull(resource, path, completePath); + return getFixedJarURL(resource); + } + +@@ -205,7 +203,6 @@ public class DefaultResourceDataBroker i + public InputStream getFromRulesDirAsStream(final String path) { + final String completePath = this.getCompleteRulesUrl(path); + final InputStream resourceAsStream = ResourceDataBroker.class.getResourceAsStream(completePath); +- assertNotNull(resourceAsStream, path, completePath); + return resourceAsStream; + } + +@@ -224,7 +221,6 @@ public class DefaultResourceDataBroker i + public URL getFromRulesDirAsUrl(final String path) { + final String completePath = this.getCompleteRulesUrl(path); + final URL resource = ResourceDataBroker.class.getResource(completePath); +- assertNotNull(resource, path, completePath); + return getFixedJarURL(resource); + } + --- src/java/de/danielnaber/languagetool/tagging/BaseTagger.java +++ src/java/de/danielnaber/languagetool/tagging/BaseTagger.java -@@ -61,6 +61,9 @@ +@@ -62,6 +62,9 @@ // caching IStemmer instance - lazy init - if (morfologik == null) { + if (dictLookup == null) { final URL url = this.getClass().getResource(getFileName()); + if (url == null) { + throw new IOException("Did not detect the dictonary file"); + } - morfologik = new DictionaryLookup(Dictionary.read(url)); + dictLookup = new DictionaryLookup(Dictionary.read(url)); } --- src/java/de/danielnaber/languagetool/tagging/cs/CzechTagger.java +++ src/java/de/danielnaber/languagetool/tagging/cs/CzechTagger.java -@@ -60,6 +60,9 @@ +@@ -61,6 +61,9 @@ // caching Lametyzator instance - lazy init if (morfologik == null) { final URL url = JLanguageTool.getDataBroker().getFromResourceDirAsUrl(RESOURCE_FILENAME); @@ -162,7 +204,7 @@ --- src/java/de/danielnaber/languagetool/tagging/de/GermanTagger.java +++ src/java/de/danielnaber/languagetool/tagging/de/GermanTagger.java -@@ -74,6 +74,9 @@ +@@ -76,6 +76,9 @@ // caching Lametyzator instance - lazy init if (morfologik == null) { final URL url = JLanguageTool.getDataBroker().getFromResourceDirAsUrl(DICT_FILENAME); @@ -186,7 +228,7 @@ --- src/java/de/danielnaber/languagetool/tagging/ro/RomanianTagger.java +++ src/java/de/danielnaber/languagetool/tagging/ro/RomanianTagger.java -@@ -71,6 +71,9 @@ +@@ -72,6 +72,9 @@ // caching Lametyzator instance - lazy init if (morfologik == null) { final URL url = JLanguageTool.getDataBroker().getFromResourceDirAsUrl(RESOURCE_FILENAME); @@ -198,7 +240,7 @@ --- src/java/de/danielnaber/languagetool/tagging/uk/UkrainianMyspellTagger.java +++ src/java/de/danielnaber/languagetool/tagging/uk/UkrainianMyspellTagger.java -@@ -62,6 +62,9 @@ +@@ -63,6 +63,9 @@ if (wordsToPos == null) { wordsToPos = new HashMap<String, String[]>(); final InputStream resourceFile = JLanguageTool.getDataBroker().getFromResourceDirAsStream(RESOURCE_FILENAME); ++++++ JLanguageTool-1.2.tar.bz2 -> JLanguageTool-1.4.tar.bz2 ++++++ libreoffice-languagetool/JLanguageTool-1.2.tar.bz2 /mounts/work_src_done/STABLE/libreoffice-languagetool/JLanguageTool-1.4.tar.bz2 differ: char 11, line 1 ++++++ lo-languagetool-data ++++++ %lang ca Catalan 0 %license GPL %files %doc src/resource/ca/README %lang de German 0 %license CCA-SA3.0 %files %doc src/resource/de/{errors.txt,tagset.txt} %lang en English 0 %license BSD3c, BSD4c, Public Domain, Freeware %files %doc src/resource/en/{12dicts-readme.html,agid-readme.txt,errors.txt,pos-readme.txt} %lang gl Galician 0 %license GPL %files %doc src/resource/gl/{LICENSE,README,README.cvs} %lang fr French 0 %license GPLv2.0, LGPLv2.1, MPLv1.1 %files %doc src/resource/fr/README_lexique.txt %lang it Italian 0 %license CCA-SA2.0, LGPL %files %doc src/resource/it/readme-morph-it.txt %lang km Khmer 0 %license BSD, CCA-SA3.0 %files %doc src/resource/km/README.txt %lang nl Dutch 0 %license LGPL %lang pl Polish 0 %license LGPL %lang ro Romanian 0 %license LGPL %lang ru Russian 0 %license LGPL %lang sv Swedish 0 %license LGPL %lang sk Slovak 0 %license LGPL %files %doc src/resource/sk/README %lang es Spanish 0 %license GPL %files %doc src/resource/es/{README,README.cvs} %lang sv Swedish 0 %license LGPL ++++++ lo-languagetool-gen-spec ++++++ #!/usr/bin/perl -w # This script changes the definite article of ProductName use strict; sub init_lang_data($$$$) { my ($datap, $curLang, $long_name, $level) = @_; $datap->{$curLang}{'long_name'} = $long_name; $datap->{$curLang}{'level'} = $level; $datap->{$curLang}{'locale'} = "$curLang"; $datap->{$curLang}{'locale'} =~ s/-/_/g; $datap->{$curLang}{'package'} = (); return $curLang; } sub read_data($$) { my ($data_file, $datap) = @_; my $curLang; open DATA , "< $data_file" or die "Can't open '$data_file'\n"; while( my $line = <DATA>){ chomp $line; if ( $line =~ m/^\s*\%lang\s+([\w-]+)\s+(\w+)\s+(\d+)\s*$/ ) { $curLang = init_lang_data($datap, "$1", "$2", "$3"); } elsif ( $line =~ m/^\s*\%lang\s+([\w-]+)\s+\"([\w\s]+)\"\s+(\d+)\s*$/ ) { $curLang = init_lang_data($datap, "$1", "$2", "$3"); } elsif ( $line =~ /^\s*\%package\s+(.*)$/ ) { push @ {$datap->{$curLang}{'package'}}, "$1"; } elsif ( $line =~ /^\s*\%license\s+(.*)$/ ) { $datap->{$curLang}{'license'} = "$1"; } elsif ( $line =~ /^\s*\%files\s+(.*)$/ ) { push @ {$datap->{$curLang}{'files'}}, "$1"; } elsif ( $line =~ /^\s*$/ ) { # ignore empty line } else { die "Synrax error in $data_file, line $.\n"; } } close(DATA); } sub write_generated_section_start() { print "########################################################\n"; print "# Start of a section generated by lo-languagetool-gen-spec\n"; print "# Do not edit!\n"; print "########################################################\n"; print "\n"; } sub write_generated_section_end() { print "######################################################\n"; print "# End of a section generated by lo-languagetool-gen-spec\n"; print "######################################################\n"; print "\n"; } sub write_section_comment($) { my ($section_name) = @_; print "#\n"; print "# $section_name\n"; print "#\n"; print "\n"; } sub write_level_begin($$) { my ($curLevel, $newLevel) = @_; if ($curLevel != $newLevel) { print "%endif\n" if ($curLevel > 0); print "%if %test_build_langs >= $newLevel\n" if ($newLevel > 0); print "\n"; } return $newLevel; } sub write_level_end($) { my ($curLevel) = @_; if ($curLevel > 0) { print "%endif\n"; print "\n"; } return 0; } sub write_langtool_package_section($$) { my ($datap, $curLang) = @_; return if ("$curLang" eq "en-US"); # we do not have the l10n-en-US package unless (defined $datap->{$curLang}{'license'}) { die "Error: License is not defined for the language: $curLang"; } print "%package -n libreoffice-languagetool-$curLang\n"; print "License: $datap->{$curLang}{'license'}\n"; print "Summary: $datap->{$curLang}{'long_name'} Dictionary for LibreOffice Language Tool\n"; print "Group: Productivity/Office/Dictionary\n"; print "Provides: locale(libreoffice-languagetool:$datap->{$curLang}{'locale'})\n"; print "PreReq: libreoffice-ure >= 2.99\n"; print "Requires: libreoffice-languagetool = %version\n"; print "# compat stuff\n"; print "Provides: OpenOffice_org-LanguageTool-$curLang = %version\n"; print "Obsoletes: OpenOffice_org-LanguageTool-$curLang <= %version\n"; foreach my $line (@{$datap->{$curLang}{'package'}}) { print "$line\n"; } print "\n"; print "%description -n libreoffice-languagetool-$curLang\n"; print "The $datap->{$curLang}{'long_name'} dictionary that can be used to check grammar and other more\n"; print "complex mistakes using the LibreOffice language tool extension.\n"; print "\n"; print "\n"; print "\n"; } sub write_langtool_scripts_section($$) { my ($datap, $curLang) = @_; print "# $curLang\n"; print "%posttrans -n libreoffice-languagetool-$curLang\n"; print "%_datadir/%ooo_home/link-to-ooo-home %_datadir/%ooo_home/files-langtool-$datap->{$curLang}{'locale'}.txt || true\n"; print "\n"; print "%preun -n libreoffice-languagetool-$curLang\n"; print "test \"\$1\" = \"0\" && cp %_datadir/%ooo_home/files-langtool-$datap->{$curLang}{'locale'}.txt %_datadir/%ooo_home/files-langtool-$datap->{$curLang}{'locale'}.txt.postun || true\n"; print "\n"; print "%postun -n libreoffice-languagetool-$curLang\n"; print "test \"\$1\" = \"0\" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-$datap->{$curLang}{'locale'}.txt.postun || true\n"; print "rm -f %_datadir/%ooo_home/files-langtool-$datap->{$curLang}{'locale'}.txt.postun 2>/dev/null\n" } sub write_langtool_files_section($$) { my ($datap, $curLang) = @_; print "%files -f files-langtool-$datap->{$curLang}{'locale'}.txt -n libreoffice-languagetool-$curLang\n"; print "%defattr(-,root,root)\n"; foreach my $line (@{$datap->{$curLang}{'files'}}) { print "$line\n"; } print "\n"; } sub write_langtool_section($$$) { my ($datap, $write_single_lang_section, $section_name) = @_; my $curLevel = 0; write_section_comment($section_name); foreach my $curLang (sort keys %{$datap}) { $curLevel = write_level_begin($curLevel, $datap->{$curLang}{'level'}); & {$write_single_lang_section} ($datap, $curLang); } $curLevel = write_level_end($curLevel); } sub usage() { print "This tool generates pieces of the LanguageTool spec\n\n" . "Usage:\n". "\tlo-langtool-gen-spec [--help] data_file...\n\n" . "Options:\n" . "\t--help: prints this help\n" . "\tdata_file: input file\n"; } # info about localizations # it is a hash, the key is the lang id, e.g. "en-US", the value is: # a hash, keys introduce perl-like structure items: # 'long_name' ... string, long name of the language, e.g. "American" # 'level' ... integer, level in whih it should get build, e.g. '1' # it is the level in the rpm spec to do a reduced build # 'locale' ... string, it is actually the lang id with undersore instead of dash, # e.g. "en_US" # 'package' ... array of strings that should be added to the %package section for # the given language # 'license' ... string, defines the license of the package # 'files' ... array of strings that should be added to the %files section for # the given language my %data; my $l10n = 1; my $help = 1; for my $arg (@ARGV) { if ($arg eq '--help' || $arg eq '-h') { usage; exit 0; } else { if (-f $arg) { read_data($arg, \%data); } else { die "File does not exist: $arg\n"; } } } write_generated_section_start(); write_langtool_section(\%data, \&write_langtool_package_section, "langtool dictionaries"); write_generated_section_end(); write_generated_section_start(); write_langtool_section(\%data, \&write_langtool_scripts_section, "langtool dictionaries"); write_langtool_section(\%data, \&write_langtool_files_section, "langtool dictionaries"); write_generated_section_end(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libopenraw for openSUSE:Factory
by root＠hilbert.suse.de 05 Sep '11

05 Sep '11

Hello community, here is the log from the commit of package libopenraw for openSUSE:Factory checked in at Mon Sep 5 16:35:50 CEST 2011. -------- --- libopenraw/libopenraw.changes 2010-10-11 21:23:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/libopenraw/libopenraw.changes 2011-09-05 05:45:48.000000000 +0200 @@ -1,0 +2,11 @@ +Mon Sep 5 02:18:19 UTC 2011 - glin(a)suse.com + +- Merge upstream patch libopenraw-detect-compressed-otf.patch to + avoid segfault while loading Olympus raw files (.orf) + bnc#561232, fdo#26618 +- Rebase and merge upstream patch libopenraw-orf-thumbnail.patch to + decompress otf bnc#699678 +- Add autoreconf to %build to refresh Makefiles +- Remove the invalid link in Source0 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libopenraw-detect-compressed-otf.patch libopenraw-orf-thumbnail.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libopenraw.spec ++++++ --- /var/tmp/diff_new_pack.oxmup7/_old 2011-09-05 16:35:21.000000000 +0200 +++ /var/tmp/diff_new_pack.oxmup7/_new 2011-09-05 16:35:21.000000000 +0200 @@ -21,13 +21,17 @@ Name: libopenraw Version: 0.0.8 -Release: 13 +Release: 15 License: LGPLv2.1+ Group: Development/Libraries/C and C++ -Source0: http://libopenraw.freedesktop.org/download/%name-%{version}.tar.bz2 +Source0: %name-%{version}.tar.bz2 Source99: baselibs.conf # PATCH-FIX-UPSTREAM libopenraw-gdk-pixbuf-loaders-path.patch fdo29208 -- Install gdk-pixbuf module in the right directory, only works with gdk-pixbuf >= 2.21 Patch0: libopenraw-gdk-pixbuf-loaders-path.patch +# PATCH-FIX-UPSTREAM libopenraw-detect-compressed-otf.patch bnc561232 fdo26618 glin(a)suse.com -- Detect the compressed otf file to avoid potential segfault +Patch1: libopenraw-detect-compressed-otf.patch +# PATCH-FIX-UPSTREAM libopenraw-orf-thumbnail.patch bnc699678 glin(a)suse.com - Decompress otf files +Patch2: libopenraw-orf-thumbnail.patch BuildRequires: gcc-c++ BuildRequires: boost-devel >= 1.33.1 BuildRequires: libjpeg-devel @@ -73,8 +77,11 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build +autoreconf %configure --disable-static --with-pic %{__make} %{?jobs:-j%jobs} ++++++ libopenraw-detect-compressed-otf.patch ++++++ commit 1b15acdcfdc4664bc6c0be473cb6e096071a4e62 Author: Hubert Figuiere <hub(a)figuiere.net> Date: Sat Mar 6 11:41:43 2010 -0800 - Support (partially) PEF from Pentax K20D. - Detect that ORF file are compressed if they are. (Closes #26618) - Skip compressed CFA when rendering the image. (Closes #25464) diff --git a/README b/README index b4716ee..e373a22 100644 --- a/README +++ b/README @@ -114,9 +114,9 @@ Olympus ORF Y Y N Y Y Y E-10 B B T E-3 T T T E-300 T T B T T T - E-330 T T T + E-330 T T N T E-400 T B T T - E-410 B T T T + E-410 B T N T T E-500 T T T T E-510 B T T T SP-350 @@ -143,6 +143,7 @@ Pentax PEF Y Y N Y Y Y K10D T T N T T T K100D T K100D Super T T N T + K20D T T N T Epson ERF Y Y Y Y Y Y Epson RD1 T T T T T T diff --git a/include/libopenraw/consts.h b/include/libopenraw/consts.h index c2d6bf4..de49034 100644 --- a/include/libopenraw/consts.h +++ b/include/libopenraw/consts.h @@ -1,8 +1,8 @@ /* * libopenraw - consts.h * - * Copyright (C) 2005-2009 Hubert Figuiere * Copyright (c) 2008 Novell, Inc. + * Copyright (C) 2005-2010 Hubert Figuiere * * This library is free software: you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -204,7 +204,8 @@ extern "C" { OR_TYPEID_PENTAX_IST_D, OR_TYPEID_PENTAX_IST_DL, OR_TYPEID_PENTAX_K100D_PEF, - OR_TYPEID_PENTAX_K100D_SUPER_PEF + OR_TYPEID_PENTAX_K100D_SUPER_PEF, + OR_TYPEID_PENTAX_K20D_PEF }; /** Epson type IDs */ diff --git a/lib/orffile.cpp b/lib/orffile.cpp index c9f0181..28980f4 100644 --- a/lib/orffile.cpp +++ b/lib/orffile.cpp @@ -1,7 +1,7 @@ /* * libopenraw - orffile.cpp * - * Copyright (C) 2006, 2008 Hubert Figuiere + * Copyright (C) 2006, 2008, 2010 Hubert Figuiere * * This library is free software: you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -77,7 +77,7 @@ namespace OpenRaw { IFDDir::Ref ORFFile::_locateCfaIfd() { - // in PEF the CFA IFD is the main IFD + // in ORF the CFA IFD is the main IFD if(!m_mainIfd) { m_mainIfd = _locateMainIfd(); } @@ -92,12 +92,37 @@ namespace OpenRaw { - ::or_error ORFFile::_getRawData(RawData & data, uint32_t /*options*/) + ::or_error ORFFile::_getRawData(RawData & data, uint32_t options) { + ::or_error err; if(!m_cfaIfd) { m_cfaIfd = _locateCfaIfd(); } - return _getRawDataFromDir(data, m_cfaIfd); + err = _getRawDataFromDir(data, m_cfaIfd); + if(err == OR_ERROR_NONE) { + // ORF files seems to be marked as uncompressed even if they are. + uint32_t x = data.x(); + uint32_t y = data.y(); + uint16_t compression = 0; + if(data.size() < x * y * 2) { + compression = 65535; + data.setCompression(65535); + data.setDataType(OR_DATA_TYPE_COMPRESSED_CFA); + } + else { + compression = data.compression(); + } + switch(compression) { + case 65535: + if((options & OR_OPTIONS_DONT_DECOMPRESS) == 0) { + // TODO decompress + } + break; + default: + break; + } + } + return err; } } diff --git a/lib/peffile.cpp b/lib/peffile.cpp index d8849fb..cef6b27 100644 --- a/lib/peffile.cpp +++ b/lib/peffile.cpp @@ -1,7 +1,7 @@ /* * libopenraw - peffile.cpp * - * Copyright (C) 2006-2008 Hubert Figuiere + * Copyright (C) 2006-2008, 2010 Hubert Figuiere * * This library is free software: you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -48,6 +48,8 @@ namespace OpenRaw { OR_TYPEID_PENTAX_K100D_PEF) }, { "PENTAX K100D Super ", OR_MAKE_FILE_TYPEID(OR_TYPEID_VENDOR_PENTAX, OR_TYPEID_PENTAX_K100D_PEF) }, + { "PENTAX K20D ", OR_MAKE_FILE_TYPEID(OR_TYPEID_VENDOR_PENTAX, + OR_TYPEID_PENTAX_K20D_PEF) }, { 0, 0 } }; @@ -83,7 +85,7 @@ namespace OpenRaw { return m_container->setDirectory(0); } - ::or_error PEFFile::_getRawData(RawData & data, uint32_t /*options*/) + ::or_error PEFFile::_getRawData(RawData & data, uint32_t options) { ::or_error err; if(!m_cfaIfd) { @@ -91,14 +93,12 @@ namespace OpenRaw { } err = _getRawDataFromDir(data, m_cfaIfd); if(err == OR_ERROR_NONE) { - uint16_t compression = 0; - m_cfaIfd->getValue(IFD::EXIF_TAG_COMPRESSION, compression); - switch(compression) { - case 1: - data.setDataType(OR_DATA_TYPE_CFA); - break; - case 65535: - // TODO decompress + uint16_t compression = data.compression(); + switch(compression) { + case 65535: + if((options & OR_OPTIONS_DONT_DECOMPRESS) == 0) { + // TODO decompress + } break; default: break; diff --git a/lib/rawfile.cpp b/lib/rawfile.cpp index 6b0821b..c1c11cb 100644 --- a/lib/rawfile.cpp +++ b/lib/rawfile.cpp @@ -1,8 +1,8 @@ /* * libopenraw - rawfile.cpp * - * Copyright (C) 2006-2008 Hubert Figuiere * Copyright (C) 2008 Novell, Inc. + * Copyright (C) 2006-2008, 2010 Hubert Figuiere * * This library is free software: you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -379,8 +379,13 @@ const std::vector<uint32_t> & RawFile::listThumbnailSizes(void) ::or_error RawFile::getRenderedImage(BitmapData & bitmapdata, uint32_t options) { RawData rawdata; + Trace(DEBUG1) << "options are " << options << "\n"; ::or_error ret = getRawData(rawdata, options); if(ret == OR_ERROR_NONE) { + if(rawdata.dataType() != OR_DATA_TYPE_CFA) { + Trace(DEBUG1) << "wrong data type\n"; + return OR_ERROR_INVALID_FORMAT; + } uint32_t x,y; or_cfa_pattern pattern; uint16_t *src; diff --git a/testsuite/testsuite.xml b/testsuite/testsuite.xml index 9f18dec..c5964b4 100644 --- a/testsuite/testsuite.xml +++ b/testsuite/testsuite.xml @@ -346,6 +346,42 @@ </results> </test> <test> + <name>ORF-test E330</name> + <file>/home/hub/samples/300mm_f5.6.ORF</file> + <source>http://raw.fotosite.pl/download-Olympus_E-330_Sigma_135-400_f4.5-5.6/300mm_…</source> + <results> + <rawType>ORF</rawType> + <rawTypeId>458757</rawTypeId> + <thumbNum>1</thumbNum> + <thumbSizes>160</thumbSizes> + <thumbFormats>JPEG</thumbFormats> + <thumbDataSizes>11074</thumbDataSizes> + <rawDataType>COMP_CFA</rawDataType> + <rawDataSize>12857600</rawDataSize> + <rawDataDimensions>3280 2450</rawDataDimensions> + <rawCfaPattern>RGGB</rawCfaPattern> + <rawMinValue>0</rawMinValue> + <rawMaxValue>65535</rawMaxValue> + <metaOrientation>1</metaOrientation> + </results> + </test> + <test> + <name>ORF-test E-410</name> + <file>/home/hub/samples/p1013308.orf</file> + <results> + <rawType>ORF</rawType> + <rawTypeId>458759</rawTypeId> + <thumbNum>0</thumbNum> + <rawDataType>COMP_CFA</rawDataType> + <rawDataSize>8131436</rawDataSize> + <rawDataDimensions>3720 2800</rawDataDimensions> + <rawCfaPattern>RGGB</rawCfaPattern> + <rawMinValue>0</rawMinValue> + <rawMaxValue>65535</rawMaxValue> + <metaOrientation>1</metaOrientation> + </results> + </test> + <test> <name>MRW-test Dimage5</name> <file>/home/hub/samples/mrw/Dimage5/dimage5.mrw</file> <source>http://libopenraw.freedesktop.org/samples/mrw/dimage5.mrw</source> ++++++ libopenraw-orf-thumbnail.patch ++++++ >From 9be26e10ecbf89ce99b294906be1208d5a484c7e Mon Sep 17 00:00:00 2001 From: Hubert Figuiere <hub(a)figuiere.net> Date: Fri, 18 Mar 2011 23:41:38 -0700 Subject: [PATCH 1/2] Better support for compression ID Implement Olympus decompression (with decompressor borrowed from RawSpeed) --- AUTHORS | 3 + lib/Makefile.am | 2 + lib/bititerator.cpp | 30 +++++-- lib/bititerator.h | 4 +- lib/dngfile.cpp | 2 +- lib/ifd.h | 4 +- lib/ifdfile.cpp | 14 +++- lib/ifdfile.h | 7 ++ lib/olympusdecompressor.cpp | 205 +++++++++++++++++++++++++++++++++++++++++++ lib/olympusdecompressor.h | 51 +++++++++++ lib/orffile.cpp | 28 +++++- lib/orffile.h | 5 + lib/peffile.cpp | 2 +- 13 files changed, 338 insertions(+), 19 deletions(-) create mode 100644 lib/olympusdecompressor.cpp create mode 100644 lib/olympusdecompressor.h Index: libopenraw-0.0.8/AUTHORS =================================================================== --- libopenraw-0.0.8.orig/AUTHORS +++ libopenraw-0.0.8/AUTHORS @@ -4,6 +4,9 @@ MRW support: Bradley Broom NEF decompression: Rafael Espíndola Python bindings: Brian Quinlan +Indirect contributors: +Klaus Post for code from RawSpeed. + Sponsors: Novell sponsored time to work on libopenraw as part of their ITO programme (and HackWeek in February 2008) Index: libopenraw-0.0.8/lib/Makefile.am =================================================================== --- libopenraw-0.0.8.orig/lib/Makefile.am +++ libopenraw-0.0.8/lib/Makefile.am @@ -32,6 +32,7 @@ noinst_HEADERS = or_debug.h \ ljpegdecompressor.h \ ljpegdecompressor_priv.h \ crwdecompressor.h \ + olympusdecompressor.h \ exception.h \ endianutils.h \ metavalue.h \ @@ -83,6 +84,7 @@ libopenraw_la_SOURCES = \ decompressor.cpp \ ljpegdecompressor.cpp \ crwdecompressor.cpp \ + olympusdecompressor.cpp \ metavalue.cpp \ unpack.cpp \ bimedian_demosaic.cpp demosaic.h \ Index: libopenraw-0.0.8/lib/bititerator.cpp =================================================================== --- libopenraw-0.0.8.orig/lib/bititerator.cpp +++ libopenraw-0.0.8/lib/bititerator.cpp @@ -20,6 +20,7 @@ */ #include <assert.h> +#include <algorithm> #include "bititerator.h" namespace OpenRaw { @@ -53,22 +54,35 @@ void BitIterator::load(size_t numBits) uint32_t BitIterator::get(size_t n) { - assert(n <= 25); + uint32_t ret = peek(n); + + skip(n); + return ret; +} + +uint32_t BitIterator::peek(size_t n) +{ + assert(n <= 25); + if (n == 0) return 0; - + if (n > m_bitsOnBuffer) load(n - m_bitsOnBuffer); - + assert(n <= m_bitsOnBuffer); + + return m_bitBuffer >> (32 - n); +} - uint32_t ret = m_bitBuffer >> (32 - n); - m_bitsOnBuffer -= n; - m_bitBuffer <<= n; - - return ret; +void BitIterator::skip(size_t n) +{ + size_t num_bits = std::min(n, m_bitsOnBuffer); + m_bitsOnBuffer -= num_bits; + m_bitBuffer <<= num_bits; } + } } Index: libopenraw-0.0.8/lib/bititerator.h =================================================================== --- libopenraw-0.0.8.orig/lib/bititerator.h +++ libopenraw-0.0.8/lib/bititerator.h @@ -31,12 +31,14 @@ namespace Internals { class BitIterator { const uint8_t* m_p; uint32_t m_bitBuffer; - uint8_t m_bitsOnBuffer; + size_t m_bitsOnBuffer; void load(size_t numBits); public: BitIterator(const void *); uint32_t get(size_t); + uint32_t peek(size_t); + void skip(size_t); }; } Index: libopenraw-0.0.8/lib/dngfile.cpp =================================================================== --- libopenraw-0.0.8.orig/lib/dngfile.cpp +++ libopenraw-0.0.8/lib/dngfile.cpp @@ -89,7 +89,7 @@ namespace OpenRaw { if(ret == OR_ERROR_NONE) { uint16_t compression = 0; if (m_cfaIfd->getValue(IFD::EXIF_TAG_COMPRESSION, compression) && - compression == 7) { + compression == IFD::COMPRESS_LJPEG) { // if the option is not set, decompress if ((options & OR_OPTIONS_DONT_DECOMPRESS) == 0) { boost::scoped_ptr<IO::Stream> s(new IO::MemStream(data.data(), Index: libopenraw-0.0.8/lib/ifd.h =================================================================== --- libopenraw-0.0.8.orig/lib/ifd.h +++ libopenraw-0.0.8/lib/ifd.h @@ -69,8 +69,10 @@ namespace OpenRaw { typedef enum { COMPRESS_NONE = 1, COMPRESS_JPEG = 6, + COMPRESS_LJPEG = 7, /**< Lossless JPEG, see DNG */ COMPRESS_NIKON_PACK = 32769, - COMPRESS_NIKON_QUANTIZED = 34713 + COMPRESS_NIKON_QUANTIZED = 34713, + COMPRESS_CUSTOM = 65535 /**< The value everybody seems to use */ } TiffCompress; } } Index: libopenraw-0.0.8/lib/ifdfile.cpp =================================================================== --- libopenraw-0.0.8.orig/lib/ifdfile.cpp +++ libopenraw-0.0.8/lib/ifdfile.cpp @@ -339,6 +339,15 @@ MetaValue *IFDFile::_getMetaValue(int32_ } return val; } + +/** by default we don't translate the compression + */ +uint32_t IFDFile::_translateCompressionType(IFD::TiffCompress tiffCompression) +{ + return (uint32_t)tiffCompression; +} + + namespace { @@ -541,14 +550,15 @@ static RawData::CfaPattern _getCfaPatter return OR_ERROR_NOT_FOUND; } - uint32_t compression = 0; - got_it = dir->getIntegerValue(IFD::EXIF_TAG_COMPRESSION, compression); + uint16_t tiffCompression = 0; + got_it = dir->getValue(IFD::EXIF_TAG_COMPRESSION, tiffCompression); if(!got_it) { Trace(DEBUG1) << "Compression type not found\n"; } BitmapData::DataType data_type = OR_DATA_TYPE_NONE; + uint32_t compression = _translateCompressionType((IFD::TiffCompress)tiffCompression); switch(compression) { case IFD::COMPRESS_NONE: Index: libopenraw-0.0.8/lib/ifdfile.h =================================================================== --- libopenraw-0.0.8.orig/lib/ifdfile.h +++ libopenraw-0.0.8/lib/ifdfile.h @@ -102,6 +102,13 @@ namespace OpenRaw { virtual MetaValue *_getMetaValue(int32_t meta_index); + /** Translate the compression type from the tiff type (16MSB) + * to the RAW specific type if needed (16MSB) + * @param tiffCompression the 16 bits value from TIFF + * @return the actually value. Anything >= 2^16 is specific the RAW type + */ + virtual uint32_t _translateCompressionType(IFD::TiffCompress tiffCompression); + IFDDir::Ref m_cfaIfd; /**< the IFD for the CFA */ IFDDir::Ref m_mainIfd; /**< the IFD for the main image * does not necessarily reference Index: libopenraw-0.0.8/lib/olympusdecompressor.cpp =================================================================== --- /dev/null +++ libopenraw-0.0.8/lib/olympusdecompressor.cpp @@ -0,0 +1,207 @@ +/* + * libopenraw - olympusdecompressor.cpp + * + * Copyright (C) 2011 Hubert Figuiere + * Olympus Decompression copied from RawSpeed + * Copyright (C) 2009 Klaus Post + * + * This library is free software: you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation, either version 3 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#include <stdlib.h> + +#include <libopenraw++/rawdata.h> + +#include "io/stream.h" +#include "olympusdecompressor.h" +#include "bititerator.h" + + +namespace OpenRaw { +namespace Internals { + +static void decompressOlympus(const uint8_t* buffer, uint8_t* data, uint32_t w, uint32_t h); + +// decompression ported from RawSpeed. +static void decompressOlympus(const uint8_t* buffer, uint8_t* data, uint32_t w, uint32_t h) +{ + int nbits, sign, low, high, i, wo0, n, nw0, wo1, nw1; + int acarry0[3], acarry1[3], pred, diff; + + int pitch = w * 2; //(((w * 2/*bpp*/) + 15) / 16) * 16; // TODO make that part of the outer datas + + /* Build a table to quickly look up "high" value */ + char bittable[4096]; + for (i = 0; i < 4096; i++) { + int b = i; + for (high = 0; high < 12; high++) { + if ((b>>(11-high))&1) { + break; + } + } + bittable[i] = high; + } + wo0 = nw0 = wo1 = nw1 = 0; + buffer += 7; + + BitIterator bits(buffer); + + for (uint32_t y = 0; y < h; y++) { + memset(acarry0, 0, sizeof acarry0); + memset(acarry1, 0, sizeof acarry1); + uint16_t* dest = (uint16_t*) & data[y*pitch]; + for (uint32_t x = 0; x < w; x++) { +// bits.checkPos(); +// bits.fill(); + i = 2 * (acarry0[2] < 3); + for (nbits = 2 + i; (uint16_t) acarry0[0] >> (nbits + i); nbits++) { + + } + + uint32_t b = bits.peek(15); + sign = (b >> 14) * -1; + low = (b >> 12) & 3; + high = bittable[b&4095]; + // Skip bits used above. + bits.skip(std::min(12+3, high + 1 + 3)); + + if (high == 12) { + high = bits.get(16 - nbits) >> 1; + } + + acarry0[0] = (high << nbits) | bits.get(nbits); + diff = (acarry0[0] ^ sign) + acarry0[1]; + acarry0[1] = (diff * 3 + acarry0[1]) >> 5; + acarry0[2] = acarry0[0] > 16 ? 0 : acarry0[2] + 1; + + if (y < 2 || x < 2) { + if (y < 2 && x < 2) { + pred = 0; + } + else if (y < 2) { + pred = wo0; + } + else { + pred = dest[-pitch+((int)x)]; + nw0 = pred; + } + dest[x] = pred + ((diff << 2) | low); + // Set predictor + wo0 = dest[x]; + } + else { + n = dest[-pitch+((int)x)]; + if (((wo0 < nw0) & (nw0 < n)) | ((n < nw0) & (nw0 < wo0))) { + if (abs(wo0 - nw0) > 32 || abs(n - nw0) > 32) { + pred = wo0 + n - nw0; + } + else { + pred = (wo0 + n) >> 1; + } + } + else { + pred = abs(wo0 - nw0) > abs(n - nw0) ? wo0 : n; + } + + dest[x] = pred + ((diff << 2) | low); + // Set predictors + wo0 = dest[x]; + nw0 = n; + } + // _ASSERTE(0 == dest[x] >> 12) ; + + // ODD PIXELS + x += 1; +// bits.checkPos(); +// bits.fill(); + i = 2 * (acarry1[2] < 3); + for (nbits = 2 + i; (uint16_t) acarry1[0] >> (nbits + i); nbits++) { + + } + b = bits.peek(15); + sign = (b >> 14) * -1; + low = (b >> 12) & 3; + high = bittable[b&4095]; + // Skip bits used above. + bits.skip(std::min(12+3, high + 1 + 3)); + + if (high == 12) { + high = bits.get(16 - nbits) >> 1; + } + + acarry1[0] = (high << nbits) | bits.get(nbits); + diff = (acarry1[0] ^ sign) + acarry1[1]; + acarry1[1] = (diff * 3 + acarry1[1]) >> 5; + acarry1[2] = acarry1[0] > 16 ? 0 : acarry1[2] + 1; + + if (y < 2 || x < 2) { + if (y < 2 && x < 2) { + pred = 0; + } + else if (y < 2) { + pred = wo1; + } + else { + pred = dest[-pitch+((int)x)]; + nw1 = pred; + } + dest[x] = pred + ((diff << 2) | low); + // Set predictor + wo1 = dest[x]; + } + else { + n = dest[-pitch+((int)x)]; + if (((wo1 < nw1) & (nw1 < n)) | ((n < nw1) & (nw1 < wo1))) { + if (abs(wo1 - nw1) > 32 || abs(n - nw1) > 32) { + pred = wo1 + n - nw1; + } + else { + pred = (wo1 + n) >> 1; + } + } + else { + pred = abs(wo1 - nw1) > abs(n - nw1) ? wo1 : n; + } + + dest[x] = pred + ((diff << 2) | low); + + // Set predictors + wo1 = dest[x]; + nw1 = n; + } + // _ASSERTE(0 == dest[x] >> 12) ; + } + } +} + +RawData *OlympusDecompressor::decompress(RawData *in) +{ + RawData *output; + if(in) { + output = in; + } + else { + output = new RawData; + } + + output->allocData(m_w * m_h * 2); + decompressOlympus(m_buffer, (uint8_t*)output->data(), m_w, m_h); + + return output; +} + + +} +} Index: libopenraw-0.0.8/lib/olympusdecompressor.h =================================================================== --- /dev/null +++ libopenraw-0.0.8/lib/olympusdecompressor.h @@ -0,0 +1,51 @@ +/* + * libopenraw - olympusdecompressor.cpp + * + * Copyright (C) 2011 Hubert Figuiere + * + * This library is free software: you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation, either version 3 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + + +#ifndef __OPENRAW_OLYMPUSDECOMPRESSOR_H__ +#define __OPENRAW_OLYMPUSDECOMPRESSOR_H__ + +#include "decompressor.h" + +namespace OpenRaw { +namespace Internals { + +class OlympusDecompressor + : public Decompressor +{ +public: + OlympusDecompressor(const uint8_t *buffer, + RawContainer * container, uint32_t w, uint32_t h) + : Decompressor(NULL, container) + , m_buffer(buffer) + , m_h(h) + , m_w(w) + { + } + virtual RawData *decompress(RawData *in = NULL); +private: + const uint8_t *m_buffer; + uint32_t m_h; + uint32_t m_w; +}; + +} +} +#endif Index: libopenraw-0.0.8/lib/orffile.cpp =================================================================== --- libopenraw-0.0.8.orig/lib/orffile.cpp +++ libopenraw-0.0.8/lib/orffile.cpp @@ -27,6 +27,7 @@ #include "ifddir.h" #include "ifdentry.h" #include "orfcontainer.h" +#include "olympusdecompressor.h" #include "io/file.h" using namespace Debug; @@ -103,19 +104,27 @@ namespace OpenRaw { // ORF files seems to be marked as uncompressed even if they are. uint32_t x = data.x(); uint32_t y = data.y(); - uint16_t compression = 0; + uint32_t compression = 0; if(data.size() < x * y * 2) { - compression = 65535; - data.setCompression(65535); + compression = ORF_COMPRESSION; + data.setCompression(ORF_COMPRESSION); data.setDataType(OR_DATA_TYPE_COMPRESSED_CFA); } else { compression = data.compression(); } switch(compression) { - case 65535: + case ORF_COMPRESSION: if((options & OR_OPTIONS_DONT_DECOMPRESS) == 0) { - // TODO decompress + OlympusDecompressor decomp((const uint8_t*)data.data(), m_container, x, y); + RawData *dData = decomp.decompress(NULL); + if (dData != NULL) { + dData->setCfaPattern(data.cfaPattern()); + data.swap(*dData); + data.setDataType(OR_DATA_TYPE_CFA); + data.setDimensions(x, y); + delete dData; + } } break; default: @@ -124,6 +133,15 @@ namespace OpenRaw { } return err; } + +uint32_t ORFFile::_translateCompressionType(IFD::TiffCompress tiffCompression) +{ + if(tiffCompression == IFD::COMPRESS_CUSTOM) { + return ORF_COMPRESSION; + } + return (uint32_t)tiffCompression; +} + } } Index: libopenraw-0.0.8/lib/orffile.h =================================================================== --- libopenraw-0.0.8.orig/lib/orffile.h +++ libopenraw-0.0.8/lib/orffile.h @@ -43,11 +43,16 @@ namespace OpenRaw { ORFFile(IO::Stream *); virtual ~ORFFile(); + enum { + ORF_COMPRESSION = 0x10000 + }; + protected: virtual IFDDir::Ref _locateCfaIfd(); virtual IFDDir::Ref _locateMainIfd(); virtual ::or_error _getRawData(RawData & data, uint32_t options); + virtual uint32_t _translateCompressionType(IFD::TiffCompress tiffCompression); private: static RawFile::TypeId _typeIdFromModel(const std::string & model); Index: libopenraw-0.0.8/lib/peffile.cpp =================================================================== --- libopenraw-0.0.8.orig/lib/peffile.cpp +++ libopenraw-0.0.8/lib/peffile.cpp @@ -95,7 +95,7 @@ namespace OpenRaw { if(err == OR_ERROR_NONE) { uint16_t compression = data.compression(); switch(compression) { - case 65535: + case IFD::COMPRESS_CUSTOM: if((options & OR_OPTIONS_DONT_DECOMPRESS) == 0) { // TODO decompress } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 jakarta-commons-logging for openSUSE:Factory
by root＠hilbert.suse.de 05 Sep '11

05 Sep '11

Hello community, here is the log from the commit of package jakarta-commons-logging for openSUSE:Factory checked in at Mon Sep 5 16:35:24 CEST 2011. -------- --- jakarta-commons-logging/jakarta-commons-logging.changes 2008-07-16 13:03:11.000000000 +0200 +++ jakarta-commons-logging/jakarta-commons-logging.changes 2011-08-27 22:29:38.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Aug 27 20:32:52 UTC 2011 - andrea.turrini(a)gmail.com + +- fixed typos in jakarta-commons-logging.spec + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jakarta-commons-logging.spec ++++++ --- /var/tmp/diff_new_pack.wSXjXv/_old 2011-09-05 16:33:03.000000000 +0200 +++ /var/tmp/diff_new_pack.wSXjXv/_new 2011-09-05 16:33:03.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package jakarta-commons-logging (Version 1.0.4) +# spec file for package jakarta-commons-logging # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -26,7 +26,7 @@ %define name jakarta-%{short_name} %define section free Version: 1.0.4 -Release: 314 +Release: 324 Summary: Jakarta Commons Logging Package License: The Apache Software License Group: Development/Libraries/Java @@ -39,7 +39,7 @@ %description The commons-logging package provides a simple, component oriented interface (org.apache.commons.logging.Log) together with wrappers for -logging systems. The user can choose at runtime which system they want +logging systems. The users can choose at runtime which system they want to use. In addition, a small number of basic implementations are provided to allow users to use the package independently. commons-logging was heavily influenced by Avalon's Logkit and Log4J. @@ -58,11 +58,11 @@ %description javadoc The commons-logging package provides a simple, component oriented interface (org.apache.commons.logging.Log) together with wrappers for -logging systems. The user can choose at runtime which system they want +logging systems. The users can choose at runtime which system they want to use. In addition, a small number of basic implementations are provided to allow users to use the package standalone. commons-logging was heavily influenced by Avalon's Logkit and Log4J. The -commons-logging abstraction is meant to minimixe the differences +commons-logging abstraction is meant to minimize the differences between the two, and to allow a developer to not tie himself to a particular logging implementation. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kiwi for openSUSE:Factory
by root＠hilbert.suse.de 05 Sep '11

05 Sep '11

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Mon Sep 5 16:35:23 CEST 2011. -------- --- kiwi/kiwi.changes 2011-08-27 21:31:43.000000000 +0200 +++ kiwi/kiwi.changes 2011-09-02 16:00:41.000000000 +0200 @@ -1,0 +2,58 @@ +Fri Sep 2 15:51:15 CEST 2011 - ms(a)suse.de + +- v4.95.4 released + +------------------------------------------------------------------- +Fri Sep 2 15:41:51 CEST 2011 - ms(a)suse.de + +- fixed warning when checking for rpc_pipefs (bnc #711389) + +------------------------------------------------------------------- +Fri Sep 2 12:57:46 CEST 2011 - ms(a)suse.de + +- fixed checkLVMbind() to search for the lvm flag on the disk + first. Only if the disk has that flag we search for the LVM + devices. + +------------------------------------------------------------------- +Thu Sep 1 11:52:24 CEST 2011 - ms(a)suse.de + +- last commit causes a regression for non split types. + +------------------------------------------------------------------- +Thu Sep 1 11:04:55 CEST 2011 - ms(a)suse.de + +- fixed bootloader setup for split images + +------------------------------------------------------------------- +Thu Sep 1 10:07:23 CEST 2011 - ms(a)suse.de + +- added missing done() flag + +------------------------------------------------------------------- +Wed Aug 31 16:34:21 CEST 2011 - adrian(a)suse.de + +- product build: avoid multiple handling of debug packages + +------------------------------------------------------------------- +Wed Aug 31 16:29:44 CEST 2011 - adrian(a)suse.de + +- priorize repositories over fallback architectures + +------------------------------------------------------------------- +Tue Aug 30 16:30:56 CEST 2011 - ms(a)suse.de + +- more readable 'kiwi --list' output + +------------------------------------------------------------------- +Tue Aug 30 16:09:47 CEST 2011 - ms(a)suse.de + +- make sure $prio variable is initialized empty for + each repo validation (bnc #714927) + +------------------------------------------------------------------- +Tue Aug 30 12:49:54 CEST 2011 - ms(a)suse.de + +- fixed inline description of addRepository() function + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.3d5cXN/_old 2011-09-05 16:33:15.000000000 +0200 +++ /var/tmp/diff_new_pack.3d5cXN/_new 2011-09-05 16:33:15.000000000 +0200 @@ -69,7 +69,7 @@ %endif %endif Summary: OpenSuSE - KIWI Image System -Version: 4.95.3 +Version: 4.95.4 Release: 1 Group: System/Management License: GPLv2 ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2011-08-19 17:34:52.000000000 +0200 +++ new/kiwi/.revision 2011-08-30 16:30:46.000000000 +0200 @@ -1 +1 @@ -0cd0b56b04d2c81adc6753ee1ed0d4316cd00b66 +d632869396adc2458d87ff31f6a97a4de8487e64 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl --- old/kiwi/kiwi.pl 2011-08-19 17:34:52.000000000 +0200 +++ new/kiwi/kiwi.pl 2011-08-30 16:30:46.000000000 +0200 @@ -1500,7 +1500,7 @@ "$system/$image" ); if ($controlFile) { - $kiwi -> info ($image); + $kiwi -> info ("* ".$image."\n"); my $xml = new KIWIXML ( $kiwi,$system."/".$image,undef,undef,$cmdL ); @@ -1508,7 +1508,7 @@ next; } my $version = $xml -> getImageVersion(); - $kiwi -> note (" -> Version: $version"); + $kiwi -> info ("Version: $version"); $kiwi -> done(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm --- old/kiwi/modules/KIWIBoot.pm 2011-08-26 16:01:55.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2011-09-02 15:52:24.000000000 +0200 @@ -279,7 +279,7 @@ #========================================== # check for activated volume group #------------------------------------------ - $sdev = $this -> checkLVMbind ($sdev); + $sdev = $this -> checkLVMbind ($sdev,$this->{loop}); #========================================== # perform mount call #------------------------------------------ @@ -784,7 +784,7 @@ #========================================== # check for activated volume group #------------------------------------------ - $sdev = $this -> checkLVMbind ($sdev); + $sdev = $this -> checkLVMbind ($sdev,$this->{loop}); #========================================== # perform mount call #------------------------------------------ @@ -1149,7 +1149,7 @@ #========================================== # check for activated volume group #------------------------------------------ - $sdev = $this -> checkLVMbind ($sdev); + $sdev = $this -> checkLVMbind ($sdev,$this->{loop}); #========================================== # perform mount call #------------------------------------------ @@ -1734,6 +1734,7 @@ "Adding $splitMB MB space for split read-write portion" ); $this -> __updateDiskSize ($splitMB); + $kiwi -> done(); } #========================================== # obtain filesystem type from xml data @@ -4076,8 +4077,15 @@ # --- my $this = shift; my $sdev = shift; + my $disk = shift; my @groups; #========================================== + # check for lvm flag on disk + #------------------------------------------ + if (! $this-> __getPartID ($disk,"lvm")) { + return $sdev; + } + #========================================== # activate volume groups #------------------------------------------ open (my $SCAN,"vgscan 2>/dev/null |"); @@ -5248,4 +5256,27 @@ return $this; } +#========================================== +# __getPartID +#------------------------------------------ +sub __getPartID { + # ... + # try to find the partition number which references + # the provided flag like "boot" or "lvm" + # --- + my $this = shift; + my $disk = shift; + my $flag = shift; + my $fd = new FileHandle; + if ($fd -> open ("parted -m $disk print | cut -f1,7 -d:|")) { + while (my $line = <$fd>) { + if ($line =~ /^(\d):$flag/) { + return $1; + } + } + $fd -> close(); + } + return 0; +} + 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWICollect.pm new/kiwi/modules/KIWICollect.pm --- old/kiwi/modules/KIWICollect.pm 2011-07-18 11:52:49.000000000 +0200 +++ new/kiwi/modules/KIWICollect.pm 2011-09-02 15:52:24.000000000 +0200 @@ -821,23 +821,23 @@ my @fallbacklist = ($requestedArch); if($nofallback==0 && $mode != 2) { - @fallbacklist = $this->{m_archlist}->fallbacks($requestedArch); + @fallbacklist = $this->{m_archlist}->fallbacks($requestedArch); @fallbacklist = ($requestedArch) unless @fallbacklist; $this->logMsg("I", " Look for fallbacks fallbacks") if $this->{m_debug} >= 6; } $this->logMsg("I", " Use as expanded architectures >".join(" ", @fallbacklist)."<") if $this->{m_debug} >= 5; my $fb_available = 0; - FA:foreach my $arch(@fallbacklist) { - $this->logMsg("I", " check architecture $arch ") if $this->{m_debug} >= 5; - PACKKEY:foreach my $packKey( sort{$poolPackages->{$a}->{priority} <=> $poolPackages->{$b}->{priority}} keys(%{$poolPackages})) { - # FIXME: check for forcerepo + PACKKEY:foreach my $packKey( sort{$poolPackages->{$a}->{priority} <=> $poolPackages->{$b}->{priority}} keys(%{$poolPackages})) { + FA:foreach my $arch(@fallbacklist) { + $this->logMsg("I", " check architecture $arch ") if $this->{m_debug} >= 5; + # FIXME: check for forcerepo $this->logMsg("I", " check $packKey ") if $this->{m_debug} >= 5; my $packPointer = $poolPackages->{$packKey}; if ( $packPointer->{arch} ne $arch ) { $this->logMsg("I", " => package $packName not available for arch $arch in repo $packKey") if $this->{m_debug} >= 4; - next PACKKEY; + next FA; } if($nofallback==0 && $mode != 2 && $this->{m_archlist}->arch($arch)) { my $follow = $this->{m_archlist}->arch($arch)->follower(); @@ -849,7 +849,7 @@ && ! defined( $packOptions->{requireVersion}->{$packPointer->{version}."-".$packPointer->{release}} ) ) { $this->logMsg("D", " => package ".$packName."-".$packPointer->{version}."-".$packPointer->{release}." not available for arch $arch in repo $packKey in this version") if $this->{m_debug} >= 4; - next PACKKEY; + next FA; } # Success, found a package ! my $medium = $packOptions->{'medium'} || 1; @@ -904,15 +904,15 @@ } $this->addDebugPackage($srcname."-debuginfo".$suffix, $arch, $packPointer); $this->addDebugPackage($srcname."-debugsource", $arch, $packPointer); - $this->addDebugPackage($basename."-debuginfo".$suffix, $arch, $packPointer); + $this->addDebugPackage($basename."-debuginfo".$suffix, $arch, $packPointer) unless $srcname eq $basename; }; } } next ARCH; # package processed, jump to the next request arch or package } - $this->logMsg("W", " => package $packName not available for arch $arch in any repo") if $this->{m_debug} >= 4; + $this->logMsg("W", " => package $packName not available for $requestedArch nor its fallbacks for repository $packKey") if $this->{m_debug} >= 4; } # /@fallbackarch - $this->logMsg("W", " => package $packName not available for $requestedArch nor its fallbacks") if $this->{m_debug} >= 1; + $this->logMsg("W", " => package $packName not available for arch $requestedArch in any repo") if $this->{m_debug} >= 1; push @missingPackages, $packName; } # /@archs } @@ -1112,11 +1112,11 @@ } $this->logMsg("I", " Use as expanded architectures >".join(" ", @fallbacklist)."<") if $this->{m_debug} >= 5; - FARCH:foreach my $arch(@fallbacklist) { - PACKKEY:foreach my $packKey( sort{$poolPackages->{$a}->{priority} <=> $poolPackages->{$b}->{priority}} keys(%{$poolPackages})) { + PACKKEY:foreach my $packKey( sort{$poolPackages->{$a}->{priority} <=> $poolPackages->{$b}->{priority}} keys(%{$poolPackages})) { + FARCH:foreach my $arch(@fallbacklist) { my $packPointer = $poolPackages->{$packKey}; - next PACKKEY if(!$packPointer->{'localfile'}); # should not be needed - next PACKKEY if($packPointer->{arch} ne $arch); + next FARCH if(!$packPointer->{'localfile'}); # should not be needed + next FARCH if($packPointer->{arch} ne $arch); $this->logMsg("I", "unpack $packPointer->{'localfile'} "); $this->{m_util}->unpac_package($packPointer->{'localfile'}, "$tmp"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2011-08-27 21:29:52.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2011-09-02 15:52:24.000000000 +0200 @@ -40,7 +40,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "4.95.3"; + $data{Version} = "4.95.4"; $data{Publisher} = "SUSE LINUX Products GmbH"; $data{Preparer} = "KIWI - http://kiwi.berlios.de"; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2011-08-26 16:01:55.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2011-09-02 15:52:24.000000000 +0200 @@ -437,6 +437,9 @@ #-------------------------------------- function mount_rpc_pipefs { # See if the file system is there yet + if [ ! -e /var/lib/nfs/rpc_pipefs ];then + return 0 + fi case `stat -c "%t" -f /var/lib/nfs/rpc_pipefs 2>/dev/null` in *67596969*) return 0;; @@ -4013,7 +4016,7 @@ # if there is a downloaded kernel and initrd from the KIWI_INITRD # setup. the kernelList function won't find initrds that gets # downloaded over tftp so make sure the vmlinu[zx]/initrd combo - # gets added + # gets added as well as the linux.vmx/initrd.vmx combo # ---- if [ -e $prefix/boot/vmlinuz ];then KERNEL_LIST="vmlinuz:initrd" @@ -4023,6 +4026,10 @@ KERNEL_LIST="vmlinux:initrd" KERNEL_NAME[1]=vmlinux fi + if [ -e $prefix/boot/linux.vmx ];then + KERNEL_LIST="vmlinux:initrd" + KERNEL_NAME[1]="vmlinux" + fi fi KERNEL_LIST=$(echo $KERNEL_LIST | sed -e s@^,@@) export KERNEL_LIST @@ -7253,10 +7260,6 @@ fi return fi - if [ ! -z "$COMBINED_IMAGE" ];then - # split image, /boot must be on the fsreadwrite area - return - fi if [ -z "$imageDiskDevice" ];then # no disk device like for live ISO based on clicfs return @@ -7273,9 +7276,11 @@ #-------------------------------------- mkdir -p /$mpoint mount $imageBootDevice /$mpoint - cp -a /mnt/boot /$mpoint - if [ -e /boot.tgz ];then - tar -xf /boot.tgz -C /$mpoint + if [ -z "$COMBINED_IMAGE" ];then + cp -a /mnt/boot /$mpoint + if [ -e /boot.tgz ];then + tar -xf /boot.tgz -C /$mpoint + fi fi umount /$mpoint rmdir /$mpoint diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIManager.pm new/kiwi/modules/KIWIManager.pm --- old/kiwi/modules/KIWIManager.pm 2011-08-27 20:52:49.000000000 +0200 +++ new/kiwi/modules/KIWIManager.pm 2011-08-30 16:22:03.000000000 +0200 @@ -779,7 +779,6 @@ if ($manager eq "zypper") { my @zypper = @{$this->{zypper}}; my $stype = "private"; - my $prio; qxx ("rm -f $dataDir/*.repo"); if (! $chroot) { $stype = "public"; @@ -795,6 +794,7 @@ foreach my $alias (keys %{$source{$stype}}) { my @sopts = @{$source{$stype}{$alias}}; my @zopts = (); + my $prio; foreach my $opt (@sopts) { next if ! defined $opt; $opt =~ /(.*?)=(.*)/; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIXML.pm new/kiwi/modules/KIWIXML.pm --- old/kiwi/modules/KIWIXML.pm 2011-08-27 20:52:49.000000000 +0200 +++ new/kiwi/modules/KIWIXML.pm 2011-08-30 16:22:03.000000000 +0200 @@ -1908,12 +1908,8 @@ #------------------------------------------ sub addRepository { # ... - # Add a repository node to the current list of repos - # this is done by reading the xml description file again and - # overwriting the first repository node with the new data - # A new object XML::LibXML::NodeList is created which - # contains the changed element. The element is then appended - # the the global repositNodeList + # Add a repository section to the current list of + # repos and update repositNodeList accordingly. # --- my $this = shift; my $kiwi = $this->{kiwi}; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libdv for openSUSE:Factory
by root＠hilbert.suse.de 05 Sep '11

05 Sep '11

Hello community, here is the log from the commit of package libdv for openSUSE:Factory checked in at Mon Sep 5 16:35:07 CEST 2011. -------- --- libdv/libdv.changes 2011-07-08 16:45:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/libdv/libdv.changes 2011-09-03 22:33:01.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Sep 3 20:32:28 UTC 2011 - crrodriguez(a)opensuse.org + +- Fix build with no-add-needed + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libdv-fix-no-add-needed.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdv.spec ++++++ --- /var/tmp/diff_new_pack.kYUZO0/_old 2011-09-05 16:34:18.000000000 +0200 +++ /var/tmp/diff_new_pack.kYUZO0/_new 2011-09-05 16:34:18.000000000 +0200 @@ -19,7 +19,8 @@ Name: libdv -BuildRequires: SDL-devel gtk2-devel libstdc++-devel popt-devel +BuildRequires: SDL-devel gtk2-devel popt-devel +BuildRequires: xorg-x11-libX11-devel xorg-x11-libXext-devel %if 0%{?suse_version} >= 1210 BuildRequires: libv4l-devel >= 0.8.4 %endif @@ -33,7 +34,7 @@ %endif # Version: 1.0.0 -Release: 158 +Release: 160 Summary: The Quasar DV Codec Source: %name-%version.tar.bz2 Source2: baselibs.conf @@ -45,6 +46,7 @@ Patch4: libdv-filesizecheck.patch Patch5: libdv-1.0.0-textrels-selinux.patch Patch6: libdv-v4l-2.6.38.patch +Patch7: libdv-fix-no-add-needed.patch %description The Quasar DV codec (libdv) is a software codec for DV video, the @@ -129,8 +131,10 @@ %if 0%{?suse_version} >= 1210 %patch6 -p1 %endif +%patch7 %build +mkdir m4 autoreconf -fiv CFLAGS="${RPM_OPT_FLAGS/O2/O3} -fomit-frame-pointer -fPIC -DPIC" \ %configure --disable-static --with-pic --enable-sdl ++++++ libdv-fix-no-add-needed.patch ++++++ --- playdv/Makefile.am.orig +++ playdv/Makefile.am @@ -15,4 +15,4 @@ bin_PROGRAMS= playdv noinst_HEADERS= display.h oss.h playdv_SOURCES= playdv.c display.c display.h oss.c -playdv_LDADD= $(SDL_LIBS) $(GTK_LIBS) $(XV_LIB) ../libdv/libdv.la $(POPT_LIB) +playdv_LDADD= $(SDL_LIBS) $(GTK_LIBS) $(XV_LIB) ../libdv/libdv.la $(POPT_LIB) -lX11 -lXext --- configure.ac.orig +++ configure.ac @@ -1,20 +1,22 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(libdv/parse.c) +AC_INIT +AC_CONFIG_SRCDIR([libdv/parse.c]) dnl AC_CONFIG_AUX_DIR(config) -AM_CONFIG_HEADER(config.h) - +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_MACRO_DIR([m4]) RPM_RELEASE=1 AC_CANONICAL_HOST AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(libdv, 1.0.0) AM_MAINTAINER_MODE -AC_LIBTOOL_PICMODE(no) dnl Checks for programs. AC_SUBST(CFLAGS) -AC_PROG_CC +AC_PROG_CC_STDC +AC_USE_SYSTEM_EXTENSIONS +AC_SYS_LARGEFILE AM_PROG_AS AS="${CC}" # stupid automake bug @@ -25,9 +27,6 @@ if test "$GCC" = "yes"; then CFLAGS="$CFLAGS -Wall" fi -AH_TEMPLATE([_GNU_SOURCE], - [Define to enable GNU extensions of glibc, notably large file support]) - AH_TEMPLATE([YUV_420_USE_YV12], [Define to 1 to use planar YUV format for 420 blocks in IEC PAL]) @@ -49,7 +48,6 @@ AH_TEMPLATE([HAVE_GTK], AH_TEMPLATE([HAVE_LIBXV], [Define if you have the `Xv' library (-lXv).]) -AC_DEFINE(_GNU_SOURCE) AC_PROG_INSTALL AC_PROG_LIBTOOL --- Makefile.am.orig +++ Makefile.am @@ -1,3 +1,4 @@ +ACLOCAL_AMFLAGS = -I m4 if HAVE_GTK gtk_subdirs = playdv else ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kde3-celestia for openSUSE:Factory
by root＠hilbert.suse.de 05 Sep '11

05 Sep '11

Hello community, here is the log from the commit of package kde3-celestia for openSUSE:Factory checked in at Mon Sep 5 16:34:04 CEST 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/kde3-celestia/kde3-celestia.changes 2011-08-31 14:26:42.000000000 +0200 @@ -0,0 +1,223 @@ +------------------------------------------------------------------- +Tue Aug 30 09:42:04 UTC 2011 - reddwarf(a)opensuse.org + +- run spec-cleaner +- add full URL in Source tag +- removed obsolete patches and added celestia-1.6.1-new_glibc.patch + and celestia-1.6.1-no_copy_dt_needed_entries.patch +- use libpng 1.4 +- add provides/obsoletes to easy upgrade to the new kde3-celestia + name +- update to 1.6.1 + + bugfixes + + enhancements + + For more details, please see the included ChangeLog + +------------------------------------------------------------------- +Tue May 3 07:26:45 UTC 2011 - idoenmez(a)novell.com + +- Add celestia-1.6.0-gcc46.patch: don't take address of temporary, + add missing cstddef include to fix compilation with gcc 4.6 + +------------------------------------------------------------------- +Mon Nov 15 09:50:10 UTC 2010 - neptunia(a)mail.ru + +- use libpng 1.2 compat to fix build + +------------------------------------------------------------------- +Mon Feb 15 12:35:53 UTC 2010 - llunak(a)novell.com + +- fix build with gcc-4.5 + +------------------------------------------------------------------- +Sun Aug 2 17:43:33 UTC 2009 - tittiatcoke(a)gmail.com + +- update to 1.6.0: + + bugfixes + + enhancements + + For more details, please see the included ChangeLog + +------------------------------------------------------------------- +Fri Jun 19 10:35:46 CEST 2009 - coolo(a)novell.com + +- disable as-needed for this package as it fails to build with it + +------------------------------------------------------------------- +Tue Apr 28 11:55:34 CEST 2009 - coolo(a)suse.de + +- fix compilation with gcc 4.4 + +------------------------------------------------------------------- +Sat Apr 4 17:28:48 CEST 2009 - coolo(a)suse.de + +- refresh all patches to fix build + +------------------------------------------------------------------- +Wed Jun 25 19:40:58 CEST 2008 - dmueller(a)suse.de + +- merge from the OBS + +------------------------------------------------------------------- +Mon May 19 21:41:07 CEST 2008 - lars(a)linux-schulserver.de + +- update to 1.5.1: + + Added fonts for Russian, Chinese, and Japanese + + Updated translations + + Fixed date formatting for non-UTF8 locales + + Fixed crash for dates prior to JD -1.5 when local format is used + + Fixed star glare clipping bug + + Fixed bug that caused some stars to be drawn untextured +- added celestia-1.5.1-config.patch to allow ~/.celestia config +- enabled theora, lua and cairo + +------------------------------------------------------------------- +Thu May 15 22:32:11 CEST 2008 - dmueller(a)suse.de + +- fix build on x86_64 + +------------------------------------------------------------------- +Thu Apr 24 16:53:04 CEST 2008 - stbinner(a)suse.de + +- update to version 1.5, for a list of new features see + http://www.shatters.net/celestia/150-feature-summary.html + +------------------------------------------------------------------- +Tue Nov 6 19:00:30 CET 2007 - dmueller(a)suse.de + +- really fix build with gcc 4.3 + +------------------------------------------------------------------- +Thu Oct 25 07:18:39 CEST 2007 - stbinner(a)suse.de + +- fix build with gcc 4.3 + +------------------------------------------------------------------- +Mon Oct 22 09:52:08 CEST 2007 - stbinner(a)suse.de + +- update to version 1.4.1, for changes see ChangeLog + +------------------------------------------------------------------- +Sun Aug 19 18:35:30 CEST 2007 - stbinner(a)suse.de + +- fix build on 10.0 + +------------------------------------------------------------------- +Fri Aug 3 12:35:24 CEST 2007 - stbinner(a)suse.de + +- add a GenericName entry to the .desktop file + +------------------------------------------------------------------- +Tue May 15 09:24:13 CEST 2007 - coolo(a)suse.de + +- use %find_lang + +------------------------------------------------------------------- +Wed Nov 8 15:28:13 CET 2006 - prusnak(a)suse.cz + +- fixed subscript out of range [#216330] + +------------------------------------------------------------------- +Tue Nov 7 00:58:43 CET 2006 - ro(a)suse.de + +- fix permissions for icon file + +------------------------------------------------------------------- +Thu Jun 15 00:13:10 CEST 2006 - dmueller(a)suse.de + +- build parallel + +------------------------------------------------------------------- +Wed Jan 25 21:34:54 CET 2006 - mls(a)suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Thu Oct 27 17:03:59 CEST 2005 - stbinner(a)suse.de + +- fix compilation with gcc 4.1 + +------------------------------------------------------------------- +Tue Aug 23 16:41:55 CEST 2005 - nadvornik(a)suse.cz + +- use update_admin [#106072] + +------------------------------------------------------------------- +Tue Apr 19 18:13:20 CEST 2005 - nadvornik(a)suse.de + +- fixed to compile with gcc4 + +------------------------------------------------------------------- +Thu Feb 17 18:06:12 CET 2005 - adrian(a)suse.de + +- menu entry moved to xdg dir + +------------------------------------------------------------------- +Fri Dec 10 02:03:27 CET 2004 - ro(a)suse.de + +- install icon file + +------------------------------------------------------------------- +Fri Oct 29 01:27:39 CEST 2004 - ro(a)suse.de + +- remove gtk from neededforbuild + +------------------------------------------------------------------- +Mon Aug 30 17:53:41 CEST 2004 - nadvornik(a)suse.cz + +- update to 1.3.2 + +------------------------------------------------------------------- +Wed Mar 24 16:24:34 CET 2004 - nadvornik(a)suse.cz + +- fixed options for aclocal + +------------------------------------------------------------------- +Thu Feb 12 11:54:57 CET 2004 - nadvornik(a)suse.cz + +- updated to 1.3.1 + +------------------------------------------------------------------- +Sat Jan 10 14:26:34 CET 2004 - adrian(a)suse.de + +- build as user + +------------------------------------------------------------------- +Sat Aug 9 14:20:05 CEST 2003 - adrian(a)suse.de + +- add Categories + +------------------------------------------------------------------- +Mon Jul 28 15:32:30 CEST 2003 - nadvornik(a)suse.cz + +- update to 1.3.0 + +------------------------------------------------------------------- +Wed Jun 18 16:36:26 CEST 2003 - ro(a)suse.de + +- added directory to filelist ++++ 26 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/kde3-celestia/kde3-celestia.changes calling whatdependson for head-i586 New: ---- celestia-1.6.0-config.patch celestia-1.6.0-desktop.patch celestia-1.6.1-new_glibc.patch celestia-1.6.1-no_copy_dt_needed_entries.patch celestia-1.6.1.tar.gz celestia-rpmlintrc kde3-celestia.changes kde3-celestia.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde3-celestia.spec ++++++ # # spec file for package kde3-celestia # # Copyright (c) 2011 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: kde3-celestia Version: 1.6.1 Release: 1 License: GPLv2+ Summary: OpenGL Space Simulator Url: http://celestia.sourceforge.net Group: Productivity/Scientific/Astronomy Source: http://sourceforge.net/projects/celestia/files/Celestia-source/%{version}/c… Source1: celestia-rpmlintrc Patch1: celestia-1.6.0-desktop.patch Patch2: celestia-1.6.0-config.patch Patch3: celestia-1.6.1-new_glibc.patch Patch4: celestia-1.6.1-no_copy_dt_needed_entries.patch BuildRequires: fdupes BuildRequires: gettext-tools BuildRequires: kdelibs3-devel BuildRequires: libtheora-devel BuildRequires: lua-devel BuildRequires: popt-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %define kdedir /opt/kde3 # celestia was last used in openSUSE 11.4 Provides: celestia = %{version} Obsoletes: celestia < 1.6.1 %description Celestia is a free real-time space simulation that lets you experience our universe in three dimensions. Unlike most planetarium software, Celestia does not confine you to the surface of the Earth. You can travel throughout the solar system to any of over 100,000 stars or even beyond the galaxy. All travel in Celestia is seamless; the exponential zoom feature lets you explore space across a huge range of scales, from galaxy clusters down to spacecraft only a few meters across. A 'point-and-goto' interface makes it simple to navigate through the universe to the object you want to visit. %prep %setup -q -n celestia-%{version} %patch1 %patch2 %patch3 %patch4 %build . /etc/opt/kde3/common_options srcdir=`pwd` CXXFLAGS="%{optflags}" \ ./configure --with-kde \ --with-lua \ --enable-theora \ --enable-libsuffix=`/opt/kde3/bin/kde-config --libsuffix` \ --datarootdir=/opt/kde3/share make %{?_smp_mflags} %install . /etc/opt/kde3/common_options %makeinstall install -d %{buildroot}%{_datadir}/pixmaps install -m644 src/celestia/kde/data/hi32-app-celestia.png %{buildroot}%{_datadir}/pixmaps/celestia.png rm %{buildroot}%{kdedir}/share/doc/HTML/en/celestia/common %suse_update_desktop_file -G "Space Simulator" celestia Education Astronomy # I don't really know if it is OK to just rename it. mv %{buildroot}%{kdedir}/share/locale/no %{buildroot}%{kdedir}/share/locale/nb %find_lang celestia %find_lang celestia_constellations cat celestia_constellations.lang >>celestia.lang %fdupes -s %{buildroot} %clean rm -rf %{buildroot} %files -f celestia.lang %defattr(-,root,root) %doc AUTHORS COPYING INSTALL README %{kdedir}/bin/celestia %{kdedir}/share/applications/kde/celestia.desktop %{kdedir}/share/celestia %{kdedir}/share/apps/celestia %{kdedir}/share/config/celestiarc %{kdedir}/share/mimelnk/application/x-celestia-script.desktop %{kdedir}/share/services/celestia.protocol %{kdedir}/share/icons/hicolor/* %{_datadir}/pixmaps/*.png %changelog ++++++ celestia-1.6.0-config.patch ++++++ --- celestia.cfg.orig +++ celestia.cfg @@ -195,7 +195,7 @@ # or # ExtrasDirectories [ "D:\\celestia-extras" ] #------------------------------------------------------------------------ - ExtrasDirectories [ "extras-standard" "extras" ] + ExtrasDirectories [ "extras-standard" "extras" "~/.celestia" ] #------------------------------------------------------------------------ ++++++ celestia-1.6.0-desktop.patch ++++++ --- src/celestia/kde/data/celestia.desktop +++ src/celestia/kde/data/celestia.desktop @@ -3,6 +3,7 @@ Name=Celestia Comment=Celestia Exec=celestia %f Terminal=false -Icon=celestia.png -MimeType=application/x-celestia-script +Icon=celestia +MimeType=application/x-celestia-script; Type=Application +Categories=Education;Astronomy; ++++++ celestia-1.6.1-new_glibc.patch ++++++ Index: src/celengine/frametree.h =================================================================== --- src/celengine/frametree.h.orig +++ src/celengine/frametree.h @@ -14,6 +14,7 @@ #define _CELENGINE_FRAMETREE_H_ #include <vector> +#include <cstddef> class Star; class Body; ++++++ celestia-1.6.1-no_copy_dt_needed_entries.patch ++++++ Index: src/celestia/Makefile.am =================================================================== --- src/celestia/Makefile.am.orig +++ src/celestia/Makefile.am @@ -7,14 +7,14 @@ DEFS = -DCONFIG_DATA_DIR='"$(PKGDATADIR) if ENABLE_KDE SUBDIRS += kde -celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \ - $(LIBSOCKET) -lDCOP kde/libkdegui.a +celestiaKDELIBS = kde/libkdegui.a $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \ + $(LIBSOCKET) -lDCOP celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH) endif if ENABLE_GTK SUBDIRS += gtk -celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a +celestiaGTKLIBS = gtk/libgtkgui.a $(GTK_LIBS) endif COMMONSOURCES = \ @@ -80,15 +80,16 @@ EXTRA_DIST = \ celestia_LDADD = \ $(celestiaKDELIBS) \ $(celestiaGTKLIBS) \ - $(DL_LIBS) \ - $(LUA_LIBS) \ - $(THEORA_LIBS) \ ../celengine/libcelengine.a \ ../celtxf/libceltxf.a \ ../cel3ds/libcel3ds.a \ ../celmath/libcelmath.a \ ../celutil/libcelutil.a \ - $(SPICE_LIBS) + $(DL_LIBS) \ + $(LUA_LIBS) \ + $(THEORA_LIBS) \ + $(SPICE_LIBS) \ + -lGL noinst_HEADERS = $(wildcard *.h) noinst_DATA = ../../celestia Index: src/celestia/Makefile.in =================================================================== --- src/celestia/Makefile.in.orig +++ src/celestia/Makefile.in @@ -473,11 +473,11 @@ xdg_directorydir = @xdg_directorydir@ xdg_menudir = @xdg_menudir@ SUBDIRS = res $(am__append_1) $(am__append_2) INCLUDES = -I.. -@ENABLE_KDE_TRUE@celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \ -@ENABLE_KDE_TRUE@ $(LIBSOCKET) -lDCOP kde/libkdegui.a +@ENABLE_KDE_TRUE@celestiaKDELIBS = kde/libkdegui.a $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \ +@ENABLE_KDE_TRUE@ $(LIBSOCKET) -lDCOP @ENABLE_KDE_TRUE@celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH) -@ENABLE_GTK_TRUE@celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a +@ENABLE_GTK_TRUE@celestiaGTKLIBS = gtk/libgtkgui.a $(GTK_LIBS) COMMONSOURCES = \ celestiacore.cpp \ configfile.cpp \ @@ -530,15 +530,16 @@ EXTRA_DIST = \ celestia_LDADD = \ $(celestiaKDELIBS) \ $(celestiaGTKLIBS) \ - $(DL_LIBS) \ - $(LUA_LIBS) \ - $(THEORA_LIBS) \ ../celengine/libcelengine.a \ ../celtxf/libceltxf.a \ ../cel3ds/libcel3ds.a \ ../celmath/libcelmath.a \ ../celutil/libcelutil.a \ - $(SPICE_LIBS) + $(DL_LIBS) \ + $(LUA_LIBS) \ + $(THEORA_LIBS) \ + $(SPICE_LIBS) \ + -lGL noinst_HEADERS = $(wildcard *.h) noinst_DATA = ../../celestia ++++++ celestia-rpmlintrc ++++++ addFilter("untranslated-desktop-file.*/mimelnk/application/x-celestia-script.desktop") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 jakarta-commons-launcher for openSUSE:Factory
by root＠hilbert.suse.de 05 Sep '11

05 Sep '11

Hello community, here is the log from the commit of package jakarta-commons-launcher for openSUSE:Factory checked in at Mon Sep 5 16:32:47 CEST 2011. -------- --- jakarta-commons-launcher/jakarta-commons-launcher.changes 2008-10-09 17:44:24.000000000 +0200 +++ jakarta-commons-launcher/jakarta-commons-launcher.changes 2011-08-27 16:23:55.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Aug 27 14:26:51 UTC 2011 - andrea.turrini(a)gmail.com + +- fixed typos in jakarta-commons-launcher.spec + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jakarta-commons-launcher.spec ++++++ --- /var/tmp/diff_new_pack.VJYcCL/_old 2011-09-05 16:32:24.000000000 +0200 +++ /var/tmp/diff_new_pack.VJYcCL/_new 2011-09-05 16:32:24.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package jakarta-commons-launcher (Version 1.1) +# spec file for package jakarta-commons-launcher # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -26,7 +26,7 @@ %define name jakarta-%{short_name} %define section devel Version: 1.1 -Release: 1 +Release: 11 Summary: A Cross-Platform Java Application Launcher License: The Apache Software License Group: Development/Libraries/Java @@ -42,7 +42,7 @@ * You want to avoid having to determining where certain application paths are, for example, your application's home directory. - Determining this dynamically in a Windows batch scripts is very + Determining this dynamically in a Windows batch script is very tricky on some versions of Windows or when softlinks are used on Unix platforms. @@ -57,10 +57,10 @@ script. This can be tricky or messy in batch and shell scripts. * You want to bootstrap system properties from a configuration file - instead hard-coding them in your batch and shell scripts. + instead of hard-coding them in your batch and shell scripts. * You want to provide localized error messages, which is very tricky to -do in batch and shell scripts. + do in batch and shell scripts. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 jackEQ for openSUSE:Factory
by root＠hilbert.suse.de 05 Sep '11

05 Sep '11

Hello community, here is the log from the commit of package jackEQ for openSUSE:Factory checked in at Mon Sep 5 16:32:44 CEST 2011. -------- --- jackEQ/jackEQ.changes 2009-08-26 13:56:46.000000000 +0200 +++ jackEQ/jackEQ.changes 2011-09-03 20:28:19.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Sep 3 18:27:44 UTC 2011 - crrodriguez(a)opensuse.org + +- Fix build with no-add-needed + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- jackeq-fix-no-add-needed.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jackEQ.spec ++++++ --- /var/tmp/diff_new_pack.kOe1yp/_old 2011-09-05 16:32:15.000000000 +0200 +++ /var/tmp/diff_new_pack.kOe1yp/_new 2011-09-05 16:32:15.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package jackEQ (Version 0.4.0) +# spec file for package jackEQ # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -22,13 +22,14 @@ BuildRequires: alsa-devel gtk2-devel jack-devel ladspa-devel libxml2-devel update-desktop-files Summary: JACK Equalization Tool for Live Performance Version: 0.4.0 -Release: 292 +Release: 303 License: GPL v2 or later Group: Productivity/Multimedia/Sound/Mixers Url: http://jackeq.sf.net Requires: jack ladspa Source: %{name}-%{version}.tar.bz2 Patch: %{name}-overflow.patch +Patch1: jackeq-fix-no-add-needed.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -47,11 +48,12 @@ %prep %setup -q %patch -p1 +%patch1 %build -autoreconf -fi +autoreconf -fiv %configure -make +make %{?_smp_mflags} %install make DESTDIR=$RPM_BUILD_ROOT install ++++++ jackeq-fix-no-add-needed.patch ++++++ --- configure.in.orig +++ configure.in @@ -5,9 +5,9 @@ AM_INIT_AUTOMAKE(jackEQ, 0.4.0) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE -AC_ISC_POSIX -AC_PROG_CC -AM_PROG_CC_STDC +AC_PROG_CC_STDC +AC_USE_SYSTEM_EXTENSIONS +AC_SYS_LARGEFILE AC_HEADER_STDC dnl Checks for libraries. @@ -16,7 +16,9 @@ PKG_CHECK_MODULES(JACK, jack >= 0.50.0) PKG_CHECK_MODULES(XML, libxml-2.0 >= 2.0) -AC_CHECK_LIB([m], [sqrt], , [AC_MSG_ERROR(Can't find libm)]) + +AC_SEARCH_LIBS(sqrt, m) +AC_SEARCH_LIBS(dlopen, dl) CFLAGS="$CFLAGS $JACK_CFAGS $XML_CFLAGS" LIBS="$LIBS $JACK_LIBS $XML_LIBS" --- src/Makefile.am.orig +++ src/Makefile.am @@ -6,7 +6,6 @@ INCLUDES = \ @PACKAGE_CFLAGS@ jackeq_CFLAGS = -g -ffast-math -jackeq_LDFLAGS = -lm bin_PROGRAMS = jackeq ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 jack-rack for openSUSE:Factory
by root＠hilbert.suse.de 05 Sep '11

05 Sep '11

Hello community, here is the log from the commit of package jack-rack for openSUSE:Factory checked in at Mon Sep 5 16:32:19 CEST 2011. -------- --- jack-rack/jack-rack.changes 2009-11-03 20:18:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/jack-rack/jack-rack.changes 2011-09-03 20:20:03.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Sep 3 18:19:23 UTC 2011 - crrodriguez(a)opensuse.org + +- Fix build with as-needed and no-add-needed + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jack-rack.spec ++++++ --- /var/tmp/diff_new_pack.HJl5rZ/_old 2011-09-05 16:31:51.000000000 +0200 +++ /var/tmp/diff_new_pack.HJl5rZ/_new 2011-09-05 16:31:51.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package jack-rack (Version 1.4.7) +# spec file for package jack-rack # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -22,7 +22,7 @@ BuildRequires: jack-devel ladspa-devel libgnomeui-devel liblrdf-devel libraptor-devel update-desktop-files Summary: LADSPA Effects Rack for JACK Version: 1.4.7 -Release: 115 +Release: 126 License: GPL v2 or later Group: Productivity/Multimedia/Sound/Utilities Requires: jack ladspa @@ -53,14 +53,10 @@ %endif %build -# This package failed when testing with -Wl,-as-needed being default. -# So we disable it here, if you want to retest, just delete this comment and the line below. -export SUSE_ASNEEDED=0 -%{?suse_update_config:%{suse_update_config -f}} autoreconf -fi %configure \ --disable-desktop-inst -make +make %{?_smp_mflags} %install %makeinstall ++++++ jack-rack-undeprec.dif ++++++ --- /var/tmp/diff_new_pack.HJl5rZ/_old 2011-09-05 16:31:51.000000000 +0200 +++ /var/tmp/diff_new_pack.HJl5rZ/_new 2011-09-05 16:31:51.000000000 +0200 @@ -1,8 +1,6 @@ -Index: src/Makefile.am -=================================================================== --- src/Makefile.am.orig +++ src/Makefile.am -@@ -55,10 +55,8 @@ jack_rack_CFLAGS = \ +@@ -55,13 +55,11 @@ jack_rack_CFLAGS = \ -DPIXMAPDIR=\"$(pixmapdir)\" \ -DDTDDIR=\"$(dtddir)\" \ -DG_DISABLE_DEPRECATED=1 \ @@ -13,9 +11,11 @@ + -DGDK_PIXBUF_DISABLE_DEPRECATED=1 - jack_rack_LDFLAGS = \ -Index: src/Makefile.in -=================================================================== +-jack_rack_LDFLAGS = \ ++jack_rack_LDADD = \ + $(JACK_LIBS) \ + $(GTK_LIBS) \ + $(GNOMEUI_LIBS) \ --- src/Makefile.in.orig +++ src/Makefile.in @@ -263,10 +263,8 @@ jack_rack_CFLAGS = \ @@ -30,3 +30,26 @@ jack_rack_LDFLAGS = \ $(JACK_LIBS) \ +--- configure.ac.orig ++++ configure.ac +@@ -4,7 +4,10 @@ AM_INIT_AUTOMAKE(1.6) + AM_CONFIG_HEADER(src/ac_config.h) + AM_MAINTAINER_MODE + +-AC_PROG_CC ++AC_PROG_CC_STDC ++AM_PROG_CC_C_O ++AC_USE_SYSTEM_EXTENSIONS ++AC_SYS_LARGEFILE + #AC_PROG_LIBTOOL + + +@@ -175,6 +178,8 @@ fi + + AM_CONDITIONAL(HAVE_LASH, test "$LASH_FOUND" = "yes") + ++AC_SEARCH_LIBS(dlopen, dl) ++ + ############ + ### lrdf ### + ############ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 iscsitarget for openSUSE:Factory
by root＠hilbert.suse.de 05 Sep '11

05 Sep '11

Hello community, here is the log from the commit of package iscsitarget for openSUSE:Factory checked in at Mon Sep 5 16:32:10 CEST 2011. -------- --- iscsitarget/iscsitarget.changes 2010-12-08 17:05:48.000000000 +0100 +++ iscsitarget/iscsitarget.changes 2011-09-05 14:20:00.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 5 12:19:32 UTC 2011 - mmarek(a)suse.cz + +- Update to current svn to fix build with newer kernels. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- iscsitarget-0.4.17.diff iscsitarget-1.4.19.tar.gz iscsitarget-2.6.29.patch iscsitarget-2.6.30.patch iscsitarget-2.6.33.patch iscsitarget-2.6.37.patch iscsitarget-isns-bounds-checking New: ---- iscsitarget-1.4.20-svn.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iscsitarget.spec ++++++ --- /var/tmp/diff_new_pack.ShahtJ/_old 2011-09-05 16:31:34.000000000 +0200 +++ /var/tmp/diff_new_pack.ShahtJ/_new 2011-09-05 16:31:34.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package iscsitarget (Version 1.4.19) +# spec file for package iscsitarget # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,21 +25,15 @@ Group: System/Daemons PreReq: %fillup_prereq %insserv_prereq /bin/cat /bin/rm AutoReqProv: on -Version: 1.4.19 -Release: 7 +Version: 1.4.20 +Release: 1 Requires: iscsitarget-kmp Summary: Open Source iSCSI Target with Professional Features -Source: %{name}-%{version}.tar.gz +Source: %{name}-%{version}-svn.tar.gz Source1: %{name}.init Source2: %{name}.sysconfig Source3: preamble Source4: services -Patch0: iscsitarget-2.6.29.patch -Patch1: iscsitarget-2.6.30.patch -Patch2: iscsitarget-2.6.33.patch -Patch3: iscsitarget-0.4.17.diff -Patch4: iscsitarget-isns-bounds-checking -Patch5: iscsitarget-2.6.37.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %suse_kernel_module_package -n %{name} -p %{S:3} kdump um @@ -61,13 +55,7 @@ challenge of future storage needs and developments. %prep -%setup -%patch0 -%patch1 -%patch2 -%patch3 -p0 -%patch4 -p1 -%patch5 -p1 +%setup -q -n %name-%version-svn echo "iscsi_trgt.ko yes" > kernel/Module.supported %build ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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