4 files changed, 62 insertions, 69 deletions
diff --git a/pcr/fair-coin/PKGBUILD b/pcr/fair-coin/PKGBUILD
index 0b5451078..d4063e3fc 100644
--- a/pcr/fair-coin/PKGBUILD
+++ b/pcr/fair-coin/PKGBUILD
@@ -1,68 +1,51 @@
-# $Id$
-# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
-# Contributor: shahid <helllamer@gmail.com>
+# Maintainer (Arch): Eugenio M. Vigo <emvigo@gmail.com>
+# Co-mantainer (Arch): Rubén Fdes. Moreira <ruben.fdesmoreira@openmailbox.org>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
-pkgbase=fair-coin
-pkgname=('faircoin-daemon' 'faircoin-qt')
+pkgname=fair-coin
 pkgver=1.5.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://fair-coin.org/"
-makedepends=('boost<1.60' 'automoc4' 'qrencode' 'miniupnpc' 'protobuf')
-license=('custom:MIT')
-source=(https://github.com/FairCoinTeam/fair-coin/archive/v${pkgver}.tar.gz
-        https://raw.githubusercontent.com/FairCoinTeam/fair-coin/v1.2.0/contrib/debian/examples/novacoin.conf
-        https://raw.githubusercontent.com/FairCoinTeam/fair-coin/v1.2.0/contrib/debian/manpages/novacoin.conf.5
-        https://raw.githubusercontent.com/FairCoinTeam/fair-coin/v1.2.0/contrib/debian/manpages/novacoind.1
-        https://raw.githubusercontent.com/FairCoinTeam/fair-coin/v1.2.0/contrib/debian/novacoin-qt.desktop)
-
-prepare() {
-  cd "${srcdir}"
-  sed -e "s/Nova/Fair/g" -e "s/nova/fair/g" \
-      -e "s/bitcoin/faircoin/g" \
-      -i novacoin-qt.desktop novacoin.conf \
-         novacoind.1 novacoin.conf.5
-
-  cd "$srcdir/$pkgbase-$pkgver"
-  ./autogen.sh
-}
+pkgrel=3
+pkgdesc="FairCoin Qt official client"
+arch=(i686 x86_64)
+url="https://fair-coin.org/"
+license=('MIT')
+depends=('qt4' 'boost-libs' 'qrencode' 'protobuf')
+makedepends=('boost' 'imagemagick')
+
+provides=("faircoin-daemon=${pkgver}" "faircoin-qt=${pkgver}")
+conflicts=('faircoin-daemon' 'faircoin-qt')
+replaces=('faircoin-daemon' 'faircoin-qt')
+
+source=("https://github.com/FairCoinTeam/fair-coin/archive/v$pkgver.tar.gz"
+        "$pkgname.desktop")
+install=("$pkgname.install")
+sha256sums=("72e512768f8307db5c2f1ae5513bf222835919268110db7361bab056ee44db5e"
+            "7bf32cef879eb08682d92cd8ee35d68b8e295030d2873dc6a3a95cd37b88612c")
 
 build() {
-  cd "$srcdir/$pkgbase-$pkgver"
-  ./configure --prefix=/usr --disable-maintainer-mode --disable-tests --with-incompatible-bdb --with-gui=qt4
-
-  # fix error with missing DSO by adding -lrt
-  # https://github.com/bitcoin/bitcoin/issues/879
-  sed -i -e "s/^LIBS = .*$/& -lrt/" src/Makefile
-  make
+    cd $pkgname-$pkgver
+    ./autogen.sh
+    LIBS=-lrt ./configure --prefix=/usr --with-incompatible-bdb --disable-tests 
+    make
 }
 
-package_faircoin-qt() {
-  pkgdesc="faircoin is a peer-to-peer network based digital currency - Qt"
-  depends=("boost-libs<1.60" qt4 miniupnpc qrencode protobuf)
-  install=faircoin-qt.install
+package() {
+    cd ${pkgname}-${pkgver}
 
-  cd "$srcdir/$pkgbase-$pkgver"
-  install -Dm755 src/qt/FairCoin-qt "$pkgdir"/usr/bin/faircoin-qt
-  install -Dm644 "${srcdir}/novacoin-qt.desktop" "${pkgdir}"/usr/share/applications/faircoin-qt.desktop
-  install -Dm644 share/pixmaps/faircoin80.xpm "${pkgdir}"/usr/share/pixmaps/faircoin80.xpm
-  install -Dm644 share/pixmaps/faircoin32.xpm "${pkgdir}"/usr/share/pixmaps/faircoin32.xpm
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
+    DESTDIR="$pkgdir" make install
+
+    # Install license file (recommended, as license is MIT)
+    install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
 
-package_faircoin-daemon() {
-  pkgdesc="faircoin is a peer-to-peer network based digital currency - daemon"
-  depends=("boost-libs<1.60" miniupnpc openssl)
+    # Imagemagick comes to the rescue to create icons... Extracting the ICO file
+    # for the Windows build into several pngs
+    convert share/pixmaps/faircoin.ico ${pkgname}.png
+    install -Dm644 ${pkgname}-0.png ${pkgdir}/usr/share/icons/hicolor/16x16/apps/${pkgname}.png
+    install -Dm644 ${pkgname}-1.png ${pkgdir}/usr/share/icons/hicolor/32x32/apps/${pkgname}.png
+    install -Dm644 ${pkgname}-2.png ${pkgdir}/usr/share/icons/hicolor/48x48/apps/${pkgname}.png
+    install -Dm644 ${pkgname}-3.png ${pkgdir}/usr/share/icons/hicolor/64x64/apps/${pkgname}.png
+    install -Dm644 ${pkgname}-4.png ${pkgdir}/usr/share/icons/hicolor/128x128/apps/${pkgname}.png
 
-  cd "$srcdir/$pkgbase-$pkgver"
-  install -Dm755 src/FairCoind "$pkgdir"/usr/bin/faircoind
-  install -Dm644 "${srcdir}"/novacoin.conf "${pkgdir}"/etc/faircoin.conf
-  install -Dm644 "${srcdir}"/novacoin.conf.5 "${pkgdir}"/usr/share/man/man5/faircoin.conf.5
-  install -Dm644 "${srcdir}"/novacoind.1 "${pkgdir}"/usr/share/man/man1/faircoind.1
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+    # Desktop entry file
+    install -Dm644 ../${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
 }
-sha512sums=('b19f73b40f5b491c73c0670679dc7461e1eef8f05d4af86570743f45d26e1e1b8e17b43ad604531741a6a1febf1fd526c05fcd31bc08d0d779137911bdf737cd'
-            '8e148d602106e1b403b07fe23269aa7210139274f58ddd42bd6ca18e3b3998ea45ce3e82eeb2aa4968449b072cd3b2d338f10b97e7e07e810b7488ac46d6442c'
-            '35c5f5f34f134b44f41b0d169232ee00b7edaabc3c00f3a3200f6ec8f3d80ed312c43784d290c137995906d56777e842f10fb3dad7d66aa81279dbd725fe3abc'
-            '24f46919cbc84b2c204850b64d2d0737b7fb9d0c727da974c930ae4be182e104d72c780d7f534fb25541a1a94dff670067a7c57e7b35979657d088c4903102b0'
-            'b6348a030f122d2807e9b73a482ca0e551f3b191525c00954f941fe1e9d8988537f52da14e1361c82862929207f4cc8922d2143ceca175e9e6b741115f7eae02')
diff --git a/pcr/fair-coin/fair-coin.desktop b/pcr/fair-coin/fair-coin.desktop
new file mode 100644
index 000000000..05f0c4fc7
--- /dev/null
+++ b/pcr/fair-coin/fair-coin.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=FairCoin
+Comment=FairCoin Qt Wallet client
+Exec=FairCoin-qt
+Icon=fair-coin
+Terminal=false
+Categories=Utility;
diff --git a/pcr/fair-coin/fair-coin.install b/pcr/fair-coin/fair-coin.install
new file mode 100644
index 000000000..029294d67
--- /dev/null
+++ b/pcr/fair-coin/fair-coin.install
@@ -0,0 +1,12 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/pcr/fair-coin/faircoin-qt.install b/pcr/fair-coin/faircoin-qt.install
deleted file mode 100644
index f98ba7338..000000000
--- a/pcr/fair-coin/faircoin-qt.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}