[psi] unbundle qjdns (rhbz#737304)

[Raphael Groner]

commit 0b35989fea7050f9fc1e86b5f206588d0b245582
Author: Raphael Groner <projects.rg at smart.ms>
Date:   Sat Dec 13 15:44:54 2014 +0100

    unbundle qjdns (rhbz#737304)

 .gitignore |    1 +
 psi.spec   |   50 ++++++++++++++++++++++++++++----------------------
 sources    |    1 +
 3 files changed, 30 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 09f6f81..b807c9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ psi-0.14.tar.bz2
 /psi-0.15-rc2.tar.bz2
 /psi-0.15-rc3.tar.bz2
 /psi-0.15.tar.bz2
+/psi-qjdns.patch
diff --git a/psi.spec b/psi.spec
index 102dbcc..eb5bd5f 100644
--- a/psi.spec
+++ b/psi.spec
@@ -1,15 +1,20 @@
 Name:       psi
 Version:    0.15
-Release:    5%{?dist}
+Release:    6%{?dist}
 Summary:    Jabber client based on Qt
 License:    GPLv2+
 Group:      Applications/Internet
 URL:        http://psi-im.org
 Source0:    http://dl.sf.net/psi/psi-%{version}.tar.bz2
 
+# external jdns/qjdns, remove configure, configure.exe and iris from upstream patch
+#Patch0:     https://github.com/drizt/psi/commit/92cd9a58cd2d342a69647fc0d91af766c562df79.patch#/psi-qjdns.patch
+Patch0:     psi-qjdns.patch
+
 BuildRequires:  qt4-devel, zlib-devel, desktop-file-utils
 BuildRequires:  qca2-devel, glib2-devel
 BuildRequires:  enchant-devel, libXScrnSaver-devel
+BuildRequires:  qjdns-devel qconf
 
 Requires: sox
 Requires: gnupg
@@ -37,7 +42,7 @@ with no bloated extras that slow your computer down. The Jabber protocol
 provides gateways to other protocols as AIM, ICQ, MSN and Yahoo!.
 If you want SSL support, install the qca-tls package.
 
-%package -n %name-i18n
+%package i18n
 Summary:    Language packs for Psi
 Group:      Applications/Internet
 Requires:   psi = %version
@@ -48,7 +53,7 @@ If you want to add a translation from http://psi-im.org,
 just put the .qm file in %_datadir/%name (you'll have to do
 this as root), and restart psi.
 
-%package -n %name-icons
+%package icons
 Summary:    Additional icons for Psi
 Group:      Applications/Internet
 Requires:   psi >= 0.9.1
@@ -64,26 +69,26 @@ More icons can be found on http://jisp.netflint.net
 
 %prep
 %setup -q -n psi-0.15
+rm -r configure configure.exe mac win32
+# FIXME unbundle iris
+#rm -r iris
+%patch0 -p1
+qconf-qt4
+
 
 %build
 unset QTDIR
-./configure                        \
-        --prefix=%{_prefix}        \
-        --bindir=%{_bindir}        \
-        --libdir=%{_libdir}        \
-        --datadir=%{_datadir}      \
-        --disable-aspell           \
-        --debug                    \
-        --no-separate-debug-info
-
+#% configure does not work here
+./configure --prefix=%{_prefix} --disable-aspell \
+ --debug --no-separate-debug-info \
+ --qtdir=%{_includedir}/Qt --verbose \
+ --with-qjdns-inc=%{_includedir}/qjdns --with-qjdns-lib=%{_libdir}
 echo "DEFINES += QT_NO_DEBUG" >> conf.pri
-
+#qmake-qt4
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 export INSTALL_ROOT=$RPM_BUILD_ROOT
 make install
 
@@ -112,9 +117,6 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 %endif
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
@@ -140,17 +142,21 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 %exclude %{_datadir}/%{name}/*.qm
 %exclude %{_datadir}/%{name}/iconsets/*/*.jisp
 
-%files -n %name-i18n
+%files i18n
 %defattr(0644,root,root,0755)
 %{_datadir}/%name/%{name}_*.qm
 
 
-%files -n %name-icons
+%files icons
 %defattr(0644,root,root,0755)
 %{_datadir}/%name/iconsets/*/*.jisp
 
 
 %changelog
+* Fri Dec 12 2014 Raphael Groner <projects.rg [AT] smart.ms> - 0.15-6
+- unbundle jdns (and iris later)
+- cleanup to spec
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
@@ -163,7 +169,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
-* Sat Oct 05 2012 Sven Lankes <sven at lank.es> - 0.15-1
+* Fri Oct 05 2012 Sven Lankes <sven at lank.es> - 0.15-1
 - new upstream release
 
 * Wed Sep 26 2012 Sven Lankes <sven at lank.es> - 0.15-0.2.rc3
@@ -235,7 +241,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 - 0.13 rc3
 - remove qt 4.5 patch
 
-* Thu Jul 05 2009 Sven Lankes <sven at lank.es> 0.13-0.2.rc2
+* Sun Jul 05 2009 Sven Lankes <sven at lank.es> 0.13-0.2.rc2
 - own plugin directories (bz #509683)
 
 * Thu Jul 02 2009 Sven Lankes <sven at lank.es> 0.13-0.1.rc2
diff --git a/sources b/sources
index 2ad5864..d86af6d 100644
--- a/sources
+++ b/sources
@@ -2,3 +2,4 @@
 054311487f6bad8e749b6034461bb293  psi-lang-packs-0.13-1.tar.gz
 51386c12abbee7100f092455bfb88bf1  rostericons-0.10.tar.gz
 aea15f17cf93e7cea52f305523f761be  psi-0.15.tar.bz2
+b0bc234cee312565fa816ff9b46476f1  psi-qjdns.patch