rpms/rcssserver3d/F-9 rcssserver3d-0.6.1-cmakefix.patch, NONE, 1.1 simspark.png, NONE, 1.1 .cvsignore, 1.2, 1.3 rcssserver3d.desktop, 1.1, 1.2 rcssserver3d.spec, 1.1, 1.2 sources, 1.2, 1.3 rcssserver3d-0.6-libnamefix.patch, 1.1, NONE rcssserver3d-rsgedit.desktop, 1.1, NONE rcssserver3d.png, 1.1, NONE

Mon Mar 23 12:19:42 UTC 2009

Author: hedayat

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

Modified Files:
	.cvsignore rcssserver3d.desktop rcssserver3d.spec sources 
Added Files:
	rcssserver3d-0.6.1-cmakefix.patch simspark.png 
Removed Files:
	rcssserver3d-0.6-libnamefix.patch rcssserver3d-rsgedit.desktop 
	rcssserver3d.png 
Log Message:
New version: 0.6.1

rcssserver3d-0.6.1-cmakefix.patch:

--- NEW FILE rcssserver3d-0.6.1-cmakefix.patch ---
diff -up rcssserver3d-0.6.1/CMakeLists.txt.cmakefix rcssserver3d-0.6.1/CMakeLists.txt
--- rcssserver3d-0.6.1/CMakeLists.txt.cmakefix	2009-03-23 15:57:29.000000000 +0430
+++ rcssserver3d-0.6.1/CMakeLists.txt	2009-03-23 15:57:50.000000000 +0430
@@ -17,7 +17,7 @@ find_package(Freetype REQUIRED)
 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_CXX_FLAGS_DEBUG "-O0 -g -W -Wall -Woverloaded-virtual" CACHE
         STRING "C++ compiler flags for Debug builds" FORCE)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver3d/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Aug 2008 20:11:00 -0000	1.2
+++ .cvsignore	23 Mar 2009 12:19:11 -0000	1.3
@@ -1 +1 @@
-rcssserver3d-0.6.tar.gz
+rcssserver3d-0.6.1.tar.gz


Index: rcssserver3d.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver3d/F-9/rcssserver3d.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rcssserver3d.desktop	4 Aug 2008 20:11:00 -0000	1.1
+++ rcssserver3d.desktop	23 Mar 2009 12:19:11 -0000	1.2
@@ -3,8 +3,8 @@
 Name=RoboCup Soccer Server 3D
 Comment=RoboCup Soccer Simulation Server 3D
 Exec=simspark
-Icon=rcssserver3d
+Icon=simspark
 Terminal=false
 Type=Application
-Categories=Education;Science;Robotics
+Categories=Education;Science;Robotics;
 


Index: rcssserver3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver3d/F-9/rcssserver3d.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rcssserver3d.spec	4 Aug 2008 20:11:00 -0000	1.1
+++ rcssserver3d.spec	23 Mar 2009 12:19:11 -0000	1.2
@@ -1,24 +1,23 @@
 Name:           rcssserver3d
-Version:        0.6
-Release:        3%{?dist}
+Version:        0.6.1
+Release:        1%{?dist}
 Summary:        Robocup 3D Soccer Simulation Server
 
 Group:          Applications/System
 License:        GPLv2
-URL:            http://sourceforge.net/projects/sserver/
-Source0:        http://downloads.sourceforge.net/sserver/%{name}-%{version}.tar.gz
+URL:            http://sourceforge.net/projects/simspark/
+Source0:        http://downloads.sourceforge.net/simspark/%{name}-%{version}.tar.gz
 
-# Source 2 & 3 are created by myslef. Source1 is created by me using the photo in the user-manual.pdf
-Source1:        %{name}.png
+# Source 2 is created by myslef. Source1 is now available in rcssserver3d svn
+# (under data/logos directory)
+Source1:        simspark.png
 Source2:        %{name}.desktop
-Source3:        %{name}-rsgedit.desktop
-Patch0:         %{name}-0.6-libnamefix.patch
+Patch0:         %{name}-0.6.1-cmakefix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  automake autoconf gcc-c++ boost-devel slang-devel
-BuildRequires:  ruby ruby-devel SDL-devel desktop-file-utils libtool
+BuildRequires:  cmake boost-devel SDL-devel desktop-file-utils simspark-devel
 BuildRequires:  ode-devel libGL-devel DevIL-devel freetype-devel libGLU-devel
-Requires:       ruby ruby(abi) = 1.8
+BuildRequires:  tex(latex) ImageMagick
 
 %define         linvendor fedora
 
@@ -34,13 +33,12 @@
 Summary:        Header files and libraries for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       boost-devel ruby-devel ode-devel DevIL-devel
-Requires:       libGL-devel libGLU-devel
+Requires:       boost-devel ode-devel DevIL-devel
+Requires:       libGL-devel libGLU-devel simspark-devel
 
 %description    devel
-This package contains the header files and libraries
-for %{name}. If you like to develop programs using %{name},
-you will need to install %{name}-devel.
+This package contains the header files for %{name}. If you like to develop
+programs using %{name}, you will need to install %{name}-devel.
 
 %package        doc
 Summary:        Users manual for %{name}
@@ -51,119 +49,65 @@
 for %{name}. If you like to develop agents for %{name},
 you will find %{name}-doc package useful.
 
