[arch-commits] Commit in libfm/trunk (PKGBUILD)

Balló György bgyorgy at archlinux.org
Tue Oct 7 12:15:53 UTC 2014


    Date: Tuesday, October 7, 2014 @ 14:15:53
  Author: bgyorgy
Revision: 120351

upgpkg: libfm 1.2.2.1-3

Split libfm-extra to avoid circular dependency with menu-cache>=0.7.0

Modified:
  libfm/trunk/PKGBUILD

----------+
 PKGBUILD |   39 ++++++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-07 11:52:38 UTC (rev 120350)
+++ PKGBUILD	2014-10-07 12:15:53 UTC (rev 120351)
@@ -5,9 +5,10 @@
 # Contributor: Angel Velasquez <angvp at archlinux.org>
 # Contributor: Juergen Hoetzel <juergen at archlinux.org>
 
-pkgname=libfm
+pkgbase=libfm
+pkgname=(libfm libfm-extra)
 pkgver=1.2.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Library for file management'
 url='http://pcmanfm.sourceforge.net/'
 arch=('i686' 'x86_64')
@@ -17,7 +18,6 @@
 replaces=('lxshortcut')
 provides=('lxshortcut')
 conflicts=('lxshortcut')
-install=libfm.install
 source=(http://downloads.sourceforge.net/pcmanfm/libfm-$pkgver.tar.xz
         0001-Fix-default-app-detection-in-App-chooser-combo-box.patch)
 md5sums=('f898c480b142b56471377ef3a2810f2d'
@@ -24,13 +24,13 @@
          '10ece6d3a98f1244a82929b7c7ceba2a')
 
 prepare() {
-  cd $pkgname-$pkgver
+  cd $pkgbase-$pkgver
 
   patch -Np1 -i ../0001-Fix-default-app-detection-in-App-chooser-combo-box.patch
 }
 
 build() {
-  cd $pkgname-$pkgver
+  cd $pkgbase-$pkgver
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --enable-udisks \
@@ -38,11 +38,36 @@
   make
 }
 
-package() {
-  cd $pkgname-$pkgver
+package_libfm() {
+  depends+=('libfm-extra')
+  install=libfm.install
+
+  cd $pkgbase-$pkgver
   make DESTDIR="$pkgdir" install
 
   # Temporary fix to FS#32361
   rm -rf "$pkgdir"/usr/include/libfm
   mv "$pkgdir"/usr/include/libfm-1.0/ "$pkgdir"/usr/include/libfm
+
+  # Split libfm-extra
+  [[ -d $srcdir/libfm-extra ]] && rm -r "$srcdir/libfm-extra/"
+  mkdir "$srcdir"/libfm-extra
+  mv "$pkgdir"/usr/include/libfm/fm-{extra,version,xml-file}.h \
+     "$pkgdir"/usr/lib/libfm-extra.so* \
+     "$pkgdir"/usr/lib/pkgconfig/libfm-extra.pc \
+     "$srcdir/libfm-extra/"
 }
+
+package_libfm-extra() {
+  pkgdesc="Extra library for file management" 
+  depends=('glib2')
+  replaces=()
+  provides=()
+  conflicts=()
+
+  cd "$srcdir"/libfm-extra
+  mkdir -p "$pkgdir"/usr/{include/libfm,lib/pkgconfig}
+  mv *.h "$pkgdir/usr/include/libfm"
+  mv libfm-extra.so* "$pkgdir/usr/lib"
+  mv libfm-extra.pc "$pkgdir/usr/lib/pkgconfig"
+}



More information about the arch-commits mailing list