rpms/ClanLib/devel .cvsignore, 1.3, 1.4 ClanLib.spec, 1.11, 1.12 sources, 1.3, 1.4

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	.cvsignore ClanLib.spec sources 
Log Message:
* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-7
- Fix multilib conflicts in generated Reference documentation (bz 340851)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ClanLib/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Aug 2006 10:39:27 -0000	1.3
+++ .cvsignore	21 Oct 2007 11:37:37 -0000	1.4
@@ -1 +1,2 @@
 ClanLib-0.8.0.tgz
+ClanLib-0.8.0-generated-docs.tar.gz


Index: ClanLib.spec
===================================================================
RCS file: /cvs/extras/rpms/ClanLib/devel/ClanLib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ClanLib.spec	3 Aug 2007 11:03:41 -0000	1.11
+++ ClanLib.spec	21 Oct 2007 11:37:37 -0000	1.12
@@ -1,18 +1,23 @@
 Summary:        Cross platform C++ game library
 Name:           ClanLib
 Version:        0.8.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Group:          System Environment/Libraries
 License:        zlib
 URL:            http://www.clanlib.org/
 Source0:        http://www.clanlib.org/download/releases-0.8/%{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-fullscreen.patch
 Patch1:         ClanLib-0.8.0-tex-format.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
 BuildRequires:  libvorbis-devel mikmod-devel SDL-devel SDL_gfx-devel
-BuildRequires:  libpng-devel libjpeg-devel libxslt perl
+BuildRequires:  libpng-devel libjpeg-devel
 Provides:       clanlib = %{version}-%{release}
 
 %description
@@ -31,7 +36,7 @@
 
 
 %prep
-%setup -q
+%setup -q -a 1
 %patch0 -p1 -z .fs
 %patch1 -p1 -z .texfmt
 # fixup pc files
@@ -41,7 +46,8 @@
 
 
 %build
-%configure --disable-dependency-tracking --disable-static --enable-dyn
+%configure --disable-dependency-tracking --disable-static --enable-dyn \
+  --disable-docs
 make %{?_smp_mflags}
 
 
@@ -57,8 +63,6 @@
 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
@@ -84,6 +88,9 @@
 
 
 %changelog
+* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-7
+- Fix multilib conflicts in generated Reference documentation (bz 340851)
+
 * Fri Aug  3 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.8.0-6
 - Update License tag for new Licensing Guidelines compliance
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ClanLib/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Aug 2006 10:39:28 -0000	1.3
+++ sources	21 Oct 2007 11:37:37 -0000	1.4
@@ -1 +1,2 @@
 3e183a801a31f646b012db2d82f97ff3  ClanLib-0.8.0.tgz
+e552916511247b59b1f220421dd68539  ClanLib-0.8.0-generated-docs.tar.gz