Fri Mar 7 18:58:12 UTC 2008

Author: kwizart

Update of /cvs/pkgs/rpms/oyranos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19288/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README-Fedora-ICC_PROFILES oyranos-0.1.7-default.patch 
	oyranos-0.1.7-fix_bash.patch oyranos-0.1.7-fix_pc.patch 
	oyranos-0.1.7-install_p.patch oyranos-0.1.7-man-1_3.patch 
	oyranos-0.1.7-rm_class.patch oyranos-0.1.7-rpath.patch 
	oyranos-0.1.7-shared_NVCtrl.patch 
	oyranos-0.1.7-sw_elektra.patch oyranos-repack.sh oyranos.spec 
Log Message:
Initial import

--- NEW FILE README-Fedora-ICC_PROFILES ---
README-Fedora-ICC_PROFILES

Fedora does not currently redistribute icc profiles.
You need to download them manually for now.

They need to be placed in ~/.color/icc
or /usr/share/color/icc (for system wide access).

See:
http://www.behrmann.name
http://www.colormanagement.org
http://www.eci.org
http://www.littlecms.com/profiles.zip
http://www.photogamut.org

oyranos-0.1.7-default.patch:

--- NEW FILE oyranos-0.1.7-default.patch ---
diff -up oyranos-0.1.7/settings/prepress.policy.xml.default oyranos-0.1.7/settings/prepress.policy.xml
--- oyranos-0.1.7/settings/prepress.policy.xml.default	2008-02-28 00:06:03.000000000 +0100
+++ oyranos-0.1.7/settings/prepress.policy.xml	2008-02-28 00:07:39.000000000 +0100
@@ -18,15 +18,15 @@
 
   <!-- Editing XYZ
        Prefered XYZ Editing Colour Space -->
-  <oyEDITING_XYZ>XYZ.icc</oyEDITING_XYZ>
+  <oyEDITING_XYZ>LCMSXYZI.ICM</oyEDITING_XYZ>
 
   <!-- Editing Lab
        Prefered CIE*Lab Editing Colour Space -->
-  <oyEDITING_LAB>Lab.icc</oyEDITING_LAB>
+  <oyEDITING_LAB>LCMSLABI.ICM</oyEDITING_LAB>
 
   <!-- Assumed XYZ source
        Assigning an untagged XYZ Image an colour space -->
-  <oyASSUMED_XYZ>XYZ.icc</oyASSUMED_XYZ>
+  <oyASSUMED_XYZ>LCMSXYZI.ICM</oyASSUMED_XYZ>
 
   <!-- Assumed Lab source
        Assigning an untagged CIE*Lab Image an colour space -->
diff -up oyranos-0.1.7/settings/office.policy.xml.default oyranos-0.1.7/settings/office.policy.xml
--- oyranos-0.1.7/settings/office.policy.xml.default	2008-02-28 00:03:30.000000000 +0100
+++ oyranos-0.1.7/settings/office.policy.xml	2008-02-28 00:04:59.000000000 +0100
@@ -18,19 +18,19 @@
 
   <!-- Editing XYZ
        Prefered XYZ Editing Colour Space -->
-  <oyEDITING_XYZ>XYZ.icc</oyEDITING_XYZ>
+  <oyEDITING_XYZ>LCMSXYZI.ICM</oyEDITING_XYZ>
 
   <!-- Editing Lab
        Prefered CIE*Lab Editing Colour Space -->
-  <oyEDITING_LAB>Lab.icc</oyEDITING_LAB>
+  <oyEDITING_LAB>LCMSLABI.ICM</oyEDITING_LAB>
 
   <!-- Assumed XYZ source
        Assigning an untagged XYZ Image an colour space -->
-  <oyASSUMED_XYZ>XYZ.icc</oyASSUMED_XYZ>
+  <oyASSUMED_XYZ>LCMSXYZI.ICM</oyASSUMED_XYZ>
 
   <!-- Assumed Lab source
        Assigning an untagged CIE*Lab Image an colour space -->
-  <oyASSUMED_LAB>Lab.icc</oyASSUMED_LAB>
+  <oyASSUMED_LAB>LCMSLABI.ICM</oyASSUMED_LAB>
 
   <!-- Assumed Rgb source
        Assigning an untagged Rgb Image an colour space -->
diff -up oyranos-0.1.7/settings/photographer.policy.xml.default oyranos-0.1.7/settings/photographer.policy.xml
--- oyranos-0.1.7/settings/photographer.policy.xml.default	2008-02-28 00:05:56.000000000 +0100
+++ oyranos-0.1.7/settings/photographer.policy.xml	2008-02-28 00:06:55.000000000 +0100
@@ -18,15 +18,15 @@
 
   <!-- Editing XYZ
        Prefered XYZ Editing Colour Space -->
-  <oyEDITING_XYZ>XYZ.icc</oyEDITING_XYZ>
+  <oyEDITING_XYZ>LCMSXYZI.ICM</oyEDITING_XYZ>
 
   <!-- Editing Lab
        Prefered CIE*Lab Editing Colour Space -->
-  <oyEDITING_LAB>Lab.icc</oyEDITING_LAB>
+  <oyEDITING_LAB>LCMSLABI.ICM</oyEDITING_LAB>
 
   <!-- Assumed XYZ source
        Assigning an untagged XYZ Image an colour space -->
