rpms/oyranos/devel import.log, NONE, 1.1 oyranos-0.1.9-cmms_lf.patch, NONE, 1.1 oyranos-0.1.9-default.patch, NONE, 1.1 oyranos-0.1.9-man-1_3.patch, NONE, 1.1 oyranos-0.1.9-rm_class.patch, NONE, 1.1 oyranos-0.1.9-shared_NVCtrl.patch, NONE, 1.1 oyranos-0.1.9-sw_elektra.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 oyranos-repack.sh, 1.1, 1.2 oyranos.spec, 1.5, 1.6 sources, 1.2, 1.3 oyranos-0.1.7-default.patch, 1.1, NONE oyranos-0.1.7-fix_bash.patch, 1.1, NONE oyranos-0.1.7-fix_pc.patch, 1.1, NONE oyranos-0.1.7-install_p.patch, 1.1, NONE oyranos-0.1.7-man-1_3.patch, 1.1, NONE oyranos-0.1.7-rm_class.patch, 1.1, NONE oyranos-0.1.7-rpath.patch, 1.1, NONE oyranos-0.1.7-shared_NVCtrl.patch, 1.1, NONE oyranos-0.1.7-sw_elektra.patch, 1.1, NONE
NicolasChauvet
kwizart at fedoraproject.org
Mon Mar 9 10:26:14 UTC 2009
Author: kwizart
Update of /cvs/pkgs/rpms/oyranos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25321/devel
Modified Files:
.cvsignore oyranos-repack.sh oyranos.spec sources
Added Files:
import.log oyranos-0.1.9-cmms_lf.patch
oyranos-0.1.9-default.patch oyranos-0.1.9-man-1_3.patch
oyranos-0.1.9-rm_class.patch oyranos-0.1.9-shared_NVCtrl.patch
oyranos-0.1.9-sw_elektra.patch
Removed Files:
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
Log Message:
Update to 0.1.9
--- NEW FILE import.log ---
oyranos-0_1_9-1_fc10:HEAD:oyranos-0.1.9-1.fc10.src.rpm:1236594370
oyranos-0.1.9-cmms_lf.patch:
--- NEW FILE oyranos-0.1.9-cmms_lf.patch ---
diff -up oyranos-0.1.9/makefile.in.cmms_lf oyranos-0.1.9/makefile.in
--- oyranos-0.1.9/makefile.in.cmms_lf 2009-03-05 14:06:40.000000000 +0100
+++ oyranos-0.1.9/makefile.in 2009-03-05 14:07:33.000000000 +0100
@@ -24,9 +24,9 @@ LIB_MONI_SONAMEFULL = lib$(TARGET)_moni$
LIB_MONI_SONAME = lib$(TARGET)_moni$(SO).$(VERSION_A)$(LIBEXT)
LIB_MONI_SO = lib$(TARGET)_moni$(SO)$(LIBEXT)
LIB_MONI_NAME = lib$(TARGET)_moni.a
-LIB_CMM_LCMS = lib$(TARGET)_lcms$(OY_MODULE_NAME)$(SO).$(VERSION)$(LIBEXT)
-LIB_CMM_oyX1 = lib$(TARGET)_oyX1$(OY_MODULE_NAME)$(SO).$(VERSION)$(LIBEXT)
-LIB_CMM_oyra = lib$(TARGET)_oyra$(OY_MODULE_NAME)$(SO).$(VERSION)$(LIBEXT)
+LIB_CMM_LCMS = lib$(TARGET)_lcms$(OY_MODULE_NAME)$(SO).$(LIBEXT)
+LIB_CMM_oyX1 = lib$(TARGET)_oyX1$(OY_MODULE_NAME)$(SO).$(LIBEXT)
+LIB_CMM_oyra = lib$(TARGET)_oyra$(OY_MODULE_NAME)$(SO).$(LIBEXT)
EXAMPLE1 = examples/image2pdf
EXAMPLES = \
oyranos-0.1.9-default.patch:
--- NEW FILE oyranos-0.1.9-default.patch ---
diff -up oyranos-0.1.9/settings/designer.policy.xml.default oyranos-0.1.9/settings/designer.policy.xml
--- oyranos-0.1.9/settings/designer.policy.xml.default 2008-10-22 18:30:57.000000000 +0200
+++ oyranos-0.1.9/settings/designer.policy.xml 2009-03-05 13:19:29.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.9/settings/office.policy.xml.default oyranos-0.1.9/settings/office.policy.xml
--- oyranos-0.1.9/settings/office.policy.xml.default 2008-10-22 18:31:10.000000000 +0200
+++ oyranos-0.1.9/settings/office.policy.xml 2009-03-05 13:19:29.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.9/settings/photographer.policy.xml.default oyranos-0.1.9/settings/photographer.policy.xml
--- oyranos-0.1.9/settings/photographer.policy.xml.default 2008-10-22 18:49:30.000000000 +0200
+++ oyranos-0.1.9/settings/photographer.policy.xml 2009-03-05 13:19:29.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.9/settings/prepress.policy.xml.default oyranos-0.1.9/settings/prepress.policy.xml
--- oyranos-0.1.9/settings/prepress.policy.xml.default 2008-10-22 18:49:14.000000000 +0200
+++ oyranos-0.1.9/settings/prepress.policy.xml 2009-03-05 13:19:29.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.9-man-1_3.patch:
--- NEW FILE oyranos-0.1.9-man-1_3.patch ---
diff -up oyranos-0.1.9/oyranos.3.man-1_3 oyranos-0.1.9/oyranos.3
--- oyranos-0.1.9/oyranos.3.man-1_3 2009-03-05 13:38:30.000000000 +0100
+++ oyranos-0.1.9/oyranos.3 2009-03-05 13:38:41.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.9/oyranos-config-fltk.1.man-1_3 oyranos-0.1.9/oyranos-config-fltk.1
--- oyranos-0.1.9/oyranos-config-fltk.1.man-1_3 2009-03-05 13:37:55.000000000 +0100
+++ oyranos-0.1.9/oyranos-config-fltk.1 2009-03-05 13:38:06.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.9/oyranos-policy.1.man-1_3 oyranos-0.1.9/oyranos-policy.1
--- oyranos-0.1.9/oyranos-policy.1.man-1_3 2009-03-05 13:39:19.000000000 +0100
+++ oyranos-0.1.9/oyranos-policy.1 2009-03-05 13:39:31.000000000 +0100
@@ -54,6 +54,6 @@ Print a help text:
.SH AUTHOR
Kai-Uwe Behrmann (ku.b (at) gmx.de)
.SH "SEE ALSO"
-oyranos-config(1) oyranos-monitor(1) oyranos(3)
+oyranos-config(3) oyranos-monitor(1) oyranos(3)
.SH BUGS
at: http://sourceforge.net/tracker/?group_id=177017&atid=879553
oyranos-0.1.9-rm_class.patch:
--- NEW FILE oyranos-0.1.9-rm_class.patch ---
diff -up oyranos-0.1.9/Doxyfile.rm_class oyranos-0.1.9/Doxyfile
--- oyranos-0.1.9/Doxyfile.rm_class 2008-11-03 14:48:57.000000000 +0100
+++ oyranos-0.1.9/Doxyfile 2009-03-05 13:49:35.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.9-shared_NVCtrl.patch:
--- NEW FILE oyranos-0.1.9-shared_NVCtrl.patch ---
diff -up oyranos-0.1.9/makefile.in.NVCtrl oyranos-0.1.9/makefile.in
--- oyranos-0.1.9/makefile.in.NVCtrl 2009-03-05 12:08:05.000000000 +0100
+++ oyranos-0.1.9/makefile.in 2009-03-05 13:19:07.000000000 +0100
@@ -33,8 +33,8 @@ EXAMPLES = \
$(EXAMPLE1)
#ifdef $(X11)
-LIB_XNVCTRL = libXNVCtrl
-LIB_XNVCTRL_NAME = $(LIB_XNVCTRL).a
+#LIB_XNVCTRL = libXNVCtrl
+LIB_XNVCTRL_NAME = -lXNVCtrl
#endif
LIBFL_I18N = fl_i18n/libfl_i18n.a
@@ -310,17 +310,17 @@ $(BUILDDIR)$(LIB_CMM_oyra): $(CMM_oyra_O
$(RM) $(BUILDDIR)lib$(TARGET)_oyra$(OY_MODULE_NAME)$(SO)$(LIBEXT)
$(LNK) $@ $(BUILDDIR)lib$(TARGET)_oyra$(OY_MODULE_NAME)$(SO)$(LIBEXT)
-$(LIB_XNVCTRL).a:
- echo Building $@ ...
- -(cd $(LIB_XNVCTRL) && $(MAKE) -f Makefile)
- test -L $(BUILDDIR)$(LIB_XNVCTRL).a || $(LNK) $(LIB_XNVCTRL)/$(LIB_XNVCTRL).a $(BUILDDIR).
+#(LIB_XNVCTRL).a:
+# echo Building $@ ...
+# -(cd $(LIB_XNVCTRL) && $(MAKE) -f Makefile)
+# test -L $(BUILDDIR)$(LIB_XNVCTRL).a || $(LNK) $(LIB_XNVCTRL)/$(LIB_XNVCTRL).a $(BUILDDIR).
# the twinview library
-$(BUILDDIR)$(TARGET)-monitor-nvidia: $(TARGET)_monitor_nvidia.c $(BUILDDIR)$(LIB_XNVCTRL).a $(BUILDDIR)$(LIB_MONI_SONAMEFULL)
+$(BUILDDIR)$(TARGET)-monitor-nvidia: $(TARGET)_monitor_nvidia.c $(BUILDDIR)$(LIB_MONI_SONAMEFULL)
echo Linking $@ ...
- -$(CC) $(CFLAGS) $(INCL) $(TARGET)_monitor_nvidia.c -I./$(LIB_XNVCTRL) \
+ -$(CC) $(CFLAGS) $(INCL) $(TARGET)_monitor_nvidia.c -I/usr/include/NVCtrl \
-o $(BUILDDIR)$(TARGET)-monitor-nvidia -L./ $(LDLIBS) $(X11_LIBS) \
- -L./$(LIB_XNVCTRL) -lXNVCtrl $(BUILDDIR)$(LIBSONAMEFULL) $(BUILDDIR)$(LIB_MONI_SONAMEFULL) \
+ -lXNVCtrl $(BUILDDIR)$(LIBSONAMEFULL) $(BUILDDIR)$(LIB_MONI_SONAMEFULL) \
$(LINK_LIB_PATH)
$(target)_config_fltk.o: $(TARGET)_config_fltk.cxx
@@ -665,7 +665,7 @@ uninstall_docu:
distclean: clean
-$(RM) Makefile
-$(RM) fl_i18n/Makefile
- -$(RM) libXNVCtrl/Makefile
+ #-$(RM) libXNVCtrl/Makefile
-$(RM) default_profiles/base/Makefile
-$(RM) default_profiles/printing/Makefile
-$(RM) mkdepend config.h oyranos.pc oyranos.spec
@@ -698,7 +698,7 @@ clean:
$(BUILDDIR)lib$${lib}$(SO)$(LIBEXT) \
$(BUILDDIR)lib$${lib}.a; \
done
- -(cd $(LIB_XNVCTRL) && $(MAKE) -f Makefile clean)
+ #-(cd $(LIB_XNVCTRL) && $(MAKE) -f Makefile clean)
cd fl_i18n/ && $(MAKE) -f $(MAKEFILE_ARCH) clean
echo ... $@ done
@@ -779,8 +779,8 @@ copy_files:
$(DESTDIR)
$(COPY) -r settings $(DESTDIR)
#$(COPY) -r cmms $(DESTDIR)
- -(cd $(LIB_XNVCTRL) && $(MAKE) -f Makefile clean)
- $(COPY) -R $(LIB_XNVCTRL) $(DESTDIR)
+ #-(cd $(LIB_XNVCTRL) && $(MAKE) -f Makefile clean)
+ #$(COPY) -R $(LIB_XNVCTRL) $(DESTDIR)
mkdir $(DESTDIR)/tests
$(COPY) $(TEST_FILES) $(DESTDIR)/tests
mkdir $(DESTDIR)/examples
oyranos-0.1.9-sw_elektra.patch:
--- NEW FILE oyranos-0.1.9-sw_elektra.patch ---
diff -up oyranos-0.1.9/configure.sh.sw_elektra oyranos-0.1.9/configure.sh
--- oyranos-0.1.9/configure.sh.sw_elektra 2009-03-05 12:08:05.000000000 +0100
+++ oyranos-0.1.9/configure.sh 2009-03-05 13:19:29.000000000 +0100
@@ -113,7 +113,7 @@ if [ -n "$ELEKTRA" ] && [ "$ELEKTRA" -gt
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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oyranos/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 7 Mar 2008 18:57:34 -0000 1.2
+++ .cvsignore 9 Mar 2009 10:26:13 -0000 1.3
@@ -1 +1 @@
-oyranos-repack-0.1.7.tar.bz2
+oyranos-repack-0.1.9.tar.bz2
Index: oyranos-repack.sh
===================================================================
RCS file: /cvs/pkgs/rpms/oyranos/devel/oyranos-repack.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- oyranos-repack.sh 7 Mar 2008 18:57:34 -0000 1.1
+++ oyranos-repack.sh 9 Mar 2009 10:26:13 -0000 1.2
@@ -12,16 +12,14 @@
unset CDPATH
pwd=$(pwd)
-ver=0.1.7
+ver=0.1.9
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
+rm -rf libXNVCtrl
# 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
@@ -30,7 +28,7 @@
touch -r ChangeLog.origine ChangeLog
rm -rf ChangeLog.origine
# Remove icc profiles from the archive
-rm -rf standard_profiles
+rm -rf default_profiles
popd
tar jcf "$pwd"/oyranos-repack-${ver}.tar.bz2 oyranos-${ver}
cd - >/dev/null
Index: oyranos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oyranos/devel/oyranos.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- oyranos.spec 6 Mar 2009 18:14:10 -0000 1.5
+++ oyranos.spec 9 Mar 2009 10:26:13 -0000 1.6
@@ -1,28 +1,24 @@
-%define _default_patch_fuzz 2
-
Name: oyranos
-Version: 0.1.7
-Release: 14%{?dist}
+Version: 0.1.9
+Release: 1%{?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
+Source0: http://kwizart.fedorapeople.org/SOURCES/oyranos-repack-%{version}.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
+Patch0: oyranos-0.1.9-sw_elektra.patch
+Patch1: oyranos-0.1.9-shared_NVCtrl.patch
+Patch2: oyranos-0.1.9-default.patch
+Patch3: oyranos-0.1.9-man-1_3.patch
+Patch4: oyranos-0.1.9-rm_class.patch
+Patch5: oyranos-0.1.9-cmms_lf.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: OpenEXR-devel
BuildRequires: boost-devel
BuildRequires: doxygen
BuildRequires: graphviz
@@ -47,7 +43,7 @@
Requires: %{name}-libs = %{version}-%{release}
#Requires: color-icc-profiles
-#Requires(post): /usr/sbin/elektra-kdb
+Requires(post): elektra-kdb
@@ -94,29 +90,11 @@
%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
+%patch1 -p1 -b .NVCtrl
+%patch2 -p1 -b .default
+%patch3 -p1 -b .man-1_3
+%patch4 -p1 -b .rm_class
+#patch5 -p1 -b .cmms_lf
# Update Doxygen
doxygen -u
@@ -126,7 +104,6 @@
%build
-export internalelektra=no
%configure --disable-static --syscolordir=%{_colordir}
# Parralle build sometime fails
@@ -137,21 +114,12 @@
%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
@@ -159,9 +127,9 @@
# 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
+#Manual install
+mkdir -p $RPM_BUILD_ROOT%{_settingscolordir}
+install -pm 0644 settings/*.policy.xml $RPM_BUILD_ROOT%{_settingscolordir}
%find_lang %{name}
@@ -172,12 +140,10 @@
%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
+ oyranos-policy -i %{_settingscolordir}/office.policy.xml > /dev/null 2>&1
fi || :
-%endif
%postun libs -p /sbin/ldconfig
@@ -189,10 +155,10 @@
%{_bindir}/%{name}-monitor-nvidia
%{_bindir}/%{name}-config-fltk
%{_bindir}/%{name}-policy
-%{_mandir}/man1/%{name}-config-fltk.*
-%{_mandir}/man1/%{name}-policy.*
+#{_mandir}/man1/%{name}-config-fltk.*
+#{_mandir}/man1/%{name}-policy.*
%{_datadir}/color/settings/*.policy.xml
-%{_datadir}/color/cmms/*.oy_cmm_register.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.
@@ -201,28 +167,25 @@
%files libs
%defattr(-,root,root,-)
%{_libdir}/*.so.*
-
+%{_libdir}/color
%files devel
%defattr(-,root,root,-)
%{_bindir}/%{name}-config
-%{_mandir}/man3/%{name}.*
-%{_mandir}/man3/%{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/*
+#doc __doc/html/*
%changelog
-* Fri Mar 06 2009 Jesse Keating <jkeating at redhat.com> - 0.1.7-14
-- Rebuild for new elektra
-
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.7-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Thu Mar 5 2009 kwizart < kwizart at gmail.com > - 0.1.9-1
+- Update to 0.1.9
* Sun Sep 28 2008 kwizart < kwizart at gmail.com > - 0.1.7-12
- Fix patch fuzz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oyranos/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 7 Mar 2008 18:57:34 -0000 1.2
+++ sources 9 Mar 2009 10:26:13 -0000 1.3
@@ -1 +1 @@
-7db310bbdaea1c603941783b71372f52 oyranos-repack-0.1.7.tar.bz2
+9d8fe36499b6da7ff80389ca09150dac oyranos-repack-0.1.9.tar.bz2
--- oyranos-0.1.7-default.patch DELETED ---
--- oyranos-0.1.7-fix_bash.patch DELETED ---
--- oyranos-0.1.7-fix_pc.patch DELETED ---
--- oyranos-0.1.7-install_p.patch DELETED ---
--- oyranos-0.1.7-man-1_3.patch DELETED ---
--- oyranos-0.1.7-rm_class.patch DELETED ---
--- oyranos-0.1.7-rpath.patch DELETED ---
--- oyranos-0.1.7-shared_NVCtrl.patch DELETED ---
--- oyranos-0.1.7-sw_elektra.patch DELETED ---
More information about the fedora-extras-commits
mailing list