rpms/directfb/devel DirectFB-0.9.25.1-linux-compiler.patch, NONE, 1.1 DirectFB-0.9.25.1-types.patch, NONE, 1.1 directfb.spec, 1.12, 1.13

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/directfb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22154

Modified Files:
	directfb.spec 
Added Files:
	DirectFB-0.9.25.1-linux-compiler.patch 
	DirectFB-0.9.25.1-types.patch 
Log Message:
Fix build on FC6 and on x86_64.


DirectFB-0.9.25.1-linux-compiler.patch:

--- NEW FILE DirectFB-0.9.25.1-linux-compiler.patch ---
diff -Naupr DirectFB-0.9.25.1.orig/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_v4l.c DirectFB-0.9.25.1/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_v4l.c
--- DirectFB-0.9.25.1.orig/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_v4l.c	2006-05-03 09:22:37.000000000 +0200
+++ DirectFB-0.9.25.1/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_v4l.c	2006-09-14 14:50:43.000000000 +0200
@@ -44,7 +44,6 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
-#include <linux/compiler.h>
 #include "videodev.h"
 
 #include <directfb.h>

DirectFB-0.9.25.1-types.patch:

--- NEW FILE DirectFB-0.9.25.1-types.patch ---
diff -Naupr DirectFB-0.9.25.1.orig/include/dfb_types.h DirectFB-0.9.25.1/include/dfb_types.h
--- DirectFB-0.9.25.1.orig/include/dfb_types.h	2005-10-19 01:14:12.000000000 +0200
+++ DirectFB-0.9.25.1/include/dfb_types.h	2006-09-14 14:48:26.000000000 +0200
@@ -1,6 +1,7 @@
 #ifndef __DFB_TYPES_H__
 #define __DFB_TYPES_H__
 
+#include <asm/types.h>
 #include <sys/types.h>
 
 #ifndef USE_KOS


Index: directfb.spec
===================================================================
RCS file: /cvs/extras/rpms/directfb/devel/directfb.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- directfb.spec	10 Jul 2006 02:48:20 -0000	1.12
+++ directfb.spec	15 Sep 2006 13:26:28 -0000	1.13
@@ -1,12 +1,14 @@
 Name:           directfb
 Version:        0.9.25.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Graphics abstraction library for the Linux Framebuffer Device
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.directfb.org/
 Source:         http://www.directfb.org/download/DirectFB/DirectFB-%{version}.tar.gz
+Patch0:         DirectFB-0.9.25.1-types.patch
+Patch1:         DirectFB-0.9.25.1-linux-compiler.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libpng-devel
@@ -14,9 +16,12 @@
 BuildRequires:  libjpeg-devel
 BuildRequires:  freetype-devel
 BuildRequires:  SDL-devel
-BuildRequires:  libsysfs-devel
-# libtool
-BuildRequires:  gcc-c++
+# Use sysfsutils-devel up to FC5, and libsysfs-devel for FC6+ and non-Fedora
+%if %{!?fedora:6}%{?fedora} >= 6
+BuildRequires: libsysfs-devel
+%else
+BuildRequires: sysfsutils-devel
+%endif
 
 %define oname   DirectFB
 
@@ -44,6 +49,8 @@
 
 %prep
 %setup -q -n %{oname}-%{version}
+%patch0 -p1 -b .types
+%patch1 -p1 -b .linux-compiler
 
 %build
 %configure \
@@ -82,8 +89,8 @@
 #%{_libdir}/directfb-%{version}
 #%{_datadir}/%{name}-%{version}
 # grrr, I hate it when projects do brown paper bag releases in a dirty way ...
-%{_libdir}/directfb-0.9.25
-%{_datadir}/%{name}-0.9.25
+%{_libdir}/directfb-0.9.25/
+%{_datadir}/%{name}-0.9.25/
 %{_bindir}/dfbg
 %{_bindir}/dfbdump
 %{_bindir}/dfbinfo
@@ -100,8 +107,8 @@
 %doc docs/html/*.html docs/html/*.png
 %{_bindir}/directfb-config
 %{_bindir}/directfb-csource
-%{_includedir}/directfb
-%{_includedir}/directfb-internal
+%{_includedir}/directfb/
+%{_includedir}/directfb-internal/
 %{_mandir}/man1/directfb-csource.1*
 %{_libdir}/pkgconfig/direct.pc
 %{_libdir}/pkgconfig/directfb.pc
@@ -112,6 +119,13 @@
 %{_libdir}/libfusion.so
 
 %changelog
+* Thu Sep 14 2006 Matthias Saou <http://freshrpms.net/> 0.9.25.1-3
+- FC6 rebuild.
+- Remove gcc-c++ build requirement, it's a default now.
+- End directory lines in %%files with slashes to identify them more easily.
+- Add types patch to fix 64bit build on FC6.
+- Add linux-compiler patch to remove obsolete kernel header include.
+
 * Sun Jun 09 2006 Warren Togami <wtogami at redhat.com> 0.9.25.1-2
 - buildreq sysfsutils-devel became libsysfs-devel