[packages/icc_examin] - added pld patch (avoid including issue.net in C code, failed miserably on PLD)

qboosh qboosh at pld-linux.org
Sun Mar 31 21:41:20 CEST 2013


commit 5db5d379baeab8a99650e1f1308e12f3886c0241
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Mar 31 21:41:09 2013 +0200

    - added pld patch (avoid including issue.net in C code, failed miserably on PLD)

 icc_examin-pld.patch | 27 +++++++++++++++++++++++++++
 icc_examin.spec      |  2 ++
 2 files changed, 29 insertions(+)
---
diff --git a/icc_examin.spec b/icc_examin.spec
index cf0f8cc..0756cc3 100644
--- a/icc_examin.spec
+++ b/icc_examin.spec
@@ -9,6 +9,7 @@ Source0:	http://downloads.sourceforge.net/oyranos/%{name}-%{version}.tar.bz2
 # Source0-md5:	4add0302cc7978549335f507d711605c
 Patch0:		%{name}-configure.patch
 Patch1:		%{name}-paths.patch
+Patch2:		%{name}-pld.patch
 URL:		http://www.oyranos.org/icc-examin
 BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	fltk-devel >= 1.1.4
@@ -46,6 +47,7 @@ tablic gamma kart graficznych.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 export CC="%{__cc}"
diff --git a/icc_examin-pld.patch b/icc_examin-pld.patch
new file mode 100644
index 0000000..8852da3
--- /dev/null
+++ b/icc_examin-pld.patch
@@ -0,0 +1,27 @@
+--- icc_examin-0.54/configure.orig	2013-01-11 12:55:26.676880980 +0100
++++ icc_examin-0.54/configure	2013-03-31 21:11:35.026149419 +0200
+@@ -345,6 +345,11 @@
+       test -n $ECHO && $ECHO $e "$echo_" >> $CONF_LOG; test -n "$INFOECHO" && $INFOECHO "$echo_"
+         DISTNAME="$echo_"
+       SYS=1; fi
++    if [ -f /etc/pld-release ]; then
++      echo_="`cat /etc/pld-release`"
++      test -n $ECHO && $ECHO $e "$echo_" >> $CONF_LOG; test -n "$INFOECHO" && $INFOECHO "$echo_"
++        DISTNAME="$echo_"
++      SYS=1; fi
+     if [ -f /etc/debian_version ]; then
+       if [ -f /etc/issue.net ]; then
+         echo_="`cat /etc/issue.net || cat /etc/debian_version`"
+@@ -352,10 +357,7 @@
+         DISTNAME="$echo_"
+         SYS=2; fi; fi
+     if [ $SYS -eq 0 ]; then
+-      if [ -f /etc/issue.net ]; then
+-        echo_="`cat /etc/issue.net`"
+-        test -n $ECHO && $ECHO $e "$echo_" >> $CONF_LOG; test -n "$INFOECHO" && $INFOECHO "$echo_"
+-        DISTNAME="$echo_"
+-    fi; fi
++      DISTNAME="Linux"
++    fi
+     OSUNAME=Linux
+   else
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/icc_examin.git/commitdiff/5db5d379baeab8a99650e1f1308e12f3886c0241



More information about the pld-cvs-commit mailing list