rpms/directfb/devel directfb.spec, 1.8, 1.9 directfb-0.9.24-use-rpm-cflags.patch, 1.1, NONE

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	directfb.spec 
Removed Files:
	directfb-0.9.24-use-rpm-cflags.patch 
Log Message:
Merge FC4 and devel, fix bug 162358


Index: directfb.spec
===================================================================
RCS file: /cvs/extras/rpms/directfb/devel/directfb.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- directfb.spec	24 Nov 2005 09:31:57 -0000	1.8
+++ directfb.spec	25 Nov 2005 12:12:27 -0000	1.9
@@ -1,9 +1,9 @@
 Name:           directfb
 Version:        0.9.24
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Graphics abstraction library for the Linux Framebuffer Device
 
-Group:          System/Libraries
+Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.directfb.org/
 Source:         http://www.directfb.org/download/DirectFB/DirectFB-%{version}.tar.gz
@@ -47,15 +47,13 @@
 
 %build
 %configure \
-        --disable-maintainer-mode \
-        --enable-shared \
-        --enable-static \
-        --disable-avifile \
-	--enable-video4linux2 \
-	--with-gfxdrivers=\
-ati128,cle266,cyber5k,i810,i830,mach64,matrox,\
-neomagic,nsc,nvidia,radeon,savage,\
-tdfx,unichrome,sis315,r200
+        --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}
 
 %install
@@ -81,12 +79,8 @@
 %{_libdir}/libdirectfb-*.so.*
 %{_libdir}/libdirect-*.so.*
 %{_libdir}/libfusion-*.so.*
-%dir %{_libdir}/directfb-%{version}
-%{_libdir}/directfb-%{version}/*/*.so
-%{_libdir}/directfb-%{version}/*/*/*.so
-
+%{_libdir}/directfb-%{version}
 %{_datadir}/%{name}-%{version}
-
 %{_bindir}/dfbg
 %{_bindir}/dfbdump
 %{_bindir}/dfbinfo
@@ -111,15 +105,12 @@
 %{_libdir}/libdirectfb.so
 %{_libdir}/libdirect.so
 %{_libdir}/libfusion.so
-%{_libdir}/libdirectfb.a
-%{_libdir}/libdirect.a
-%{_libdir}/libfusion.a
-%{_libdir}/directfb-%{version}/*/*.a
-%{_libdir}/directfb-%{version}/*/*/*.a
-%{_libdir}/directfb-%{version}/*/*.o
-%{_libdir}/directfb-%{version}/*/*/*.o
 
 %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
@@ -129,23 +120,30 @@
 * 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
+* 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
+* 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.
 
-* Tue Jul 19 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.9.22-1
+* Thu Jun 30 2005 Thomas Vander Stichele <thomas at apestaart dot org>
+- 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.fc4
+- new upstream release
+- add libdirect and libfusion shared libraries
+
 * Fri Dec 31 2004 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.9.21-0.fdr.1
 - new upstream release


--- directfb-0.9.24-use-rpm-cflags.patch DELETED ---