rpms/rcssserver/F-8 rcssserver-12.1.1-libfix.patch, NONE, 1.1 rcssserver-12.1.1-utf8fix.patch, NONE, 1.1 rcssserver-12.1.3-libdirfix.patch, NONE, 1.1 rcssserver.desktop, NONE, 1.1 rcssserver.spec, NONE, 1.1 sources, 1.1, 1.2

Hedayat Vatankhah hedayat at fedoraproject.org
Thu Sep 18 06:48:43 UTC 2008


Author: hedayat

Update of /cvs/pkgs/rpms/rcssserver/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29336

Modified Files:
	sources 
Added Files:
	rcssserver-12.1.1-libfix.patch rcssserver-12.1.1-utf8fix.patch 
	rcssserver-12.1.3-libdirfix.patch rcssserver.desktop 
	rcssserver.spec 
Log Message:
added f-8 branch

rcssserver-12.1.1-libfix.patch:

--- NEW FILE rcssserver-12.1.1-libfix.patch ---
diff -up rcssserver-12.1.1/src/Makefile.am.libfix rcssserver-12.1.1/src/Makefile.am
--- rcssserver-12.1.1/src/Makefile.am.libfix	2008-04-11 16:12:53.000000000 +0430
+++ rcssserver-12.1.1/src/Makefile.am	2008-07-12 00:27:45.000000000 +0430
@@ -104,7 +104,7 @@ rcssexceptions.h \
 rcssserverconfig.hpp \
 resultsaver.hpp
 
-librcssclangparser_la_LDFLAGS = -version-info 3:0:1
+librcssclangparser_la_LDFLAGS = -version-info 3:0:1 -lrcssconfparser
 #    Changed from 2.0.0 to 3.0.1 at 9.3.5 for addition of buildCondList
 #
 #    1. Start with version information of `0:0:0' for each libtool library.
@@ -149,6 +149,9 @@ clangutil.cpp \
 cond.cpp \
 compop.cpp \
 arithop.cpp \
+serverparam.cpp \
+utility.cpp \
+playerparam.cpp \
 rule.cpp
 
 
@@ -180,7 +183,6 @@ main.cpp \
 types.h \
 field.cpp \
 playerparam.h \
-playerparam.cpp \
 field.h \
 netif.cpp \
 netif.h \
@@ -244,7 +246,6 @@ serializercommonstdv8.cpp \
 serializermonitor.h \
 serializermonitor.cpp \
 serverparam.h \
-serverparam.cpp \
 referee.h \
 referee.cpp \
 xpmholder.cpp \
@@ -263,7 +264,6 @@ synctimer.h \
 synctimer.cpp \
 timeable.h \
 utility.h \
-utility.cpp \
 dispsender.h \
 dispsender.cpp \
 bodysender.h \

rcssserver-12.1.1-utf8fix.patch:

--- NEW FILE rcssserver-12.1.1-utf8fix.patch ---
diff -up rcssserver-12.1.1/NEWS.utf8fix rcssserver-12.1.1/NEWS
--- rcssserver-12.1.1/NEWS.utf8fix	2008-05-22 13:20:29.000000000 +0430
+++ rcssserver-12.1.1/NEWS	2008-07-11 01:58:33.000000000 +0430
@@ -1905,7 +1905,7 @@
   otherwise. Player_2_ball is a vector from the player to the ball, relative
   to the player's body direction.
 
-  If the tackle is successfull, the ball is pushed in the direction of the
+  If the tackle is successfull, the ball is pushed in the direction of the
   players body.
 
   When players can see another players team, they can also see if that player

rcssserver-12.1.3-libdirfix.patch:

--- NEW FILE rcssserver-12.1.3-libdirfix.patch ---
diff -up rcssserver-12.1.3/src/rcsoccersim.in.libdirfix rcssserver-12.1.3/src/rcsoccersim.in
--- rcssserver-12.1.3/src/rcsoccersim.in.libdirfix	2008-07-07 18:05:34.000000000 +0430
+++ rcssserver-12.1.3/src/rcsoccersim.in	2008-09-14 00:13:40.000000000 +0430
@@ -26,7 +26,7 @@ which rcssmodtest 2> /dev/null
 if test $? -eq 1; then
     LIBLOAD=""
 else
-    rcssmodtest @prefix@/lib/@PACKAGE@/modules/libstdoutsaver 2> /dev/null
+    rcssmodtest @libdir@/@PACKAGE@/modules/libstdoutsaver 2> /dev/null
     if test $? -eq 1; then
         LIBLOAD=""
     fi


--- NEW FILE rcssserver.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=RoboCup 2D Soccer Simulation
Comment=Runs a 2D Soccer Simulation on local machine
Exec=rcsoccersim
Icon=rcssmonitor
Terminal=true
Type=Application
Categories=Education;Science;Robotics;



--- NEW FILE rcssserver.spec ---
Name:           rcssserver
Version:        12.1.3
Release:        2%{?dist}
Summary:        Robocup 2D Soccer Simulation Server

Group:          Applications/System
License:        GPLv2+
URL:            http://sourceforge.net/projects/sserver/
Source0:        http://downloads.sourceforge.net/sserver/%{name}-%{version}.tar.gz
# Source 1 is created by me.
Source1:        %{name}.desktop
Patch0:         %{name}-12.1.1-utf8fix.patch
Patch1:         %{name}-12.1.1-libfix.patch
Patch2:         %{name}-12.1.3-libdirfix.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  automake libtool boost-devel rcssbase-devel desktop-file-utils

%description
The RoboCup Soccer Simulator Server (rcssserver) is a research and educational
tool for mutli-agent systems and artificial intelligence. It allows 11
simulated autonomous robotic players to play soccer (football).

This package includes the simulation server. If you want to view the games 
you should install and run a monitor (rcssmonitor or rcssmonitor_classic).

%package        devel
Summary:        Header files and libraries for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       boost-devel rcssbase-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.

%package        gui
Summary:        A simple way to run 2D Soccer Simulation on a single machine
Group:          Applications/System
Requires:       %{name} = %{version}-%{release}
Requires:       rcssmonitor

%description    gui
This package contains rcsoccersim script as simple way for
running 2D Soccer Simulation on a single machine. It'll also
provide a menu entry for this script.


%prep
%setup -q
%patch0 -p1 -b .utf8fix
%patch1 -p1 -b .libfix
%patch2 -p1 -b .libdirfix
sed -i.lib \
    -e 's|\$ac_boost_path/lib|\$libdir|' \
    -e 's|$ac_boost_path_tmp/lib|\$libdir|' \
    m4/ax_boost_base.m4
autoreconf -if
# Fix rpath
sed -i.rpath -e '/sys_lib_search_path_spec/s| /usr/lib| /lib64 /usr/lib64 /usr/lib|' \
    configure

%build
%configure
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
#%{?_smp_mflags} doesn't work
make 

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"
rm -rf %{buildroot}/%{_libdir}/*.la
rm -rf %{buildroot}/%{_libdir}/%{name}/modules/*.la  

desktop-file-install --vendor="fedora"                 \
  --dir=%{buildroot}/%{_datadir}/applications %{SOURCE1}

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING.LESSER NEWS README 
%{_bindir}/rcss*
%{_libdir}/*.so.*
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/modules
%{_libdir}/%{name}/modules/*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so

%files gui
%defattr(-,root,root,-)
%{_bindir}/rcsoccersim
%{_datadir}/applications/*

%changelog
* Sat Sep 13 2008 Hedayat Vatankhah <hedayat at grad.com> 12.1.3-2
(Thanks to Mamoru Tasaka)
- Fixed License tag
- Fixed gui sub-package requires to include release number of the main package
- Added defattr to -gui files section
- Modules moved completely to the main package (from -devel)
- Fixed libdir problem in 64bit platforms in rcsoccersim.in 

* Thu Sep 11 2008 Hedayat Vatankhah <hedayat at grad.com> 12.1.3-1
- Updated to the latest version (12.1.3)

* Thu Sep 04 2008 Hedayat Vatankhah <hedayat at grad.com> 12.1.1-1
- Some fixes from rcssbase.spec
- Added gui subpackage

* Fri Jul 11 2008 Hedayat Vatankhah <hedayat at grad.com> 12.1.1-1
- Initial version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Sep 2008 03:19:22 -0000	1.1
+++ sources	18 Sep 2008 06:48:13 -0000	1.2
@@ -0,0 +1 @@
+97a4da25e48a469b9958a22a1cd93437  rcssserver-12.1.3.tar.gz




More information about the fedora-extras-commits mailing list