rpms/directfb/devel import.log, NONE, 1.1 .cvsignore, 1.8, 1.9 directfb.spec, 1.19, 1.20 sources, 1.8, 1.9 DirectFB-0.9.25.1-ppc.patch, 1.2, NONE DirectFB-0.9.25.1-sysfs.patch, 1.1, NONE DirectFB-1.0.0-rc2-asmtypes.patch, 1.1, NONE

Thu Oct 23 11:15:10 UTC 2008

Author: kwizart

Update of /cvs/pkgs/rpms/directfb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24618/devel

Modified Files:
	.cvsignore directfb.spec sources 
Added Files:
	import.log 
Removed Files:
	DirectFB-0.9.25.1-ppc.patch DirectFB-0.9.25.1-sysfs.patch 
	DirectFB-1.0.0-rc2-asmtypes.patch 
Log Message:
- Update to 1.2.6
- Exclude directfb-config - Fix multiarch conflicts #341011.
- Disable ppc asm
- Drop the asm/type.h patch (fixed upstream)
- Add BR libvncserver-devel
- Enable Unique WM
- Enable multi (Requires linux-fusion kernel module)

--- NEW FILE import.log ---
directfb-1_2_6-3_fc8_kwizart:HEAD:directfb-1.2.6-3.fc8.kwizart.src.rpm:1224760273


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/directfb/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	9 Apr 2007 14:33:32 -0000	1.8
+++ .cvsignore	23 Oct 2008 11:14:39 -0000	1.9
@@ -1 +1 @@
-DirectFB-1.0.0.tar.gz
+DirectFB-1.2.6.tar.gz


Index: directfb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/directfb/devel/directfb.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- directfb.spec	20 Feb 2008 04:02:43 -0000	1.19
+++ directfb.spec	23 Oct 2008 11:14:39 -0000	1.20
@@ -1,14 +1,11 @@
 Summary: Graphics abstraction library for the Linux Framebuffer Device
 Name: directfb
-Version: 1.0.0
-Release: 4%{?dist}
+Version: 1.2.6
+Release: 3%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2+
 URL: http://www.directfb.org/
 Source: http://www.directfb.org/downloads/Core/DirectFB-%{version}.tar.gz
-Patch0: DirectFB-1.0.0-rc2-asmtypes.patch
-Patch1: DirectFB-0.9.25.1-ppc.patch
-Patch2: DirectFB-0.9.25.1-sysfs.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libpng-devel
 BuildRequires: zlib-devel
@@ -16,6 +13,10 @@
 BuildRequires: freetype-devel
 BuildRequires: SDL-devel
 BuildRequires: libsysfs-devel
+BuildRequires: libvncserver-devel
+%{?_with_linux-fusion:BuildRequires: linux-fusion-devel}
+%{?_with_linux-fusion:Requires: linux-fusion}
+
 
 %description
 DirectFB is a thin library that provides hardware graphics acceleration,
@@ -28,6 +29,9 @@
 DirectFB adds graphical power to embedded systems and sets a new standard
 for graphics under Linux.
 
+Non-default rpmbuild options:
+--with linux-fusion:   Enable linux-fusion support
+
 
 %package devel
 Summary: Development files for DirectFB
@@ -36,6 +40,7 @@
 Requires: pkgconfig
 Requires: zlib-devel
 Requires: libsysfs-devel
+%{?_with_linux-fusion:Requires: linux-fusion-devel}
 
 %description devel
 Development files for DirectFB.
@@ -43,27 +48,33 @@
 
 %prep
 %setup -q -n DirectFB-%{version}
-%patch0 -p1 -b .asmtypes
-%patch1 -p1 -b .ppc
-%patch2 -p1 -b .sysfs
+
+#Disable ppc asm since compilation fails (and it seems better to use glibc)
+sed -i.noppcasm -e 's/want_ppcasm=yes/want_ppcasm=no/'g configure.in configure
+
 # Remove executable bit from sources
 find . \( -name '*.c' -o -name '*.h' \) -a -perm 755 -exec chmod -x {} \;
 
 
 %build
 %configure \
-    --disable-dependency-tracking \
+    --enable-sdl \
     --enable-zlib \
+%{?_with_linux-fusion:  --enable-multi } \
+    --enable-unique \
     --enable-video4linux2
