Merge branch 'master' of ssh://gparabola/srv/git/abslibre

4 files changed, 5 insertions, 5 deletions

diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index 9d5226562..cf0ecaa08 100644..100755
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgname=liferea
 pkgname=liferea-libre
 pkgver=1.8.8
-pkgrel=1
+pkgrel=1.2
 pkgdesc="A desktop news aggregator for online news feeds and weblogs"
 arch=('i686' 'x86_64')
 url="http://liferea.sourceforge.net/"
@@ -35,6 +35,6 @@ package() {
   make DESTDIR="${pkgdir}" install
   
   install -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${_pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas
   rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
 }
diff --git a/libre/liferea-libre/libnotify-0.7.patch b/libre/liferea-libre/libnotify-0.7.patch
index 6dbbffb87..6dbbffb87 100644..100755
--- a/libre/liferea-libre/libnotify-0.7.patch
+++ b/libre/liferea-libre/libnotify-0.7.patch
diff --git a/libre/liferea-libre/liferea.install b/libre/liferea-libre/liferea.install
index 7d812ccdb..3e1aa5820 100644..100755
--- a/libre/liferea-libre/liferea.install
+++ b/libre/liferea-libre/liferea.install
@@ -1,7 +1,7 @@
-pkgname=liferea
+pkgname=liferea-libre
 
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
+  usr/sbin/gconfpkg --install ${_pkgname}
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
@@ -14,7 +14,7 @@ post_upgrade() {
 }
 
 pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
+  usr/sbin/gconfpkg --uninstall ${_pkgname}
 }
 
 post_remove() {
diff --git a/libre/liferea-libre/remove-non-free-suggestions.patch b/libre/liferea-libre/remove-non-free-suggestions.patch
index 325017567..325017567 100644..100755
--- a/libre/liferea-libre/remove-non-free-suggestions.patch
+++ b/libre/liferea-libre/remove-non-free-suggestions.patch