version 2.2.2-1

4 files changed, 44 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cb5061ce1045..862f38535357 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,41 @@
 pkgbase = cdesktopenv
 	pkgdesc = CDE - Common Desktop Environment
-	pkgver = 2.2.0d
-	pkgrel = 1
+	pkgver = 2.2.2
+	pkgrel = 3
 	url = http://sourceforge.net/projects/cdesktopenv/
+	install = cdesktopenv.install
 	arch = i686
 	arch = x86_64
 	license = LGPL2
 	makedepends = tcl
 	makedepends = ncompress
+	makedepends = bison
 	depends = openmotif
 	depends = xbitmaps
 	depends = rpcbind
 	depends = mksh
 	depends = ncurses
+	depends = libxss
+	depends = xbitmaps
 	optdepends = xorg-fonts-100dpi: additional fonts
 	optdepends = cups: for printing support
 	optdepends = xinetd: for rpc services
 	options = !strip
 	options = !zipman
 	backup = etc/dt/config/xfonts/C/fonts.alias
-	source = http://downloads.sourceforge.net/cdesktopenv/cde-src-2.2.0d-beta.tar.gz
+	source = http://downloads.sourceforge.net/cdesktopenv/cde-src-2.2.2.tar.gz
+	source = cdesktopenv.install
 	source = dtlogin.service
 	source = fonts.alias
 	source = fonts.dir
 	source = cde.desktop
 	source = startxsession.sh
-	md5sums = 6ebda6347706c2aac361e399acad2120
+	md5sums = 8ceb3110832421c14b135058c6c11cd9
+	md5sums = 66ff27b4c6b7c5fda4e2db69f829e4aa
 	md5sums = 18f9ef4643ff7ed6637907f5cbdabecf
 	md5sums = 5cc80c2851ea90b94e94b0c5d92d81fb
 	md5sums = 897316929176464ebc9ad085f31e7284
-	md5sums = f4c8125c54dbed1e91ce859b7ad6a365
+	md5sums = 7d11b9d2bc1234278f14151025744916
 	md5sums = 2e5557241915e4c2761ba136dbcba469
 
 pkgname = cdesktopenv
diff --git a/PKGBUILD b/PKGBUILD
index 0abf1f34be8f..92dfcf775311 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,31 +4,34 @@
 # New Maintainer: BlindPenguin <ferdinand holzner at gmail dot com>
 #
 pkgname=cdesktopenv
-pkgver=2.2.0d
-pkgrel=1
+pkgver=2.2.2
+pkgrel=3
 pkgdesc="CDE - Common Desktop Environment"
 url="http://sourceforge.net/projects/cdesktopenv/"
 arch=('i686' 'x86_64') # Some parts of CDE are not stable on x86_64 yet.
 license=('LGPL2')
 options=(!strip !zipman)
-depends=(openmotif xbitmaps rpcbind mksh ncurses)
-makedepends=(tcl ncompress)
+install="cdesktopenv.install"
+depends=(openmotif xbitmaps rpcbind mksh ncurses libxss xbitmaps)
+makedepends=(tcl ncompress bison)
 optdepends=('xorg-fonts-100dpi: additional fonts'
             'cups: for printing support'
             'xinetd: for rpc services')
 backup=('etc/dt/config/xfonts/C/fonts.alias')
-source=("http://downloads.sourceforge.net/$pkgname/cde-src-$pkgver-beta.tar.gz"
+source=("http://downloads.sourceforge.net/$pkgname/cde-src-$pkgver.tar.gz"
+	'cdesktopenv.install'
         'dtlogin.service'
         'fonts.alias'
         'fonts.dir'
         'cde.desktop'
 	'startxsession.sh')
 
-md5sums=('6ebda6347706c2aac361e399acad2120'
+md5sums=('8ceb3110832421c14b135058c6c11cd9'
+	 '66ff27b4c6b7c5fda4e2db69f829e4aa'
          '18f9ef4643ff7ed6637907f5cbdabecf'
          '5cc80c2851ea90b94e94b0c5d92d81fb'
          '897316929176464ebc9ad085f31e7284'
-         'f4c8125c54dbed1e91ce859b7ad6a365'
+         '7d11b9d2bc1234278f14151025744916'
          '2e5557241915e4c2761ba136dbcba469')
 
 build() {
@@ -45,8 +48,8 @@ build() {
 #define DtLocalesToBuild
 EOF
 
-  mkdir -p imports/x11/include
-  ln -sf /usr/include/X11 imports/x11/include/
+#  mkdir -p imports/x11/include
+#  ln -sf /usr/include/X11 imports/x11/include/
   
   (
      export LANG=C
diff --git a/cde.desktop b/cde.desktop
index 5e1f60371356..4677598fe580 100644
--- a/cde.desktop
+++ b/cde.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=CDE
 Comment=Use this session to boot into the Common Desktop Environment
-Exec=/usr/dt/bin/startxsession.sh
+Exec=/usr/bin/startxsession.sh
 Icon=
 Type=Application
 
diff --git a/cdesktopenv.install b/cdesktopenv.install
new file mode 100644
index 000000000000..f0b4f5f4e4ab
--- /dev/null
+++ b/cdesktopenv.install
@@ -0,0 +1,20 @@
+post_install() {
+	echo
+	echo "You MUST edit /etc/conf.d/rpcbind"
+	echo "Change the line which reads:"
+	echo
+	echo "RPCBIND_ARGS=\"\""
+	echo
+	echo "to:"
+	echo
+	echo "RPCBIND_ARGS=\"-i\""
+	echo
+	echo "This is probably insecure."
+	echo "To start dtlogin, first use systemctl to start rpcbind.service, and then start dtlogin.service"
+}
+
+post_upgrade() {
+	post_install
+}
+
+# vim:set ts=2 sw=2 et: