[cinepaint] - Fixing the cinepaintrc filename -> plug-ins are reachable without intervention - Fixing the defaul

[Jaromír Cápík]

commit 8231b74f3f9140c5799123025ac3c268eae7b763
Author: Jaromir Capik <jcapik at redhat.com>
Date:   Tue Feb 25 15:23:38 2014 +0100

    - Fixing the cinepaintrc filename -> plug-ins are reachable without intervention
    - Fixing the default ICC profile path
    - Fixing the hardcoded library path in the blur plug-in check

 ...ty.patch => cinepaint-1.4-format-security.patch |    0
 cinepaint-1.4-lib64.patch                          |   12 ++++++++++++
 cinepaint.spec                                     |   20 +++++++++++++++++---
 3 files changed, 29 insertions(+), 3 deletions(-)
---
diff --git a/cinepaint-format-security.patch b/cinepaint-1.4-format-security.patch
similarity index 100%
rename from cinepaint-format-security.patch
rename to cinepaint-1.4-format-security.patch
diff --git a/cinepaint-1.4-lib64.patch b/cinepaint-1.4-lib64.patch
new file mode 100644
index 0000000..8bd9206
--- /dev/null
+++ b/cinepaint-1.4-lib64.patch
@@ -0,0 +1,12 @@
+diff -Naur cinepaint-1.0-4.orig/app/main.c cinepaint-1.0-4/app/main.c
+--- cinepaint-1.0-4.orig/app/main.c	2014-02-24 15:26:46.000000000 +0100
++++ cinepaint-1.0-4/app/main.c	2014-02-25 13:46:43.976939890 +0100
+@@ -198,7 +198,7 @@
+       char *t = malloc((strlen(text)+1024)*2);
+       FILE *fp;
+ 
+-      sprintf( t,"%s%slib%scinepaint%s%s%splug-ins%sblur",
++      sprintf( t,"%s%slib64%scinepaint%s%s%splug-ins%sblur",
+                text, DIR_SEPARATOR, DIR_SEPARATOR,
+                DIR_SEPARATOR, PROGRAM_VERSION, DIR_SEPARATOR, DIR_SEPARATOR);
+       fp = fopen(t,"r");
diff --git a/cinepaint.spec b/cinepaint.spec
index e9002e2..ab107a3 100644
--- a/cinepaint.spec
+++ b/cinepaint.spec
@@ -30,7 +30,9 @@ Patch30:        icc_examin-0.51-x11.patch
 Patch31:        cinepaint-1.4-png.patch
 Patch32:        cinepaint-1.4-oy040.patch
 Patch33:        cinepaint-1.4-no-oyranos.patch
-Patch34:        cinepaint-format-security.patch
+Patch34:        cinepaint-1.4-format-security.patch
+Patch35:        cinepaint-1.4-lib64.patch
+
 
 #ifnarch %%{ix86} ppc
 BuildRequires:  autoconf libtool
@@ -117,9 +119,15 @@ This package contains development files for %{name}.
 %patch32 -p1 -b .oy040
 %patch33 -p1 -b .no_oy
 %patch34 -p1 -b .fmtsec
+%if "%{_lib}" == "lib64"
+%patch35 -p1 -b .lib64
+%endif
 
 cp -af %{SOURCE2} .
 
+# fixing default ICC profile path (owned by icc-profiles-openicc) (FIXME: Bug 1069672)
+sed -i 's|/usr/share/color/icc/sRGB.icc|/usr/share/color/icc/OpenICC/sRGB.icc|' gimprc.in
+
 # Update bundled version of icc_examin
 #rm -rf plug-ins/icc_examin/icc_examin
 #cp -pR icc_examin-%{icc_version} plug-ins/icc_examin/icc_examin
@@ -184,14 +192,17 @@ desktop-file-install \
   --mode 644                                         \
 ${RPM_BUILD_ROOT}%{_datadir}/applications/cinepaint.desktop
 
-# Fix multilib cinepaint-devel
+# fix multilib cinepaint-devel
 sed -i -e 's|plug_in_dir=%{_libdir}/cinepaint/%{cinever}|plug_in_dir="$(pkg-config --variable programplugindir cinepaint-gtk)"|' \
   ${RPM_BUILD_ROOT}%{_bindir}/cinepainttool
 touch -r ChangeLog ${RPM_BUILD_ROOT}%{_bindir}/cinepainttool
 
-#Remove bundled fonts
+# remove bundled fonts
 rm -rf $RPM_BUILD_ROOT%{_datadir}/fonts
 
+# rename gimprc to cinepaintrc
+mv -f $RPM_BUILD_ROOT%{_datadir}/cinepaint/%{upstream_version}/gimprc \
+      $RPM_BUILD_ROOT%{_datadir}/cinepaint/%{upstream_version}/cinepaintrc
 
 %find_lang %{name}
 %find_lang cinepaint-script-fu
@@ -239,6 +250,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %changelog
 * Mon Feb 24 2014 Jaromir Capik <jcapik at redhat.com> - 1.4-5
 - Replacing the png patch with the upstream one (thx to Nick Black)
+- Fixing the cinepaintrc filename -> plug-ins are reachable without intervention
+- Fixing the default ICC profile path
+- Fixing the hardcoded library path in the blur plug-in check
 
 * Mon Feb 17 2014 Jaromir Capik <jcapik at redhat.com> - 1.4-4
 - Fixing format-security flaws (#1037014)