Update to 4.1.2

4 files changed, 52 insertions, 32 deletions

diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild
index b55341fb..066e8de6 100755
--- a/libreoffice/build/libreoffice.SlackBuild
+++ b/libreoffice/build/libreoffice.SlackBuild
@@ -148,7 +148,10 @@
 # 4.0.5-1:    07/aug/2013 by Eric Hameleers <alien@slackware.com>
 #             * New 4.0.5 release built for Slackware 14 and newer.
 # 4.1.1-1:    09/sep/2013 by Eric Hameleers <alien@slackware.com>
-#             * New 4.1.1 release built for Slackware 14 and newer.
+#             * New 4.1.1 release built for Slackware 14 and newer (packages
+#               not released to the public).
+# 4.1.2-1:    05/oct/2013 by Eric Hameleers <alien@slackware.com>
+#             * New 4.1.2 release built for Slackware 14 and newer.
 #
 # Run 'sh libreoffice.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -174,8 +177,8 @@ TAG=${TAG:-alien}
 #SRCVER=${SRCVER:-HEAD}
 #SRCVER=${SRCVER:-3.3.0.4}
 
-SRCVER=${SRCVER:-4.1.1}
-SUBVER=".2"
+SRCVER=${SRCVER:-4.1.2}
+SUBVER=".3"
 PKG_SUBVER=""
 
 # How many tarballs does this release consist of:
@@ -268,7 +271,7 @@ SRCURL[5]="http://cgit.freedesktop.org/libreoffice/core/plain/Makefile.fetch?id=
 #
 
 # --- Start of section generated by gensrc_lo4.sh ---
-# External sources for libreoffice-4.1.1.2
+# External sources for libreoffice-4.1.2.3
 
 SOURCE[6]="$SRCDIR/sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
 SRCURL[6]="http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
@@ -282,8 +285,8 @@ SRCURL[8]="http://dev-www.libreoffice.org/src/libmspub-0.0.6.tar.bz2"
 SOURCE[9]="$SRCDIR/sources/libmwaw-0.1.10.tar.bz2"
 SRCURL[9]="http://dev-www.libreoffice.org/src/libmwaw-0.1.10.tar.bz2"
 
-SOURCE[10]="$SRCDIR/sources/libvisio-0.0.30.tar.bz2"
-SRCURL[10]="http://dev-www.libreoffice.org/src/libvisio-0.0.30.tar.bz2"
+SOURCE[10]="$SRCDIR/sources/libvisio-0.0.31.tar.bz2"
+SRCURL[10]="http://dev-www.libreoffice.org/src/libvisio-0.0.31.tar.bz2"
 
 SOURCE[11]="$SRCDIR/sources/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz"
 SRCURL[11]="http://dev-www.libreoffice.org/src/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz"
@@ -930,8 +933,8 @@ fi
   done
 )
 
-# If we have any dictionaries in the $INSTDIR (this variable is set already by the build process),
-# now is the time to copy them into the package:
+# If we have any dictionaries in the $INSTDIR (this variable is set already
+# by the build process), now is the time to copy them into the package:
 echo "Starting split-off of dictionaries from main $PRGNAM package..."
 DICTS="$(find $INSTDIR/share/extensions -name "dict-*" -type d -maxdepth 1 -mindepth 1 |rev |cut -d/ -f1 |rev |cut -d- -f2-)"
 echo "Found the following dictionaries in $INSTDIR: $(echo $DICTS)"
@@ -957,6 +960,8 @@ for DICTLANG in $(cat $SRCDIR/languages.dict | cut -d= -f1) ; do
     echo "ERROR: could not find dictionary '$DICTLANG' for packageing..."
   fi
 done
+# Remove the remaining ones, we do not package them:
+rm -rf $INSTDIR/share/extensions/dict-*
 
 # Create aliases for locales that have matching languages in LibreOffice.
 # This enables people with these locales to use the autocorrect function:
diff --git a/libreoffice/build/libreoffice41.SlackBuild b/libreoffice/build/libreoffice41.SlackBuild
index b55341fb..066e8de6 100755
--- a/libreoffice/build/libreoffice41.SlackBuild
+++ b/libreoffice/build/libreoffice41.SlackBuild
@@ -148,7 +148,10 @@
 # 4.0.5-1:    07/aug/2013 by Eric Hameleers <alien@slackware.com>
 #             * New 4.0.5 release built for Slackware 14 and newer.
 # 4.1.1-1:    09/sep/2013 by Eric Hameleers <alien@slackware.com>
-#             * New 4.1.1 release built for Slackware 14 and newer.
+#             * New 4.1.1 release built for Slackware 14 and newer (packages
+#               not released to the public).
+# 4.1.2-1:    05/oct/2013 by Eric Hameleers <alien@slackware.com>
+#             * New 4.1.2 release built for Slackware 14 and newer.
 #
 # Run 'sh libreoffice.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -174,8 +177,8 @@ TAG=${TAG:-alien}
 #SRCVER=${SRCVER:-HEAD}
 #SRCVER=${SRCVER:-3.3.0.4}
 
-SRCVER=${SRCVER:-4.1.1}
-SUBVER=".2"
+SRCVER=${SRCVER:-4.1.2}
+SUBVER=".3"
 PKG_SUBVER=""
 
 # How many tarballs does this release consist of:
@@ -268,7 +271,7 @@ SRCURL[5]="http://cgit.freedesktop.org/libreoffice/core/plain/Makefile.fetch?id=
 #
 
 # --- Start of section generated by gensrc_lo4.sh ---
-# External sources for libreoffice-4.1.1.2
+# External sources for libreoffice-4.1.2.3
 
 SOURCE[6]="$SRCDIR/sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
 SRCURL[6]="http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
@@ -282,8 +285,8 @@ SRCURL[8]="http://dev-www.libreoffice.org/src/libmspub-0.0.6.tar.bz2"
 SOURCE[9]="$SRCDIR/sources/libmwaw-0.1.10.tar.bz2"
 SRCURL[9]="http://dev-www.libreoffice.org/src/libmwaw-0.1.10.tar.bz2"
 
-SOURCE[10]="$SRCDIR/sources/libvisio-0.0.30.tar.bz2"
-SRCURL[10]="http://dev-www.libreoffice.org/src/libvisio-0.0.30.tar.bz2"
+SOURCE[10]="$SRCDIR/sources/libvisio-0.0.31.tar.bz2"
+SRCURL[10]="http://dev-www.libreoffice.org/src/libvisio-0.0.31.tar.bz2"
 
 SOURCE[11]="$SRCDIR/sources/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz"
 SRCURL[11]="http://dev-www.libreoffice.org/src/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz"
@@ -930,8 +933,8 @@ fi
   done
 )
 
-# If we have any dictionaries in the $INSTDIR (this variable is set already by the build process),
-# now is the time to copy them into the package:
+# If we have any dictionaries in the $INSTDIR (this variable is set already
+# by the build process), now is the time to copy them into the package:
 echo "Starting split-off of dictionaries from main $PRGNAM package..."
 DICTS="$(find $INSTDIR/share/extensions -name "dict-*" -type d -maxdepth 1 -mindepth 1 |rev |cut -d/ -f1 |rev |cut -d- -f2-)"
 echo "Found the following dictionaries in $INSTDIR: $(echo $DICTS)"
@@ -957,6 +960,8 @@ for DICTLANG in $(cat $SRCDIR/languages.dict | cut -d= -f1) ; do
     echo "ERROR: could not find dictionary '$DICTLANG' for packageing..."
   fi
 done
+# Remove the remaining ones, we do not package them:
+rm -rf $INSTDIR/share/extensions/dict-*
 
 # Create aliases for locales that have matching languages in LibreOffice.
 # This enables people with these locales to use the autocorrect function:
