[ClanLib] New upstream release 2.3.4

[Hans de Goede]

commit 331662f8366a63b630686cb311bac1a1b4ea54e4
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Sun Dec 11 17:30:29 2011 +0100

    New upstream release 2.3.4

 .gitignore                |    2 +
 ClanLib-2.3.4-focus.patch |   13 ++++++++++++
 ClanLib.spec              |   46 ++++++++++++++++++--------------------------
 sources                   |    4 +-
 4 files changed, 36 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c141ff5..8733a74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 ClanLib-2.1.2.tgz
 ClanLib-2.1.2-generated-docs.tar.gz
+/ClanLib-2.3.4.tgz
+/ClanLib-2.3.4-generated-docs.zip
diff --git a/ClanLib-2.3.4-focus.patch b/ClanLib-2.3.4-focus.patch
new file mode 100644
index 0000000..895068a
--- /dev/null
+++ b/ClanLib-2.3.4-focus.patch
@@ -0,0 +1,13 @@
+diff -up ClanLib-2.3.4/Sources/Display/X11/x11_window.cpp~ ClanLib-2.3.4/Sources/Display/X11/x11_window.cpp
+--- ClanLib-2.3.4/Sources/Display/X11/x11_window.cpp~	2011-12-11 15:56:37.000000000 +0100
++++ ClanLib-2.3.4/Sources/Display/X11/x11_window.cpp	2011-12-11 16:10:51.406348375 +0100
+@@ -930,6 +930,9 @@ void CL_X11Window::map_window()
+ 			}while ( (event.type != MapNotify) || (event.xmap.event != window) );
+ 
+ 			is_window_mapped = true;
++			
++			if (fullscreen)
++				XSetInputFocus(display, window, RevertToParent, CurrentTime);
+ 		}
+ 		XSync(display, True);
+ 
diff --git a/ClanLib.spec b/ClanLib.spec
index 983dea3..40f7b7a 100644
--- a/ClanLib.spec
+++ b/ClanLib.spec
@@ -1,17 +1,15 @@
 Summary:        Cross platform C++ game library
 Name:           ClanLib
-Version:        2.1.2
-Release:        3%{?dist}
+Version:        2.3.4
+Release:        1%{?dist}
 Group:          System Environment/Libraries
 License:        zlib
 URL:            http://www.clanlib.org/
 Source0:        http://www.clanlib.org/download/releases-2.0/%{name}-%{version}.tgz
-# Prebuild docs to avoid multilib conflicts. To regenerate, build and install
-# ClanLib passing --enable-docs (requires perl, libxslt) and then:
-# mv $RPM_BUILD_ROOT%{_datadir}/doc/clanlib-2.1/Overview html
-# tar cvfz ClanLib-%{version}-generated-docs.tar.gz html
-Source1:        ClanLib-%{version}-generated-docs.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# This is http://clanlib.org/docs/clanlib-2.3/reference_doxygen.zip renamed
+# to reflect the exact version for which it was downloaded
+Source1:        ClanLib-%{version}-generated-docs.zip
+Patch0:         ClanLib-2.3.4-focus.patch
 BuildRequires:  libX11-devel libXi-devel libXmu-devel libGLU-devel libICE-devel
 BuildRequires:  libXext-devel libXxf86vm-devel libXt-devel xorg-x11-proto-devel
 BuildRequires:  libvorbis-devel mikmod-devel alsa-lib-devel
@@ -25,7 +23,7 @@ ClanLib is a cross platform C++ game library.
 %package devel
 Summary:        Development Libraries and Headers for ClanLib
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       libGLU-devel xorg-x11-proto-devel pkgconfig
 Requires:       fontconfig-devel libjpeg-devel libpng-devel libXxf86vm-devel
 Provides:       clanlib-devel = %{version}-%{release}
@@ -36,45 +34,39 @@ ClanLib development headers and libraries
 
 %prep
 %setup -q -a 1
+%patch0 -p1
+mv reference_doxygen html
 
 
 %build
-%configure --disable-dependency-tracking --disable-static --enable-dyn \
-  --disable-docs
-# Get rid of /usr/lib64 rpath on 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
+%configure --disable-dependency-tracking --disable-static --disable-docs
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
+
 %files
-%defattr(-,root,root,-)
 %doc COPYING CREDITS
-%{_libdir}/libclan21*.so.*
+%{_libdir}/libclan23*.so.*
 
 %files devel
-%defattr(-,root,root,-)
-%doc README* html UPGRADE.txt
-%{_libdir}/libclan21*.so
-%{_includedir}/%{name}-2.1
-%{_libdir}/pkgconfig/clan*-2.1.pc
+%doc README html
+%{_libdir}/libclan23*.so
+%{_includedir}/%{name}-2.3
+%{_libdir}/pkgconfig/clan*-2.3.pc
 
 
 %changelog
+* Sun Dec 11 2011 Hans de Goede <hdegoede at redhat.com> - 2.3.4-1
+- New upstream release 2.3.4
+
 * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 2.1.2-3
 - Rebuild for new libpng
 
diff --git a/sources b/sources
index 9a4918f..4d3f428 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-30b519248bcecb486632d59050797157  ClanLib-2.1.2.tgz
-9232ddc72aa554cd558fb9c7ba565b9b  ClanLib-2.1.2-generated-docs.tar.gz
+cc89f632aa194399e909bbbd13beca1b  ClanLib-2.3.4.tgz
+cb5a1b2b208417fbdde1c266bd32028e  ClanLib-2.3.4-generated-docs.zip