rpms/ClanLib/devel ClanLib-0.8.0-gcc41.patch, NONE, 1.1 ClanLib-0.8.0-grave_key.patch, NONE, 1.1 ClanLib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	.cvsignore sources 
Added Files:
	ClanLib-0.8.0-gcc41.patch ClanLib-0.8.0-grave_key.patch 
	ClanLib.spec 
Log Message:
auto-import ClanLib-0.8.0-0.2.RC2 on branch devel from ClanLib-0.8.0-0.2.RC2.src.rpm

ClanLib-0.8.0-gcc41.patch:

--- NEW FILE ClanLib-0.8.0-gcc41.patch ---
--- ClanLib-0.8.0-RC2/Sources/GUI/messagebox_generic.h~	2006-07-19 08:48:49.000000000 +0200
+++ ClanLib-0.8.0-RC2/Sources/GUI/messagebox_generic.h	2006-07-19 08:48:49.000000000 +0200
@@ -51,7 +51,7 @@
 		const std::string &button2,
 		const std::string &button3);
 
-	CL_MessageBox_Generic::~CL_MessageBox_Generic();
+	~CL_MessageBox_Generic();
 
 	std::string text;
 
--- ClanLib-0.8.0-RC2/Sources/GUI/inputdialog_generic.h~	2006-07-19 08:46:36.000000000 +0200
+++ ClanLib-0.8.0-RC2/Sources/GUI/inputdialog_generic.h	2006-07-19 08:46:36.000000000 +0200
@@ -57,7 +57,7 @@
 		const std::string &button2,
 		const std::string &button3);
 
-	CL_InputDialog_Generic::~CL_InputDialog_Generic();
+	~CL_InputDialog_Generic();
 
 	CL_InputDialog *inputdialog;
 

ClanLib-0.8.0-grave_key.patch:

--- NEW FILE ClanLib-0.8.0-grave_key.patch ---
--- ClanLib-0.8.0-RC2/Sources/API/Display/keys.h~	2006-07-21 09:26:23.000000000 +0200
+++ ClanLib-0.8.0-RC2/Sources/API/Display/keys.h	2006-07-21 09:26:23.000000000 +0200
@@ -472,6 +472,7 @@
 #define CL_KEY_RCONTROL XK_Control_R
 #define CL_KEY_LMENU XK_Meta_L
 #define CL_KEY_RMENU XK_Meta_R
+#define CL_KEY_GRAVE XK_grave
 #endif
 #endif
 


--- NEW FILE ClanLib.spec ---
%define pre_version RC2

Summary:        Cross platform C++ game library
Name:           ClanLib
Version:        0.8.0
Release:        0.2.%{pre_version}%{?dist}
Group:          System Environment/Libraries
License:        zlib License
URL:            http://www.clanlib.org/
Source0:        http://www.clanlib.org/download/releases-0.8/%{name}-%{version}-%{pre_version}.tgz
Patch0:         ClanLib-0.8.0-gcc41.patch
Patch1:         ClanLib-0.8.0-grave_key.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libvorbis-devel SDL-devel SDL_gfx-devel libpng-devel libxslt
BuildRequires:  libjpeg-devel mikmod-devel libX11-devel libXext-devel perl
BuildRequires:  libXmu-devel libICE-devel libXxf86vm-devel xorg-x11-proto-devel
Provides:       clanlib = %{version}-%{release}

%description
ClanLib is a cross platform C++ game library.


%package devel
Summary:        Development Libraries and Headers for ClanLib
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Provides:       clanlib-devel = %{version}-%{release}

%description devel
ClanLib development headers and libraries


%prep
%setup -q -n %{name}-%{version}-%{pre_version}
%patch0 -p1 -z .gcc41
%patch1 -p1 -z .grave
# 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|' \
  pkgconfig/clan*.pc.in


%build
%configure --disable-dependency-tracking --disable-static --enable-dyn
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
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
  ln -sf ../`readlink $i` $i
done
# for %doc
mv $RPM_BUILD_ROOT%{_datadir}/doc/clanlib html


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc COPYING CREDITS NEWS TODO-RSN
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc README README.kdevelop README.sdl README.upgrade html
%{_libdir}/%{name}-0.8
%{_includedir}/%{name}-0.8
%{_libdir}/pkgconfig/clan*.pc


%changelog
* Fri Jul 21 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-0.2.RC2
- Change License: to "zlib License" as 0.8 is under the zlib License not the
  LGPL (0.6 is LGPL).
- Add a patch from pingus contrib dir which adds support for the grave key
- Add libXmu-devel to the BuildRequires

* Wed Jul 19 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-0.1.RC2
- Initial FE version based on the newrpms SRPM by Che.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ClanLib/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Jul 2006 17:51:27 -0000	1.1
+++ .cvsignore	23 Jul 2006 17:55:57 -0000	1.2
@@ -0,0 +1 @@
+ClanLib-0.8.0-RC2.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ClanLib/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Jul 2006 17:51:27 -0000	1.1
+++ sources	23 Jul 2006 17:55:57 -0000	1.2
@@ -0,0 +1 @@
+808382d5e181aff62a36c6d824fcf058  ClanLib-0.8.0-RC2.tgz