rpms/ClanLib/devel .cvsignore, 1.5, 1.6 ClanLib-0.8.0-gcc43.patch, 1.3, 1.4 ClanLib.spec, 1.19, 1.20 sources, 1.5, 1.6 ClanLib-0.8.1-abi-compat.patch, 1.1, NONE

Mon May 18 13:57:21 UTC 2009

Author: jwrdegoede

Update of /cvs/extras/rpms/ClanLib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1355

Modified Files:
	.cvsignore ClanLib-0.8.0-gcc43.patch ClanLib.spec sources 
Removed Files:
	ClanLib-0.8.1-abi-compat.patch 
Log Message:
* Sun May 17 2009 Hans de Goede <hdegoede at redhat.com> 1.0.0-1
- New upstream release 1.0.0, note: API compatible but changes soname



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ClanLib/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6

--- .cvsignore	12 Mar 2008 22:48:05 -0000	1.5
+++ .cvsignore	18 May 2009 13:56:51 -0000	1.6
@@ -1,2 +1,2 @@
-ClanLib-0.8.1.tgz
-ClanLib-0.8.1-generated-docs.tar.gz
+ClanLib-1.0.0.tgz
+ClanLib-1.0.0-generated-docs.tar.gz

ClanLib-0.8.0-gcc43.patch:

Index: ClanLib-0.8.0-gcc43.patch
===================================================================
RCS file: /cvs/extras/rpms/ClanLib/devel/ClanLib-0.8.0-gcc43.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ClanLib-0.8.0-gcc43.patch	21 Feb 2009 09:54:34 -0000	1.3
+++ ClanLib-0.8.0-gcc43.patch	18 May 2009 13:56:51 -0000	1.4
@@ -1,18 +1,7 @@
-diff -up ClanLib-0.8.1/Sources/GL/opengl.cpp~ ClanLib-0.8.1/Sources/GL/opengl.cpp
---- ClanLib-0.8.1/Sources/GL/opengl.cpp~	2008-03-12 10:39:16.000000000 +0100
-+++ ClanLib-0.8.1/Sources/GL/opengl.cpp	2008-03-12 10:39:16.000000000 +0100
-@@ -33,6 +33,7 @@
- #include "API/Core/System/error.h"
- #include "API/Core/IOData/cl_endian.h"
- #include "API/core.h"
-+#include <cstring>
- 
- #ifdef __APPLE__
- #include <OpenGL/gl.h>
-diff -up ClanLib-0.8.1/Sources/GL/GLX/input_device_linuxevent.cpp~ ClanLib-0.8.1/Sources/GL/GLX/input_device_linuxevent.cpp
---- ClanLib-0.8.1/Sources/GL/GLX/input_device_linuxevent.cpp~	2007-10-21 02:14:01.000000000 +0200
-+++ ClanLib-0.8.1/Sources/GL/GLX/input_device_linuxevent.cpp	2009-02-21 10:45:30.000000000 +0100
-@@ -35,6 +34,7 @@
+diff -up ClanLib-1.0.0/Sources/GL/GLX/input_device_linuxevent.cpp~ ClanLib-1.0.0/Sources/GL/GLX/input_device_linuxevent.cpp
+--- ClanLib-1.0.0/Sources/GL/GLX/input_device_linuxevent.cpp~	2007-10-21 02:14:01.000000000 +0200
++++ ClanLib-1.0.0/Sources/GL/GLX/input_device_linuxevent.cpp	2009-05-17 21:13:53.000000000 +0200
+@@ -35,6 +35,7 @@
  #include <iostream>
  #include <errno.h>
  #include <cstring>
@@ -20,9 +9,9 @@ diff -up ClanLib-0.8.1/Sources/GL/GLX/in
  
  #include "API/Core/System/error.h"
  #include "API/Core/System/clanstring.h"
-diff -up ClanLib-0.8.1/Sources/GL/GLX/input_device_xinput.cpp~ ClanLib-0.8.1/Sources/GL/GLX/input_device_xinput.cpp
---- ClanLib-0.8.1/Sources/GL/GLX/input_device_xinput.cpp~	2007-10-21 02:14:01.000000000 +0200
-+++ ClanLib-0.8.1/Sources/GL/GLX/input_device_xinput.cpp	2009-02-21 10:45:52.000000000 +0100
+diff -up ClanLib-1.0.0/Sources/GL/GLX/input_device_xinput.cpp~ ClanLib-1.0.0/Sources/GL/GLX/input_device_xinput.cpp
+--- ClanLib-1.0.0/Sources/GL/GLX/input_device_xinput.cpp~	2007-10-21 02:14:01.000000000 +0200
++++ ClanLib-1.0.0/Sources/GL/GLX/input_device_xinput.cpp	2009-05-17 21:14:15.000000000 +0200
 @@ -29,6 +29,7 @@
  
  #include <iostream>
@@ -31,9 +20,9 @@ diff -up ClanLib-0.8.1/Sources/GL/GLX/in
  #include "API/Core/System/log.h"
  #include "API/Display/input_device.h"
  #include "API/Display/input_event.h"
