Attachment 5061 Details for Bug 13035 – Diff for spec

[patch] Diff for spec

italc_spec.diff (text/plain), 5.17 KB, created by Alex Loginov on 2014-03-16 17:11:03 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Loginov

Created: 2014-03-16 17:11:03 CET

Size: 5.17 KB

patch

obsolete

>Index: italc.spec
>===================================================================
>--- italc.spec	(revision 604266)
>+++ italc.spec	(working copy)
>@@ -1,3 +1,5 @@
>+%define		italcgrp italc
>+
> Name:		italc
> Version:	2.0.1
> Release:	%mkrel 1
>@@ -7,7 +9,9 @@
> URL:		http://italc.sourceforge.net/
> Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
> Source1:	italc.desktop
>+Source2:	%{name}-imc.1.gz
> Patch0:		italc-2.0.0-mdv-fix_cmake.diff
>+
> BuildRequires:	cmake
> BuildRequires:	qt4-devel
> BuildRequires:	pkgconfig(xtst)
>@@ -51,24 +55,140 @@
> 
> %install
> %makeinstall_std  DESTDIR=%{buildroot} -C build
>+# create the directories containing the auth-keys
>+mkdir -p %{buildroot}/%{_sysconfdir}/%{name}/keys/{private,public}/{teacher,admin,supporter,other}
>+# create pseudo key files so RPM can own them (ghost files)
>+for role in admin supporter teacher; do
>+	touch %{buildroot}/%{_sysconfdir}/%{name}/keys/{private,public}/$role/key
>+done
>+# create the initial config
>+mkdir -p "%{buildroot}/%{_sysconfdir}/iTALC Solutions"
>+cat > "%{buildroot}/%{_sysconfdir}/iTALC Solutions/iTALC.conf" << EOF
>+[keypathsprivate]
>+admin=%{_sysconfdir}/%{name}/keys/private/admin/key
>+supporter=%{_sysconfdir}/%{name}/keys/private/supporter/key
>+teacher=%{_sysconfdir}/%{name}/keys/private/teacher/key
> 
>+[keypathspublic]
>+admin=%{_sysconfdir}/%{name}/keys/public/admin/key
>+supporter=%{_sysconfdir}/%{name}/keys/public/supporter/key
>+teacher=%{_sysconfdir}/%{name}/keys/public/teacher/key
>+
>+[Authentication]
>+KeyAuthenticationEnabled=1
>+LogonAuthenticationEnabled=1
>+LogonGroups=%{name}
>+PermissionRequiredWithKeyAuthentication=0
>+PermissionRequiredWithLogonAuthentication=0
>+PrivateKeyBaseDir=\$GLOBALAPPDATA/keys/private
>+PublicKeyBaseDir=\$GLOBALAPPDATA/keys/public
>+SameUserConfirmationDisabled=0
>+
>+[DemoServer]
>+Backend=0
>+Multithreaded=1
>+
>+[Logging]
>+LimittedLogFileSize=0
>+LogFileDirectory=\$TEMP
>+LogFileSizeLimit=-1
>+LogLevel=4
>+LogToStdErr=1
>+LogToWindowsEventLog=0
>+
>+[Network]
>+CoreServerPort=11100
>+DemoServerPort=11400
>+FirewallExceptionEnabled=1
>+HttpServerEnabled=0
>+HttpServerPort=5800
>+
>+[Paths]
>+GlobalConfiguration=\$APPDATA/GlobalConfig.xml
>+PersonalConfiguration=\$APPDATA/PersonalConfig.xml
>+SnapshotDirectory=\$APPDATA/Snapshots
>+
>+[Service]
>+Arguments=
>+Autostart=1
>+HideTrayIcon=0
>+
>+[VNC]
>+CaptureLayeredWindows=0
>+LowAccuracy=1
>+PollFullScreen=1
>+EOF
>+# install manpages
>+mkdir -p %{buildroot}%{_mandir}/man1
>+install -m644 ./ica/ica.1 %{buildroot}%{_mandir}/man1/
>+install -m644 ./ima/%{name}.1 %{buildroot}%{_mandir}/man1/
>+install -m644 %{SOURCE2} %{buildroot}%{_mandir}/man1/imc.1.gz
>+# icon for the desktop file
>+install -Dm644 ima/data/%{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
>+# install desktop file
> desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ %{SOURCE1}
>-install -Dm 0644 ima/data/%{name}.png %{buildroot}%{_datadir}/icons/%{name}.png
>-install -Dm 0644 ima/data/%{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.xpm
> 
>+%pre client
>+%_sbindir/groupadd -r -f %{italcgrp} 2>/dev/null ||:
>+
>+%post client
>+if
>+    getent group %{italcgrp} >/dev/null
>+then
>+    : OK group %{italcgrp} already present
>+else
>+    groupadd -r %{italcgrp} 2>/dev/null || :
>+fi
>+
>+%post master
>+if
>+    getent group %{italcgrp} >/dev/null
>+then
>+    : OK group %{italcgrp} already present
>+else
>+    groupadd -r %{italcgrp} 2>/dev/null || :
>+fi
>+
>+# dont run scripts on update
>+if [ ${1:-0} -lt 2 ]; then
>+  for role in admin supporter teacher; do
>+	if [ ! -f "%{_sysconfdir}/%{name}/keys/private/$role/key" ]; then
>+		/usr/bin/imc -role $role -createkeypair "%{_sysconfdir}/%{name}/keys" >/dev/null
>+		chgrp %{italcgrp} "%{_sysconfdir}/%{name}/keys/private/$role/key"
>+		chmod 0440 "%{_sysconfdir}/%{name}/keys/private/$role/key"
>+	fi
>+  done
>+fi
>+
> %files
> %doc COPYING README AUTHORS ChangeLog
>+%{_mandir}/man1/*
> 
> %files client
> %{_bindir}/ica
> %{_bindir}/%{name}_auth_helper
> %{_libdir}/libItalcCore.so
> 
>+%dir "%{_sysconfdir}/iTALC Solutions"
>+%attr(0660,root,%{italcgrp}) %config(missingok,noreplace) "%{_sysconfdir}/iTALC Solutions/iTALC.conf"
>+
>+%dir %{_sysconfdir}/%{name}/keys/private
>+%defattr(0440,root,%{italcgrp},0750)
>+%dir %{_sysconfdir}/%{name}/keys/private/teacher
>+%dir %{_sysconfdir}/%{name}/keys/private/admin
>+%dir %{_sysconfdir}/%{name}/keys/private/supporter
>+%dir %{_sysconfdir}/%{name}/keys/private/other
>+%ghost %attr(0440,root,%{italcgrp}) %config(noreplace) %{_sysconfdir}/%{name}/keys/private/teacher/key
>+%ghost %attr(0440,root,%{italcgrp}) %config(noreplace) %{_sysconfdir}/%{name}/keys/private/admin/key
>+%ghost %attr(0440,root,%{italcgrp}) %config(noreplace) %{_sysconfdir}/%{name}/keys/private/supporter/key
>+%ghost %attr(0444,root,%{italcgrp}) %config(noreplace) %{_sysconfdir}/%{name}/keys/public/teacher/key
>+%ghost %attr(0444,root,%{italcgrp}) %config(noreplace) %{_sysconfdir}/%{name}/keys/public/admin/key
>+%ghost %attr(0444,root,%{italcgrp}) %config(noreplace) %{_sysconfdir}/%{name}/keys/public/supporter/key
>+
> %files master
> %{_bindir}/%{name}
> %{_bindir}/imc
> %{_datadir}/applications/%{name}.desktop
>-%{_datadir}/icons/%{name}.png
>-%{_datadir}/pixmaps/%{name}.xpm
>+%{_datadir}/pixmaps/%{name}.png
> %{_datadir}/%{name}/JavaViewer/VncViewer.jar
> %{_datadir}/%{name}/JavaViewer/index.vnc

Index: italc.spec
===================================================================
--- italc.spec	(revision 604266)
+++ italc.spec	(working copy)
@@ -1,3 +1,5 @@
+%define		italcgrp italc
+
 Name:		italc
 Version:	2.0.1
 Release:	%mkrel 1
@@ -7,7 +9,9 @@
 URL:		http://italc.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:	italc.desktop
+Source2:	%{name}-imc.1.gz
 Patch0:		italc-2.0.0-mdv-fix_cmake.diff
+
 BuildRequires:	cmake
 BuildRequires:	qt4-devel
 BuildRequires:	pkgconfig(xtst)
@@ -51,24 +55,140 @@
 
 %install
 %makeinstall_std  DESTDIR=%{buildroot} -C build
+# create the directories containing the auth-keys
+mkdir -p %{buildroot}/%{_sysconfdir}/%{name}/keys/{private,public}/{teacher,admin,supporter,other}
+# create pseudo key files so RPM can own them (ghost files)
+for role in admin supporter teacher; do
+	touch %{buildroot}/%{_sysconfdir}/%{name}/keys/{private,public}/$role/key
+done
+# create the initial config
+mkdir -p "%{buildroot}/%{_sysconfdir}/iTALC Solutions"
+cat > "%{buildroot}/%{_sysconfdir}/iTALC Solutions/iTALC.conf" << EOF
+[keypathsprivate]
+admin=%{_sysconfdir}/%{name}/keys/private/admin/key
+supporter=%{_sysconfdir}/%{name}/keys/private/supporter/key
+teacher=%{_sysconfdir}/%{name}/keys/private/teacher/key
 
+[keypathspublic]
+admin=%{_sysconfdir}/%{name}/keys/public/admin/key
+supporter=%{_sysconfdir}/%{name}/keys/public/supporter/key
+teacher=%{_sysconfdir}/%{name}/keys/public/teacher/key
+
+[Authentication]
+KeyAuthenticationEnabled=1
+LogonAuthenticationEnabled=1
+LogonGroups=%{name}
+PermissionRequiredWithKeyAuthentication=0
+PermissionRequiredWithLogonAuthentication=0
+PrivateKeyBaseDir=\$GLOBALAPPDATA/keys/private
+PublicKeyBaseDir=\$GLOBALAPPDATA/keys/public
+SameUserConfirmationDisabled=0
+
+[DemoServer]
+Backend=0
+Multithreaded=1
+
+[Logging]
+LimittedLogFileSize=0
+LogFileDirectory=\$TEMP
+LogFileSizeLimit=-1
+LogLevel=4
+LogToStdErr=1
+LogToWindowsEventLog=0
+
+[Network]
+CoreServerPort=11100
+DemoServerPort=11400
+FirewallExceptionEnabled=1
+HttpServerEnabled=0
+HttpServerPort=5800
+
+[Paths]
+GlobalConfiguration=\$APPDATA/GlobalConfig.xml
+PersonalConfiguration=\$APPDATA/PersonalConfig.xml
+SnapshotDirectory=\$APPDATA/Snapshots
+
+[Service]
+Arguments=
+Autostart=1
+HideTrayIcon=0
+
+[VNC]
+CaptureLayeredWindows=0
+LowAccuracy=1
+PollFullScreen=1
+EOF
+# install manpages
+mkdir -p %{buildroot}%{_mandir}/man1
+install -m644 ./ica/ica.1 %{buildroot}%{_mandir}/man1/
+install -m644 ./ima/%{name}.1 %{buildroot}%{_mandir}/man1/
+install -m644 %{SOURCE2} %{buildroot}%{_mandir}/man1/imc.1.gz
+# icon for the desktop file
+install -Dm644 ima/data/%{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
+# install desktop file
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ %{SOURCE1}
-install -Dm 0644 ima/data/%{name}.png %{buildroot}%{_datadir}/icons/%{name}.png
-install -Dm 0644 ima/data/%{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.xpm
 
+%pre client
+%_sbindir/groupadd -r -f %{italcgrp} 2>/dev/null ||:
+
+%post client
+if
+    getent group %{italcgrp} >/dev/null
+then
+    : OK group %{italcgrp} already present
+else
+    groupadd -r %{italcgrp} 2>/dev/null || :
+fi
+
+%post master
+if
+    getent group %{italcgrp} >/dev/null
+then
+    : OK group %{italcgrp} already present
+else
+    groupadd -r %{italcgrp} 2>/dev/null || :
+fi
+
+# dont run scripts on update
+if [ ${1:-0} -lt 2 ]; then
+  for role in admin supporter teacher; do
+	if [ ! -f "%{_sysconfdir}/%{name}/keys/private/$role/key" ]; then
+		/usr/bin/imc -role $role -createkeypair "%{_sysconfdir}/%{name}/keys" >/dev/null
+		chgrp %{italcgrp} "%{_sysconfdir}/%{name}/keys/private/$role/key"
+		chmod 0440 "%{_sysconfdir}/%{name}/keys/private/$role/key"
+	fi
+  done
+fi
+
 %files
 %doc COPYING README AUTHORS ChangeLog
+%{_mandir}/man1/*
 
 %files client
 %{_bindir}/ica
 %{_bindir}/%{name}_auth_helper
 %{_libdir}/libItalcCore.so
 
+%dir "%{_sysconfdir}/iTALC Solutions"
+%attr(0660,root,%{italcgrp}) %config(missingok,noreplace) "%{_sysconfdir}/iTALC Solutions/iTALC.conf"
+
+%dir %{_sysconfdir}/%{name}/keys/private
+%defattr(0440,root,%{italcgrp},0750)
+%dir %{_sysconfdir}/%{name}/keys/private/teacher
+%dir %{_sysconfdir}/%{name}/keys/private/admin
+%dir %{_sysconfdir}/%{name}/keys/private/supporter
+%dir %{_sysconfdir}/%{name}/keys/private/other
+%ghost %attr(0440,root,%{italcgrp}) %config(noreplace) %{_sysconfdir}/%{name}/keys/private/teacher/key
+%ghost %attr(0440,root,%{italcgrp}) %config(noreplace) %{_sysconfdir}/%{name}/keys/private/admin/key
+%ghost %attr(0440,root,%{italcgrp}) %config(noreplace) %{_sysconfdir}/%{name}/keys/private/supporter/key
+%ghost %attr(0444,root,%{italcgrp}) %config(noreplace) %{_sysconfdir}/%{name}/keys/public/teacher/key
+%ghost %attr(0444,root,%{italcgrp}) %config(noreplace) %{_sysconfdir}/%{name}/keys/public/admin/key
+%ghost %attr(0444,root,%{italcgrp}) %config(noreplace) %{_sysconfdir}/%{name}/keys/public/supporter/key
+
 %files master
 %{_bindir}/%{name}
 %{_bindir}/imc
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/%{name}.png
-%{_datadir}/pixmaps/%{name}.xpm
+%{_datadir}/pixmaps/%{name}.png
 %{_datadir}/%{name}/JavaViewer/VncViewer.jar
 %{_datadir}/%{name}/JavaViewer/index.vnc

Actions: View | Diff

Attachments on bug 13035: 5061 | 5062 | 5063