diff --git a/SOURCES/id_rsa.pub b/SOURCES/id_rsa.pub deleted file mode 100644 index 82de81e..0000000 --- a/SOURCES/id_rsa.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDQNd29/Muof9RcGpjp9xjzUImkJF2p8EY2A9Ydbv+RYlIR/HkKV9ynAQZF5qEc3a20H5dxv8SKaItOlnqXJZzHU+L92CiDAQFD8+TwGQN2+kNA8WIiVetmRY1pQ1F6uEXKxx3XOBuOs8Ol1TYy3dv2jHi+A2fxG5plsShpa/1xYbPsamtPE8372kyIco9qC/gShniXAydviN+y5LBIVchKRcO0X/B7aWQVt2NpOxpOBgi9Zt6nnGVZuBccyfT5E7VES4BW4czCx3mnEALInT8OTz2AeAY/a1+uCgYLY7JPrF+btiRo+fl4Yi85mNI1noNX2y4FKtAo9pCCK3kbn1GYlkR5qyIajAq5VfeO8Lz22WZLGcbsEs36U43uxmeVeRazq3gRhX/PC2TAF/m/5iGw+VtwNCf/rCIHbFyTQZV5rpBPvc1W+ZAbIWlUWUp/TBLiFztshmn1t1K2ize3OqcpN3Ec3Bd0PekT1h2rPawkC5b+wke9PuIV99EKfxDQeGM= ssh@serveur.lalis.fr diff --git a/SPECS/log.task-lalis b/SPECS/log.task-lalis new file mode 100644 index 0000000..3f9e820 --- /dev/null +++ b/SPECS/log.task-lalis @@ -0,0 +1,84 @@ +Exécution_de(%install) : /bin/sh -e /mnt/perso/develop_asus/task-lalis/BUILDROOT/rpm-tmp.xnEQ2S ++ umask 022 ++ cd /mnt/perso/develop_asus/task-lalis/BUILD ++ '[' 1 -eq 1 ']' ++ '[' /mnt/perso/develop_asus/task-lalis/BUILDROOT/task-lalis-5-1.mga8.x86_64 '!=' / ']' ++ rm -rf /mnt/perso/develop_asus/task-lalis/BUILDROOT/task-lalis-5-1.mga8.x86_64 +++ dirname /mnt/perso/develop_asus/task-lalis/BUILDROOT/task-lalis-5-1.mga8.x86_64 ++ mkdir -p /mnt/perso/develop_asus/task-lalis/BUILDROOT ++ mkdir /mnt/perso/develop_asus/task-lalis/BUILDROOT/task-lalis-5-1.mga8.x86_64 ++ '[' 1 -eq 1 ']' ++ mkdir -p /mnt/perso/develop_asus/task-lalis/BUILDROOT/task-lalis-5-1.mga8.x86_64/usr/bin ++ mkdir -p /mnt/perso/develop_asus/task-lalis/BUILDROOT/task-lalis-5-1.mga8.x86_64/usr/share/lalis ++ mkdir /mnt/perso/develop_asus/task-lalis/BUILDROOT/task-lalis-5-1.mga8.x86_64/usr/share/kio_desktop ++ mkdir -p /mnt/perso/develop_asus/task-lalis/BUILDROOT/task-lalis-5-1.mga8.x86_64/usr/share/dist/desktop-files/default ++ mkdir -p /mnt/perso/develop_asus/task-lalis/BUILDROOT/task-lalis-5-1.mga8.x86_64/etc/pki/rpm-gpg ++ mkdir /mnt/perso/develop_asus/task-lalis/BUILDROOT/task-lalis-5-1.mga8.x86_64/etc/yum.repos.d ++ cp /mnt/perso/develop_asus/task-lalis/SOURCES/lalistunnel /mnt/perso/develop_asus/task-lalis/BUILDROOT/task-lalis-5-1.mga8.x86_64/usr/bin ++ cp /mnt/perso/develop_asus/task-lalis/SOURCES/identMM.pl /mnt/perso/develop_asus/task-lalis/BUILDROOT/task-lalis-5-1.mga8.x86_64/usr/bin ++ cp /mnt/perso/develop_asus/task-lalis/SOURCES/Lalis.desktop /mnt/perso/develop_asus/task-lalis/BUILDROOT/task-lalis-5-1.mga8.x86_64/usr/share/kio_desktop/ ++ cp /mnt/perso/develop_asus/task-lalis/SOURCES/Lalis.desktop /mnt/perso/develop_asus/task-lalis/BUILDROOT/task-lalis-5-1.mga8.x86_64/usr/share/dist/desktop-files/default/ ++ cp /mnt/perso/develop_asus/task-lalis/SOURCES/test.desktop /mnt/perso/develop_asus/task-lalis/BUILDROOT/task-lalis-5-1.mga8.x86_64/usr/share/dist/desktop-files/default/ ++ cp /mnt/perso/develop_asus/task-lalis/SOURCES/journald.conf /mnt/perso/develop_asus/task-lalis/BUILDROOT/task-lalis-5-1.mga8.x86_64/usr/share/lalis/ ++ cp /mnt/perso/develop_asus/task-lalis/SOURCES/checklist.txt /mnt/perso/develop_asus/task-lalis/BUILDROOT/task-lalis-5-1.mga8.x86_64/usr/share/lalis/ ++ cp /mnt/perso/develop_asus/task-lalis/SOURCES/simple-scan.mo.patch /mnt/perso/develop_asus/task-lalis/BUILDROOT/task-lalis-5-1.mga8.x86_64/usr/share/lalis/ ++ cp /mnt/perso/develop_asus/task-lalis/SOURCES/ssh_id_rsa /mnt/perso/develop_asus/task-lalis/BUILDROOT/task-lalis-5-1.mga8.x86_64/usr/share/lalis/ ++ cp /mnt/perso/develop_asus/task-lalis/SOURCES/RPM-GPG-KEY-Lalis /mnt/perso/develop_asus/task-lalis/BUILDROOT/task-lalis-5-1.mga8.x86_64/etc/pki/rpm-gpg/ ++ cp /mnt/perso/develop_asus/task-lalis/SOURCES/lalis-i586.repo /mnt/perso/develop_asus/task-lalis/BUILDROOT/task-lalis-5-1.mga8.x86_64/etc/yum.repos.d/ ++ cp /mnt/perso/develop_asus/task-lalis/SOURCES/lalis-i586-source.repo /mnt/perso/develop_asus/task-lalis/BUILDROOT/task-lalis-5-1.mga8.x86_64/etc/yum.repos.d/ ++ cp /mnt/perso/develop_asus/task-lalis/SOURCES/lalis-x86_64.repo /mnt/perso/develop_asus/task-lalis/BUILDROOT/task-lalis-5-1.mga8.x86_64/etc/yum.repos.d/ ++ cp /mnt/perso/develop_asus/task-lalis/SOURCES/lalis-x86_64-source.repo /mnt/perso/develop_asus/task-lalis/BUILDROOT/task-lalis-5-1.mga8.x86_64/etc/yum.repos.d/ ++ '[' -n '' ']' ++ /usr/share/spec-helper/clean_files ++ '[' -n '' ']' ++ /usr/share/spec-helper/compress_files .xz ++ '[' -n '' ']' ++ /usr/share/spec-helper/relink_symlinks ++ '[' -n '' ']' ++ /usr/share/spec-helper/clean_perl ++ '[' -n '' ']' ++ /usr/share/spec-helper/lib_symlinks ++ '[' -n '' ']' ++ /usr/share/spec-helper/gprintify ++ '[' -n '' ']' ++ /usr/share/spec-helper/fix_mo ++ '[' -n '' ']' ++ /usr/share/spec-helper/translate_menu ++ '[' -n '' ']' ++ /usr/share/spec-helper/fix_pamd ++ '[' -n '' ']' ++ /usr/share/spec-helper/remove_info_dir ++ '[' -n '' ']' ++ /usr/share/spec-helper/fix_eol ++ '[' -n '' ']' ++ /usr/share/spec-helper/check_desktop_files ++ '[' -n '' ']' ++ /usr/share/spec-helper/check_elf_files ++ /usr/lib/rpm/brp-strip /usr/bin/strip ++ /usr/lib/rpm/brp-strip-comment-note /usr/bin/strip /usr/bin/objdump ++ /usr/lib/rpm/brp-strip-static-archive /usr/bin/strip ++ /usr/lib/rpm/brp-strip-shared /usr/bin/strip ++ /usr/lib/rpm/brp-python-bytecompile /usr/bin/python 1 1 ++ /usr/lib/rpm/brp-python-hardlink ++ /usr/lib/rpm/redhat/brp-mangle-shebangs +Traitement des fichiers : task-lalis-5-1.mga8.noarch +Traitement des fichiers : task-lalis-minimal-5-1.mga8.noarch +attention : Fichier listé deux fois : /usr/share/lalis/journald.conf +attention : Fichier listé deux fois : /usr/share/lalis/ssh_id_rsa +Provides: task-lalis-minimal = 5-1.mga8 +Requires(interp): /bin/sh +Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 +Requires(post): /bin/sh +Requires: perl(Tk) perl(strict) perl(warnings) perl-base >= 2:5.30.2 +Obsoletes: task-lalis < 4 +Vérification des fichiers non empaquetés : /usr/lib/rpm/check-files /mnt/perso/develop_asus/task-lalis/BUILDROOT/task-lalis-5-1.mga8.x86_64 +Écrit : /mnt/perso/develop_asus/task-lalis/SRPMS/task-lalis-5-1.mga8.src.rpm +Écrit : /mnt/perso/develop_asus/task-lalis/RPMS/noarch/task-lalis-5-1.mga8.noarch.rpm +Écrit : /mnt/perso/develop_asus/task-lalis/RPMS/noarch/task-lalis-minimal-5-1.mga8.noarch.rpm +Exécution_de(%clean) : /bin/sh -e /mnt/perso/develop_asus/task-lalis/BUILDROOT/rpm-tmp.wT7bOR ++ umask 022 ++ cd /mnt/perso/develop_asus/task-lalis/BUILD ++ /usr/bin/rm -rf /mnt/perso/develop_asus/task-lalis/BUILDROOT/task-lalis-5-1.mga8.x86_64 ++ RPM_EC=0 +++ jobs -p ++ exit 0 diff --git a/SPECS/task-lalis.spec b/SPECS/task-lalis.spec index 59f92f0..da4bf09 100755 --- a/SPECS/task-lalis.spec +++ b/SPECS/task-lalis.spec @@ -1,7 +1,7 @@ Summary: Install LALIS packages and configuration Name: task-lalis -Version: 4 -Release: %mkrel 2 +Version: 5 +Release: %mkrel 1 License: GPLv3 Group: Tools Url: http://lalis.fr @@ -14,6 +14,11 @@ Source5: test.desktop Source6: checklist.txt Source7: simple-scan.mo.patch Source8: ssh_id_rsa +Source9: RPM-GPG-KEY-Lalis +Source10: lalis-i586.repo +Source11: lalis-i586-source.repo +Source12: lalis-x86_64.repo +Source13: lalis-x86_64-source.repo Requires: task-lalis-minimal Requires: celestia @@ -39,6 +44,7 @@ Requires: kpat Requires: audiokonverter Requires: tintii Requires: ffmulticonverter +Requires: msttcore-fonts-installer %description This package installs LALIS choosen packages and some configurations. @@ -131,42 +137,48 @@ Requires: kpdftool Requires: ktorrent Requires: kdeconnect-kde Requires: chromium-browser -Requires: msttcore-fonts-installer -Obsoletes: task-lalis <= 4 +Obsoletes: task-lalis < 4 %description minimal This package installs LALIS minimal choosen packages and some configurations. %install -mkdir -p %{buildroot}/tmp/ -mkdir -p %{buildroot}/usr/local/bin/ -mkdir %{buildroot}/usr/local/etc/ -mkdir -p %{buildroot}/usr/share/lalis/ -mkdir %{buildroot}/usr/share/kio_desktop/ -mkdir -p %{buildroot}/usr/share/dist/desktop-files/default/ -cp -af %{SOURCE1} %{buildroot}/tmp/ -cp -f %{SOURCE2} %{buildroot}/usr/local/bin/ -cp -f %{SOURCE4} %{buildroot}/usr/local/bin/ -cp -f %{SOURCE3} %{buildroot}/usr/share/kio_desktop/ -cp -f %{SOURCE3} %{buildroot}/usr/share/dist/desktop-files/default/ -cp -f %{SOURCE5} %{buildroot}/usr/share/dist/desktop-files/default/ -cp -f %{SOURCE6} %{buildroot}/usr/share/lalis/ -cp -f %{SOURCE7} %{buildroot}/usr/share/lalis/ -cp -f %{SOURCE8} %{buildroot}/usr/local/etc/ +mkdir -p %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_datadir}/lalis +mkdir %{buildroot}%{_datadir}/kio_desktop +mkdir -p %{buildroot}%{_datadir}/dist/desktop-files/default +mkdir -p %{buildroot}%{_sysconfdir}/pki/rpm-gpg +mkdir %{buildroot}%{_sysconfdir}/yum.repos.d +cp %{SOURCE2} %{buildroot}%{_bindir} +cp %{SOURCE4} %{buildroot}%{_bindir} +cp %{SOURCE3} %{buildroot}%{_datadir}/kio_desktop/ +cp %{SOURCE3} %{buildroot}%{_datadir}/dist/desktop-files/default/ +cp %{SOURCE5} %{buildroot}%{_datadir}/dist/desktop-files/default/ +cp %{SOURCE1} %{buildroot}%{_datadir}/lalis/ +cp %{SOURCE6} %{buildroot}%{_datadir}/lalis/ +cp %{SOURCE7} %{buildroot}%{_datadir}/lalis/ +cp %{SOURCE8} %{buildroot}%{_datadir}/lalis/ +cp %{SOURCE9} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/ +cp %{SOURCE10} %{buildroot}%{_sysconfdir}/yum.repos.d/ +cp %{SOURCE11} %{buildroot}%{_sysconfdir}/yum.repos.d/ +cp %{SOURCE12} %{buildroot}%{_sysconfdir}/yum.repos.d/ +cp %{SOURCE13} %{buildroot}%{_sysconfdir}/yum.repos.d/ %files %files minimal -/tmp/journald.conf -/usr/local/bin/lalistunnel -/usr/local/bin/identMM.pl -/usr/local/etc/ssh_id_rsa -/usr/share/kio_desktop/Lalis.desktop -/usr/share/lalis/* -/usr/share/dist/desktop-files/default/* +%{_bindir}/lalistunnel +%{_bindir}/identMM.pl +%{_datadir}/lalis/ssh_id_rsa +%{_datadir}/lalis/journald.conf +%{_datadir}/kio_desktop/Lalis.desktop +%{_datadir}/lalis/* +%{_datadir}/dist/desktop-files/default/* +%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-Lalis +%{_sysconfdir}/yum.repos.d/* %post minimal @@ -174,11 +186,15 @@ cp -f %{SOURCE8} %{buildroot}/usr/local/etc/ # crée un utilisateur Lalis et enlève les droits de lecture/écriture/visibilité/exécution à others desktop() { - DESKTOP=`grep XDG_DESKTOP_DIR $1/.config/user-dirs.dirs` - DESKTOP=${DESKTOP##*} + if [ -f "$1/.config/user-dirs.dirs" ]; then + DESKTOP=`grep XDG_DESKTOP_DIR $1/.config/user-dirs.dirs` + DESKTOP=${DESKTOP##*} + else + DESKTOP="" + fi } -mv -f /tmp/journald.conf /etc/systemd/ +cp -f /usr/share/lalis/journald.conf /etc/systemd/ getent passwd lalis if [ ${?} -ne 0 ]; then adduser lalis @@ -197,7 +213,7 @@ fi # Ajoute le fichier test.desktop sur le bureau de l'utilisateur lalis desktop /home/lalis echo $DESKTOP -if ! [ -d "/home/lalis/$DESKTOP" ]; then +if ! [ "$DESKTOP" = "" ]; then /usr/bin/mkdir "/home/lalis/$DESKTOP" fi @@ -221,9 +237,10 @@ do if ! [ -d "$i/$DESKTOP" ]; then su -c "mkdir $i/$DESKTOP" - "$USER" echo "su -c mkdir $i/$DESKTOP - $USER" + cp -fa /usr/share/kio_desktop/Lalis.desktop "$i/$DESKTOP/" + chown $USER:$USER "$i/$DESKTOP" fi - cp -fa /usr/share/kio_desktop/Lalis.desktop "$i/$DESKTOP/" - chown $USER:$USER "$i/$DESKTOP" + fi fi done @@ -245,5 +262,5 @@ MGAVERSION=${U##*.mga} grep -q 'lalis rsync://lalis69.ddns.net:10073/mageia/lalis/' /etc/urpmi/urpmi.cfg if [ ${?} -ne 0 ]; then echo -e "\nlalis rsync://lalis69.ddns.net:10073/mageia/lalis/8/x86_64/media/core {\n}" >>/etc/urpmi/urpmi.cfg - echo "urpmi.update lalis" | at now +2 minutes + echo "urpmi.update lalis;urpmi msttcore-fonts-installer" | at now +2 minutes fi