rpms/directfb/FC-4 .cvsignore, 1.3, 1.4 directfb.spec, 1.4, 1.5 sources, 1.3, 1.4

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/directfb/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14149

Modified Files:
	.cvsignore directfb.spec sources 
Log Message:
Merge FC4 and devel, fix bug 162358


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/directfb/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Jun 2005 18:52:53 -0000	1.3
+++ .cvsignore	25 Nov 2005 12:12:25 -0000	1.4
@@ -1 +1 @@
-DirectFB-0.9.22.tar.gz
+DirectFB-0.9.24.tar.gz


Index: directfb.spec
===================================================================
RCS file: /cvs/extras/rpms/directfb/FC-4/directfb.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- directfb.spec	30 Jun 2005 07:54:35 -0000	1.4
+++ directfb.spec	25 Nov 2005 12:12:25 -0000	1.5
@@ -1,10 +1,10 @@
 Name:           directfb
-Version:        0.9.22
-Release:        2%{?dist}
+Version:        0.9.24
+Release:        4%{?dist}
 Summary:        Graphics abstraction library for the Linux Framebuffer Device
 
-Group:          System/Libraries
-License:        GPL
+Group:          System Environment/Libraries
+License:        LGPL
 URL:            http://www.directfb.org/
 Source:         http://www.directfb.org/download/DirectFB/DirectFB-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -14,6 +14,7 @@
 BuildRequires:  libjpeg-devel
 BuildRequires:  freetype-devel
 BuildRequires:  SDL-devel
+BuildRequires:  sysfsutils-devel
 # libtool
 BuildRequires:  gcc-c++
 
@@ -34,6 +35,8 @@
 Summary:        Development package for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
+Requires:       zlib-devel
 
 %description    devel
 The %{name}-devel package contains the static libraries and header files
@@ -44,25 +47,12 @@
 
 %build
 %configure \
-	--with-gfxdrivers=ati128,cle266,i810,mach64,matrox,nsc,nvidia,radeon,tdfx \
-	--disable-sse \
-%ifarch	athlon i686
-	--enable-mmx \
-%else
-	--disable-mmx \
-%endif
-	--disable-maintainer-mode \
-	--enable-shared \
-	--enable-static \
-	--enable-fast-install \
-	--disable-avifile \
-	--disable-debug \
-	--with-gfxdrivers=\
-ati128,cle266,cyber5k,i810,mach64,matrox,\
-neomagic,nsc,nvidia,radeon,savage,\
-tdfx,unichrome
-# no kernel support: radeon, i810, neomagic, savage
-# build errors: sis315
+        --disable-dependency-tracking \
+        --enable-zlib \
+        --enable-video4linux2 \
+        --with-gfxdrivers=\
+ati128,cle266,cyber5k,i810,i830,mach64,matrox,neomagic,nsc,nvidia,radeon,\
+savage,tdfx,unichrome,sis315,r200
 
 make %{?_smp_mflags}
 
@@ -102,7 +92,7 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc docs/html/*
+%doc docs/html/*.html docs/html/*.png
 %{_bindir}/directfb-config
 %{_bindir}/directfb-csource
 %{_includedir}/directfb
@@ -115,17 +105,42 @@
 %{_libdir}/libdirectfb.so
 %{_libdir}/libdirect.so
 %{_libdir}/libfusion.so
-%{_libdir}/libdirectfb.a
-%{_libdir}/libdirect.a
-%{_libdir}/libfusion.a
 
 %changelog
+* Fri Nov 25 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.24-4
+- Merge FC-4 and devel specfiles for easier maintainance and consistence.
+- Incorperate improvements suggested by Ville Skyttä in bug 162358.
+
+* Thu Nov 24 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.24-3
+- Remove "remove custom CFLAGS" patch, this only adds -ffast-math,
+  which IMHO is unlikely to be the cause of the build problems, especially
+  since a local x86_64 mockbuild works fine. Try to build it hoping that the
+  real cause is gone now, since Dan's build did succeed.
+
+* Tue Nov 15 2005 Dan Williams <dcbw at redhat.com> 0.9.24-2
+- Try removing custom CFLAGS to see if build makes it through x86_64
+
+* Sun Nov 13 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.24-1
+- 0.9.22 Has build troubles on PPC, upgrade to 0.9.24 which will most
+  likely fix this (Only a build will tell for sure).
+- Re-enable sis315 since this is fixed in 0.9.24, add r200.
+
+* Mon Oct 17 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.22-2.fc5
+- increase release field to be equal to FC4 release field, to avoid upgrade
+  problems.
+- force rebuild since directfb is missing from extra-devel repository.
+
 * Thu Jun 30 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.9.22-2
+- 0.9.22-2.fc4
 - increment release because of new source upload
 
+* Tue Jun 19 2005 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.9.22-1.fc5
+- incorporate changes from Ville
+- update to new upstream release
+
 * Wed Jun 15 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.9.22-1
+- 0.9.22-1.fc4
 - new upstream release
 - add libdirect and libfusion shared libraries
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/directfb/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Jun 2005 18:52:53 -0000	1.3
+++ sources	25 Nov 2005 12:12:25 -0000	1.4
@@ -1 +1 @@
-f52e23f4bb56db0d284d2a78ebc4a586  DirectFB-0.9.22.tar.gz
+1f4b56b20d4e6f5c6ceb15c1c4fd2ecd  DirectFB-0.9.24.tar.gz