Hello community,
here is the log from the commit of package myspell-dictionaries for
openSUSE:Factory checked in at 2014-09-17 17:41:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/myspell-dictionaries (Old)
and /work/SRC/openSUSE:Factory/.myspell-dictionaries.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "myspell-dictionaries"
Changes:
--------
---
/work/SRC/openSUSE:Factory/myspell-dictionaries/myspell-dictionaries.changes
2014-06-02 07:00:12.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.myspell-dictionaries.new/myspell-dictionaries.changes
2014-09-17 17:41:50.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Sep 11 09:43:48 UTC 2014 - [email protected]
+
+- package lightproof files [bnc#890735]
+- package all doc files
+- update to 20140911
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ myspell-dictionaries.spec ++++++
++++ 603 lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/myspell-dictionaries/myspell-dictionaries.spec
++++ and
/work/SRC/openSUSE:Factory/.myspell-dictionaries.new/myspell-dictionaries.spec
++++++ dictionaries.tar.xz ++++++
/work/SRC/openSUSE:Factory/myspell-dictionaries/dictionaries.tar.xz
/work/SRC/openSUSE:Factory/.myspell-dictionaries.new/dictionaries.tar.xz
differ: char 26, line 1
++++++ myspell-dictionaries.spec.in ++++++
--- /var/tmp/diff_new_pack.ugsuxi/_old 2014-09-17 17:41:54.000000000 +0200
+++ /var/tmp/diff_new_pack.ugsuxi/_new 2014-09-17 17:41:54.000000000 +0200
@@ -27,10 +27,11 @@
Group: Productivity/Text/Spell
Url: http://cgit.freedesktop.org/libreoffice/dictionaries/
Source0: dictionaries.tar.xz
+Source1: update.sh
+Source2: myspell-dictionaries.spec.in
BuildRequires: dos2unix
BuildRequires: xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildArch: noarch
Obsoletes: myspell-african
Obsoletes: myspell-albanian
Obsoletes: myspell-american
@@ -187,7 +188,7 @@
%install
function install_dictionary_files
{
- locale_dir=$1
+ locale=$1
system_dir=$2
files=$3
@@ -198,20 +199,38 @@
# symlink
ln -s %{_datadir}/$system_dir/$file
%{buildroot}%{_datadir}/$compat_dir/$file
# file list
- echo %{_datadir}/$system_dir/$file >> $locale_dir.list
- echo %{_datadir}/$compat_dir/$file >> $locale_dir.list
+ echo %{_datadir}/$system_dir/$file >> $locale.list
+ echo %{_datadir}/$compat_dir/$file >> $locale.list
done
fi
}
function install_doc_files
{
- locale_dir=$1
+ locale=$1
doc_files=$2
dos2unix -q $doc_files
- install -m 755 -d %{buildroot}%{_docdir}/myspell-$locale_dir
- install -m 644 `echo $doc_files | tr '\n' ' '`
%{buildroot}%{_docdir}/myspell-$locale_dir
- echo "%{_docdir}/myspell-$locale_dir" >> $locale_dir.list
+ install -m 755 -d %{buildroot}%{_docdir}/myspell-$locale
+ install -m 644 `echo $doc_files | tr '\n' ' '`
%{buildroot}%{_docdir}/myspell-$locale
+ echo "%{_docdir}/myspell-$locale" >> $locale.list
}
+function install_lightproof_files
+{
+ locale=$1
+ files=$2
+ dsc_files=$3
+ lightproof_dir=%{_libdir}/libreoffice/share/extensions/lightproof_$locale
+ if [[ "$files" =~ 'Lightproof.py' ]]; then
+ if [ ! -d %{buildroot}$lightproof_dir ]; then
+ mkdir -p %{buildroot}$lightproof_dir
+ echo "%dir %{_libdir}/libreoffice" >> ../common.list
+ echo "%dir %{_libdir}/libreoffice/share" >> ../common.list
+ echo "%dir %{_libdir}/libreoffice/share/extensions" >> ../common.list
+ fi
+ cp -r $files $dsc_files %{buildroot}$lightproof_dir
+ echo $lightproof_dir >> lightproof.$locale.list
+ fi
+}
+
dic_dir="hunspell"
hyph_dir="hyphen"
th_dir="mythes"
@@ -219,25 +238,33 @@
for system_dir in $dic_dir $hyph_dir $th_dir $compat_dir; do
install -m 755 -d %{buildroot}%{_datadir}/$system_dir/
done
+echo '%%defattr(-,root,root,-)' > common.list
for locale_dir in @LANG_DIRS@ ; do
pushd $locale_dir
dic_files=`find -maxdepth 1 -name '*.dic' -a ! -name 'hyph*' -o -name
'*.aff'`
hyph_files=`find -maxdepth 1 -name 'hyph*.dic'`
th_files=`find -maxdepth 1 -name 'th*.dat' -o -name 'th*.idx'`
doc_files=`find -maxdepth 1 -type f | grep
'.txt\|.xcu\|.xml\|.png\|.tex\|^[^.]*$' || true`
+ lightproof_files=`find -maxdepth 1 -name 'pythonpath' -o -name 'dialog' -o
-name 'Lightproof*' -o \
+ -name 'Linguistic.xcu' -o -name
'META-INF' -o -name 'icons' -o \
+ -name 'description.xml'`
# install dictionary files
echo '%%defattr(-,root,root,-)' > $locale_dir.list
install_dictionary_files $locale_dir $dic_dir "$dic_files"
install_dictionary_files $locale_dir $hyph_dir "$hyph_files"
install_dictionary_files $locale_dir $th_dir "$th_files"
# install documentation
- install_doc_files $locale_dir $doc_files
+ install_doc_files $locale_dir "$doc_files"
+ # install lightproof files
+ echo '%%defattr(-,root,root,-)' > lightproof.$locale_dir.list
+ install_lightproof_files $locale_dir "$lightproof_files"
popd
mv $locale_dir/$locale_dir.list .
+ mv $locale_dir/lightproof.$locale_dir.list .
done
-%files
+%files -f common.list
%defattr(-,root,root)
%dir %{_datadir}/hunspell/
%dir %{_datadir}/hyphen/
++++++ update.sh ++++++
--- /var/tmp/diff_new_pack.ugsuxi/_old 2014-09-17 17:41:54.000000000 +0200
+++ /var/tmp/diff_new_pack.ugsuxi/_new 2014-09-17 17:41:54.000000000 +0200
@@ -1,5 +1,5 @@
#!/bin/bash
-# DOWNLOAD='no' when improving this script or spec.in
+# DOWNLOAD='no' when testing this script or spec.in
DOWNLOAD='yes'
GIT_DIR='dictionaries'
VERBOSE='no'
@@ -122,6 +122,13 @@
grep "$dat_file" $GIT_DIR/locale_to_file_map.txt | sed 's:.* \([^
]\+\.idx\).*:\1:'
}
+# arch package?
+function have_lightproof()
+{
+ dir=$1
+ [ -f $GIT_DIR/$dir/Lightproof.py ]
+}
+
#
# prepare 'dictionaries' directory
#
@@ -242,10 +249,26 @@
for p in ${provides_map["myspell-$subpackage"]}; do
sed -i "s#@METADATA@#Provides: $p\n@METADATA@#"
myspell-dictionaries.spec
done
+ sed -i "s#@METADATA@#BuildArch: noarch\n@METADATA@#"
myspell-dictionaries.spec
+ if have_lightproof $subpackage; then
+ sed -i "s#@METADATA@#Recommends:
myspell-lightproof-$subpackage\n@METADATA@#" myspell-dictionaries.spec
+ fi
sed -i "s#@METADATA@#\n@METADATA@#" myspell-dictionaries.spec
sed -i "s#@METADATA@#%description -n myspell-$subpackage\n@METADATA@#"
myspell-dictionaries.spec
sed -i "s#@METADATA@#$desc.\n@METADATA@#" myspell-dictionaries.spec
sed -i "s#@METADATA@#\n@METADATA@#" myspell-dictionaries.spec
+ # lightproof subpackage
+ if have_lightproof $subpackage; then
+ sed -i "s#@METADATA@#%package -n
myspell-lightproof-$subpackage\n@METADATA@#" myspell-dictionaries.spec
+ sed -i "s#@METADATA@#Summary: Lightproof for
$subpackage\n@METADATA@#" myspell-dictionaries.spec
+ sed -i "s#@METADATA@#Group: Productivity/Text/Spell\n@METADATA@#"
myspell-dictionaries.spec
+ sed -i "s#@METADATA@#Requires: myspell-$subpackage\n@METADATA@#"
myspell-dictionaries.spec
+ sed -i "s#@METADATA@#\n@METADATA@#" myspell-dictionaries.spec
+ sed -i "s#@METADATA@#\n@METADATA@#" myspell-dictionaries.spec
+ sed -i "s#@METADATA@#%description -n
myspell-lightproof-$subpackage\n@METADATA@#" myspell-dictionaries.spec
+ sed -i "s#@METADATA@#Lightproof grammar checker information for
$subpackage.\n@METADATA@#" myspell-dictionaries.spec
+ sed -i "s#@METADATA@#\n@METADATA@#" myspell-dictionaries.spec
+ fi
done
sed -i "s:@METADATA@::" myspell-dictionaries.spec
@@ -254,6 +277,10 @@
for subpackage in $dirs; do
sed -i "s:@FILES@:%files -n myspell-$subpackage -f
$subpackage.list\n@FILES@:" myspell-dictionaries.spec
sed -i "s:@FILES@:\n@FILES@:" myspell-dictionaries.spec
+ if have_lightproof $subpackage; then
+ sed -i "s:@FILES@:%files -n myspell-lightproof-$subpackage -f
lightproof.$subpackage.list\n@FILES@:" myspell-dictionaries.spec
+ sed -i "s:@FILES@:\n@FILES@:" myspell-dictionaries.spec
+ fi
done
sed -i "s:@FILES@::" myspell-dictionaries.spec
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
