[oyranos] Update to 0.1.10
Nicolas Chauvet
kwizart at fedoraproject.org
Sun Aug 22 15:49:01 UTC 2010
commit d1affc9d82031c0abf400e3ff7c7864e33a55a12
Author: Nicolas Chauvet <kwizart at gmail.com>
Date: Sun Aug 22 17:49:01 2010 +0200
Update to 0.1.10
.gitignore | 1 +
oyranos-0.1.10-shared_NVCtrl.patch | 20 ++++++++
oyranos-0.1.9-default.patch | 93 ------------------------------------
oyranos-0.1.9-man-1_3.patch | 33 -------------
oyranos-0.1.9-rm_class.patch | 14 -----
oyranos-0.1.9-shared_NVCtrl.patch | 68 --------------------------
oyranos-0.1.9-sw_elektra.patch | 12 -----
oyranos-repack.sh | 9 +---
oyranos.spec | 63 ++++++++++++------------
sources | 2 +-
10 files changed, 54 insertions(+), 261 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 368bec4..3fed70c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
oyranos-repack-0.1.9.tar.bz2
+/oyranos-repack-0.1.10.tar.bz2
diff --git a/oyranos-0.1.10-shared_NVCtrl.patch b/oyranos-0.1.10-shared_NVCtrl.patch
new file mode 100644
index 0000000..5cea512
--- /dev/null
+++ b/oyranos-0.1.10-shared_NVCtrl.patch
@@ -0,0 +1,20 @@
+diff -up oyranos-0.1.10/makefile.in.NVCtrl oyranos-0.1.10/makefile.in
+--- oyranos-0.1.10/makefile.in.NVCtrl 2010-08-22 17:03:50.000000000 +0200
++++ oyranos-0.1.10/makefile.in 2010-08-22 17:12:18.000000000 +0200
+@@ -518,13 +518,13 @@ $(LIB_XNVCTRL).a:
+ test -L $(LIB_XNVCTRL).a || $(LNK) $(LIB_XNVCTRL)/$(LIB_XNVCTRL).a .
+
+ # the twinview library
+-$(TARGET)-monitor-nvidia: $(SRCDIR)/$(TARGET)_monitor_nvidia.c $(LIB_XNVCTRL_NAME) $(MONI_OBJECTS)
++$(TARGET)-monitor-nvidia: $(SRCDIR)/$(TARGET)_monitor_nvidia.c $(MONI_OBJECTS)
+ echo Linking $@ $(LIB_XNVCTRL_)1 $(XNVCtrl)2 $(LIB_XNVCTRL)3 $(LIB_XNVCTRL_NAME)4 ...
+ -$(CC) -I./ $(CFLAGS) $(INCL) $(SRCDIR)/$(TARGET)_monitor_nvidia.c \
+- -I$(SRCDIR)/libXNVCtrl \
++ -I/usr/include/NVCtrl \
+ -o $(TARGET)-monitor-nvidia $(MONI_OBJECTS) -L./ \
+ $(LDLIBS) $(X11_LIBS) $(m) \
+- -L./$(LIB_XNVCTRL) -lXNVCtrl $(LIBSONAMEFULL) \
++ -lXNVCtrl $(LIBSONAMEFULL) \
+ $(LINK_LIB_PATH)
+
+ $(TARGET)_config_fltk.o: $(SRCDIR)/$(TARGET)_config_fltk.cxx
diff --git a/oyranos-repack.sh b/oyranos-repack.sh
index 07a7da9..94c4189 100755
--- a/oyranos-repack.sh
+++ b/oyranos-repack.sh
@@ -12,7 +12,7 @@ cleanup() {
unset CDPATH
pwd=$(pwd)
-ver=0.1.9
+ver=0.1.10
cd "$tmp"
wget -N http://downloads.sourceforge.net/oyranos/oyranos-${ver}.tar.gz
@@ -20,13 +20,6 @@ tar zxvf oyranos-${ver}.tar.gz
pushd oyranos-${ver}
# Prevent static libXNVCtrl to be used
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
-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 default_profiles
popd
diff --git a/oyranos.spec b/oyranos.spec
index f4aee86..f07c332 100644
--- a/oyranos.spec
+++ b/oyranos.spec
@@ -1,7 +1,7 @@
Name: oyranos
-Version: 0.1.9
-Release: 5%{?dist}
-Summary: The Oyranos Colour Management System (CMS)
+Version: 0.1.10
+Release: 1%{?dist}
+Summary: The Oyranos Color Management System (CMS)
Group: Applications/Multimedia
License: GPLv2+
@@ -10,15 +10,12 @@ URL: http://www.oyranos.org
Source0: http://kwizart.fedorapeople.org/SOURCES/oyranos-repack-%{version}.tar.bz2
Source1: README-Fedora-ICC_PROFILES
Source10: oyranos-repack.sh
-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
+Patch0: oyranos-0.1.10-shared_NVCtrl.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: OpenEXR-devel
BuildRequires: boost-devel
+BuildRequires: cups-devel
BuildRequires: doxygen
BuildRequires: graphviz
BuildRequires: elektra-devel
@@ -30,28 +27,34 @@ BuildRequires: lcms-devel >= 1.14
BuildRequires: libstdc++-devel
BuildRequires: libxslt-devel
BuildRequires: libpng-devel
+#LibRaw only provides a static lib that doesn't work on x86_64.
+#/usr/bin/ld: /usr/lib64/libraw.a(libraw_cxx.o): relocation R_X86_64_32 against
+#`.rodata.str1.1' can not be used when making a shared object; recompile with -fPIC
+#BuildRequires: LibRaw-devel
BuildRequires: libtiff-devel
BuildRequires: libjpeg-devel
+BuildRequires: libXcm-devel
BuildRequires: libXNVCtrl-devel
-
BuildRequires: libXinerama-devel
BuildRequires: libXext-devel
BuildRequires: libX11-devel
BuildRequires: libXxf86vm-devel
+#BuildRequires: sane-backends-devel
BuildRequires: color-filesystem
Requires: color-filesystem
Requires: %{name}-libs = %{version}-%{release}
-#Requires: color-icc-profiles
+
+Requires: shared-color-profiles-extra
Requires(post): %{_bindir}/elektra-kdb
%description
-The Colour Management System (CMS) Oyranos is intented to coordinate device
-specific informations (ICC colour profiles) and configure their system wide
+The Color Management System (CMS) Oyranos is intended to coordinate device
+specific information (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.
+colors across devices and across platforms.
Oyranos is intended as a OS level CMS.
@@ -60,10 +63,10 @@ Summary: Libraries for %{name}
Group: System Environment/Libraries
%description libs
-The Colour Management System (CMS) Oyranos is intented to coordinate device
-specific informations (ICC colour profiles) and configure their system wide
+The Color Management System (CMS) Oyranos is intended to coordinate device
+specific information (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.
+colors across devices and across platforms.
Oyranos is intended as a OS level CMS.
@@ -86,14 +89,7 @@ This package contains development files for %{name}.
%prep
%setup -q
-%patch0 -p1 -b .sw_elektra
-%patch1 -p1 -b .NVCtrl
-%patch2 -p1 -b .default
-%patch3 -p1 -b .man-1_3
-%patch4 -p1 -b .rm_class
-
-# Update Doxygen
-doxygen -u
+%patch0 -p1 -b .NVCtrl
# Install Fedora doc
install -pm 0644 %{SOURCE1} .
@@ -102,9 +98,7 @@ install -pm 0644 %{SOURCE1} .
%build
%configure --disable-static --syscolordir=%{_colordir}
-# Parralle build sometime fails
-make LDFLAGS=-lpthread
-#{?_smp_mflags}
+make %{?_smp_mflags}
# Doxygen documentation generated here
make docu
@@ -118,13 +112,10 @@ make DESTDIR=$RPM_BUILD_ROOT install_bin install_linguas install_gui
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
-# 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
touch -r ChangeLog doc/html/*
+touch -r ChangeLog $RPM_BUILD_ROOT%{_includedir}/%{name}/oyranos_version.h
#Manual install
mkdir -p $RPM_BUILD_ROOT%{_settingscolordir}
@@ -167,7 +158,11 @@ fi || :
%files libs
%defattr(-,root,root,-)
%{_libdir}/*.so.*
-%{_libdir}/color
+%dir %{_libdir}/colour
+%dir %{_libdir}/colour/modules
+%{_libdir}/colour/modules/*.so.*
+%dir %{_libdir}/oyranos
+%{_libdir}/oyranos/*.so*
%files devel
%defattr(-,root,root,-)
@@ -182,6 +177,10 @@ fi || :
%changelog
+* Sun Aug 22 2010 Nicolas Chauvet <kwizart at gmail.com> - 0.1.10-1
+- Update to 0.1.10
+- Fix description
+
* Wed Jun 23 2010 Dan Horák <dan[at]danny.cz> - 0.1.9-5
- fixed FTBFS #564777 and #599809
diff --git a/sources b/sources
index 11a5b1b..28bb7c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9d8fe36499b6da7ff80389ca09150dac oyranos-repack-0.1.9.tar.bz2
+f8534381c51cdc5b487d5ca3aef4695c oyranos-repack-0.1.10.tar.bz2
More information about the scm-commits
mailing list