From 6b115e0e1a47a6c1229a33e93d9c40b33fc0e258 Mon Sep 17 00:00:00 2001
From: Sergey Zhemoitel <djam5@ya.ru>
Date: Thu, 17 Nov 2016 14:52:12 +0300
Subject: [PATCH] Update to 3.0.1

---
 .abf.yml                           |  4 +++-
 ica-start                          |  3 +++
 italc-2.0.0-mdv-fix_cmake.diff     | 13 ++++++++++++
 italc-2.0.2-mga-globalconfig.patch | 32 ++++++++++++++++++++++++++++++
 italc.desktop                      | 12 +++++++++++
 italc3.rpmlintrc                   |  3 +++
 italc3.spec                        | 10 ++++++----
 7 files changed, 72 insertions(+), 5 deletions(-)
 create mode 100644 ica-start
 create mode 100644 italc-2.0.0-mdv-fix_cmake.diff
 create mode 100644 italc-2.0.2-mga-globalconfig.patch
 create mode 100644 italc.desktop
 create mode 100644 italc3.rpmlintrc

diff --git a/.abf.yml b/.abf.yml
index a766f49..24262d2 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,4 @@
-sources:
+removed_sources:
   italc-3.0.0.tar.gz: 936fd8bdaf30c34b6ed5e63ab11aa8775de39b27
+sources:
+  italc-3.0.1.tar.gz: de04ae9ed46d7c8105a4a72530f51308b0f1fabc
diff --git a/ica-start b/ica-start
new file mode 100644
index 0000000..47d3471
--- /dev/null
+++ b/ica-start
@@ -0,0 +1,3 @@
+#!/bin/bash
+killall ica
+/usr/bin/ica
diff --git a/italc-2.0.0-mdv-fix_cmake.diff b/italc-2.0.0-mdv-fix_cmake.diff
new file mode 100644
index 0000000..0f554fa
--- /dev/null
+++ b/italc-2.0.0-mdv-fix_cmake.diff
@@ -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
diff --git a/italc-2.0.2-mga-globalconfig.patch b/italc-2.0.2-mga-globalconfig.patch
new file mode 100644
index 0000000..e97ad02
--- /dev/null
+++ b/italc-2.0.2-mga-globalconfig.patch
@@ -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" );
diff --git a/italc.desktop b/italc.desktop
new file mode 100644
index 0000000..5dd2964
--- /dev/null
+++ b/italc.desktop
@@ -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;
diff --git a/italc3.rpmlintrc b/italc3.rpmlintrc
new file mode 100644
index 0000000..5cbcf5e
--- /dev/null
+++ b/italc3.rpmlintrc
@@ -0,0 +1,3 @@
+addFilter("E: non-standard-dir-perm")
+addFilter("E: non-readable")
+addFilter("E: invalid-soname")
diff --git a/italc3.spec b/italc3.spec
index bc5083c..4b50ae7 100644
--- a/italc3.spec
+++ b/italc3.spec
@@ -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