packages: SaWMan/SaWMan.spec, SaWMan/SaWMan-update.patch (NEW) - updated to...

[qboosh]

Author: qboosh                       Date: Thu Nov 18 20:14:08 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.4.10
- added update patch to fix build with current DirectFB

---- Files affected:
packages/SaWMan:
   SaWMan.spec (1.2 -> 1.3) , SaWMan-update.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/SaWMan/SaWMan.spec
diff -u packages/SaWMan/SaWMan.spec:1.2 packages/SaWMan/SaWMan.spec:1.3
--- packages/SaWMan/SaWMan.spec:1.2	Fri Sep  5 17:39:15 2008
+++ packages/SaWMan/SaWMan.spec	Thu Nov 18 21:14:03 2010
@@ -2,19 +2,21 @@
 Summary:	Shared application and Window Manager
 Summary(pl.UTF-8):	Zarządca współdzielonych aplikacji i okien
 Name:		SaWMan
-Version:	1.2.0
-%define	subver	rc1
+Version:	1.4.10
 Release:	1
 License:	LGPL v2+
 Group:		Libraries
-Source0:	http://www.directfb.org/downloads/Extras/%{name}-%{version}-%{subver}.tar.gz
-# Source0-md5:	95dfb3bb0a588e486eed3fef28fa3644
+Source0:	http://www.directfb.org/downloads/Extras/%{name}-%{version}.tar.gz
+# Source0-md5:	a56cb8a12246e041070d2ae87021e24d
+Patch0:		%{name}-update.patch
 URL:		http://www.directfb.org/index.php?path=Platform/SaWMan
-BuildRequires:	DirectFB-devel >= 1:1.2.0
+BuildRequires:	DirectFB-devel >= 1:1.4.0
 BuildRequires:	pkgconfig >= 1:0.9
 %requires_eq	DirectFB
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		dfblibdir	%{_libdir}/directfb-1.4-5
+
 %description
 SaWMan is a new window manager module for use with DirectFB. Its main
 difference to the default module is that it allows one process to be
@@ -32,7 +34,7 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki sawman
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	DirectFB-devel >= 1:1.2.0
+Requires:	DirectFB-devel >= 1:1.4.0
 
 %description devel
 Header files for sawman library.
@@ -53,7 +55,8 @@
 Statyczna biblioteka sawman.
 
 %prep
-%setup -q -n %{name}-%{version}-%{subver}
+%setup -q
+%patch0 -p1
 
 %build
 %configure \
@@ -74,11 +77,11 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README
+%doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/swmdump
-%attr(755,root,root) %{_libdir}/libsawman-1.2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsawman-1.2.so.0
-%attr(755,root,root) %{_libdir}/directfb-1.2-0/wm/libdirectfbwm_sawman.so
+%attr(755,root,root) %{_libdir}/libsawman-1.4.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsawman-1.4.so.5
+%attr(755,root,root) %{dfblibdir}/wm/libdirectfbwm_sawman.so
 
 %files devel
 %defattr(644,root,root,755)
@@ -90,7 +93,7 @@
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libsawman.a
-%{_libdir}/directfb-1.2-0/wm/libdirectfbwm_sawman.[aol]*
+%{dfblibdir}/wm/libdirectfbwm_sawman.[aol]*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -98,6 +101,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/11/18 20:14:03  qboosh
+- updated to 1.4.10
+- added update patch to fix build with current DirectFB
+
 Revision 1.2  2008/09/05 15:39:15  qboosh
 - updated to 1.2.0-rc1
 

================================================================
Index: packages/SaWMan/SaWMan-update.patch
diff -u /dev/null packages/SaWMan/SaWMan-update.patch:1.1
--- /dev/null	Thu Nov 18 21:14:08 2010
+++ packages/SaWMan/SaWMan-update.patch	Thu Nov 18 21:14:03 2010
@@ -0,0 +1,20 @@
+--- SaWMan-1.4.10/src/sawman.c.orig	2010-11-03 13:05:31.000000000 +0100
++++ SaWMan-1.4.10/src/sawman.c	2010-11-18 20:55:46.827104966 +0100
+@@ -139,7 +139,7 @@
+ 
+ #if !DIRECTFB_BUILD_PURE_VOODOO
+      if (dfb_config->remote.host)
+-          return CreateRemote( dfb_config->remote.host, dfb_config->remote.session, ret_sawman );
++          return CreateRemote( dfb_config->remote.host, dfb_config->session, ret_sawman );
+ 
+      CoreDFB *core;
+ 
+@@ -163,7 +163,7 @@
+ 
+      return DFB_OK;
+ #else
+-     return CreateRemote( dfb_config->remote.host ?: "", dfb_config->remote.session, ret_sawman );
++     return CreateRemote( dfb_config->remote.host ?: "", dfb_config->session, ret_sawman );
+ #endif
+ }
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/SaWMan/SaWMan.spec?r1=1.2&r2=1.3&f=u