wok rev 19536

Up: docbook-xsl (1.79.1): conversion xml->man now works; udisks2 (2.1.8): now it auto-unmount and free /media/* folders before reboot/shutdown.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Thu Dec 01 04:42:13 2016 +0200 (2016-12-01)
parents 15463737adaa
children 10d3d9504ec6
files docbook-xsl/receipt udisks2-dev/receipt udisks2/receipt
line diff
     1.1 --- a/docbook-xsl/receipt	Tue Nov 29 19:12:12 2016 +0200
     1.2 +++ b/docbook-xsl/receipt	Thu Dec 01 04:42:13 2016 +0200
     1.3 @@ -1,13 +1,13 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="docbook-xsl"
     1.7 -VERSION="1.76.1"
     1.8 +VERSION="1.79.1"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="DocBook XSL stylesheets."
    1.11  MAINTAINER="paul@slitaz.org"
    1.12  LICENSE="MIT"
    1.13 +WEB_SITE="http://docbook.sourceforge.net/"
    1.14  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    1.15 -WEB_SITE="http://docbook.sourceforge.net/"
    1.16  WGET_URL="$SF_MIRROR/docbook/$TARBALL"
    1.17  
    1.18  DEPENDS="docbook-xml libxml2-tools libxslt"
    1.19 @@ -19,7 +19,7 @@
    1.20  	pkgroot=$fs/usr/share/xml/docbook/stylesheet/$PACKAGE
    1.21  	install -dm755 $pkgroot/common
    1.22  	install -dm755 $pkgroot/params
    1.23 -	install  -m755 VERSION $pkgroot
    1.24 +	install  -m644 VERSION.xsl $pkgroot
    1.25  
    1.26  	for fn in xml xsl dtd ent; do
    1.27  		install -m644 common/*.${fn} $pkgroot/common/
    1.28 @@ -53,22 +53,22 @@
    1.29  
    1.30  	chroot "$1/" xmlcatalog --noout --add "rewriteSystem" \
    1.31  		"http://docbook.sourceforge.net/release/xsl/$VERSION" \
    1.32 -		"/usr/share/xml/docbook/stylesheet/$PACKAGE/catalog.xml" \
    1.33 +		"/usr/share/xml/docbook/stylesheet/$PACKAGE" \
    1.34  	/etc/xml/catalog &&
    1.35  
    1.36  	chroot "$1/" xmlcatalog --noout --add "rewriteURI" \
    1.37  		"http://docbook.sourceforge.net/release/xsl/$VERSION" \
    1.38 -		"/usr/share/xml/docbook/stylesheet/$PACKAGE/catalog.xml" \
    1.39 +		"/usr/share/xml/docbook/stylesheet/$PACKAGE" \
    1.40  	/etc/xml/catalog &&
    1.41  
    1.42  	chroot "$1/" xmlcatalog --noout --add "rewriteSystem" \
    1.43  		"http://docbook.sourceforge.net/release/xsl/current" \
    1.44 -		"/usr/share/xml/docbook/stylesheet/$PACKAGE/catalog.xml" \
    1.45 +		"/usr/share/xml/docbook/stylesheet/$PACKAGE" \
    1.46  	/etc/xml/catalog &&
    1.47  
    1.48  	chroot "$1/" xmlcatalog --noout --add "rewriteURI" \
    1.49  		"http://docbook.sourceforge.net/release/xsl/current" \
    1.50 -		"/usr/share/xml/docbook/stylesheet/$PACKAGE/catalog.xml" \
    1.51 +		"/usr/share/xml/docbook/stylesheet/$PACKAGE" \
    1.52  	/etc/xml/catalog
    1.53  
    1.54  	# link nwalsh dir
     2.1 --- a/udisks2-dev/receipt	Tue Nov 29 19:12:12 2016 +0200
     2.2 +++ b/udisks2-dev/receipt	Thu Dec 01 04:42:13 2016 +0200
     2.3 @@ -1,24 +1,18 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="udisks2-dev"
     2.7 -VERSION="2.1.3"
     2.8 +VERSION="2.1.8"
     2.9  CATEGORY="development"
    2.10  SHORT_DESC="D-Bus service to access and manipulate storage devices (development)"
    2.11  MAINTAINER="pankso@slitaz.org"
    2.12  LICENSE="GPL2"
    2.13  WEB_SITE="http://www.freedesktop.org/wiki/Software/udisks"
    2.14 +
    2.15  WANTED="udisks2"
    2.16 -
    2.17 -DEPENDS="glib-dev libffi-dev libgio-dev pcre-dev udisks2"
    2.18 +DEPENDS="udisks2 libgio-dev glib-dev"
    2.19  
    2.20  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.21  genpkg_rules()
    2.22  {
    2.23 -	mkdir -p $fs/usr/lib $fs/usr/share
    2.24 -
    2.25 -	cp -a $install/usr/include $fs/usr
    2.26 -	cp -a $install/usr/lib/*.*a $fs/usr/lib
    2.27 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    2.28 -	cp -a $install/usr/lib/girepository-1.0 $fs/usr/lib
    2.29 -	cp -a $install/usr/share/gir-1.0 $fs/usr/share
    2.30 +	cook_copy_files *.h *.a *.la *.pc *.typelib *.gir
    2.31  }
     3.1 --- a/udisks2/receipt	Tue Nov 29 19:12:12 2016 +0200
     3.2 +++ b/udisks2/receipt	Thu Dec 01 04:42:13 2016 +0200
     3.3 @@ -1,18 +1,18 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="udisks2"
     3.7 -VERSION="2.1.3"
     3.8 +VERSION="2.1.8"
     3.9  CATEGORY="system-tools"
    3.10  SHORT_DESC="D-Bus service to access and manipulate storage devices"
    3.11  MAINTAINER="pankso@slitaz.org"
    3.12  LICENSE="GPL2"
    3.13 +WEB_SITE="https://www.freedesktop.org/wiki/Software/udisks/"
    3.14  TARBALL="udisks-$VERSION.tar.bz2"
    3.15 -WEB_SITE="http://www.freedesktop.org/wiki/Software/udisks"
    3.16 -WGET_URL="http://udisks.freedesktop.org/releases/$TARBALL"
    3.17 +WGET_URL="https://udisks.freedesktop.org/releases/$TARBALL"
    3.18  
    3.19  DEPENDS="libatasmart libgudev polkit"
    3.20 -BUILD_DEPENDS="libxslt-dev gobject-introspection-dev libgudev-dev polkit-dev \
    3.21 -libatasmart-dev expat-dev"
    3.22 +BUILD_DEPENDS="docbook-xsl gtk-doc libgudev-dev polkit-dev libatasmart-dev \
    3.23 +gobject-introspection-dev"
    3.24  
    3.25  # Rules to configure and make the package.
    3.26  compile_rules()
    3.27 @@ -20,35 +20,24 @@
    3.28  	./configure \
    3.29  		--sysconfdir=/etc \
    3.30  		--localstatedir=/var \
    3.31 -		--disable-static \
    3.32 -		--disable-gtk-doc-html \
    3.33 +		--enable-fhs-media \
    3.34  		--with-udevdir=/etc/udev \
    3.35 -		$CONFIGURE_ARGS
    3.36 -	# Build fails when build doc even with docbook-xsl installed.
    3.37 -	sed -i '/^SUBDIRS/ s|doc||' Makefile
    3.38 +		--with-systemdsystemunitdir=no \
    3.39 +		$CONFIGURE_ARGS &&
    3.40  	make && make install
    3.41  }
    3.42  
    3.43  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.44  genpkg_rules()
    3.45  {
    3.46 -	mkdir -p $fs/etc/polkit-1/localauthority/90-mandatory.d \
    3.47 -		$fs/usr/lib $fs/usr/share
    3.48 +	cook_copy_folders etc bin sbin libexec dbus-1 polkit-1 var
    3.49 +	cook_copy_files *.so*
    3.50  
    3.51 -	cp -a $install/etc $fs
    3.52 -	cp -a $install/usr/bin $fs/usr
    3.53 -	cp -a $install/usr/sbin $fs/usr
    3.54 -	cp -a $install/usr/lib/udisks2 $fs/usr/lib
    3.55 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    3.56 -	cp -a $install/usr/share/dbus-1 $fs/usr/share
    3.57 -	cp -a $install/usr/share/polkit-1 $fs/usr/share
    3.58 -	cp -a $install/var $fs
    3.59 +	# Please, note:
    3.60 +	# Package:  slitaz-configs-base
    3.61 +	# File:     /etc/polkit-1/localauthority/50-local.d/55-storage.pkla
    3.62 +	# Provides: complete access to udisks2 methods
    3.63  
    3.64 -	# we don't have consolekit and don't want systemd, so we need
    3.65 -	# a rule to give disk group complete access to udisks2
    3.66 -	# methods without password.
    3.67 -	cp $stuff/*.pkla $fs/etc/polkit-1/localauthority/90-mandatory.d
    3.68 -
    3.69 -	# mount to "/media"
    3.70 +	# mount to "/media" instead of "/media/<user>"
    3.71  	cp $stuff/99-udisks2.rules $fs/etc/udev/rules.d/
    3.72  }