Update to 3.0.1

This commit is contained in:
Sergey Zhemoitel 2016-11-17 14:52:12 +03:00
parent 2f09c4bd0f
commit 6b115e0e1a
7 changed files with 72 additions and 5 deletions

View file

@ -1,2 +1,4 @@
sources:
removed_sources:
italc-3.0.0.tar.gz: 936fd8bdaf30c34b6ed5e63ab11aa8775de39b27
sources:
italc-3.0.1.tar.gz: de04ae9ed46d7c8105a4a72530f51308b0f1fabc

3
ica-start Normal file
View file

@ -0,0 +1,3 @@
#!/bin/bash
killall ica
/usr/bin/ica

View file

@ -0,0 +1,13 @@
--- /lib/src/LocalSystem.cpp 2011-08-03 23:18:00.000000000 +0200
+++ /lib/src/LocalSystem.cpp.new 2013-01-06 00:03:38.156733747 +0100
@@ -29,7 +29,10 @@
#include <QtCore/QProcess>
#include <QtGui/QWidget>
#include <QtNetwork/QHostInfo>
-
+#ifdef ITALC_BUILD_LINUX
+#include <unistd.h>
+#include <sys/types.h>
+#endif
#ifdef ITALC_BUILD_WIN32

View file

@ -0,0 +1,32 @@
diff -ur italc-2.0.2.orig/ima/src/main.cpp italc-2.0.2/ima/src/main.cpp
--- italc-2.0.2.orig/ima/src/main.cpp 2014-07-11 00:36:06.000000000 +0400
+++ italc-2.0.2/ima/src/main.cpp 2014-12-28 22:20:51.000000000 +0300
@@ -26,6 +26,8 @@
#include <QtCore/QModelIndex>
#include <QtGui/QApplication>
#include <QtGui/QSplashScreen>
+#include <QFile>
+#include <QDir>
#ifdef ITALC3
#include "MasterCore.h"
@@ -51,6 +53,19 @@
{
QApplication app( argc, argv );
+ // create directory ~/.italc
+ QDir dir(QDir::home ().path()+"/.italc");
+ if (dir.exists()==false){
+ dir.mkdir(QDir::home ().path()+"/.italc");
+ }
+
+ // copy file ~/.italc/GlobalConfig.xml
+ QFile file (QDir::home ().path()+"/.italc/GlobalConfig.xml");
+ if (file.exists()==false){
+ QFile fileSkel("/etc/skel/.italc/GlobalConfig.xml");
+ if (fileSkel.exists()==true) fileSkel.copy(QDir::home().path()+"/.italc/GlobalConfig.xml");
+ }
+
ItalcCore::init();
Logger l( "ItalcMaster" );

12
italc.desktop Normal file
View file

@ -0,0 +1,12 @@
[Desktop Entry]
Name=iTALC
GenericName=View and remote-control clients
GenericName[ru]=Просмотр и дистанционное управление клиентами
GenericName[de]=Clients überwachen und fernsteuern
Comment=Intelligent Teaching And Learning with Computers
Comment[ru]=Управление рабочими столами учеников
Icon=italc
Exec=italc
Type=Application
Terminal=false
Categories=Education;

3
italc3.rpmlintrc Normal file
View file

@ -0,0 +1,3 @@
addFilter("E: non-standard-dir-perm")
addFilter("E: non-readable")
addFilter("E: invalid-soname")

View file

@ -1,11 +1,11 @@
%define debug_package %{nil}
%define libname %mklibname italc
%define italcgrp italc
%define oname italc
%define oname italc
Name: italc3
Summary: Intelligent Teaching And Learning with Computers - software for teachers
Version: 3.0.0
Version: 3.0.1
Release: 1
License: GPLv2+
Group: Networking/Remote access
@ -15,6 +15,7 @@ Source2: italc-start_ica
Source3: italc.sysconfig
Source5: ica-autostart.desktop
Source6: italc-launcher
Source10: %{name}.rpmlintrc
BuildRequires: cmake
BuildRequires: qt5-linguist
BuildRequires: pam-devel
@ -24,6 +25,7 @@ BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5Xml)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(libopenjpeg1)
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(xtst)
BuildRequires: pkgconfig(zlib)
@ -188,12 +190,12 @@ install -D -m644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/ica
%files -n %{libname}
%doc AUTHORS COPYING ChangeLog INSTALL README TODO
%doc AUTHORS COPYING ChangeLog INSTALL README.md README.LZO
%{_libdir}/*
%files master
%doc AUTHORS COPYING ChangeLog INSTALL README TODO
%doc AUTHORS COPYING ChangeLog INSTALL README.md README.LZO
%{_bindir}/italc
%{_bindir}/italc-launcher
%{_bindir}/imc