commit libreoffice-languagetool for openSUSE:11.4

26 Apr 2011

Hello community,

here is the log from the commit of package libreoffice-languagetool for openSUSE:11.4
checked in at Tue Apr 26 18:50:51 CEST 2011.



--------

--- old-versions/11.4/all/libreoffice-languagetool/libreoffice-languagetool.changes	2011-02-13 22:11:40.000000000 +0100
+++ /d/11.4/libreoffice-languagetool/libreoffice-languagetool.changes	2011-04-26 18:43:48.805484000 +0200
@@ -1,0 +2,6 @@
+Mon Mar  7 14:54:51 CET 2011 - pmladek@suse.cz
+
+- fixed handling of the architecture dependant symlinks
+  (bnc#677354, bnc#665112, swampid#39716)
+
+-------------------------------------------------------------------

Package does not exist at destination yet. Using Fallback old-versions/11.4/all/libreoffice-languagetool
Destination is old-versions/11.4/UPDATES/all/libreoffice-languagetool
calling whatdependson for 11.4-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libreoffice-languagetool.spec ++++++
--- /var/tmp/diff_new_pack.WQNOnw/_old	2011-04-26 18:50:42.000000000 +0200
+++ /var/tmp/diff_new_pack.WQNOnw/_new	2011-04-26 18:50:42.000000000 +0200
@@ -20,7 +20,7 @@
 
 Name:           libreoffice-languagetool
 Version:        1.2
-Release:        1
+Release:        6.<RELEASE7>
 BuildRequires:  ant java-devel libreoffice-ure unzip
 #!BuildIgnore:  libreoffice
 %define	        ooo_prefix      %_libdir
@@ -360,17 +360,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,16 +396,22 @@
     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
+
+%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
 
 ########################################################
 # Start of a section generated by lo-langtool-gen-spec
@@ -413,91 +428,143 @@
 %_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
 # 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
 #

++++++ lo-LanguageTool-gen-spec ++++++
--- /var/tmp/diff_new_pack.WQNOnw/_old	2011-04-26 18:50:42.000000000 +0200
+++ /var/tmp/diff_new_pack.WQNOnw/_new	2011-04-26 18:50:42.000000000 +0200
@@ -142,7 +142,11 @@
     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\" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-$datap->{$curLang}{'locale'}.txt || true\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($$)


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)