-  <oyASSUMED_XYZ>XYZ.icc</oyASSUMED_XYZ>
+  <oyASSUMED_XYZ>LCMSXYZI.ICM</oyASSUMED_XYZ>
 
   <!-- Assumed Lab source
        Assigning an untagged CIE*Lab Image an colour space -->
diff -up oyranos-0.1.7/settings/designer.policy.xml.default oyranos-0.1.7/settings/designer.policy.xml
--- oyranos-0.1.7/settings/designer.policy.xml.default	2008-02-28 00:08:10.000000000 +0100
+++ oyranos-0.1.7/settings/designer.policy.xml	2008-02-28 00:08:38.000000000 +0100
@@ -18,15 +18,15 @@
 
   <!-- Editing XYZ
        Prefered XYZ Editing Colour Space -->
-  <oyEDITING_XYZ>XYZ.icc</oyEDITING_XYZ>
+  <oyEDITING_XYZ>LCMSXYZI.ICM</oyEDITING_XYZ>
 
   <!-- Editing Lab
        Prefered CIE*Lab Editing Colour Space -->
-  <oyEDITING_LAB>Lab.icc</oyEDITING_LAB>
+  <oyEDITING_LAB>LCMSLABI.ICM</oyEDITING_LAB>
 
   <!-- Assumed XYZ source
        Assigning an untagged XYZ Image an colour space -->
-  <oyASSUMED_XYZ>XYZ.icc</oyASSUMED_XYZ>
+  <oyASSUMED_XYZ>LCMSXYZI.ICM</oyASSUMED_XYZ>
 
   <!-- Assumed Lab source
        Assigning an untagged CIE*Lab Image an colour space -->

oyranos-0.1.7-fix_bash.patch:

--- NEW FILE oyranos-0.1.7-fix_bash.patch ---
diff -up oyranos-0.1.7/configure.sh.fix_bash oyranos-0.1.7/configure.sh
--- oyranos-0.1.7/configure.sh.fix_bash	2008-03-04 12:59:25.000000000 +0100
+++ oyranos-0.1.7/configure.sh	2008-03-04 12:59:25.000000000 +0100
@@ -418,7 +418,6 @@ if [ -n "$DEBUG" ] && [ $DEBUG -gt 0 ]; 
         DEBUG_="-Wall -g -DDEBUG --pedantic"
         test -f "$i/makefile".in && echo "DEBUG = $DEBUG_"  >> "$i/makefile"
         test -f "$i/makefile".in && echo "DEBUG_SWITCH = -v"  >> "$i/makefile"
-      else
       fi
     done
   fi
diff -up oyranos-0.1.7/configure.fix_bash oyranos-0.1.7/configure
--- oyranos-0.1.7/configure.fix_bash	2008-03-04 12:59:25.000000000 +0100
+++ oyranos-0.1.7/configure	2008-03-04 13:18:24.000000000 +0100
@@ -25,7 +25,7 @@ else
 fi
 MAKEFILE_DIR=". fl_i18n $PROFILE_DIR"; export MAKEFILE_DIR
 
-export CONF_H CONF CONF_I18N CONF_NV
+export CONF_H CONF CONF_I18N
 
 VERSION_A=0
 VERSION_B=1
@@ -375,8 +375,6 @@ test -n "$ECHO" && $ECHO "CXX = $CXX" >>
 test -n "$ECHO" && $ECHO "CC = $CC" >> $CONF
 test -n "$ECHO" && $ECHO "CXX = $CXX" >> $CONF_I18N
 test -n "$ECHO" && $ECHO "CC = $CC" >> $CONF_I18N
-test -n "$ECHO" && $ECHO "CXX = $CXX" >> $CONF_NV
-test -n "$ECHO" && $ECHO "CC = $CC" >> $CONF_NV
 export CC CXX
 
 CFLAGS_COMMON="`echo $CFLAGS | $STRIPOPT` \$(DEBUG) \$(INCL)"
@@ -417,7 +415,6 @@ export internalelektra
 # set some compiler and linker options
 
 test -n "$ECHO" && $ECHO "RM = rm -vf" >> $CONF
-test -n "$ECHO" && $ECHO "RM = rm -vf" >> $CONF_NV
 if [ $OSUNAME = "Darwin" ]; then
   test -n "$ECHO" && $ECHO "LIBEXT = .dylib" >> $CONF
   GCC_VERSION_INFO="-Wl,-compatibility_version -Wl,$VERSION_ABI_A -Wl,-current_version -Wl,$VERSION_ABI_A.$VERSION_ABI_B"
@@ -579,7 +576,6 @@ test -n "$ECHO" && $ECHO "prefix=$prefix
 test -n "$ECHO" && $ECHO "exec_prefix=$exec_prefix" >> $CONF_SH
 test -n "$ECHO" && $ECHO "bindir=$bindir" >> $CONF_SH
 test -n "$ECHO" && $ECHO "sbindir=$sbindir" >> $CONF_SH
-test -n "$ECHO" && $ECHO "libdir=$libdir" >> $CONF_SH
 test -n "$ECHO" && $ECHO "includedir=$includedir" >> $CONF_SH
 test -n "$ECHO" && $ECHO "datadir=$datadir" >> $CONF_SH
 test -n "$ECHO" && $ECHO "mandir=$mandir" >> $CONF_SH
