diff --git a/.cvsignore b/.cvsignore index ddaa0e4..85371d0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -alleggl-0.4.2.tar.bz2 -alleggl-0.4.2-doxygen-docs.tar.gz +alleggl-0.4.3.tar.bz2 diff --git a/alleggl.spec b/alleggl.spec index 5cfccc2..a284bd7 100644 --- a/alleggl.spec +++ b/alleggl.spec @@ -1,15 +1,11 @@ Name: alleggl -Version: 0.4.2 -Release: 2%{?dist} +Version: 0.4.3 +Release: 1%{?dist} Summary: OpenGL support library for Allegro Group: System Environment/Libraries License: zlib URL: http://allegrogl.sourceforge.net/ Source0: http://downloads.sourceforge.net/allegrogl/%{name}-%{version}.tar.bz2 -# prebuild doxygen docs to avoid multilib conflicts. To regenerate: untar, -# cd docs, doxygen Doxyfile, cd .., -# tar cvfz %{name}-%{version}-doxygen-docs.tar.gz docs -Source1: %{name}-%{version}-doxygen-docs.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel libGLU-devel libX11-devel libXext-devel BuildRequires: libXpm-devel libXxf86vm-devel @@ -38,7 +34,7 @@ developing applications that use %{name}. %prep -%setup -q -a 1 -n %{name} +%setup -q -n %{name} %build @@ -53,10 +49,7 @@ make %{?_smp_mflags} 'LIB_BUILDER=gcc -shared -Wl,-soname,libagl.so.0 -o' \ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -# clean up messy alleggl install -# mv $RPM_BUILD_ROOT%{_libdir}/libagl.so $RPM_BUILD_ROOT%{_libdir}/libagl.so.0 -# chmod +x $RPM_BUILD_ROOT%{_libdir}/libagl.so.0 -# ln -s libagl.so.0 $RPM_BUILD_ROOT%{_libdir}/libagl.so + # alleggl installs an autoheader generated header file which could very # well conflict with other autoheader generated header files, so we override # this with our own version which contains only the bare minimum: @@ -64,6 +57,7 @@ echo '#define ALLEGROGL_HAVE_DYNAMIC_LINK 1' \ > $RPM_BUILD_ROOT%{_includedir}/alleggl_config.h echo '#define ALLEGROGL_HAVE_XF86VIDMODE 1' \ >> $RPM_BUILD_ROOT%{_includedir}/alleggl_config.h + # we don't want these files to end up under %%doc and there is no way # to %%exclude files from %%doc, so we remove them rm docs/html/index.hh? @@ -91,6 +85,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Nov 11 2007 Hans de Goede 0.4.3-1 +- New upstream release 0.4.3 +- Drop prebuild doxygen Source as upstream now includes prebuild doxygen docs + * Sun Oct 21 2007 Hans de Goede 0.4.2-2 - Some cleanups to the multilib doxygen documentation bugfix diff --git a/sources b/sources index 5174455..4385c59 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -e9432c7e29d88252ad65568f3aa3b814 alleggl-0.4.2.tar.bz2 -d3551545c7d17fe2a53aaadf1d3be212 alleggl-0.4.2-doxygen-docs.tar.gz +18733c5525e9af9c6b139759e0684ed9 alleggl-0.4.3.tar.bz2