diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-09-02 14:37:23 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-03 08:18:03 +0000 |
| commit | 72699595aaa3ecb8975050b6dfc6fde437770493 (patch) | |
| tree | 11f1d8416f7d5e7fec2dc0c1cb4f196ea0a290fc /bin | |
| parent | d465e8273f1ee54450f0bf59c41bda93c54b3db4 (diff) | |
remove KDE3 support, --enable-kde and --enable-kdeab
With the new RHEL6-era baseline TDF can finally ship KDE4 support.
Change-Id: I227278b576a3ed2f2aaa751d41b469ca92dc78b3
Reviewed-on: https://gerrit.libreoffice.org/18267
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/distro-install-file-lists | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists index f011c0c80a32..988e8f01d95e 100755 --- a/bin/distro-install-file-lists +++ b/bin/distro-install-file-lists @@ -226,15 +226,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then mv_file_between_flists tde_list.txt common_list.txt $INSTALLDIR/program/libtdeabdrv1l..so add_used_directories tde_list.txt common_list.txt - # kde subpackage - test -f $DESTDIR/gid_Module_Optional_Kde && cp $DESTDIR/gid_Module_Optional_Kde kde_list.txt || : - mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/kdefilepicker - mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/fps_kdelo.so - mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/libvclplug_kdel..so - mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/libkab1l..so - mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/libkabdrv1l..so - add_used_directories kde_list.txt common_list.txt - # create kde4 subpackage mv_file_between_flists kde4_list.txt kde_list.txt $INSTALLDIR/program/kde4be1lo.so mv_file_between_flists kde4_list.txt common_list.txt $INSTALLDIR/program/libvclplug_kde4l..so @@ -421,7 +412,6 @@ else create_package_directory gid_Module_Pyuno pkg/python-uno create_package_directory gid_Module_Optional_Gnome pkg/libreoffice-gnome create_package_directory gid_Module_Optional_Tde pkg/libreoffice-tde - create_package_directory gid_Module_Optional_Kde pkg/libreoffice-kde create_package_directory gid_Module_Root_Files_2 pkg/libreoffice-common create_package_directory gid_Module_Root_Files_3 pkg/libreoffice-common @@ -493,7 +483,7 @@ else fi && ( cd pkg/libreoffice-common/$d find -maxdepth 1 \ - -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|tdefilepicker\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|uri-encode\)' \ + -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|tdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|uri-encode\)' \ -exec mv {} $DESTDIR/pkg/libreoffice-core/$d \; ); \ done |