@@ -727,7 +723,6 @@ CFLAGS="$CFLAGS_COMMON `echo $CFLAGS | $
 CXXFLAGS="$CXXFLAGS_COMMON `echo $CXXFLAGS | $STRIPOPT`"
 LDFLAGS="`echo $LDFLAGS | $STRIPOPT` \$(dl)"
 
-test -n "$ECHO" && $ECHO "CFLAGS=$CFLAGS"     >> $CONF_NV
 test -n "$ECHO" && $ECHO "CFLAGS = $CFLAGS"   >> $CONF_I18N
 test -n "$ECHO" && $ECHO "CXXFLAGS = $CXXFLAGS">>$CONF_I18N
 test -n "$ECHO" && $ECHO "LDFLAGS = $LDFLAGS" >> $CONF_I18N

oyranos-0.1.7-fix_pc.patch:

--- NEW FILE oyranos-0.1.7-fix_pc.patch ---
diff -up oyranos-0.1.7/oyranos_monitor.pc.in.fix_pc oyranos-0.1.7/oyranos_monitor.pc.in
--- oyranos-0.1.7/oyranos_monitor.pc.in.fix_pc	2006-04-13 11:30:25.000000000 +0200
+++ oyranos-0.1.7/oyranos_monitor.pc.in	2008-03-07 15:45:39.000000000 +0100
@@ -1,7 +1,7 @@
-includedir=${prefix}/include
 
-Name: oyranos
+Name: oyranos_monitor
 Description: Oyranos Colour Management System
-Libs: -L${libdir} -loyranos -loyranos_moni -X11 -Xinerama
+Requires: x11 xinerama oyranos
+Libs: -L${libdir} -loyranos_moni
 Cflags: -I${includedir}
 
diff -up oyranos-0.1.7/oyranos-config.in.fix_pc oyranos-0.1.7/oyranos-config.in
--- oyranos-0.1.7/oyranos-config.in.fix_pc	2007-04-03 15:53:41.000000000 +0200
+++ oyranos-0.1.7/oyranos-config.in	2008-03-07 16:03:11.000000000 +0100
@@ -1,3 +1,9 @@
+
+ELEKTRA_VERSION=`pkg-config --modversion elektra`
+export ELEKTRA_VERSION
+libdir=`pkg-config x11 --variable libdir`
+export libdir
+
 if [ -n "$PKG_CONFIG_PATH" ]; then
   PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$libdir/pkgconfig
 else
@@ -82,6 +88,7 @@ if [ "$echo_help" = "yes" ]; then
   echo "  $0 --settingsdirname   Oyranos settings directory name"
 fi
 
+if [ -f liboyranos.so ]; then
 if [ -z $ELEKTRA_VERSION ]; then
   elektra_dyn="`pkg-config --libs elektra`"
   if [ -f $libdir/libelektra.a ]; then
@@ -102,6 +109,7 @@ else
     elektra="$libdir/lib${TARGET}_elektra.a $dl $iconv $intl"
   fi
 fi
+fi
 
 if [ "$echo_cflags" = "yes" ]; then
   echo "-I$prefix/include"
@@ -111,7 +119,7 @@ if [ "$echo_ldflags" = "yes" ]; then
   if [ -f liboyranos.so ]; then
     echo "-L. -loyranos $elektra_dyn $oyranos_add"
   else
-    echo "-L$libdir -loyranos $elektra_dyn $oyranos_add"
+    pkg-config --libs oyranos
   fi
 fi
 
@@ -127,13 +135,13 @@ if [ "$echo_ld_x_flags" = "yes" ]; then
   if [ -f liboyranos.so ]; then
     echo "-L. -loyranos -loyranos_moni $elektra_dyn $oyranos_add"
   else
-    echo "-L$libdir -loyranos -loyranos_moni $elektra_dyn $oyranos_add"
+    pkg-config --libs oyranos_monitor
   fi
 fi
 
 # only standard paths are here supported
-if [ -f /usr/lib/libX11.so ]; then
-  X11_PATH=-L/usr/lib
+if [ -f $libdir/libX11.so ]; then
+  X11_PATH=-L$libdir
 fi
 if [ -f /usr/local/lib/libX11.so ]; then
   X11_PATH=-L/usr/local/lib

oyranos-0.1.7-install_p.patch:

--- NEW FILE oyranos-0.1.7-install_p.patch ---
--- oyranos-0.1.7/configure.install_p	2007-06-18 01:22:09.000000000 +0200
+++ oyranos-0.1.7/configure	2007-06-18 01:25:09.000000000 +0200
@@ -435,7 +435,7 @@
   test -n "$ECHO" && $ECHO "REZ = fltk-config --post \$@" >> $CONF
   test -n "$ECHO" && $ECHO "I18N_LIB = \$(iconv) \$(intl) \$(LIBNAMEV)" >> $CONF
   test -n "$ECHO" && $ECHO "I18N_LIBSTAT = \$(iconv) \$(intl) \$(LIBNAMEV)" >> $CONF
-  INSTALL="install $DEBUG_SWITCH"
+  INSTALL="install -p $DEBUG_SWITCH"
   oyranos_add="-framework ApplicationServices \$dl"
   oyranos_x_add=""
 else