-diff -up ClanLib-0.8.1/Sources/GL/canvas_opengl.cpp~ ClanLib-0.8.1/Sources/GL/canvas_opengl.cpp
---- ClanLib-0.8.1/Sources/GL/canvas_opengl.cpp~	2007-10-21 02:14:01.000000000 +0200
-+++ ClanLib-0.8.1/Sources/GL/canvas_opengl.cpp	2009-02-21 10:44:34.000000000 +0100
+diff -up ClanLib-1.0.0/Sources/GL/canvas_opengl.cpp~ ClanLib-1.0.0/Sources/GL/canvas_opengl.cpp
+--- ClanLib-1.0.0/Sources/GL/canvas_opengl.cpp~	2007-10-21 02:14:01.000000000 +0200
++++ ClanLib-1.0.0/Sources/GL/canvas_opengl.cpp	2009-05-17 21:10:45.000000000 +0200
 @@ -48,6 +48,7 @@
  #include "graphic_context_opengl.h"
  #include "surface_target_opengl.h"


Index: ClanLib.spec
===================================================================
RCS file: /cvs/extras/rpms/ClanLib/devel/ClanLib.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ClanLib.spec	23 Feb 2009 20:09:17 -0000	1.19
+++ ClanLib.spec	18 May 2009 13:56:51 -0000	1.20
@@ -1,18 +1,17 @@
 Summary:        Cross platform C++ game library
 Name:           ClanLib
-Version:        0.8.1
-Release:        3%{?dist}
+Version:        1.0.0
+Release:        1%{?dist}
 Group:          System Environment/Libraries
 License:        zlib
 URL:            http://www.clanlib.org/
-Source0:        http://www.clanlib.org/download/releases-0.8/%{name}-%{version}.tgz
+Source0:        http://www.clanlib.org/download/releases-1.0/%{name}-%{version}.tgz
 # Prebuild docs to avoid multilib conflicts. To regenerate, build and install
 # ClanLib without passing --disable-docs (requires perl, libxslt) and then:
 # mv $RPM_BUILD_ROOT%{_datadir}/doc/clanlib html
 # tar cvfz ClanLib-%{version}-generated-docs.tar.gz html
 Source1:        ClanLib-%{version}-generated-docs.tar.gz
 Patch0:         ClanLib-0.8.0-gcc43.patch
-Patch1:         ClanLib-0.8.1-abi-compat.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libX11-devel libXi-devel libXmu-devel libGLU-devel libICE-devel
 BuildRequires:  libXext-devel libXxf86vm-devel libXt-devel xorg-x11-proto-devel
@@ -38,10 +37,15 @@ ClanLib development headers and librarie
 %prep
 %setup -q -a 1
 %patch0 -p1
-%patch1 -p1
+iconv -f iso8859-1 -t utf8 NEWS -o NEWS.utf8
+touch -r NEWS.utf8 NEWS
+mv NEWS.utf8 NEWS
+iconv -f iso8859-1 -t utf8 CREDITS -o CREDITS.utf8
+touch -r CREDITS.utf8 CREDITS
+mv CREDITS.utf8 CREDITS
 # fixup pc files
 sed -i 's|libdir=${exec_prefix}/lib|libdir=@libdir@|' pkgconfig/clan*.pc.in
-sed -i 's|Libs:   -L${libdir}|Libs:   -L${libdir}/%{name}-0.8|' \
+sed -i 's|Libs:   -L${libdir}|Libs:   -L${libdir}/%{name}-1.0|' \
   pkgconfig/clan*.pc.in
 
 
@@ -58,11 +62,16 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
 # put .so links in a subdir of %{libdir} so they don't conflict with
 # ClanLib06-devel .so links. The pkg-config files are patches to transparently
 # handle this for applications using us.
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}-0.8
-mv $RPM_BUILD_ROOT%{_libdir}/*.so $RPM_BUILD_ROOT%{_libdir}/%{name}-0.8
-for i in $RPM_BUILD_ROOT%{_libdir}/%{name}-0.8/*; do
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}-1.0
+mv $RPM_BUILD_ROOT%{_libdir}/*.so $RPM_BUILD_ROOT%{_libdir}/%{name}-1.0
+for i in $RPM_BUILD_ROOT%{_libdir}/%{name}-1.0/*; do
   ln -sf ../`readlink $i` $i
 done
+# we're API compatible with 0.8, add 0.8 pkgconfig symlinks, so 0.8
+# expecting sources can be build against us
+for i in $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc; do
+  ln -s `basename $i` `echo $i|sed 's/1\.0\.pc/0\.8\.pc/'`
+done
 
 
 %clean
@@ -80,13 +89,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%doc README README.kdevelop README.sdl README.upgrade html
-%{_libdir}/%{name}-0.8
-%{_includedir}/%{name}-0.8
+%doc README* html
+%{_libdir}/%{name}-1.0
+%{_includedir}/%{name}-1.0
 %{_libdir}/pkgconfig/clan*.pc
 
 
 %changelog
+* Sun May 17 2009 Hans de Goede <hdegoede at redhat.com> 1.0.0-1
+- New upstream release 1.0.0, note: API compatible but changes soname
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ClanLib/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Mar 2008 22:48:05 -0000	1.5
+++ sources	18 May 2009 13:56:51 -0000	1.6
@@ -1,2 +1,2 @@
-24e86202eb6d702f788ff16a2718aa97  ClanLib-0.8.1.tgz
-9958807c66c9deee64c2047208d3542e  ClanLib-0.8.1-generated-docs.tar.gz
+281e64a463155474d0f1270686286811  ClanLib-1.0.0.tgz
+33de5771bee71214ac5c3af81b369cb4  ClanLib-1.0.0-generated-docs.tar.gz


--- ClanLib-0.8.1-abi-compat.patch DELETED ---


