Author: fcrozat
Date: Mon Feb 5 15:50:07 2007
New Revision: 116235
Added:
packages/cooker/nucleo/current/SOURCES/nucleo-0.6-fixdnssd.patch
packages/cooker/nucleo/current/SOURCES/nucleo-0.6.tar.bz2 (contents, props
changed)
Removed:
packages/cooker/nucleo/current/SOURCES/nucleo-20061014-sgNodeId.patch
packages/cooker/nucleo/current/SOURCES/nucleo-20061224.tar.bz2
packages/cooker/nucleo/current/SOURCES/nucleo-qminmax.patch
Modified:
packages/cooker/nucleo/current/SPECS/nucleo.spec
Log:
-Release 0.6 final
-Patch1 (CVS): fix build when dns-sd isn't available
-Remove merged patches upstream
Added: packages/cooker/nucleo/current/SOURCES/nucleo-0.6-fixdnssd.patch
==============================================================================
--- (empty file)
+++ packages/cooker/nucleo/current/SOURCES/nucleo-0.6-fixdnssd.patch Mon Feb
5 15:50:07 2007
@@ -0,0 +1,31 @@
+Index: nucleo/network/Makefile.am
+===================================================================
+RCS file: /users/asspro/roussel/cvsroot/nucleo/nucleo/network/Makefile.am,v
+retrieving revision 1.9
+retrieving revision 1.10
+diff -u -r1.9 -r1.10
+--- nucleo/nucleo/network/Makefile.am 15 Jan 2007 15:33:27 -0000 1.9
++++ nucleo/nucleo/network/Makefile.am 5 Feb 2007 13:44:22 -0000 1.10
+@@ -9,7 +9,7 @@
+ # this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ #
+
+-SUBDIRS = http udp tcp
++SUBDIRS = http udp tcp dnssd
+
+ AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir}
+
+@@ -17,12 +17,7 @@
+
+ libnetwork_la_SOURCES = NetworkUtils.cxx
+
+-libnetwork_la_LIBADD = udp/libudp.la tcp/libtcp.la http/libhttp.la
+-
+-if HAVE_DNS_SD
+-SUBDIRS += dnssd
+-libnetwork_la_LIBADD += dnssd/libdnssd.la
+-endif
++libnetwork_la_LIBADD = udp/libudp.la tcp/libtcp.la http/libhttp.la
dnssd/libdnssd.la
+
+ # install headers
+
Added: packages/cooker/nucleo/current/SOURCES/nucleo-0.6.tar.bz2
==============================================================================
Binary file. No diff available.
Modified: packages/cooker/nucleo/current/SPECS/nucleo.spec
==============================================================================
--- packages/cooker/nucleo/current/SPECS/nucleo.spec (original)
+++ packages/cooker/nucleo/current/SPECS/nucleo.spec Mon Feb 5 15:50:07 2007
@@ -6,10 +6,10 @@
%define name nucleo
%define version 0.6
-%define cvs 20061224
-%define rel 3
-%define release %mkrel 0.%{cvs}.%{rel}
-%define distname %{name}-%{cvs}
+#%define cvs 20061224
+%define rel 1
+%define release %mkrel %{rel}
+%define distname %{name}-%{version}
%define common_summary explore video and human-computer interaction
%define common_description Nucleo is a toolkit for exploring new uses of video
and new\
@@ -25,13 +25,13 @@
Source0: %{distname}.tar.bz2
# (gb) 64-bit fixes (API change)
Patch0: nucleo-20061224-64bit-fixes.patch
-# (fc)
-Patch2: nucleo-qminmax.patch
+# (fc) 0.6-1mdv fix build without dns-sd
+Patch1: nucleo-0.6-fixdnssd.patch
License: LGPL
Group: System/Libraries
Url: http://www.lri.fr/~roussel/projects/nucleo/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: automake
+BuildRequires: automake1.9
BuildRequires: mesaglu-devel jpeg-devel png-devel libexif-devel freetype2-devel
BuildRequires: ffmpeg-devel
BuildRequires: libxi-devel
@@ -66,11 +66,13 @@
%prep
%setup -q -n %{distname}
%patch0 -p1 -b .64bit-fixes
-%patch2 -p1 -b .qminmax
+%patch1 -p1 -b .fixdnssd
+
+#needed by patch1
+automake-1.9
%build
-./build-utils/bootstrap
-%configure2_5x --disable-qt --disable-howl
+%configure2_5x --disable-qt
%make
%install