@@ -462,7 +462,7 @@
     test -n "$ECHO" && $ECHO "MAKEDEPEND	= makedepend -Y" >> $CONF
     CFLAGS="$CFLAGS -fPIC -DPIC"
     CXXFLAGS="$CXXFLAGS -fPIC -DPIC"
-    INSTALL="install $DEBUG_SWITCH"
+    INSTALL="install -p $DEBUG_SWITCH"
   else
     test -n "$ECHO" && $ECHO "COPY = cp -p" >> $CONF
     if [ $OSUNAME = "BSD" ]; then
@@ -471,14 +471,14 @@
       test -n "$ECHO" && $ECHO "LINK_NAME_M = -Wl,-soname -Wl,\$(LIB_MONI_SONAMEFULL)" >> $CONF
       test -n "$ECHO" && $ECHO "LINK_LIB_PATH = -Wl,\$(libdir)" >> $CONF
       test -n "$ECHO" && $ECHO "LINK_SRC_PATH = -Wl,\$(srcdir)" >> $CONF
-      INSTALL="install $DEBUG_SWITCH"
+      INSTALL="install -p $DEBUG_SWITCH"
     fi
     if [ $OSUNAME = "SunOS" ]; then
       LDFLAGS="$LDFLAGS -mimpure-text"
       INSTALL="install"
     else
       LDFLAGS="$LDFLAGS"
-      INSTALL="install"
+      INSTALL="install -p"
     fi
     test -n "$ECHO" && $ECHO "I18N_LIB = \$(iconv) \$(intl) \$(LIBNAMEV)" >> $CONF
     test -n "$ECHO" && $ECHO "I18N_LIBSTAT = \$(iconv) \$(intl) \$(LIBNAMEV)" >> $CONF
@@ -737,9 +737,9 @@
 test -n "$ECHO" && $ECHO "CFLAGS = $CFLAGS"   >> $CONF
 test -n "$ECHO" && $ECHO "CXXFLAGS = $CXXFLAGS">>$CONF
 test -n "$ECHO" && $ECHO "LDFLAGS = $LDFLAGS" >> $CONF
-test -n "$ECHO" && $ECHO "INSTALL = $INSTALL" >> $CONF
-test -n "$ECHO" && $ECHO "INSTALL = $INSTALL" >> $ECI_CONF
-test -n "$ECHO" && $ECHO "INSTALL = $INSTALL" >> $BASE_CONF
+test -n "$ECHO" && $ECHO "INSTALL = $INSTALL -p" >> $CONF
+test -n "$ECHO" && $ECHO "INSTALL = $INSTALL -p" >> $ECI_CONF
+test -n "$ECHO" && $ECHO "INSTALL = $INSTALL -p" >> $BASE_CONF
 
 test -n "$ECHO" && $ECHO "" >> $CONF
 test -n "$ECHO" && $ECHO "" >> $CONF

oyranos-0.1.7-man-1_3.patch:

--- NEW FILE oyranos-0.1.7-man-1_3.patch ---
diff -up oyranos-0.1.7/oyranos-config-fltk.1.man-1_3 oyranos-0.1.7/oyranos-config-fltk.1
--- oyranos-0.1.7/oyranos-config-fltk.1.man-1_3	2008-03-04 13:08:38.000000000 +0100
+++ oyranos-0.1.7/oyranos-config-fltk.1	2008-03-04 13:08:44.000000000 +0100
@@ -15,6 +15,6 @@ www.oyranos.org/wiki/index.php?title=Oyr
 .SH AUTHOR
 Kai-Uwe Behrmann (ku.b (at) gmx.de)
 .SH "SEE ALSO"
-oyranos-config(1) oyranos-policy(1) oyranos-monitor(1) oyranos(3)
+oyranos-config(3) oyranos-policy(1) oyranos-monitor(1) oyranos(3)
 .SH BUGS
 at: http://sourceforge.net/tracker/?group_id=177017&atid=879553
diff -up oyranos-0.1.7/oyranos.3.man-1_3 oyranos-0.1.7/oyranos.3
--- oyranos-0.1.7/oyranos.3.man-1_3	2008-03-04 13:06:20.000000000 +0100
+++ oyranos-0.1.7/oyranos.3	2008-03-04 13:06:27.000000000 +0100
@@ -25,6 +25,6 @@ http://www.oyranos.org/doc/html/index.ht
 .SH AUTHOR
 Kai-Uwe Behrmann (ku.b (at) gmx.de)
 .SH "SEE ALSO"
-oyranos-config(1) oyranos-policy(1) oyranos-monitor(1)
+oyranos-config(3) oyranos-policy(1) oyranos-monitor(1)
 .SH BUGS
 at: http://sourceforge.net/tracker/?group_id=177017&atid=879553
diff -up oyranos-0.1.7/oyranos-policy.1.man-1_3 oyranos-0.1.7/oyranos-policy.1
--- oyranos-0.1.7/oyranos-policy.1.man-1_3	2008-03-04 13:08:16.000000000 +0100
+++ oyranos-0.1.7/oyranos-policy.1	2008-03-04 13:08:42.000000000 +0100
@@ -20,6 +20,6 @@ Dump the current policy:
 .SH AUTHOR
 Kai-Uwe Behrmann (ku.b (at) gmx.de)
 .SH "SEE ALSO"
