diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-10-16 12:15:55 +0100 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2015-10-16 13:50:28 +0000 |
| commit | 3cf557c12d27f1b2250e69a543136da098112d80 (patch) | |
| tree | a4b988a42e3cef7a019f118914572063c0f73d37 /setup_native | |
| parent | e00697d9738196f11f331335b256d7bacc17277d (diff) | |
drop gconf integration as per ESC decision
Conflicts:
shell/source/backends/gconfbe/gconfbackend.cxx
Change-Id: I609ec83ec59f5ae8d3a8c9c09649695bfcb03b87
Reviewed-on: https://gerrit.libreoffice.org/19408
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/scripts/fake-db.spec | 2 | ||||
| -rw-r--r-- | setup_native/source/packinfo/packinfo_office.txt | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/setup_native/scripts/fake-db.spec b/setup_native/scripts/fake-db.spec index bf884682f7fb..a7a5c318bbcc 100644 --- a/setup_native/scripts/fake-db.spec +++ b/setup_native/scripts/fake-db.spec @@ -28,8 +28,6 @@ AutoReqProv: no #BuildRoot: %{_tmppath}/%{name}-root Provides: libgnomevfs-2.so.0 Provides: libgnomevfs-2.so.0()(64bit) -Provides: libgconf-2.so.4 -Provides: libgconf-2.so.4()(64bit) Provides: libfreetype.so.6 Provides: libfreetype.so.6()(64bit) Provides: /bin/sh diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt index 0eade32c6eae..1aa52fdb6da5 100644 --- a/setup_native/source/packinfo/packinfo_office.txt +++ b/setup_native/source/packinfo/packinfo_office.txt @@ -41,7 +41,7 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWgnome- packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-gnome-integration" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -findrequires = "find-requires-gnome.sh" +findrequires = "" copyright = "2015 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" |