libfm: split libfm-extra into its own source/binary package

common/shlibs

@@ -823,9 +823,9 @@ libtracker-extract-1.0.so.0 libtracker-1.0.0_1
 libtracker-miner-1.0.so.0 libtracker-1.0.0_1
 libtracker-sparql-1.0.so.0 libtracker-1.0.0_1
 libtracker-control-1.0.so.0 libtracker-1.0.0_1
-libfm.so.4 libfm-1.2.3_1
+libfm.so.4 libfm-1.2.3_3
-libfm-gtk.so.4 libfm-1.2.3_1
+libfm-gtk.so.4 libfm-1.2.3_3
-libfm-extra.so.4 libfm-1.2.3_1
+libfm-extra.so.4 libfm-extra-1.2.3_3
 libunique-1.0.so.0 libunique1-1.1.6_1
 libxnoise.so.0 libxnoise-0.1.29_1
 libdiscid.so.0 libdiscid-0.2.2_1

srcpkgs/libfm-extra-devel

@@ -0,0 +1 @@
+libfm-extra

srcpkgs/libfm-extra/template

@@ -0,0 +1,29 @@
+# Template file for 'libfm-extra'
+#
+# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/libfm"; IT IS SPLITTED TO AVOID
+# A CYCLIC DEPENDENCY: libfm <-> menu-cache
+#
+pkgname=libfm-extra
+version=1.2.3
+revision=3
+wrksrc="libfm-${version}"
+build_style=gnu-configure
+configure_args="--with-extra-only --with-gtk=no --disable-static"
+hostmakedepends="pkg-config intltool"
+makedepends="glib-devel"
+short_desc="LXDE GLib/GIO based library (extra library)"
+maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://pcmanfm.sourceforge.net/"
+license="GPL-2"
+distfiles="${SOURCEFORGE_SITE}/pcmanfm/libfm-${version}.tar.xz"
+checksum=c692f1624a4cbc8d1dd55f3b3f3369fbf5d26f63a916e2c295230b2344e1fbf9
+
+libfm-extra-devel_package() {
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.so
+		vmove usr/lib/pkgconfig
+	}
+}

srcpkgs/libfm/template

@@ -1,12 +1,15 @@
 # Template file for 'libfm'
+#
+# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/libfm-extra"
+#
 pkgname=libfm
 version=1.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-udisks --disable-static"
 hostmakedepends="automake glib-devel gtk-doc gettext-devel libtool pkg-config intltool"
 makedepends="libexif-devel dbus-glib-devel gtk+-devel menu-cache-devel vala-devel"
-depends="desktop-file-utils"
+depends="libfm-extra>=${version}_${revision} desktop-file-utils"
 conf_files="/etc/xdg/libfm/libfm.conf"
 short_desc="LXDE GLib/GIO based library"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -19,8 +22,15 @@ pre_configure() {
 	autoreconf -fi
 }
 
+post_install() {
+	# remove files that belong to libfm-extra
+	rm -f ${DESTDIR}/usr/lib/libfm-extra.so*
+	rm -f ${DESTDIR}/usr/lib/pkgconfig/libfm-extra.pc
+	rm -f ${DESTDIR}/usr/include/libfm/fm-{extra,version,xml-file}.h
+}
+
 libfm-devel_package() {
-	depends="gtk+-devel menu-cache-devel libfm>=${version}_${revision}"
+	depends="gtk+-devel menu-cache-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" -- development files"
 	pkg_install() {
 		vmove usr/include

srcpkgs/menu-cache/template

@@ -1,11 +1,11 @@
 # Template file for 'menu-cache'
 pkgname=menu-cache
 version=1.0.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
-makedepends="libfm-devel"
+makedepends="libglib-devel libfm-extra-devel"
 short_desc="LXDE freedesktop menu specification"
 homepage="http://lxde.org/"
 license="GPL-2"
@@ -14,7 +14,7 @@ distfiles="${SOURCEFORGE_SITE}/lxde/$pkgname-$version.tar.xz"
 checksum=ff7df437bbfd3119c5f662c6d209b98f15de03a7203308c6b56a4c1e1d419aaf
 
 menu-cache-devel_package() {
-	depends="libfm-devel ${sourcepkg}>=${version}_${revision}"
+	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" -- development files"
 	pkg_install() {
 		vmove usr/include