-oyranos-config(1) oyranos-policy(1) oyranos-monitor(1) oyranos(3)
+oyranos-config(3) oyranos-policy(1) oyranos-monitor(1) oyranos(3)
 .SH BUGS
 at: http://sourceforge.net/tracker/?group_id=177017&atid=879553
diff -up oyranos-0.1.7/oyranos-config.1.man-1_3 oyranos-0.1.7/oyranos-config.1
--- oyranos-0.1.7/oyranos-config.1.man-1_3	2008-03-04 13:07:00.000000000 +0100
+++ oyranos-0.1.7/oyranos-config.1	2008-03-04 13:07:14.000000000 +0100
@@ -1,4 +1,4 @@
-.TH "oyranos-config" 1 "February 20, 2007" "User Commands"
+.TH "oyranos-config" 3 "February 20, 2007" "User Commands"
 .SH NAME
 oyranos-config \- Oyranos CMS configuration query for builds and locations
 .SH SYNOPSIS

oyranos-0.1.7-rm_class.patch:

--- NEW FILE oyranos-0.1.7-rm_class.patch ---
diff -up oyranos-0.1.7/Doxyfile.rm_class oyranos-0.1.7/Doxyfile
--- oyranos-0.1.7/Doxyfile.rm_class	2008-03-04 16:09:04.000000000 +0100
+++ oyranos-0.1.7/Doxyfile	2008-03-04 16:09:56.000000000 +0100
@@ -203,8 +203,8 @@ PERL_PATH              = /usr/bin/perl
 CLASS_DIAGRAMS         = YES
 HIDE_UNDOC_RELATIONS   = YES
 HAVE_DOT               = YES
-CLASS_GRAPH            = YES
-COLLABORATION_GRAPH    = YES
+CLASS_GRAPH            = NO
+COLLABORATION_GRAPH    = NO
 UML_LOOK               = YES
 TEMPLATE_RELATIONS     = NO
 INCLUDE_GRAPH          = NO

oyranos-0.1.7-rpath.patch:

--- NEW FILE oyranos-0.1.7-rpath.patch ---
--- oyranos-0.1.7/configure.rpath	2007-04-03 15:50:01.000000000 +0200
+++ oyranos-0.1.7/configure	2007-06-18 00:59:01.000000000 +0200
@@ -457,8 +457,8 @@
     test -n "$ECHO" && $ECHO "LINK_FLAGS_STATIC =" >> $CONF
     test -n "$ECHO" && $ECHO "LINK_NAME = -Wl,-soname -Wl,\$(LIBSONAMEFULL)" >> $CONF
     test -n "$ECHO" && $ECHO "LINK_NAME_M = -Wl,-soname -Wl,\$(LIB_MONI_SONAMEFULL)" >> $CONF
-    test -n "$ECHO" && $ECHO "LINK_LIB_PATH = -Wl,--rpath -Wl,\$(libdir)" >> $CONF
-    test -n "$ECHO" && $ECHO "LINK_SRC_PATH = -Wl,--rpath -Wl,\$(srcdir)" >> $CONF
+    test -n "$ECHO" && $ECHO "LINK_LIB_PATH = -Wl,-L\$(libdir)" >> $CONF
+    test -n "$ECHO" && $ECHO "LINK_SRC_PATH =Â -Wl,\$(srcdir)" >> $CONF
     test -n "$ECHO" && $ECHO "MAKEDEPEND	= makedepend -Y" >> $CONF
     CFLAGS="$CFLAGS -fPIC -DPIC"
     CXXFLAGS="$CXXFLAGS -fPIC -DPIC"
@@ -469,8 +469,8 @@
       LDFLAGS="$LDFLAGS"
       test -n "$ECHO" && $ECHO "LINK_NAME = -Wl,-soname -Wl,\$(LIBSONAMEFULL)" >> $CONF
       test -n "$ECHO" && $ECHO "LINK_NAME_M = -Wl,-soname -Wl,\$(LIB_MONI_SONAMEFULL)" >> $CONF
-      test -n "$ECHO" && $ECHO "LINK_LIB_PATH = -Wl,--rpath -Wl,\$(libdir)" >> $CONF
-      test -n "$ECHO" && $ECHO "LINK_SRC_PATH = -Wl,--rpath -Wl,\$(srcdir)" >> $CONF
+      test -n "$ECHO" && $ECHO "LINK_LIB_PATH = -Wl,-L\$(libdir)" >> $CONF
+      test -n "$ECHO" && $ECHO "LINK_SRC_PATH = -Wl,\$(srcdir)" >> $CONF
       INSTALL="install $DEBUG_SWITCH"
     fi
     if [ $OSUNAME = "SunOS" ]; then

oyranos-0.1.7-shared_NVCtrl.patch:

--- NEW FILE oyranos-0.1.7-shared_NVCtrl.patch ---
--- oyranos-0.1.7/configure.NVCtrl	2007-07-26 17:36:56.000000000 +0200
+++ oyranos-0.1.7/configure	2007-07-26 17:36:56.000000000 +0200
@@ -8,7 +8,6 @@
 CONF_H=config.h
 CONF=makefile
 CONF_SH=$TARGET-config
-CONF_NV=libXNVCtrl/makefile
 CONF_I18N=fl_i18n/makefile
 SPEC=$TARGET.spec
 SPECICC=$TARGET-icc.spec
