Merge remote-tracking branch 'x/master'

* x/master:
  libgweather: rebuilt with newer pango, make -devel pkg noarch.

srcpkgs/libgweather/depends

@@ -1,2 +1,2 @@
 abi_depends=">=2.91.6"
-api_depends="${abi_depends}"
+api_depends=">=3.4.1_1"

srcpkgs/libgweather/libgweather-devel.template

@@ -5,18 +5,21 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
 Add_dependency run glib-devel
 Add_dependency run gdk-pixbuf-devel
 Add_dependency run gtk+3-devel
 Add_dependency run GConf-devel
 Add_dependency run libxml2-devel
 Add_dependency run libsoup-devel
-Add_dependency run libgweather
+Add_dependency run libgweather ">=${version}"
 
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/{lib,share}
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/{gir*,gtk-doc} ${DESTDIR}/usr/share
+noarch=yes
+
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/share/gir-1.0 usr/share
+	vmove usr/share/gtk-doc usr/share
 }

srcpkgs/libgweather/libgweather.rshlibs

@@ -12,9 +12,6 @@ libsoup-gnome-2.4.so.1
 libsoup-2.4.so.1
 libgio-2.0.so.0
 libgobject-2.0.so.0
-libgmodule-2.0.so.0
-librt.so.1
 libgconf-2.so.4
 libglib-2.0.so.0
-libpthread.so.0
 libc.so.6

srcpkgs/libgweather/template

@@ -1,6 +1,7 @@
 # Template file for 'libgweather'
 pkgname=libgweather
 version=3.4.1
+revision=1
 homepage="http://www.gnome.org/"
 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure