[Mosaic] Fix hardcoded paths
commit 493ebf5d484733a8a49ff23865279a93bb8c406b
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Aug 30 01:54:14 2016 +0100
Fix hardcoded paths
Mosaic-2.7b5-Paths.patch | 46 ++++++++++++++++++++++++++++++++++++++++++++++
Mosaic.spec | 10 ++++++++--
2 files changed, 54 insertions(+), 2 deletions(-)
---
diff --git a/Mosaic-2.7b5-Paths.patch b/Mosaic-2.7b5-Paths.patch
new file mode 100644
index 0000000..8c12fdc
--- /dev/null
+++ b/Mosaic-2.7b5-Paths.patch
@@ -0,0 +1,46 @@
+--- a/src/xresources.h
++++ b/src/xresources.h
+@@ -263,7 +265,7 @@
+
+ { "documentsMenuSpecfile", "DocumentsMenuSpecfile", XtRString,
sizeof (char *),
+ offset (documents_menu_specfile), XtRString,
+- "/usr/local/lib/mosaic/documents.menu" },
++ "~/.local/share/mosaic/documents.menu" },
+
+ { "reloadReloadsImages", "ReloadReloadsImages", XtRBoolean, sizeof
(Boolean),
+ offset (reload_reloads_images), XtRString, "False" },
+@@ -477,11 +486,11 @@
+
+ { "proxySpecfile", "ProxySpecfile", XtRString, sizeof (char *),
+ offset (proxy_specfile), XtRString,
+- "/usr/local/lib/mosaic/proxy" },
++ "~/.local/share/mosaic/proxy" },
+
+ { "noproxySpecfile", "NoproxySpecfile", XtRString, sizeof (char
*),
+ offset (noproxy_specfile), XtRString,
+- "/usr/local/lib/mosaic/no_proxy" },
++ "~/.local/share/mosaic/no_proxy" },
+
+ { "useScreenGamma", "UseScreenGamma", XtRBoolean, sizeof
(Boolean),
+ offset (useScreenGamma), XtRString, "False" },
+
+--- a/src/mosaic.h
++++ b/src/mosaic.h
+@@ -170,14 +170,14 @@
+
+ #ifndef DOCUMENTS_MENU_SPECFILE
+ #define DOCUMENTS_MENU_SPECFILE \
+- "/usr/local/lib/mosaic/documents.menu"
++ "~/.local/share/mosaic/documents.menu"
+ #endif /* not DOCUMENTS_MENU_SPECFILE */
+
+ #ifndef GLOBAL_EXTENSION_MAP
+-#define GLOBAL_EXTENSION_MAP "/usr/local/lib/mosaic/mime.types"
++#define GLOBAL_EXTENSION_MAP "~/.local/share/mosaic/mime.types"
+ #endif
+ #ifndef GLOBAL_TYPE_MAP
+-#define GLOBAL_TYPE_MAP "/usr/local/lib/mosaic/mailcap"
++#define GLOBAL_TYPE_MAP "~/.local/share/mosaic/mailcap"
+ #endif
+
+
diff --git a/Mosaic.spec b/Mosaic.spec
index 58cf15e..1434614 100644
--- a/Mosaic.spec
+++ b/Mosaic.spec
@@ -1,6 +1,6 @@
Name: Mosaic
Version: 2.7
-Release: 0.5.b5%{?dist}
+Release: 0.6.b5%{?dist}
Summary: Web Browser
Group: Applications/Internet
@@ -16,6 +16,7 @@ Patch3: Mosaic-2.7b5-script.patch
Patch4: Mosaic-2.7b5-hash_url.patch
Patch5: Mosaic-2.7b5-redirect.patch
Patch6: Mosaic-2.7b5-gcc-compile.patch
+Patch7: Mosaic-2.7b5-Paths.patch
BuildRequires: openmotif-devel
BuildRequires: libjpeg-devel libpng-devel
@@ -38,6 +39,7 @@ displaying images inline with text.
%patch4 -p1 -b .hash_url
%patch5 -p1 -b .redirect
%patch6 -p1 -b .gcc
+%patch7 -p1 -b .paths
%build
autoconf
@@ -71,7 +73,8 @@ desktop-file-install %{SOURCE1} \
%files
-%doc README.resources.html
+%doc README.resources.html mosaic-user-defs
+%doc mosaic-imageselect-sites mosaic-spoof-agents
%doc CHANGES FEATURES INSTALL README
%license COPYRIGHT
%{_bindir}/Mosaic
@@ -80,6 +83,9 @@ desktop-file-install %{SOURCE1} \
%changelog
+* Tue Aug 30 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.7-0.6.b5
+- Fix hardcoded paths
+
* Mon Aug 15 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.7-0.5.b5
- Patch for libpng changes
- Patch for gcc changes