@@ -24,7 +23,7 @@
   ECI_CONF=error.txt
   BASE_CONF=error.txt
 fi
-MAKEFILE_DIR=". fl_i18n libXNVCtrl $PROFILE_DIR"; export MAKEFILE_DIR
+MAKEFILE_DIR=". fl_i18n $PROFILE_DIR"; export MAKEFILE_DIR
 
 export CONF_H CONF CONF_I18N CONF_NV
 
@@ -192,7 +191,6 @@
 test -n "$ECHO" && $ECHO "" > $CONF
 test -n "$ECHO" && $ECHO "" > $CONF_H
 test -n "$ECHO" && $ECHO "" > $CONF_I18N
-test -n "$ECHO" && $ECHO "" > $CONF_NV
 test -n "$ECHO" && $ECHO "" > $ECI_CONF
 test -n "$ECHO" && $ECHO "" > $BASE_CONF
 test -n "$ECHO" && $ECHO "" > $PKGC
@@ -486,7 +484,6 @@
     CFLAGS="$CFLAGS -L. -fPIC"
     CXXFLAGS="$CXXFLAGS -L. -fPIC"
     test -n "$ECHO" && $ECHO "RM = rm -f" >> $CONF
-    test -n "$ECHO" && $ECHO "RM = rm -f" >> $CONF_NV
   fi
 fi
 
--- oyranos-0.1.7/makefile.in.NVCtrl	2007-07-26 17:38:39.000000000 +0200
+++ oyranos-0.1.7/makefile.in	2007-07-26 18:05:05.000000000 +0200
@@ -21,6 +21,7 @@
 LIB_MONI_NAME = lib$(TARGET)_moni.a
 LIB_XNVCTRL = libXNVCtrl
 LIB_XNVCTRL_NAME = $(LIB_XNVCTRL).a
+LIB_XNVCTRL_SO = $(LIB_XNVCTRL)$(LIBEXT)
 #endif
 LIBFL_I18N = fl_i18n/libfl_i18n.a
 
@@ -189,17 +190,12 @@
 	$(RM)  $(LIB_MONI_SO)
 	$(LNK) $(LIB_MONI_SONAMEFULL) $(LIB_MONI_SO)
 
-$(LIB_XNVCTRL).a:
-	echo Building $@ ...
-	-(cd $(LIB_XNVCTRL) && $(MAKE) -f Makefile)
-	test -L $(LIB_XNVCTRL).a || $(LNK) $(LIB_XNVCTRL)/$(LIB_XNVCTRL).a .
-
 # the twinview library
-$(TARGET)-monitor-nvidia:	$(TARGET)_monitor_nvidia.c $(LIB_XNVCTRL).a
+$(TARGET)-monitor-nvidia:	$(TARGET)_monitor_nvidia.c
 	echo Linking $@ ...
-	-$(CC) $(CFLAGS) $(INCL) $(TARGET)_monitor_nvidia.c -I./$(LIB_XNVCTRL) \
+	-$(CC) $(CFLAGS) $(INCL) $(TARGET)_monitor_nvidia.c -I$(includedir)/NVCtrl \
 	-o $(TARGET)-monitor-nvidia -L./   $(LDLIBS) $(X11_LIBS) \
-	-L./$(LIB_XNVCTRL) -lXNVCtrl $(LIBSONAMEFULL) $(LIB_MONI_SONAMEFULL) \
+	-lXNVCtrl $(LIBSONAMEFULL) $(LIB_MONI_SONAMEFULL) \
 	$(LINK_LIB_PATH)
 
 $(target)_config_fltk.o:	$(TARGET)_config_fltk.cxx

oyranos-0.1.7-sw_elektra.patch:

--- NEW FILE oyranos-0.1.7-sw_elektra.patch ---
--- oyranos-0.1.7/configure.sh.sw_elektra	2007-03-29 17:02:01.000000000 +0200
+++ oyranos-0.1.7/configure.sh	2007-06-18 00:34:08.000000000 +0200
@@ -45,7 +45,7 @@
         else
           echo "ELEKTRA_LIBS = `pkg-config --libs elektra`" >> $CONF
         fi
-        echo "ELEKTRA_SW = `pkg-config --cflags-only-I  elektra | sed 's/\-I// ; s%/include%/etc/kdb/%'`" >> $CONF
+        echo "ELEKTRA_SW = /etc/kdb/" >> $CONF
         ELEKTRA_FOUND=1
       else
         if [ $ELEKTRA -eq 1 ]; then


--- NEW FILE oyranos-repack.sh ---
#!/bin/bash

set -e

tmp=$(mktemp -d)

