rpms/rcsslogplayer/F-9 rcsslogplayer-12.1.1-gcc43fix.patch, NONE, 1.1 rcsslogplayer.desktop, NONE, 1.1 rcsslogplayer.spec, NONE, 1.1 sources, 1.1, 1.2
Hedayat Vatankhah
hedayat at fedoraproject.org
Sun Sep 21 07:09:44 UTC 2008
- Previous message (by thread): rpms/rcsslogplayer/F-8 rcsslogplayer-12.1.1-gcc43fix.patch, NONE, 1.1 rcsslogplayer.desktop, NONE, 1.1 rcsslogplayer.spec, NONE, 1.1 sources, 1.1, 1.2
- Next message (by thread): rpms/sms_ntsc/F-9 import.log, NONE, 1.1 sms_ntsc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: hedayat
Update of /cvs/pkgs/rpms/rcsslogplayer/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5059/F-9
Modified Files:
sources
Added Files:
rcsslogplayer-12.1.1-gcc43fix.patch rcsslogplayer.desktop
rcsslogplayer.spec
Log Message:
import to other branches
rcsslogplayer-12.1.1-gcc43fix.patch:
--- NEW FILE rcsslogplayer-12.1.1-gcc43fix.patch ---
diff -up rcsslogplayer-12.1.1/classic/controler.cpp.gcc43fix rcsslogplayer-12.1.1/classic/controler.cpp
--- rcsslogplayer-12.1.1/classic/controler.cpp.gcc43fix 2008-07-22 08:27:06.000000000 +0430
+++ rcsslogplayer-12.1.1/classic/controler.cpp 2008-09-15 00:33:04.000000000 +0430
@@ -46,6 +46,7 @@
#include <cstdio>
#include <cstdlib>
#include <iostream>
+#include <cstring>
#include <X11/Intrinsic.h>
diff -up rcsslogplayer-12.1.1/classic/nowindow.cpp.gcc43fix rcsslogplayer-12.1.1/classic/nowindow.cpp
--- rcsslogplayer-12.1.1/classic/nowindow.cpp.gcc43fix 2008-07-22 08:27:06.000000000 +0430
+++ rcsslogplayer-12.1.1/classic/nowindow.cpp 2008-09-15 00:33:25.000000000 +0430
@@ -49,6 +49,7 @@
#include <cmath>
#include <csignal>
#include <cerrno>
+#include <cstring>
#include <sys/select.h> // select() : POSIX 1003.1-2001
#include <sys/time.h> // select() : previous standards
diff -up rcsslogplayer-12.1.1/qt4/disp_holder.cpp.gcc43fix rcsslogplayer-12.1.1/qt4/disp_holder.cpp
--- rcsslogplayer-12.1.1/qt4/disp_holder.cpp.gcc43fix 2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/qt4/disp_holder.cpp 2008-09-15 00:33:48.000000000 +0430
@@ -41,6 +41,7 @@
#include <sstream>
#include <cmath>
+#include <cstring>
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
diff -up rcsslogplayer-12.1.1/qt4/monitor_server.cpp.gcc43fix rcsslogplayer-12.1.1/qt4/monitor_server.cpp
--- rcsslogplayer-12.1.1/qt4/monitor_server.cpp.gcc43fix 2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/qt4/monitor_server.cpp 2008-09-15 00:39:51.000000000 +0430
@@ -47,6 +47,7 @@
#include <sstream>
#include <iostream>
#include <cassert>
+#include <cstring>
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
diff -up rcsslogplayer-12.1.1/qt4/mouse_state.h.gcc43fix rcsslogplayer-12.1.1/qt4/mouse_state.h
--- rcsslogplayer-12.1.1/qt4/mouse_state.h.gcc43fix 2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/qt4/mouse_state.h 2008-09-15 00:37:28.000000000 +0430
@@ -103,8 +103,8 @@ public:
bool isDragged() const
{
return ( M_pressed
- && ( std::abs( M_pressed_point.x() - M_dragged_point.x() ) > 2
- || std::abs( M_pressed_point.y() - M_dragged_point.y() ) > 2 )
+ && ( std::abs( float(M_pressed_point.x() - M_dragged_point.x()) ) > 2
+ || std::abs( float(M_pressed_point.y() - M_dragged_point.y()) ) > 2 )
);
}
diff -up rcsslogplayer-12.1.1/qt4/team_graphic_painter.cpp.gcc43fix rcsslogplayer-12.1.1/qt4/team_graphic_painter.cpp
--- rcsslogplayer-12.1.1/qt4/team_graphic_painter.cpp.gcc43fix 2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/qt4/team_graphic_painter.cpp 2008-09-15 00:40:28.000000000 +0430
@@ -42,6 +42,7 @@
#include "options.h"
#include <iostream>
+#include <cstring>
/*-------------------------------------------------------------------*/
diff -up rcsslogplayer-12.1.1/rcsslogplayer/parser.cpp.gcc43fix rcsslogplayer-12.1.1/rcsslogplayer/parser.cpp
--- rcsslogplayer-12.1.1/rcsslogplayer/parser.cpp.gcc43fix 2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/rcsslogplayer/parser.cpp 2008-09-15 00:31:38.000000000 +0430
@@ -44,6 +44,7 @@
#include <map>
#include <cmath>
#include <cstdlib>
+#include <cstring>
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
diff -up rcsslogplayer-12.1.1/rcsslogplayer/util.cpp.gcc43fix rcsslogplayer-12.1.1/rcsslogplayer/util.cpp
--- rcsslogplayer-12.1.1/rcsslogplayer/util.cpp.gcc43fix 2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/rcsslogplayer/util.cpp 2008-09-15 00:32:01.000000000 +0430
@@ -46,6 +46,7 @@
#include <rcsslogplayer/types.h>
#include <cmath>
+#include <cstring>
namespace {
const float DEG2RADF = 3.14159265358979323846f / 180.0f;
diff -up rcsslogplayer-12.1.1/tool/rcg2xml.cpp.gcc43fix rcsslogplayer-12.1.1/tool/rcg2xml.cpp
--- rcsslogplayer-12.1.1/tool/rcg2xml.cpp.gcc43fix 2008-07-22 08:27:07.000000000 +0430
+++ rcsslogplayer-12.1.1/tool/rcg2xml.cpp 2008-09-15 00:32:35.000000000 +0430
@@ -35,6 +35,7 @@
#include <iostream>
#include <limits>
+#include <cstring>
static int MAX_TIME = std::numeric_limits< short >::max();
--- NEW FILE rcsslogplayer.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=RoboCup 2D Soccer Simulator LogPlayer
Comment=A LogPlayer for RoboCup 2D Soccer Simulator
Exec=rcsslogplayer
Icon=rcsslogplayer
Terminal=false
Type=Application
Categories=Education;Science;Robotics;
--- NEW FILE rcsslogplayer.spec ---
Name: rcsslogplayer
Version: 12.1.1
Release: 2%{?dist}
Summary: RoboCup Soccer Simulator LogPlayer
Group: Applications/System
# %{_libdir}/*, %{_includedir}/*, %{_bindir}/rcsslogplayer_classic,
# %{_bindir}/rcg2xml are under LGPLv2+, others are under GPLv2+
License: LGPLv2+ and 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-gcc43fix.patch
Requires: rcssmonitor
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: automake libtool boost-devel rcssbase-devel qt-devel
BuildRequires: desktop-file-utils libXaw-devel
%description
The RoboCup Soccer Simulator LogPlayer (rcsslogpleyr) is a game log
replay tool for the RoboCup Soccer Simulator Server (rcssserver).
%package devel
Summary: Header files and libraries for %{name}
License: LGPLv2+
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: boost-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.
%prep
%setup -q
%patch0 -p1 -b .gcc43fix
sed -i.lib \
-e 's|\$ac_boost_path/lib|\$libdir|' \
-e 's|$ac_boost_path_tmp/lib|\$libdir|' \
m4/ax_boost_base.m4
autoreconf --install -f
# Fix rpath
sed -i.rpath -e '/sys_lib_search_path_spec/s| /usr/lib| /lib64 /usr/lib64 /usr/lib|' \
configure
%build
%configure --with-qt4-moc=%{_bindir}/moc-qt4
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"
rm -rf %{buildroot}/%{_libdir}/*.la
mkdir %{buildroot}/%{_datadir}/pixmaps/
cp -p icons/rcss.xpm %{buildroot}/%{_datadir}/pixmaps/rcsslogplayer.xpm
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 NEWS README
%{_bindir}/*
%{_libdir}/*.so.*
%{_datadir}/%{name}
%{_datadir}/pixmaps/*
%{_datadir}/applications/*
%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%changelog
* Sat Sep 20 2008 Hedayat Vatankhah <hedayat at grad.com> 12.1.1-2
(Thanks to Mamoru Tasaka)
- Fixed -devel sub package license tag
- Fixed build failure caused by not finding moc-qt4 binary
- Fixed .desktop file category
* Mon Sep 15 2008 Hedayat Vatankhah <hedayat at grad.com> 12.1.1-1
- Initial version
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rcsslogplayer/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 21 Sep 2008 00:27:58 -0000 1.1
+++ sources 21 Sep 2008 07:09:14 -0000 1.2
@@ -0,0 +1 @@
+9b80568477c8d8246691573e3234f264 rcsslogplayer-12.1.1.tar.gz
- Previous message (by thread): rpms/rcsslogplayer/F-8 rcsslogplayer-12.1.1-gcc43fix.patch, NONE, 1.1 rcsslogplayer.desktop, NONE, 1.1 rcsslogplayer.spec, NONE, 1.1 sources, 1.1, 1.2
- Next message (by thread): rpms/sms_ntsc/F-9 import.log, NONE, 1.1 sms_ntsc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list