rpms/simspark/F-9 simspark-0.1-cmakefix.patch, NONE, 1.1 simspark-0.1-devilfix.patch, NONE, 1.1 simspark.spec, NONE, 1.1 sources, 1.1, 1.2

[Hedayat Vatankhah]

Author: hedayat

Update of /cvs/pkgs/rpms/simspark/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21399/F-9

Modified Files:
	sources 
Added Files:
	simspark-0.1-cmakefix.patch simspark-0.1-devilfix.patch 
	simspark.spec 
Log Message:
import to other branches

simspark-0.1-cmakefix.patch:

--- NEW FILE simspark-0.1-cmakefix.patch ---
diff -up simspark-0.1/CMakeLists.txt.cmakefix simspark-0.1/CMakeLists.txt
--- simspark-0.1/CMakeLists.txt.cmakefix	2009-03-17 11:00:37.000000000 +0330
+++ simspark-0.1/CMakeLists.txt	2009-03-17 11:02:03.000000000 +0330
@@ -76,8 +76,10 @@ endif (NOT FUNC_HSTRERROR_EXISTS)
 add_definitions(-DHAVE_CONFIG_H)
 include_directories(${CMAKE_BINARY_DIR})
 if (UNIX)
-  set(CMAKE_CXX_FLAGS "-Wno-deprecated" CACHE
+  set(CMAKE_CXX_FLAGS $ENV{CXXFLAGS} CACHE
         STRING "Common C++ compiler flags" FORCE)
+  set(CMAKE_C_FLAGS $ENV{CFLAGS} CACHE
+        STRING "Common C compiler flags" FORCE)
   set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -W -Wall -Woverloaded-virtual" CACHE
         STRING "C++ compiler flags for Debug builds" FORCE)
   set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE

simspark-0.1-devilfix.patch:

--- NEW FILE simspark-0.1-devilfix.patch ---
diff -up simspark-0.1/lib/kerosin/imageserver/imageserver.h.devilfix simspark-0.1/lib/kerosin/imageserver/imageserver.h
--- simspark-0.1/lib/kerosin/imageserver/imageserver.h.devilfix	2009-03-16 11:31:54.000000000 +0330
+++ simspark-0.1/lib/kerosin/imageserver/imageserver.h	2009-03-16 11:33:29.000000000 +0330
@@ -27,6 +27,9 @@
 #endif
 #ifdef HAVE_IL_IL_H
 #include <IL/il.h>
+#ifndef IL_ILBM
+#define IL_ILBM IL_LBM
+#endif
 #endif
 
 #include <zeitgeist/class.h>
@@ -66,7 +69,7 @@ public:
         eICO = IL_ICO,
         eJPG = IL_JPG,
         eJFIF = IL_JFIF,
-        eLBM = IL_LBM,
+        eLBM = IL_ILBM,
         ePCD = IL_PCD,
         ePCX = IL_PCX,
         ePIC = IL_PIC,


--- NEW FILE simspark.spec ---
Name:           simspark
Version:        0.1
Release:        3%{?dist}
Summary:        Spark physical simulation system

Group:          Development/Libraries
License:        GPLv2
URL:            http://simspark.sourceforge.net
Source0:        http://downloads.sourceforge.net/simspark/%{name}-%{version}.tar.gz
Patch0:         %{name}-0.1-cmakefix.patch
Patch1:         %{name}-0.1-devilfix.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cmake boost-devel ruby ruby-devel SDL-devel tex(latex)
BuildRequires:  ode-devel libGL-devel DevIL-devel freetype-devel libGLU-devel
BuildRequires:  ImageMagick
Conflicts:      rcssserver3d < 0.6.1
Requires:       ruby ruby(abi) = 1.8
%if 0%{?fedora} <= 10
Requires:       dejavu-fonts
%else
Requires:       dejavu-sans-mono-fonts
%endif

%description
Spark is a physical simulation system. The primary purpose of this system is
to provide a *generic* simulator for different kinds of simulations.
In these simulations, agents can participate as external processes. 

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       boost-devel ruby-devel ode-devel DevIL-devel
Requires:       libGL-devel libGLU-devel

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%prep
%setup -q
%patch0 -p1 -b .cmakefix
%patch1 -p1 -b .devilfix

%build
mkdir build
cd build
export CXXFLAGS="${CXXFLAGS:-%optflags}"
export CFLAGS="${CFLAGS:-%optflags}"
cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIBDIR:PATH=%{_lib} ..
make VERBOSE=1 %{?_smp_mflags}
make pdf
cp doc/devel/manual.pdf ../doc/devel/

%install
rm -rf %{buildroot}
make -C build install DESTDIR=%{buildroot}

ln -fs %{_datadir}/fonts/dejavu/DejaVuSansMono.ttf \
      %{buildroot}/%{_datadir}/%{name}/fonts/VeraMono.ttf
rm -rf %{buildroot}/%{_datadir}/%{name}/*.h

mkdir package_docs
mv %{buildroot}/%{_datadir}/doc/%{name}/* package_docs/
rm -rf %{buildroot}/%{_datadir}/doc

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc package_docs/*
%dir %{_libdir}/%{name}
# Notice: the package needs .so files for running so
# they can't be moved to -devel package
%{_libdir}/%{name}/[^l]*.so*
%{_libdir}/%{name}/lib*.so.*
%{_datadir}/%{name}

%files devel
%defattr(-,root,root,-)
%{_bindir}/*
%{_includedir}/%{name}
%{_libdir}/%{name}/lib*.so
%doc doc/devel/howtos doc/devel/manual.pdf

%changelog
* Wed Mar 18 2009 Hedayat Vatankhah <hedayat at grad.com> 0.1-3
- fixed lib directory variable for cmake

* Thu Mar 17 2009 Hedayat Vatankhah <hedayat at grad.com> 0.1-2
- Added cmake and DevIL patches
- Removed redundant gcc-c++ requirement
- Add verbose output for make
- Added CXXFLAGS
- Font package name fix for different distros

* Thu Feb 19 2009 Hedayat Vatankhah <hedayat at grad.com> 0.1-1
- Some cleanup
- fixed package documentation installation
- added tex(latex) and ImageMagic as a build requirement

* Fri Feb 13 2009 Hedayat Vatankhah <hedayat at grad.com> 0.1-1
- Initial version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/simspark/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Mar 2009 05:39:47 -0000	1.1
+++ sources	22 Mar 2009 07:02:20 -0000	1.2
@@ -0,0 +1 @@
+94ef43347083d72d09ab33d89d486d55  simspark-0.1.tar.gz