[ooo-build-commit] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply                             |    6 ------
 patches/dev300/installer-get-path-correctly.diff |   20 --------------------
 2 files changed, 26 deletions(-)

New commits:
commit 4babf985fbf9b82404f7e313b7ca6e9c05eb9090
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Sep 24 15:24:42 2010 +0200

    Apply installer-get-path-correctly.diff directly into the sources

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 6cd8aa7..2cf1c6a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -726,12 +726,6 @@ solenv-installer-lang-filelist-names.diff, pmladek
 # make the dummy localize.sdf realy working
 solenv-dummy-localize-sdf.diff, i#113389, pmladek
 
-# allow to get path also from ./file
-# otherwise, it installed the license files into ugly subdirectories
-# for example into <ooo-home>/LICENSE.html/LICENSE.html
-# even worse, the direcotry had the rights 444
-installer-get-path-correctly.diff, pmladek
-
 # 1.12.1 was allowed before; we have 1.12.0 on older SUSE distros
 build-allow-system-cppunit-1.12.0.diff, pmladek
 
diff --git a/patches/dev300/installer-get-path-correctly.diff b/patches/dev300/installer-get-path-correctly.diff
deleted file mode 100644
index 913662b..0000000
--- a/patches/dev300/installer-get-path-correctly.diff
+++ /dev/null
@@ -1,20 +0,0 @@
----
- solenv/bin/modules/installer/pathanalyzer.pm |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git solenv/bin/modules/installer/pathanalyzer.pm solenv/bin/modules/installer/pathanalyzer.pm
-index 95fcb8c..aab3e86 100644
---- solenv/bin/modules/installer/pathanalyzer.pm
-+++ solenv/bin/modules/installer/pathanalyzer.pm
-@@ -39,7 +39,7 @@ sub get_path_from_fullqualifiedname
- 
-     if ( $$longfilenameref =~ /\Q$installer::globals::separator\E/ )	# Is there a separator in the path? Otherwise the path is empty.
-     {	
--        if ( $$longfilenameref =~ /^\s*(\S.*\S\Q$installer::globals::separator\E)(\S.+\S?)/ )
-+        if ( $$longfilenameref =~ /^\s*(.*\Q$installer::globals::separator\E)(.+)/ )
-         {
-             $$longfilenameref = $1;
-         }
--- 
-1.7.0.1
-