trap cleanup EXIT
cleanup() {
    set +e
    [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
}

unset CDPATH
pwd=$(pwd)
ver=0.1.7

cd "$tmp"
wget -N http://downloads.sourceforge.net/oyranos/oyranos-${ver}.tar.gz
tar zxvf oyranos-${ver}.tar.gz
pushd oyranos-${ver}
# Prevent static elektra to be used
rm -rf elektra-0.6.4
# Prevent static libXNVCtrl to be used
rm -rf libXNVCtrl libXNVCtrl.a
# Make build more verbose
for f in `find . -name [mM]akefile\*` configure.sh ; do sed -i.silent -e '/.SILENT/d' $f ; done
# Fix Changelog not-utf8
cp -p ChangeLog ChangeLog.origine
iconv -f ISO-8859-1 -t UTF8 ChangeLog.origine >  ChangeLog
touch -r ChangeLog.origine ChangeLog
rm -rf ChangeLog.origine
# Remove icc profiles from the archive
rm -rf standard_profiles
popd
tar jcf "$pwd"/oyranos-repack-${ver}.tar.bz2 oyranos-${ver}
cd - >/dev/null


--- NEW FILE oyranos.spec ---
Name:           oyranos
Version:        0.1.7
Release:        11%{?dist}
Summary:        The Oyranos Colour Management System (CMS) 

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://www.oyranos.org
#Source0:        http://downloads.sourceforge.net/oyranos/oyranos-%{version}.tar.gz
Source0:        http://kwizart.fedorapeople.org/SOURCES/oyranos-repack-0.1.7.tar.bz2
Source1:        README-Fedora-ICC_PROFILES
Source10:       oyranos-repack.sh
Patch0:         oyranos-0.1.7-sw_elektra.patch
Patch1:         oyranos-0.1.7-rpath.patch
Patch2:         oyranos-0.1.7-install_p.patch
Patch3:         oyranos-0.1.7-shared_NVCtrl.patch
Patch4:         oyranos-0.1.7-fix_pc.patch
Patch5:         oyranos-0.1.7-fix_bash.patch
Patch6:         oyranos-0.1.7-default.patch
Patch7:         oyranos-0.1.7-man-1_3.patch
Patch8:         oyranos-0.1.7-rm_class.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  boost-devel
BuildRequires:  doxygen
BuildRequires:  graphviz
BuildRequires:  elektra-devel
BuildRequires:  freetype-devel
BuildRequires:  gettext
BuildRequires:  fltk-devel
BuildRequires:  imake
BuildRequires:  lcms-devel >= 1.14
BuildRequires:  libstdc++-devel
BuildRequires:  libxslt-devel
BuildRequires:  libpng-devel
BuildRequires:  libjpeg-devel
BuildRequires:  libXNVCtrl-devel

BuildRequires:  libXinerama-devel
BuildRequires:  libXext-devel
BuildRequires:  libX11-devel
BuildRequires:  libXxf86vm-devel
BuildRequires:  color-filesystem
Requires:  color-filesystem
#Requires:  color-icc-profiles

#Requires(post): /usr/sbin/elektra-kdb



%description
The Colour Management System (CMS) Oyranos is intented to coordinate device
specific informations (ICC colour profiles) and configure their system wide
settings. Target is a predictable path for applications and users to match
colours across devices and across platforms. 

Oyranos is intended as a OS level CMS.

%package libs
Summary:        Libraries for %{name}
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}

%description libs
The Colour Management System (CMS) Oyranos is intented to coordinate device
specific informations (ICC colour profiles) and configure their system wide
settings. Target is a predictable path for applications and users to match
colours across devices and across platforms. 

Oyranos is intended as a OS level CMS.


%package devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name}-libs = %{version}-%{release}
Requires:       pkgconfig
Requires:       libX11-devel
Requires:       libXinerama-devel

%description devel
This package contains development files for %{name}.

%package docs
Summary:        Documentation for %{name}
Group:          Documentation

%description docs
This package contains documentation files for %{name}.


%prep
%setup -q
%patch0 -p1 -b .sw_elektra
%patch1 -p1 -b .rpath
%patch2 -p1 -b .install_p
%patch3 -p1 -b .NVCtrl
%patch4 -p1 -b .fix_pc
%patch5 -p1 -b .fix_bash
%patch6 -p1 -b .default
%patch7 -p1 -b .man-1_3
%patch8 -p1 -b .rm_class

# Prevent static elektra to be used
#rm -rf elektra-0.6.4

# Prevent static libXNVCtrl to be used
#rm -rf libXNVCtrl libXNVCtrl.a

# Make build more verbose
#for f in `find . -name [mM]akefile\*` configure.sh ; do sed -i.silent -e '/.SILENT/d' $f ; done

# Fix Changelog not-utf8
#cp -p ChangeLog ChangeLog.origine
#iconv -f ISO-8859-1 -t UTF8 ChangeLog.origine >  ChangeLog
#touch -r ChangeLog.origine ChangeLog
#rm -rf ChangeLog.origine

# Update Doxygen
doxygen -u

#Â Install Fedora doc
install -pm 0644 %{SOURCE1} . 


%build
export internalelektra=no
%configure --disable-static --syscolordir=%{_colordir}

# Parralle build sometime fails
make 
#{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT __doc

# Prevent icc profiles with commercial license to be installed
rm -rf standard_profiles

make DESTDIR=$RPM_BUILD_ROOT install_bin install_linguas install_gui

# Remove unneeded files
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'

