[oyranos] Update to 0.2.0
Nicolas Chauvet
kwizart at fedoraproject.org
Fri Jan 7 10:40:54 UTC 2011
commit c5312bf22d325b31ea2fea3916c04b55441509da
Author: Nicolas Chauvet <kwizart at gmail.com>
Date: Fri Jan 7 11:42:17 2011 +0100
Update to 0.2.0
.gitignore | 1 +
...Ctrl.patch => oyranos-0.2.0-shared_NVCtrl.patch | 14 +++++++-------
oyranos.spec | 14 ++++++++++----
sources | 2 +-
4 files changed, 19 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9b9231e..6178beb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
oyranos-repack-0.1.9.tar.bz2
/oyranos-repack-0.1.10.tar.bz2
/oyranos-0.1.12.tar.gz
+/oyranos-0.2.0.tar.gz
diff --git a/oyranos-0.1.10-shared_NVCtrl.patch b/oyranos-0.2.0-shared_NVCtrl.patch
similarity index 63%
rename from oyranos-0.1.10-shared_NVCtrl.patch
rename to oyranos-0.2.0-shared_NVCtrl.patch
index 5cea512..67134cb 100644
--- a/oyranos-0.1.10-shared_NVCtrl.patch
+++ b/oyranos-0.2.0-shared_NVCtrl.patch
@@ -1,17 +1,17 @@
-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:
+diff -up oyranos-0.2.0/makefile.in.NVCtrl oyranos-0.2.0/makefile.in
+--- oyranos-0.2.0/makefile.in.NVCtrl 2010-12-17 19:39:07.000000000 +0100
++++ oyranos-0.2.0/makefile.in 2011-01-07 11:24:35.477805004 +0100
+@@ -662,13 +662,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)
+-$(TARGET)-monitor-nvidia: $(SRCDIR)/$(TARGET)_monitor_nvidia.c $(LIB_XNVCTRL_NAME) $(MONI_X11_OBJECTS)
++$(TARGET)-monitor-nvidia: $(SRCDIR)/$(TARGET)_monitor_nvidia.c $(MONI_X11_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./ \
+ -o $(TARGET)-monitor-nvidia $(MONI_X11_OBJECTS) -L./ \
$(LDLIBS) $(X11_LIBS) $(m) \
- -L./$(LIB_XNVCTRL) -lXNVCtrl $(LIBSONAMEFULL) \
+ -lXNVCtrl $(LIBSONAMEFULL) \
diff --git a/oyranos.spec b/oyranos.spec
index 9c5ba61..32c80ea 100644
--- a/oyranos.spec
+++ b/oyranos.spec
@@ -1,13 +1,13 @@
Name: oyranos
-Version: 0.1.12
-Release: 2%{?dist}
+Version: 0.2.0
+Release: 1%{?dist}
Summary: The Oyranos Color Management System (CMS)
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.oyranos.org
Source0: http://downloads.sourceforge.net/oyranos/oyranos-%{version}.tar.gz
-Patch0: oyranos-0.1.10-shared_NVCtrl.patch
+Patch0: oyranos-0.2.0-shared_NVCtrl.patch
Patch1: oyranos-0.1.12-pc_fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,6 +17,7 @@ BuildRequires: cups-devel
BuildRequires: doxygen
BuildRequires: graphviz
BuildRequires: elektra-devel
+BuildRequires: exiv2-devel
BuildRequires: freetype-devel
BuildRequires: gettext
BuildRequires: fltk-devel
@@ -32,7 +33,7 @@ BuildRequires: libpng-devel
#BuildRequires: LibRaw-devel
BuildRequires: libtiff-devel
BuildRequires: libjpeg-devel
-BuildRequires: libXcm-devel
+BuildRequires: libXcm-devel >= 0.4.0
BuildRequires: libXNVCtrl-devel
BuildRequires: libXinerama-devel
BuildRequires: libXext-devel
@@ -140,6 +141,7 @@ fi || :
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
+%exclude %{_sysconfdir}/xdg/autostart/oyranos-monitor-setup.desktop
%{_bindir}/%{name}-monitor
%{_bindir}/%{name}-monitor-nvidia
%{_bindir}/%{name}-config-fltk
@@ -169,6 +171,10 @@ fi || :
%changelog
+* Fri Jan 07 2011 Nicolas Chauvet <kwizart at gmail.com> - 0.2.0-1
+- Update to 0.2.0
+- Exclude autostart desktop file for now
+
* Sun Nov 07 2010 Nicolas Chauvet <kwizart at gmail.com> - 0.1.12-2
- Update to 0.1.12
- Back to upstream tarball usage
diff --git a/sources b/sources
index 5115f7e..fc9d4e7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bc8477f5594f3ec9385b8a621ee74054 oyranos-0.1.12.tar.gz
+0c4bb2479efc37123db4ff8cd7bb787a oyranos-0.2.0.tar.gz
More information about the scm-commits
mailing list