-%define _without_wxWidgets 1
-
-%if 0%{!?_without_wxWidgets:1}
-%package        rsgedit
-Summary:        RsgEditor and wxWidgets related libraries
-Group:          Applications/System
-Requires:       %{name} = %{version}-%{release}
-Requires:       wxGTK wxGTK-gl
-BuildRequires:  wxGTK-devel
-
-%description    rsgedit
-This package contains rsgedit and %{name} plugins which use wxWidgets libraries.
-
-
-%package        wxGTK-devel
-Summary:        wxWidgets related header files and libraries for %{name}
-Group:          Development/Libraries
-Requires:       %{name}-devel = %{version}-%{release}
-Requires:       %{name}-rsgedit = %{version}-%{release}
-Requires:       wxGTK-devel
-
-%description    wxGTK-devel
-This package contains wxWidgets related header files and libraries
-for %{name}. If you like to develop programs using wxWidgets plugins of %{name},
-you will need to install %{name}-wxGTK-devel.
-%endif
-
 %prep
 %setup -q
-%patch0 -p1 -b .libnamefix
-autoreconf --install
-chmod a-x app/simspark/rsg/agent/nao/*
-find -name "*.cpp" -exec chmod a-x {} \;
-find -name "*.h" -exec chmod a-x {} \;
-sed -i.stamp -e 's|cp -r|cp -pr|' app/simspark/Makefile.{am,in}
+%patch0 -p1 -b .cmakefix
 
 %build
-%configure --enable-debug=no %{?_without_wxWidgets: --without-wxWidgets}
-make %{?_smp_mflags}
+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/users/user-manual.pdf ../doc/users/
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} INSTALL="install -p" CPPROG="cp -p"
+make -C build install DESTDIR=%{buildroot}
 
 mkdir %{buildroot}/%{_datadir}/pixmaps/
 cp -p %{SOURCE1} %{buildroot}/%{_datadir}/pixmaps/
 
 desktop-file-install --vendor="%{linvendor}"                 \
-  --dir=%{buildroot}/%{_datadir}/applications %{SOURCE2} %{SOURCE3}
+  --dir=%{buildroot}/%{_datadir}/applications %{SOURCE2}
 
-rm -rf %{buildroot}/%{_libdir}/%{name}/*.la
-rm -rf %{buildroot}/%{_bindir}/{rcsoccersim3D,rcssmonitor3D-*,rcssserver3D,agenttest}
-rm -rf %{buildroot}/%{_datadir}/%{name}/*.h
-%if 0%{?_without_wxWidgets:1}
-rm -rf %{buildroot}/%{_includedir}/%{name}/wxutil
-rm -rf %{buildroot}/%{_datadir}/%{name}/xpm*
-rm -rf %{buildroot}/%{_datadir}/applications/%{linvendor}-%{name}-rsgedit.desktop
-%endif
+mkdir package_docs
+mv %{buildroot}/%{_datadir}/doc/%{name}/* package_docs/
+rm -rf %{buildroot}/%{_datadir}/doc
+rm -f package_docs/TODO
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS  NEWS ChangeLog COPYING README README-soccer THANKS TODO
+%doc package_docs/*
 %doc doc/TEXT_INSTEAD_OF_A_MANUAL.txt
-%{_bindir}/*spark*
-%dir %{_libdir}/%{name}
+%{_bindir}/*
 # Notice: the package needs .so files for running so
 # they can't be moved to -devel package
-%{_libdir}/%{name}/[^ilo]*.so*
-%{_libdir}/%{name}/inputsdl*.so*
-%{_libdir}/%{name}/openglsyssdl*.so*
-%{_libdir}/%{name}/ob*.so
-%{_libdir}/%{name}/lib[^w]*.so.*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/[^x]*
+%{_libdir}/%{name}
+%{_datadir}/%{name}
 %{_datadir}/applications/%{linvendor}-%{name}.desktop
 %{_datadir}/pixmaps/*
 
 %files devel
 %defattr(-,root,root,-)
-%{_bindir}/*-config
-%dir %{_includedir}/%{name}
-%{_includedir}/%{name}/[^w]*
-#%{_libdir}/%{name}/[^ilo]*.so
-#%{_libdir}/%{name}/inputsdl*.so
-#%{_libdir}/%{name}/openglsyssdl*.so
-%{_libdir}/%{name}/lib[^w]*.so
-%doc TODO doc/devel/howtos doc/devel/manual.pdf
+%{_includedir}/%{name}
+%doc TODO
 
 %files doc
 %defattr(-,root,root,-)
-%doc doc/users/user-manual.pdf doc/manual/manual.pdf
-
-
-%if 0%{!?_without_wxWidgets:1}
-%files rsgedit
-%defattr(-,root,root,-)
-%{_bindir}/rsgedit
-%{_libdir}/%{name}/*wx*.so.*
-#%{_datadir}/%{name}/rsgedit.rb
-%{_datadir}/%{name}/xpm*
-%doc doc/rsgedit.txt
-%{_datadir}/applications/%{linvendor}-%{name}-rsgedit.desktop
+%doc doc/users/user-manual.pdf
 
-%files wxGTK-devel
-%defattr(-,root,root,-)
-%{_libdir}/%{name}/*wx*.so
-%{_includedir}/%{name}/wxutil
-%endif
 
 %changelog
+* Mon Mar 23 2009 Hedayat Vatankhah <hedayat at grad.com> 0.6.1-1
+- Updated to 0.6.1 version
+- Using the new CMake build system
+
 * Wed Jul 02 2008 Hedayat Vatankhah <hedayat at grad.com> 0.6-3
 - Added a patch to rename libtinyxml to libtinyxml_ex since it differs from libtinyxml
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver3d/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Aug 2008 20:11:00 -0000	1.2
+++ sources	23 Mar 2009 12:19:12 -0000	1.3
@@ -1 +1 @@
-e617a2db885ae4a8c754b6e07c4b359d  rcssserver3d-0.6.tar.gz
+7617ce283127a67fdc1185fb500975ae  rcssserver3d-0.6.1.tar.gz


--- rcssserver3d-0.6-libnamefix.patch DELETED ---


--- rcssserver3d-rsgedit.desktop DELETED ---


