diff --git a/.gitignore b/.gitignore index 92754e8..202ca92 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ flam3-2.7.18.tar.gz +flam3-3.0.tar.gz diff --git a/flam3.spec b/flam3.spec index 9a07bc8..b74fb0a 100644 --- a/flam3.spec +++ b/flam3.spec @@ -1,12 +1,12 @@ Name: flam3 -Version: 2.7.18 -Release: 2%{?dist} +Version: 3.0 +Release: 1%{?dist} Summary: Programs to generate and render cosmic recursive fractal flames Group: Applications/Multimedia License: GPLv2+ URL: http://www.flam3.com/ -Source0: http://www.flam3.com/%{name}-%{version}.tar.gz +Source0: http://flam3.googlecode.com/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel @@ -27,44 +27,38 @@ Requires: libxml2-devel Requires: libpng-devel Requires: libjpeg-devel Requires: flam3 = %{version}-%{release} -Provides: flam3-static = %{version}-%{release} %description devel Flam3, or Fractal Flames, are algorithmically generated images and animations. This is free software to render fractal flames as described on http://flam3.com. Flam3-animate makes animations, and flam3-render makes still images. Flam3-genome creates and manipulates genomes (parameter sets). This -package contains a header file for C, a static library, and a pkgconfig file. +package contains a header file for C, a library, and a pkgconfig file. %prep -%setup -q -%if 0%{fedora} < 9 -sed -i.atomicops -e 's|#undef HAVE_GCC_\(.*\)ATOMIC_OPS|/* #undef HAVE_GCC_\1ATOMIC_OPS */|' config.h.in -%endif -sed -i.flags -e 's|-O3 -ffast-math||' Makefile.in -chmod 644 *.c +%setup -qn %{name}-%{version}/src %build -%configure \ - --includedir=%{_includedir}/%{name} +%configure --prefix=%{_prefix} --includedir=%{_includedir}/%{name} --enable-shared --disable-static +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make install \ - DESTDIR=$RPM_BUILD_ROOT \ - INSTALL="install -p" -# Install missing headers -install -cpm 644 \ - isaac.h isaacs.h private.h img.h \ - $RPM_BUILD_ROOT%{_includedir}/%{name}/ -rm $RPM_BUILD_ROOT%{_libdir}/libflam3.la +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} INSTALL="install -p" +rm %{buildroot}/%{_libdir}/lib%{name}.la + %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} + + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files @@ -75,17 +69,21 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/flam3-genome %{_bindir}/flam3-render %{_datadir}/flam3 +%{_libdir}/libflam3.so.* %{_mandir}/man1/flam3* %files devel %defattr(-,root,root,-) %doc COPYING.txt README.txt %{_includedir}/%{name}/ +%{_libdir}/libflam3.so %{_libdir}/pkgconfig/flam3.pc -%{_libdir}/libflam3.a %changelog +* Mon Nov 15 2010 Ian Weller - 3.0-1 +- Update to 3.0 + * Fri Jul 24 2009 Fedora Release Engineering - 2.7.18-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index c8b2427..1d6b4e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -052faba777634799b2958205ddf05545 flam3-2.7.18.tar.gz +0526e476338327f718d76e6f48ddc090 flam3-3.0.tar.gz