diff --git a/srcpkgs/metacity/metacity-devel.template b/srcpkgs/metacity/metacity-devel.template index 435a7652794..cb5817a843f 100644 --- a/srcpkgs/metacity/metacity-devel.template +++ b/srcpkgs/metacity/metacity-devel.template @@ -1,21 +1,15 @@ # Template file for 'metacity-devel'. # -short_desc="${sourcepkg} (development files)" +short_desc="${sourcepkg} -- development files" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -Add_dependency run pkg-config -Add_dependency run libcanberra-devel -Add_dependency run GConf-devel -Add_dependency run startup-notification-devel -Add_dependency run libgtop-devel -Add_dependency run metacity +noarch=yes +Add_dependency run gtk+-devel +Add_dependency run metacity ">=${version}" -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/lib*.a ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib +do_install() { + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib } diff --git a/srcpkgs/metacity/metacity.rshlibs b/srcpkgs/metacity/metacity.rshlibs index 47abe0ad1ef..82905f82f9b 100644 --- a/srcpkgs/metacity/metacity.rshlibs +++ b/srcpkgs/metacity/metacity.rshlibs @@ -6,7 +6,6 @@ libpthread.so.0 libc.so.6 libgdk_pixbuf-2.0.so.0 libgobject-2.0.so.0 -libgconf-2.so.4 libcanberra-gtk.so.0 libcanberra.so.0 libatk-1.0.so.0 @@ -31,5 +30,4 @@ libgio-2.0.so.0 libpangoft2-1.0.so.0 libfreetype.so.6 libfontconfig.so.1 -libgmodule-2.0.so.0 librt.so.1 diff --git a/srcpkgs/metacity/template b/srcpkgs/metacity/template index a740c42c7ef..454ea3371b8 100644 --- a/srcpkgs/metacity/template +++ b/srcpkgs/metacity/template @@ -1,20 +1,17 @@ # Template file for 'metacity' pkgname=metacity -version=2.34.1 +version=2.34.3 distfiles="${GNOME_SITE}/$pkgname/2.34/$pkgname-$version.tar.xz" build_style=gnu-configure -configure_args="--disable-schemas-install ---with-gconf-schema-file-dir=/usr/share/gconf/schemas" -revision=3 +configure_args="--disable-static --disable-schemas-compile --disable-scrollkeeper" short_desc="GNOME-compliant window manager" maintainer="Juan RP " -checksum=f144cb43925ca00d8eaac129a14df3260c54a32324b5cd0a4d78b0fd7ff1028a +checksum=aeac2548b62a98375fb5c832ee26ab4cb6d59f0dd96edcefb5f7bef2416576e7 long_desc=" Metacity is not a meta-City as in an urban center, but rather Meta-ness as in the state of being meta. i.e. metacity : meta as opacity : opaque. Also it may have something to do with the Meta key on UNIX keyboards." -gconf_schemas="metacity.schemas" subpackages="$pkgname-devel" Add_dependency build pkg-config @@ -26,14 +23,8 @@ Add_dependency build libXrandr-devel Add_dependency build libXcursor-devel Add_dependency build libXinerama-devel Add_dependency build libcanberra-devel -Add_dependency build GConf-devel Add_dependency build startup-notification-devel Add_dependency build libgtop-devel + Add_dependency full zenity Add_dependency full gnome-icon-theme - -post_install() { - mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc} - gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \ - --domain ${pkgname} ${wrksrc}/*.schemas -}