diff --git a/.cvsignore b/.cvsignore index e69de29..7991407 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +flam3-2.7.8.tar.gz diff --git a/flam3-2.7.7-pkgconfig.patch b/flam3-2.7.7-pkgconfig.patch new file mode 100644 index 0000000..dc3ee5e --- /dev/null +++ b/flam3-2.7.7-pkgconfig.patch @@ -0,0 +1,12 @@ +--- flam3-2.7.7/flam3.pc.in.orig 2007-10-30 16:30:53.000000000 +0900 ++++ flam3-2.7.7/flam3.pc.in 2008-01-17 17:00:42.000000000 +0900 +@@ -6,6 +6,6 @@ + Name: flam3 + Description: Renders and animates fractal flames and manipulates their genetic codes + Version: @VERSION@ +-Requires: libpng12 >= 1.0 +-Libs: -L${libdir} -lflam3 @WIN32_LIBS@ +-Cflags: -I@INCLUDEDIR@ @WIN32_CFLAGS@ ++Requires: libpng12 >= 1.0 libxml-2.0 ++Libs: -L${libdir} -lflam3 -ljpeg -lpthread ++Cflags: -I${includedir} diff --git a/flam3-2.7.8-config.h.in.patch b/flam3-2.7.8-config.h.in.patch new file mode 100644 index 0000000..5c2dd33 --- /dev/null +++ b/flam3-2.7.8-config.h.in.patch @@ -0,0 +1,15 @@ +--- flam3-2.7.8/config.h.in.orig 2008-01-28 23:16:53.000000000 -0600 ++++ flam3-2.7.8/config.h.in 2008-01-28 23:17:05.000000000 -0600 +@@ -4,10 +4,10 @@ + #undef HAVE_DLFCN_H + + /* Have 64-bit __sync_bool_compare_and_swap() and friends. */ +-#undef HAVE_GCC_64BIT_ATOMIC_OPS ++/* #undef HAVE_GCC_64BIT_ATOMIC_OPS */ + + /* Have 32-bit __sync_bool_compare_and_swap() and friends. */ +-#undef HAVE_GCC_ATOMIC_OPS ++/* #undef HAVE_GCC_ATOMIC_OPS */ + + /* Define to 1 if you have the header file. */ + #undef HAVE_INTTYPES_H diff --git a/flam3-2.7.8-remove-config.h.patch b/flam3-2.7.8-remove-config.h.patch new file mode 100644 index 0000000..72ee840 --- /dev/null +++ b/flam3-2.7.8-remove-config.h.patch @@ -0,0 +1,31 @@ +--- flam3-2.7.8/flam3-genome.c.orig 2008-01-27 07:22:18.000000000 +0900 ++++ flam3-2.7.8/flam3-genome.c 2008-01-31 16:21:13.000000000 +0900 +@@ -22,6 +22,7 @@ + + #include "private.h" + #include "isaacs.h" ++#include "config.h" + + int verbose; + +--- flam3-2.7.8/flam3.c.orig 2008-01-27 07:22:18.000000000 +0900 ++++ flam3-2.7.8/flam3.c 2008-01-31 16:07:11.000000000 +0900 +@@ -23,6 +23,7 @@ + + #include "private.h" + #include "img.h" ++#include "config.h" + #include + #include + #include +--- flam3-2.7.8/private.h.orig 2007-10-30 16:30:53.000000000 +0900 ++++ flam3-2.7.8/private.h 2008-01-31 16:07:52.000000000 +0900 +@@ -35,8 +35,6 @@ + #define basename(x) strdup(x) + #endif + +-#include "config.h" +- + #define EPS (1e-10) + #define CMAP_SIZE 256 + #define CMAP_SIZE_M1 255 diff --git a/flam3.spec b/flam3.spec new file mode 100644 index 0000000..2a60062 --- /dev/null +++ b/flam3.spec @@ -0,0 +1,133 @@ +Name: flam3 +Version: 2.7.8 +Release: 4%{?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 +Patch0: flam3-2.7.7-pkgconfig.patch +Patch1: flam3-2.7.8-config.h.in.patch +Patch2: flam3-2.7.8-remove-config.h.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: libxml2-devel +BuildRequires: libpng-devel +BuildRequires: libjpeg-devel + +%description +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). + +%package devel +Summary: C headers to generate and render cosmic recursive fractal flames +Group: Applications/Multimedia +Requires: pkgconfig +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. + + +%prep +%setup -q +%patch0 -p1 -b .pkgconfig +%patch1 -p1 -b .config_h_in +%patch2 -p1 -b .remove_config_h +sed -i.flags -e 's|-O3 -ffast-math||' Makefile.in +chmod 644 *.c + + +%build +%configure \ + --includedir=%{_includedir}/%{name} +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 + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc COPYING.txt README.txt +%{_bindir}/flam3-animate +%{_bindir}/flam3-convert +%{_bindir}/flam3-genome +%{_bindir}/flam3-render +%{_datadir}/flam3 + +%files devel +%defattr(-,root,root,-) +%doc COPYING.txt README.txt +%{_includedir}/%{name}/ +%{_libdir}/pkgconfig/flam3.pc +%{_libdir}/libflam3.a + + +%changelog +* Fri Feb 01 2008 Ian Weller 2.7.8-4 +- Made patch commands less confusing + +* Tue Jan 29 2008 Ian Weller 2.7.8-3 +- Removed config.h properly +- We now own datadir/flam3 + +* Mon Jan 28 2008 Ian Weller 2.7.8-2 +- Added more missing headers -- they might be used by some program somewhere: + private.h config.h img.h +- Fix atomic ops error on ppc and ppc64 with Patch1 + +* Sun Jan 27 2008 Ian Weller 2.7.8-1 +- Updated to version 2.7.8 +- Made sure that libflam3.la wasn't included, complying with review guidelines + "Packages must NOT contain any .la libtool archives, these should be removed in the spec." + +* Thu Jan 17 2008 Mamorut Tasaka 2.7.7-3 +- Fix pkgconfig .pc file +- Install missing headers +- Move header files into %%{_includedir}/%%{name} +- Fix cflags to meet Fedora guidelines +- More Requires to -devel subpackage for static archive + +* Wed Dec 19 2007 Ian Weller 2.7.7-2 +- *-devel now includes *-static +- *-static no longer exists, but is provided by *-devel +- added version requirement to *-devel requires main + +* Mon Dec 17 2007 Ian Weller 2.7.7-1 +- Fixed spurious-executable-perm issue +- *-devel subpackage now requires *-static subpackage +- Subpackage now requires main package +- Update to version 2.7.7 + +* Sun Dec 16 2007 Ian Weller 2.7.6-2 +- Dropped kernel from requires, as most people have one installed +- Created *-devel and *-static packages +- Removed redundant explicit requires +- Added COPYING.txt and README.txt documentation files + +* Sun Dec 9 2007 Ian Weller 2.7.6-1 +- First package build. diff --git a/sources b/sources index e69de29..f8ad4bf 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +61f6bd1fee26a6be0a87c61b3c0d1c3d flam3-2.7.8.tar.gz