rpms/ClanLib06/devel .cvsignore, 1.2, 1.3 ClanLib06.spec, 1.6, 1.7 sources, 1.2, 1.3
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Sun Oct 21 11:26:03 UTC 2007
- Previous message (by thread): rpms/pinot/devel configure-ssl-curl-libs.patch, 1.1, 1.2 pinot.spec, 1.15, 1.16
- Next message (by thread): rpms/gcc/F-8 gcc41-ppc64-cr2-unwind.patch, NONE, 1.1 gcc41-rh341221.patch, NONE, 1.1 gcc41.spec, 1.181, 1.182
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwrdegoede
Update of /cvs/extras/rpms/ClanLib06/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21158
Modified Files:
.cvsignore ClanLib06.spec sources
Log Message:
* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.6.5-9
- Explictily disable directfb support, so that it doesn't accidentally get
build on system which have directfb installed
- Fix multilib conflict in the Reference documentation (bz 340861)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ClanLib06/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 24 Jul 2006 14:03:00 -0000 1.2
+++ .cvsignore 21 Oct 2007 11:25:30 -0000 1.3
@@ -1 +1,2 @@
ClanLib-0.6.5-1.tar.gz
+ClanLib-0.6.5-generated-docs.tar.gz
Index: ClanLib06.spec
===================================================================
RCS file: /cvs/extras/rpms/ClanLib06/devel/ClanLib06.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ClanLib06.spec 3 Aug 2007 12:31:15 -0000 1.6
+++ ClanLib06.spec 21 Oct 2007 11:25:30 -0000 1.7
@@ -1,11 +1,15 @@
Summary: Version 0.6 of this Cross platform C++ game library
Name: ClanLib06
Version: 0.6.5
-Release: 8%{?dist}
+Release: 9%{?dist}
Group: System Environment/Libraries
License: LGPLv2
URL: http://www.clanlib.org/
Source0: http://www.clanlib.org/download/legacy/ClanLib-%{version}-1.tar.gz
+# prebuild docs to avoid multilib conflicts. To regenerate untar and configure,
+# cd Documentation, make, cd ..,
+# tar cvfz ClanLib-%{version}-generated-docs.tar.gz Documentation/html
+Source1: ClanLib-%{version}-generated-docs.tar.gz
Patch0: ClanLib-0.6.5-debian.patch
Patch1: ClanLib-0.6.5-suse.patch
Patch2: ClanLib-0.6.5-tolua++.patch
@@ -14,7 +18,7 @@
BuildRequires: libX11-devel libXext-devel libXt-devel libGLU-devel
BuildRequires: libICE-devel libXxf86vm-devel xorg-x11-proto-devel
BuildRequires: libvorbis-devel libpng-devel libjpeg-devel mikmod-devel
-BuildRequires: tolua++-devel Hermes-devel freetype-devel autoconf perl
+BuildRequires: tolua++-devel Hermes-devel freetype-devel autoconf
Provides: clanlib06 = %{version}-%{release}
%description
@@ -34,7 +38,7 @@
%prep
-%setup -q -n ClanLib-%{version}
+%setup -q -a 1 -n ClanLib-%{version}
%patch0 -p1 -z .deb
%patch1 -p1 -z .suse
%patch2 -p1 -z .tolua++
@@ -51,21 +55,15 @@
ARCH_CONFIG_FLAGS=--enable-asm386
%endif
%configure --disable-dependency-tracking --disable-debug --enable-dyn \
- $ARCH_CONFIG_FLAGS
+ --disable-directfb $ARCH_CONFIG_FLAGS
tolua++ -o Sources/Lua/clanbindings.cpp Sources/Lua/clanbindings.pkg
make %{?_smp_mflags}
-pushd Documentation
-make %{?_smp_mflags}
-popd
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/*.a
-pushd Documentation
-make install HTML_PREFIX=`pwd`/html
-popd
%clean
@@ -92,6 +90,11 @@
%changelog
+* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.6.5-9
+- Explictily disable directfb support, so that it doesn't accidentally get
+ build on system which have directfb installed
+- Fix multilib conflict in the Reference documentation (bz 340861)
+
* Fri Aug 3 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.6.5-8
- Update License tag for new Licensing Guidelines compliance
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ClanLib06/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 24 Jul 2006 14:03:00 -0000 1.2
+++ sources 21 Oct 2007 11:25:30 -0000 1.3
@@ -1 +1,2 @@
7115921953ef6fa45102c28622493650 ClanLib-0.6.5-1.tar.gz
+cfc8671faa0b41c6fb21433670edc109 ClanLib-0.6.5-generated-docs.tar.gz
- Previous message (by thread): rpms/pinot/devel configure-ssl-curl-libs.patch, 1.1, 1.2 pinot.spec, 1.15, 1.16
- Next message (by thread): rpms/gcc/F-8 gcc41-ppc64-cr2-unwind.patch, NONE, 1.1 gcc41-rh341221.patch, NONE, 1.1 gcc41.spec, 1.181, 1.182
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list