diff options
| -rw-r--r-- | arch/tde-core/tde-tdebase/PKGBUILD | 19 | ||||
| -rw-r--r-- | arch/tde-core/tde-tdebase/arch-kdeshutdown.png | bin | 14505 -> 0 bytes | |||
| -rw-r--r-- | arch/tde-core/tde-tdebase/kdm-default-face.png | bin | 4324 -> 0 bytes | |||
| -rw-r--r-- | arch/tde-core/tde-tdebase/trinity-tdebase.install | 14 |
4 files changed, 10 insertions, 23 deletions
diff --git a/arch/tde-core/tde-tdebase/PKGBUILD b/arch/tde-core/tde-tdebase/PKGBUILD index 9033e78a5..85f569247 100644 --- a/arch/tde-core/tde-tdebase/PKGBUILD +++ b/arch/tde-core/tde-tdebase/PKGBUILD @@ -3,7 +3,7 @@ pkgname='tde-tdebase' pkgver=14.0.10 -pkgrel=1 +pkgrel=2 pkgdesc="Trinity Desktop Enviroment base components" arch=('i686' 'x86_64') url='https://scm.trinitydesktop.org/scm/git/tdebase' @@ -50,8 +50,6 @@ options=('staticlibs' 'libtool' '!strip') install='trinity-tdebase.install' source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdebase-trinity-${pkgver}.tar.xz" - 'arch-kdeshutdown.png' - 'kdm-default-face.png' 'agent-shutdown.sh' 'agent-startup.sh' 'tdm-trinity' @@ -60,8 +58,6 @@ source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/ 'xsession.patch') md5sums=('bca895dfc2b88c4b74e307d5690108bf' - '2dac928c6177b9fa0f4e751d7dddc62e' - '81eb97f16b66a2152e592358727a30c7' '18e8d01124b19f7df2937c06e177bf7f' 'c963ef6e37c9051119972a58c67f05fb' 'bb4c25e560fa719e8e8f49ef80bd1c99' @@ -110,7 +106,10 @@ build() { -DWITH_TDEHWLIB=ON \ -DWITH_UPOWER=ON \ -DBUILD_ALL=ON \ - -DWITH_GCC_VISIBILITY=ON + -DWITH_GCC_VISIBILITY=ON \ + -DKCHECKPASS_PAM_SERVICE=tde-checkpass \ + -DTDM_PAM_SERVICE=tde \ + -DTDESCREENSAVER_PAM_SERVICE=tde-screensaver make $NUMJOBS } @@ -133,11 +132,6 @@ package() { install -D -m644 "${srcdir}"/tdm.service \ "${pkgdir}"/usr/lib/systemd/system/tdm.service - # Add image for default user avatar. This removes kdm complains about missing - # default avatar from kdm.log - install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/tdm/faces/.default.face.icon - install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/tdm/pics/users/arch-kdm.png - # create the starttrinity link # do we need this? wouldn't be better to rename startkde script # to starttrinity? (renamed to starttde) Create for compatibility sake. @@ -146,9 +140,6 @@ package() { # install mkpamserv script, so we can auto-generate pam.d configs in post_install() install -D -m755 ${srcdir}/${pkgname#*-}-trinity-${pkgver}/mkpamserv ${pkgdir}${TDEDIR}/bin/mkpamserv - # Install nice arch logo to use in the shutdown dialog - install -D -m 644 $srcdir/arch-kdeshutdown.png ${pkgdir}$TDEDIR/share/apps/ksmserver/pics/shutdownkonq.png - # add startup/shutdown agents for ssh and gpg-agent install -m644 -D $srcdir/agent-startup.sh ${pkgdir}$TDEDIR/env/agent-startup.sh install -m755 -D $srcdir/agent-shutdown.sh ${pkgdir}$TDEDIR/shutdown/agent-shutdown.sh diff --git a/arch/tde-core/tde-tdebase/arch-kdeshutdown.png b/arch/tde-core/tde-tdebase/arch-kdeshutdown.png Binary files differdeleted file mode 100644 index 48a933b81..000000000 --- a/arch/tde-core/tde-tdebase/arch-kdeshutdown.png +++ /dev/null diff --git a/arch/tde-core/tde-tdebase/kdm-default-face.png b/arch/tde-core/tde-tdebase/kdm-default-face.png Binary files differdeleted file mode 100644 index be0fc08df..000000000 --- a/arch/tde-core/tde-tdebase/kdm-default-face.png +++ /dev/null diff --git a/arch/tde-core/tde-tdebase/trinity-tdebase.install b/arch/tde-core/tde-tdebase/trinity-tdebase.install index 8bdaa12ef..b2ba604ef 100644 --- a/arch/tde-core/tde-tdebase/trinity-tdebase.install +++ b/arch/tde-core/tde-tdebase/trinity-tdebase.install @@ -1,13 +1,9 @@ post_install() { ldconfig &> /dev/null - [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh - [ -x "${TDEDIR}/bin/mkpamserv" ] && "${TDEDIR}/bin/mkpamserv" trinity || \ - echo "Warning: unable to run mkpamserv trinity, you will need to manually confirure pam" - echo "Please remember that you can change your kdesu backend from su to sudo" - echo "by adding following lines to your ~/.tde/share/kdesurc or to the" - echo "$TDEDIR/share/config/kdesurc:" - echo "[super-user-command]" - echo "super-user-command=sudo" + [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity + $TDEDIR/bin/mkpamserv tde + $TDEDIR/bin/mkpamserv tde-screensaver + $TDEDIR/bin/mkpamserv tde-checkpass } post_upgrade() { @@ -16,6 +12,6 @@ post_upgrade() { post_remove() { ldconfig &> /dev/null - rm /etc/pam.d/trinity + rm /etc/pam.d/{tde,tde-screensaver,tde-checkpass} } |
