From f197ebe3e71e66f5faa33e1a97478c10901c2528 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 5 Oct 2012 18:32:28 +0200 Subject: [PATCH] Remove gconf_schemas settings from srcpkgs. --- srcpkgs/gnome-applets/template | 5 +---- srcpkgs/gnome-media/template | 7 +------ srcpkgs/gnome-terminal/template | 4 +--- srcpkgs/gst-plugins-good/template | 3 +-- srcpkgs/libgnome-media-profiles/template | 6 ++---- srcpkgs/sound-juicer/template | 5 +---- 6 files changed, 7 insertions(+), 23 deletions(-) diff --git a/srcpkgs/gnome-applets/template b/srcpkgs/gnome-applets/template index 549bb7dd8b..712091b11f 100644 --- a/srcpkgs/gnome-applets/template +++ b/srcpkgs/gnome-applets/template @@ -22,11 +22,8 @@ checksum=f6178cb702a39a4103fcb97e9a266bf6d05f05ac5064818f119c023d76170e83 long_desc=" This package contains $short_desc." - -gconf_schemas="${pkgname}.schemas" - post_install() { mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc} - gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \ + gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \ --domain ${pkgname} ${wrksrc}/*.schemas } diff --git a/srcpkgs/gnome-media/template b/srcpkgs/gnome-media/template index 0171458570..8796db2215 100644 --- a/srcpkgs/gnome-media/template +++ b/srcpkgs/gnome-media/template @@ -16,13 +16,8 @@ checksum=a76fac286f24d3836137ddbaab66f05e19eb5fb83cca6e375dbef040765a1d1f long_desc=" The GNOME Media package contains GNOME's media applications." -gconf_schemas="gnome-sound-recorder.schemas" - - - - post_install() { mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc} - gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \ + gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/gnome-sound-recorder.schemas \ --domain gnome-media ${wrksrc}/*.schemas } diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template index 602df2939c..f5611338ad 100644 --- a/srcpkgs/gnome-terminal/template +++ b/srcpkgs/gnome-terminal/template @@ -26,10 +26,8 @@ long_desc=" GNOME Terminal features the ability to use multiple terminals in a single window (tabs) and profiles support." -gconf_schemas="$pkgname.schemas" - post_install() { mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc} - gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \ + gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \ --domain ${pkgname} ${wrksrc}/*.schemas } diff --git a/srcpkgs/gst-plugins-good/template b/srcpkgs/gst-plugins-good/template index 38b202ec09..b2a94068d6 100644 --- a/srcpkgs/gst-plugins-good/template +++ b/srcpkgs/gst-plugins-good/template @@ -9,7 +9,6 @@ configure_args="--with-gudev --with-libv4l2 --enable-experimental --with-gconf-schema-file-dir=/usr/share/gconf/schemas --enable-speex" # XXX: build libcaca, libdv, dv1394 and shout2 modules. makedepends="pkg-config intltool libpng-devel>=1.5.10 libxml2-devel libgudev-devel libflac-devel libXdamage-devel libXfixes-devel gtk+-devel taglib-devel libsoup-gnome-devel gst-plugins-base-devel GConf-devel pulseaudio-devel orc-devel libXv-devel wavpack-devel v4l-utils-devel jack-devel speex-devel" -gconf_schemas="gstreamer-0.10.schemas" short_desc="Core GStreamer libraries and elements" maintainer="Juan RP " homepage="http://gstreamer.freedesktop.org/" @@ -28,6 +27,6 @@ long_desc=" post_install() { mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc} - gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \ + gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/gstreamer-0.10.schemas \ --domain ${pkgname}-0.10 ${wrksrc}/*.schemas } diff --git a/srcpkgs/libgnome-media-profiles/template b/srcpkgs/libgnome-media-profiles/template index 9c3c1d4f2e..d41e801c46 100644 --- a/srcpkgs/libgnome-media-profiles/template +++ b/srcpkgs/libgnome-media-profiles/template @@ -1,6 +1,7 @@ # Template file for 'libgnome-media-profiles' pkgname=libgnome-media-profiles version=3.0.0 +revision=4 distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2" build_style=gnu-configure configure_args="--disable-schemas-install @@ -12,13 +13,10 @@ checksum=ab1288e53a8fccca3e8fa59757ef586901e236e09a737a1178eeb8d74428c061 long_desc=" This package contains a Library to manage media profiles." -revision=4 -gconf_schemas="gnome-media-profiles.schemas" subpackages="$pkgname-devel" - post_install() { mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc} - gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \ + gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/gnome-media-profiles.schemas \ --domain gnome-media-profiles ${wrksrc}/*.schemas } diff --git a/srcpkgs/sound-juicer/template b/srcpkgs/sound-juicer/template index 82ecc4ff67..02528ba6ed 100644 --- a/srcpkgs/sound-juicer/template +++ b/srcpkgs/sound-juicer/template @@ -18,11 +18,8 @@ long_desc=" This is Sound Juicer, a CD ripping tool using GTK+ and GStreamer for the GNOME desktop." -gconf_schemas="sound-juicer.schemas" - - post_install() { mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc} - gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \ + gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \ --domain ${pkgname} ${wrksrc}/*.schemas }