+
 # Remove rpath for 64bit
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 %{__make} %{?_smp_mflags}
 
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
+%{__make} DESTDIR=%{buildroot} install INSTALL="install -p"
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %clean
@@ -78,6 +89,7 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
+%{_bindir}/dfbfx
 %{_bindir}/dfbg
 %{_bindir}/dfbdump
 %{_bindir}/dfbinfo
@@ -85,24 +97,28 @@
 %{_bindir}/dfblayer
 %{_bindir}/dfbpenmount
 %{_bindir}/dfbscreen
-%{_bindir}/dfbsummon
+## new with 1.2.0
+%{_bindir}/dfbinspector
+## new with 1.2.6
+%{_bindir}/dfbmaster
+#{_bindir}/dfbsummon
 %{_bindir}/mkdfiff
 %{_bindir}/mkdgiff
+# uwmdump Unique WM
+%{_bindir}/uwmdump
 %{_libdir}/libdirectfb-*.so.*
 %{_libdir}/libdirect-*.so.*
 %{_libdir}/libfusion-*.so.*
-#%{_libdir}/directfb-%{version}
-#%{_datadir}/%{name}-%{version}
-# Naming is brain dead here...
-%{_libdir}/directfb-1.0-0/
-%{_datadir}/directfb-1.0.0/
+%{_libdir}/libuniquewm*.so.*
+%{_libdir}/directfb-1.2-0/
+%{_datadir}/directfb-%{version}/
 %{_mandir}/man1/dfbg.1*
 %{_mandir}/man5/directfbrc.5*
 
 %files devel
 %defattr(-,root,root,-)
 %doc docs/html/*.html docs/html/*.png
-%{_bindir}/directfb-config
+%exclude %{_bindir}/directfb-config
 %{_bindir}/directfb-csource
 %{_includedir}/directfb/
 %{_includedir}/directfb-internal/
@@ -110,16 +126,37 @@
 %{_libdir}/pkgconfig/directfb.pc
 %{_libdir}/pkgconfig/directfb-internal.pc
 %{_libdir}/pkgconfig/fusion.pc
-%exclude %{_libdir}/*.la
 %{_libdir}/libdirectfb.so
 %{_libdir}/libdirect.so
 %{_libdir}/libfusion.so
+%{_libdir}/libuniquewm.so
 %{_mandir}/man1/directfb-csource.1*
 
 
 %changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.0-4
-- Autorebuild for GCC 4.3
+* Wed Oct 22 2008 kwizart < kwizart at gmail.com > - 1.2.6-3
+- Disable the sorelease downgrade
+- Exclude directfb-config - Fix multiarch conflicts #341011.
+
+* Mon Oct 20 2008 kwizart < kwizart at gmail.com > - 1.2.6-2
+- Disable ppc asm
+- Drop the asm/type.h patch (fixed upstream)
+
+* Mon Sep 29 2008 kwizart < kwizart at gmail.com > - 1.2.6-1
+- Update to 1.2.6
+
+* Wed Jul 16 2008 kwizart < kwizart at gmail.com > - 1.2.0-1
+- Update to 1.2.0 (final)
+- Add BR libvncserver-devel
+- Enable Unique WM
+- Enabled multi (Requires linux-fusion kernel module)
+
+* Sat Jun 21 2008 kwizart < kwizart at gmail.com > - 1.2.0-0.1.rc1
+- Update to 1.2.0-rc1
+
+* Sat Jun 21 2008 kwizart < kwizart at gmail.com > - 1.1.1-1
+- Update to 1.1.1
+- Add --enable-multi 
 
 * Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 1.0.0-3
 - Rebuild for new BuildID feature.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/directfb/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	9 Apr 2007 14:33:32 -0000	1.8
+++ sources	23 Oct 2008 11:14:39 -0000	1.9
@@ -1 +1 @@
-ad746c49dc89ba6f99df71b17bbb1dc8  DirectFB-1.0.0.tar.gz
+411c3318966e7834bf505b4388deaf52  DirectFB-1.2.6.tar.gz


--- DirectFB-0.9.25.1-ppc.patch DELETED ---


--- DirectFB-0.9.25.1-sysfs.patch DELETED ---


--- DirectFB-1.0.0-rc2-asmtypes.patch DELETED ---