diff --git a/libreoffice/build/libreoffice42.SlackBuild b/libreoffice/build/libreoffice42.SlackBuild
index b55341fb..066e8de6 100755
--- a/libreoffice/build/libreoffice42.SlackBuild
+++ b/libreoffice/build/libreoffice42.SlackBuild
@@ -148,7 +148,10 @@
 # 4.0.5-1:    07/aug/2013 by Eric Hameleers <alien@slackware.com>
 #             * New 4.0.5 release built for Slackware 14 and newer.
 # 4.1.1-1:    09/sep/2013 by Eric Hameleers <alien@slackware.com>
-#             * New 4.1.1 release built for Slackware 14 and newer.
+#             * New 4.1.1 release built for Slackware 14 and newer (packages
+#               not released to the public).
+# 4.1.2-1:    05/oct/2013 by Eric Hameleers <alien@slackware.com>
+#             * New 4.1.2 release built for Slackware 14 and newer.
 #
 # Run 'sh libreoffice.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -174,8 +177,8 @@ TAG=${TAG:-alien}
 #SRCVER=${SRCVER:-HEAD}
 #SRCVER=${SRCVER:-3.3.0.4}
 
-SRCVER=${SRCVER:-4.1.1}
-SUBVER=".2"
+SRCVER=${SRCVER:-4.1.2}
+SUBVER=".3"
 PKG_SUBVER=""
 
 # How many tarballs does this release consist of:
@@ -268,7 +271,7 @@ SRCURL[5]="http://cgit.freedesktop.org/libreoffice/core/plain/Makefile.fetch?id=
 #
 
 # --- Start of section generated by gensrc_lo4.sh ---
-# External sources for libreoffice-4.1.1.2
+# External sources for libreoffice-4.1.2.3
 
 SOURCE[6]="$SRCDIR/sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
 SRCURL[6]="http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
@@ -282,8 +285,8 @@ SRCURL[8]="http://dev-www.libreoffice.org/src/libmspub-0.0.6.tar.bz2"
 SOURCE[9]="$SRCDIR/sources/libmwaw-0.1.10.tar.bz2"
 SRCURL[9]="http://dev-www.libreoffice.org/src/libmwaw-0.1.10.tar.bz2"
 
-SOURCE[10]="$SRCDIR/sources/libvisio-0.0.30.tar.bz2"
-SRCURL[10]="http://dev-www.libreoffice.org/src/libvisio-0.0.30.tar.bz2"
+SOURCE[10]="$SRCDIR/sources/libvisio-0.0.31.tar.bz2"
+SRCURL[10]="http://dev-www.libreoffice.org/src/libvisio-0.0.31.tar.bz2"
 
 SOURCE[11]="$SRCDIR/sources/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz"
 SRCURL[11]="http://dev-www.libreoffice.org/src/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz"
@@ -930,8 +933,8 @@ fi
   done
 )
 
-# If we have any dictionaries in the $INSTDIR (this variable is set already by the build process),
-# now is the time to copy them into the package:
+# If we have any dictionaries in the $INSTDIR (this variable is set already
+# by the build process), now is the time to copy them into the package:
 echo "Starting split-off of dictionaries from main $PRGNAM package..."
 DICTS="$(find $INSTDIR/share/extensions -name "dict-*" -type d -maxdepth 1 -mindepth 1 |rev |cut -d/ -f1 |rev |cut -d- -f2-)"
 echo "Found the following dictionaries in $INSTDIR: $(echo $DICTS)"
@@ -957,6 +960,8 @@ for DICTLANG in $(cat $SRCDIR/languages.dict | cut -d= -f1) ; do
     echo "ERROR: could not find dictionary '$DICTLANG' for packageing..."
   fi
 done
+# Remove the remaining ones, we do not package them:
+rm -rf $INSTDIR/share/extensions/dict-*
 
 # Create aliases for locales that have matching languages in LibreOffice.
 # This enables people with these locales to use the autocorrect function:
diff --git a/libreoffice/build/libreoffice43.SlackBuild b/libreoffice/build/libreoffice43.SlackBuild
index b55341fb..066e8de6 100755
--- a/libreoffice/build/libreoffice43.SlackBuild
+++ b/libreoffice/build/libreoffice43.SlackBuild
@@ -148,7 +148,10 @@
 # 4.0.5-1:    07/aug/2013 by Eric Hameleers <alien@slackware.com>
 #             * New 4.0.5 release built for Slackware 14 and newer.
 # 4.1.1-1:    09/sep/2013 by Eric Hameleers <alien@slackware.com>
-#             * New 4.1.1 release built for Slackware 14 and newer.
+#             * New 4.1.1 release built for Slackware 14 and newer (packages
+#               not released to the public).
+# 4.1.2-1:    05/oct/2013 by Eric Hameleers <alien@slackware.com>
+#             * New 4.1.2 release built for Slackware 14 and newer.
 #
 # Run 'sh libreoffice.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -174,8 +177,8 @@ TAG=${TAG:-alien}
 #SRCVER=${SRCVER:-HEAD}
 #SRCVER=${SRCVER:-3.3.0.4}
 
-SRCVER=${SRCVER:-4.1.1}
-SUBVER=".2"
+SRCVER=${SRCVER:-4.1.2}
+SUBVER=".3"
 PKG_SUBVER=""
 
 # How many tarballs does this release consist of:
@@ -268,7 +271,7 @@ SRCURL[5]="http://cgit.freedesktop.org/libreoffice/core/plain/Makefile.fetch?id=
 #
 
 # --- Start of section generated by gensrc_lo4.sh ---
-# External sources for libreoffice-4.1.1.2
+# External sources for libreoffice-4.1.2.3
 
 SOURCE[6]="$SRCDIR/sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
 SRCURL[6]="http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
@@ -282,8 +285,8 @@ SRCURL[8]="http://dev-www.libreoffice.org/src/libmspub-0.0.6.tar.bz2"
 SOURCE[9]="$SRCDIR/sources/libmwaw-0.1.10.tar.bz2"
 SRCURL[9]="http://dev-www.libreoffice.org/src/libmwaw-0.1.10.tar.bz2"
 
-SOURCE[10]="$SRCDIR/sources/libvisio-0.0.30.tar.bz2"
-SRCURL[10]="http://dev-www.libreoffice.org/src/libvisio-0.0.30.tar.bz2"
+SOURCE[10]="$SRCDIR/sources/libvisio-0.0.31.tar.bz2"
+SRCURL[10]="http://dev-www.libreoffice.org/src/libvisio-0.0.31.tar.bz2"
 
 SOURCE[11]="$SRCDIR/sources/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz"
 SRCURL[11]="http://dev-www.libreoffice.org/src/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz"
@@ -930,8 +933,8 @@ fi
   done
 )
 
-# If we have any dictionaries in the $INSTDIR (this variable is set already by the build process),
-# now is the time to copy them into the package:
+# If we have any dictionaries in the $INSTDIR (this variable is set already
+# by the build process), now is the time to copy them into the package:
 echo "Starting split-off of dictionaries from main $PRGNAM package..."
 DICTS="$(find $INSTDIR/share/extensions -name "dict-*" -type d -maxdepth 1 -mindepth 1 |rev |cut -d/ -f1 |rev |cut -d- -f2-)"
 echo "Found the following dictionaries in $INSTDIR: $(echo $DICTS)"
@@ -957,6 +960,8 @@ for DICTLANG in $(cat $SRCDIR/languages.dict | cut -d= -f1) ; do
     echo "ERROR: could not find dictionary '$DICTLANG' for packageing..."
   fi
 done
+# Remove the remaining ones, we do not package them:
+rm -rf $INSTDIR/share/extensions/dict-*
 
 # Create aliases for locales that have matching languages in LibreOffice.
 # This enables people with these locales to use the autocorrect function: