rpms/inetvis/devel import.log, NONE, 1.1 inetvis-0.9.3.1-build.patch, NONE, 1.1 inetvis.desktop, NONE, 1.1 inetvis.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Daniel Kopeček
mildew at fedoraproject.org
Thu Sep 4 07:47:22 UTC 2008
Author: mildew
Update of /cvs/pkgs/rpms/inetvis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2102/devel
Modified Files:
.cvsignore sources
Added Files:
import.log inetvis-0.9.3.1-build.patch inetvis.desktop
inetvis.spec
Log Message:
Initial commit
--- NEW FILE import.log ---
inetvis-0_9_3_1-1_fc8:HEAD:inetvis-0.9.3.1-1.fc8.src.rpm:1220521550
inetvis-0.9.3.1-build.patch:
--- NEW FILE inetvis-0.9.3.1-build.patch ---
diff -up inetvis-0.9.3.1/src/dataproc.cpp.orig inetvis-0.9.3.1/src/dataproc.cpp
--- inetvis-0.9.3.1/src/dataproc.cpp.orig 2008-08-14 18:24:48.000000000 +0200
+++ inetvis-0.9.3.1/src/dataproc.cpp 2008-08-14 18:25:32.000000000 +0200
@@ -2,6 +2,7 @@
#include <glviswidget.h>
#include <iostream>
#include <stdio.h>
+#include <stdlib.h>
using namespace std; //for debugging purposes
diff -up inetvis-0.9.3.1/src/glviswidget.cpp.orig inetvis-0.9.3.1/src/glviswidget.cpp
--- inetvis-0.9.3.1/src/glviswidget.cpp.orig 2008-08-14 21:27:22.000000000 +0200
+++ inetvis-0.9.3.1/src/glviswidget.cpp 2008-08-15 10:34:22.000000000 +0200
@@ -4,6 +4,7 @@
//#include <plotter.h>
#include <dataproc.h>
#include "logui.h"
+#include "glviswidget.h"
using namespace std;
@@ -26,7 +27,8 @@ GLVisWidget::GLVisWidget(QWidget *parent
blending = false;
//set background related colours
- setBackgroundCol(BLACK_BACKGROUND); //default
+ //setBackgroundCol(BLACK_BACKGROUND); //default
+ backgroundCol = BLACK_BACKGROUND;
//set refrence for list id
referenceAxesList = 1;
@@ -161,10 +163,13 @@ void GLVisWidget::initializeGL()
glLineWidth(globalLineWidth);
//set background colour
+ /*
if (backgroundCol == BLACK_BACKGROUND)
glClearColor(0.0, 0.0, 0.0, 0.0);
else
glClearColor(1.0, 1.0, 1.0, 0.0);
+ */
+ setBackgroundCol(backgroundCol);
//set memmory data alignment for capturing frames
glPixelStorei(GL_PACK_ALIGNMENT, 1); //align to byte rather than the default
diff -up inetvis-0.9.3.1/src/glviswidget.h.orig inetvis-0.9.3.1/src/glviswidget.h
--- inetvis-0.9.3.1/src/glviswidget.h.orig 2007-11-18 02:37:01.000000000 +0100
+++ inetvis-0.9.3.1/src/glviswidget.h 2008-08-14 18:18:37.000000000 +0200
@@ -44,6 +44,9 @@ Street, Fifth Floor, Boston, MA 02110-13
*
*/
+#ifndef GLVISWIDGET_H_INCLUDED
+#define GLVISWIDGET_H_INCLUDED
+
//To use nvidia development GL header
//#include "/usr/share/doc/nvidia-glx-dev/include/GL/gl.h"
@@ -302,3 +305,6 @@ signals:
void showReferenceFrameSettings();
};
+
+#endif // GLVISWIDGET_H_INCLUDED
+
diff -up inetvis-0.9.3.1/src/helpdocumentationdialog.ui.h.orig inetvis-0.9.3.1/src/helpdocumentationdialog.ui.h
--- inetvis-0.9.3.1/src/helpdocumentationdialog.ui.h.orig 2007-11-18 02:37:01.000000000 +0100
+++ inetvis-0.9.3.1/src/helpdocumentationdialog.ui.h 2008-08-14 18:18:37.000000000 +0200
@@ -47,14 +47,19 @@ Street, Fifth Floor, Boston, MA 02110-13
void HelpDocumentationDialog::init()
{
- helpTextBrowser->mimeSourceFactory()->setFilePath(QDir::currentDirPath() + "/doc");
+#ifdef INETVIS_DOCDIR
+ QString docdir = INETVIS_DOCDIR;
+#else
+ QString docdir = QDir::currentDirPath() + "/doc";
+#endif
+ helpTextBrowser->mimeSourceFactory()->setFilePath(docdir);
QString documentationFileRef;
documentationFileRef = "inetvisdoc.html";
QString altDocumentationText;
altDocumentationText = "<h3>Documentation & Help pane</h3><p>if you see this message, there was an error reading the InetVis html manual providing documentation and help for the program. It should be installed in a 'doc/' directory relative to the inetvis binary.</p>";
- if (QFile::exists("doc/" + documentationFileRef))
+ if (QFile::exists(docdir + documentationFileRef))
helpTextBrowser->setSource(documentationFileRef);
else
helpTextBrowser->setText(altDocumentationText);
diff -up inetvis-0.9.3.1/src/inetvis.pro.orig inetvis-0.9.3.1/src/inetvis.pro
--- inetvis-0.9.3.1/src/inetvis.pro.orig 2007-11-18 02:35:13.000000000 +0100
+++ inetvis-0.9.3.1/src/inetvis.pro 2008-08-15 11:43:42.000000000 +0200
@@ -53,11 +53,12 @@ CONFIG += release
## Linking
CONFIG += create_prl link_prl static
-QMAKE_LFLAGS_RELEASE = -m32
+#QMAKE_LFLAGS_RELEASE = -m32
## Optimization flags
-QMAKE_CFLAGS_RELEASE = -O3 -march=pentium4 -m32 -mfpmath=sse -mmmx -msse -msse2 -mno-sse3 -momit-leaf-frame-pointer -maccumulate-outgoing-args
-QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
+#QMAKE_CFLAGS_RELEASE += -m32 -mfpmath=sse -mmmx -msse -msse2 -mno-sse3 -momit-leaf-frame-pointer -maccumulate-outgoing-args
+QMAKE_CFLAGS_RELEASE +=
+QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
## end of CUSTOM SETTINGS ---------------------------------
diff -up inetvis-0.9.3.1/src/main.cpp.orig inetvis-0.9.3.1/src/main.cpp
--- NEW FILE inetvis.desktop ---
[Desktop Entry]
Name=InetVis
GenericName=Network traffic visualizer
Comment=3-D scatter-plot visualization for network traffic
Exec=inetvis
#Icon=inetvis
Terminal=false
Type=Application
Categories=System;Monitor;
--- NEW FILE inetvis.spec ---
Name: inetvis
Version: 0.9.3.1
Release: 1%{?dist}
Summary: 3-D scatter-plot visualization for network traffic
Group: Applications/System
License: GPLv2
URL: http://www.cs.ru.ac.za/research/g02v2468/inetvis.html
Source0: http://www.cs.ru.ac.za/research/g02v2468/inetvis/0.9.3/%{name}-%{version}.tar.gz
Source1: %{name}.desktop
Patch1: %{name}-0.9.3.1-build.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libX11-devel
BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
BuildRequires: libXext-devel
BuildRequires: libXmu-devel
BuildRequires: libpcap-devel
BuildRequires: desktop-file-utils
%if 0%{?fedora} < 9
BuildRequires: qt-devel
%else
BuildRequires: qt3-devel
%endif
%description
InetVis is a 3-D scatter-plot visualization for network traffic.
In way, it's more or less like a media player, but for network traffic.
It's quite handy for observing scan activity and other anomolous
traffic patterns.
%prep
%setup -q
%patch1 -p1 -b .build
%build
#%%configure
pushd src
qmake 'QMAKE_CFLAGS_RELEASE += -DINETVIS_DOCDIR=\"%{_docdir}/%{name}-%{version}/\"'
make %{?_smp_mflags}
popd
# fix permissions
chmod 644 doc/images/* doc/inetvisdoc.html
chmod 755 doc/ doc/images/
%install
rm -rf %{buildroot}
#setup directories
mkdir -p %{buildroot}/%{_bindir}
install -m 755 src/inetvis %{buildroot}/%{_bindir}/
desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%{_bindir}/inetvis
%{_datadir}/applications/fedora-%{name}.desktop
%doc doc/*
%changelog
* Tue Aug 12 2008 Lukas Kuklinek <lkukline at redhat.com> 0.9.3.1-1
- initial rpm
- patches to intall to right system paths and build properly
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inetvis/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 3 Sep 2008 20:32:03 -0000 1.1
+++ .cvsignore 4 Sep 2008 07:46:52 -0000 1.2
@@ -0,0 +1 @@
+inetvis-0.9.3.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inetvis/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 3 Sep 2008 20:32:03 -0000 1.1
+++ sources 4 Sep 2008 07:46:52 -0000 1.2
@@ -0,0 +1 @@
+9f7cae12928c9888329c228c4d9fbaba inetvis-0.9.3.1.tar.gz
More information about the fedora-extras-commits
mailing list