[oyranos] Update to 0.9.5 snapshot.
Christopher Meng
cicku at fedoraproject.org
Thu Jan 23 05:58:28 UTC 2014
commit 398c4d4b1f5d1ec194144dc37b0c2a20377ca94a
Author: Christopher Meng <i at cicku.me>
Date: Thu Jan 23 13:51:21 2014 +0800
Update to 0.9.5 snapshot.
FindXcm.cmake | 17 ++++++
oyranos.spec | 180 ++++++++++++++++++++++++++------------------------------
2 files changed, 101 insertions(+), 96 deletions(-)
---
diff --git a/FindXcm.cmake b/FindXcm.cmake
new file mode 100644
index 0000000..9809750
--- /dev/null
+++ b/FindXcm.cmake
@@ -0,0 +1,17 @@
+find_package(PkgConfig)
+pkg_check_modules(XCM xcm)
+
+
+if (XCM_FOUND)
+ set(HAVE_XCM TRUE)
+ if (NOT Xcm_FIND_QUIETLY)
+ message(STATUS "Found XCM: ${XCM_LIBRARY_DIRS} ${XCM_INCLUDE_DIRS}")
+ endif (NOT Xcm_FIND_QUIETLY)
+else (XCM_FOUND)
+ if (NOT Xcm_FIND_QUIETLY)
+ message(STATUS "Xcm was NOT found.")
+ endif (NOT Xcm_FIND_QUIETLY)
+ if (Xcm_FIND_REQUIRED)
+ message(FATAL_ERROR "Could NOT find Xcm")
+ endif (Xcm_FIND_REQUIRED)
+endif (XCM_FOUND)
diff --git a/oyranos.spec b/oyranos.spec
index f0e4bf4..3170b76 100644
--- a/oyranos.spec
+++ b/oyranos.spec
@@ -1,57 +1,54 @@
Name: oyranos
-Version: 0.4.0
-Release: 16%{?dist}
-Summary: The Oyranos Color Management System (CMS)
-
-Group: Applications/Multimedia
-License: GPLv2+
+Version: 0.9.5
+Release: 0.0.20140123git%{?dist}
+Summary: A Colour Management System (CMS) on operating system level
+License: GPLv2+ and BSD
URL: http://www.oyranos.org
-Source0: http://downloads.sourceforge.net/oyranos/oyranos-%{version}.tar.bz2
-Patch0: oyranos-0.3.2-shared_NVCtrl.patch
-Patch1: oyranos-0.4.0-pc_fix.patch
-Patch2: oyranos-0.3.2-yajl.patch
-Patch3: oyranos-0.4.0-xcmtest.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: OpenEXR-devel
+#Source0: http://downloads.sourceforge.net/oyranos/oyranos-%{version}.tar.bz2
+# Snapshot temporary URL.
+Source0: oyranos-%{version}git.tgz
+# Disappear since 0.9.5, upstream might do something wrong in the commit.
+Source1: FindXcm.cmake
BuildRequires: boost-devel
+BuildRequires: cairo-devel
+BuildRequires: cmake
+BuildRequires: color-filesystem
BuildRequires: cups-devel
+BuildRequires: desktop-file-utils
BuildRequires: doxygen
-BuildRequires: graphviz
BuildRequires: elektra-devel
BuildRequires: exiv2-devel
+BuildRequires: fltk-devel
BuildRequires: freetype-devel
BuildRequires: gettext
-BuildRequires: fltk-devel
+BuildRequires: graphviz
BuildRequires: imake
-BuildRequires: lcms-devel >= 1.14
+BuildRequires: lcms-devel
BuildRequires: lcms2-devel
-BuildRequires: libstdc++-devel
-BuildRequires: libxslt-devel
+BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: LibRaw-devel
+BuildRequires: libstdc++-devel
BuildRequires: libtiff-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libXcm-devel >= 0.5.0
-BuildRequires: libXNVCtrl-devel
-BuildRequires: libXinerama-devel
+BuildRequires: libX11-devel
+BuildRequires: libXcm-devel
BuildRequires: libXext-devel
BuildRequires: libXfixes-devel
-BuildRequires: libX11-devel
-BuildRequires: libXxf86vm-devel
+BuildRequires: libXinerama-devel
+BuildRequires: libxml2-devel
+#BuildRequires: libXNVCtrl-devel
BuildRequires: libXrandr-devel
+BuildRequires: libxslt-devel
+BuildRequires: libXxf86vm-devel
+BuildRequires: OpenEXR-devel
+BuildRequires: qt4-devel
BuildRequires: sane-backends-devel
-BuildRequires: color-filesystem
-BuildRequires: yajl-devel >= 1.0
-Requires: color-filesystem
-Requires: %{name}-libs = %{version}-%{release}
-
-Requires: icc-profiles-openicc >= 1.3.0
-Requires: icc-profiles-basiccolor-printing2009
-
-Requires(post): %{_bindir}/elektra-kdb
-
-
+BuildRequires: yajl-devel
+Requires: color-filesystem
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: icc-profiles-openicc
+Requires: icc-profiles-basiccolor-printing2009
+Requires(post): %{_bindir}/kdb
%description
The Color Management System (CMS) Oyranos is intended to coordinate device
@@ -61,9 +58,8 @@ colors across devices and across platforms.
Oyranos is intended as a OS level CMS.
-%package libs
+%package libs
Summary: Libraries for %{name}
-Group: System Environment/Libraries
%description libs
The Color Management System (CMS) Oyranos is intended to coordinate device
@@ -73,116 +69,108 @@ colors across devices and across platforms.
Oyranos is intended as a OS level CMS.
-
-%package devel
+%package devel
Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
# -doc deprecation introducted in F-11
Provides: %{name}-doc = %{version}-%{release}
Obsoletes: %{name}-doc < 0.1.9-2
-Requires: pkgconfig
Requires: libX11-devel
Requires: libXinerama-devel
-%description devel
-This package contains development files for %{name}.
-
-
+%description devel
+This package contains libraries and header files for
+developing applications that use %{name}.
%prep
-%setup -q
-%patch0 -p1 -b .NVCtrl
-%patch1 -p1 -b .pc_fix
-%patch2 -p1 -b .yajl
-%patch3 -p0 -b .xcmtest
+%setup -qn %{name}
-#Kill interl yajl
-rm -rf yajl
+# Remove bundled yaji sources
+rm -rf yajl/
+# Upstream did something wrong for cmake files.
+cp %{S:1} cmake/Modules/
%build
-%configure --disable-static --syscolordir=%{_colordir}
-
+%configure --enable-debug \
+ --disable-static \
+ --with-fltk-config \
+ --syscolordir=%{_colordir}
make %{?_smp_mflags}
-
-# Doxygen documentation generated here
-make docu
+make docu %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT __doc
-
-make DESTDIR=$RPM_BUILD_ROOT install_bin install_linguas install_gui
+make install DESTDIR=%{buildroot}
# Remove unneeded files
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
+find %{buildroot} -name '*.la' -delete
+find %{buildroot} -name '*.a' -delete
# Multilib tweaks
-touch -r ChangeLog $RPM_BUILD_ROOT%{_bindir}/%{name}-config
+touch -r ChangeLog %{buildroot}%{_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}
-install -pm 0644 settings/*.policy.xml $RPM_BUILD_ROOT%{_settingscolordir}
-
+touch -r ChangeLog %{buildroot}%{_includedir}/%{name}/oyranos_version.h
%find_lang %{name}
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+%post
+if [ "`kdb ls system/sw/oyranos 2>/dev/zero | wc -l`" -eq 0 ]; then
+ oyranos-policy -i %{_settingscolordir}/office.policy.xml > /dev/null 2>&1
+fi || :
%post libs -p /sbin/ldconfig
-%post
-if [ "`elektra-kdb ls system/sw/oyranos 2>/dev/zero | wc -l`" -eq 0 ]; then
- oyranos-policy -i %{_settingscolordir}/office.policy.xml > /dev/null 2>&1
-fi || :
-
%postun libs -p /sbin/ldconfig
-
%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README
+%doc AUTHORS BUGS COPYING ChangeLog README
%exclude %{_sysconfdir}/xdg/autostart/oyranos-monitor-setup.desktop
+%{_bindir}/%{name}-icc
%{_bindir}/%{name}-monitor
%{_bindir}/%{name}-monitor-daemon
-%{_bindir}/%{name}-monitor-nvidia
-%{_bindir}/%{name}-config-fltk
%{_bindir}/%{name}-policy
%{_bindir}/%{name}-profile
+%{_bindir}/%{name}-profile-graph
%{_bindir}/%{name}-profile-install
%{_bindir}/%{name}-profiles
+%{_bindir}/%{name}-xforms-modules
+%{_bindir}/qcmsevents
%{_datadir}/applications/oyranos-profile-install.desktop
-#{_mandir}/man1/%{name}-config-fltk.*
-#{_mandir}/man1/%{name}-policy.*
+%{_datadir}/applications/qcmsevents-applet.desktop
+%{_mandir}/man1/%{name}-policy.1*
+%{_mandir}/man1/%{name}-profile*.1*
+%{_mandir}/man1/%{name}-profile-install.1*
+%{_mandir}/man1/%{name}-profiles.1*
+%{_mandir}/man1/%{name}-xforms-modules.1*
+%{_mandir}/man1/%{name}-config-fltk.1*
+%{_mandir}/man1/%{name}-monitor*.1*
+%{_mandir}/man1/qcmsevents.1*
%{_datadir}/color/settings/*.policy.xml
+%{_datadir}/pixmaps/lcms_logo2.png
+%{_datadir}/pixmaps/oyranos_logo.png
+%{_datadir}/pixmaps/qcmsevents.svg
%files libs
-%defattr(-,root,root,-)
%{_libdir}/*.so.*
-%dir %{_libdir}/colour
-%dir %{_libdir}/colour/modules
-%{_libdir}/colour/modules/*.so.*
-%dir %{_libdir}/oyranos
-%{_libdir}/oyranos/*.so*
+%{_libdir}/color/
+%{_libdir}/oyranos/
%files devel
-%defattr(-,root,root,-)
%doc doc/html/*
%{_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
-
%changelog
+* Thu Jan 23 2014 Christopher Meng <rpm at cicku.me> - 0.9.5-0.0.20140123git
+- Update to 0.9.5 snapshoted from VCS repo for Kolor.
+- Add missing BRs(qt4/cairo).
* Tue Jan 21 2014 Jon Ciesla <limburgher at gmail.com> - 0.4.0-16
- Rebuild for new LibRaw.
More information about the scm-commits
mailing list