# install doc in the right place...
mkdir -p __doc/
mv $RPM_BUILD_ROOT%{_datadir}/doc/oyranos/* __doc/
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/oyranos


# Tweak the oyranos_version.h
sed -i -e '/OY_SRC/d' $RPM_BUILD_ROOT%{_includedir}/%{name}/oyranos_version.h
touch -r ChangeLog $RPM_BUILD_ROOT%{_includedir}/%{name}/oyranos_version.h

# Multilib tweaks
touch -r ChangeLog $RPM_BUILD_ROOT%{_bindir}/%{name}-config

# Move oyranos-config.1 to oyranos-config.3
mv $RPM_BUILD_ROOT%{_mandir}/man1/oyranos-config.1 $RPM_BUILD_ROOT%{_mandir}/man3/oyranos-config.3
touch -r ChangeLog $RPM_BUILD_ROOT%{_mandir}/man3/oyranos-config.3

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT 


%post libs -p /sbin/ldconfig

%if 0
%post 
if [ "`elektra-kdb ls system/sw/oyranos 2>/dev/zero | wc -l`" -eq 0 ]; then
  oyranos-policy %{_settingscolordir}/office.policy.xml
fi || :
%endif

%postun libs -p /sbin/ldconfig


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README README-Fedora-ICC_PROFILES
%{_bindir}/%{name}-monitor
%{_bindir}/%{name}-monitor-nvidia
%{_bindir}/%{name}-config-fltk
%{_bindir}/%{name}-policy
%{_mandir}/man1/%{name}-config-fltk.*
%{_mandir}/man1/%{name}-policy.*
%{_datadir}/color/settings/*.policy.xml
%{_datadir}/color/cmms/*.oy_cmm_register.xml
# No profile should be installed with oyranos (even Cineon)
# Instead we need to Requires them when available
# from a separate package or from any virtual provides.
#{_datadir}/color/icc/*

%files libs
%defattr(-,root,root,-)
%{_libdir}/*.so.*


%files devel
%defattr(-,root,root,-)
%{_bindir}/%{name}-config
%{_mandir}/man3/%{name}.*
%{_mandir}/man3/%{name}-config.*
%{_includedir}/%{name}/
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}*.pc

%files docs
%defattr(-,root,root,-)
%doc __doc/html/*


%changelog
* Thu Mar  6 2008 kwizart < kwizart at gmail.com > - 0.1.7-11
- Make oyranos-config a wrapper for pkgconfig

* Tue Mar  4 2008 kwizart < kwizart at gmail.com > - 0.1.7-10
- Comment out %%post with %%if 0
- Add BR graphviz
- Upate Doxygen before generation (-u) 
  (set CLASS_GRAPH and COLLABORATION_GRAPH to NO )
- Remove Requires color-filesystem for -devel
- Rename man1 to man3 within man pages.

* Sat Mar  1 2008 kwizart < kwizart at gmail.com > - 0.1.7-9
- Drop monitor-nvidia (will be bundled in the main package)
- Comment out the oyranos default policy until some profiles
  are available within the repository.
- Reenable oyranos-config with tweaks for multilibs
  (will be properly fixed later with pkgconfig)
- Add Requirement needed by oyranos_moni.pc
- Add README-Fedora-ICC_PROFILES

* Wed Feb 20 2008 kwizart < kwizart at gmail.com > - 0.1.7-8
- Uses color-filesystem BR and macros
- Split the doc
- Split monitor-nvidia from the main package and use alternatives
- Fix wrong file encoding not-utf8 ChangeLog
- Tweak oyranos_version.h
- Remove oyranos-config (we should use pkgconfig instead)
- Repackage the sources.

* Thu Aug 16 2007 kwizart < kwizart at gmail.com > - 0.1.7-7
- Move oyranos-config to -devel
- Add Requires elektra-devel for oyranos-devel
- Use ldconfig for -libs only
- Fix .pc files

* Thu Aug 16 2007 kwizart < kwizart at gmail.com > - 0.1.7-6
- Move man3 to -devel
- Remove .a and .la after install step
- Drop the elektra keys registration for now:
  http://www.libelektra.org/Best_Practices_When_Creating_Keys
  User will have to register them by himself

* Tue Jul 10 2007 kwizart < kwizart at gmail.com > - 0.1.7-5
- Directory ownership for %%{_datadir}/color/settings
- Drop unused macros

* Sun Jun 17 2007 kwizart < kwizart at gmail.com > - 0.1.7-4
- Uses patches to fix things
- Removed unused macros
- Removed patented icc profiles

* Mon May 14 2007 kwizart < kwizart at gmail.com > - 0.1.7-3
- Fixed remaining rpaths

* Sat May 12 2007 kwizart < kwizart at gmail.com > - 0.1.7-2
- Disabled internal elektra.
- Exclude oyranos-config.
- Include Various Licenses files.

* Sun Apr 10 2007 kwizart < kwizart at gmail.com > - 0.1.7-1
- Update to final 0.1.7

* Sun Apr  1 2007 kwizart < kwizart at gmail.com > - 0.1.7-0.1.rc8
- Initial Fedora release

* Sat Sep 16 2006 Kai-Uwe Behrmann
- set default policy if no settings are found

* Sat May 28 2005 - Kai-Uwe Behrmann
- packaging

* Tue Apr 21 2005 Kai-Uwe Behrmann
- first release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oyranos/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Mar 2008 17:44:53 -0000	1.1
+++ .cvsignore	7 Mar 2008 18:57:34 -0000	1.2
@@ -0,0 +1 @@
+oyranos-repack-0.1.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oyranos/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Mar 2008 17:44:53 -0000	1.1
+++ sources	7 Mar 2008 18:57:34 -0000	1.2
@@ -0,0 +1 @@
+7db310bbdaea1c603941783b71372f52  oyranos-repack-0.1.7.tar.bz2


