[choqok/f14: 5/5] Merge branch 'master' into f14

[Sven Lankes]

commit 1c231f6c807373b1f34148ccda57d488e18a47e0
Merge: 36958d5 6c3d4d7
Author: Sven Lankes <sven at lank.es>
Date:   Sat Aug 13 22:09:49 2011 +0200

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	choqok.spec
    	sources

 .gitignore                    |    1 +
 choqok-1.1-fixfriendlist.diff |   30 +++++++++++++++++++++++++++++
 choqok.spec                   |   42 +++++++++++++++++++++++++++++-----------
 sources                       |    2 +-
 4 files changed, 62 insertions(+), 13 deletions(-)
---
diff --cc .gitignore
index 166ac1b,534c06c..e7c5dae
--- a/.gitignore
+++ b/.gitignore
@@@ -5,4 -5,4 +5,5 @@@ choqok-0.9.85-pre.tar.bz
  /choqok-0.9.92.tar.bz2
  /choqok_0.9.98.tar.bz2
  /choqok-1.0.tar.bz2
 +/choqok-1.0.1.tar.bz2
+ /choqok-1.1.tar.bz2
diff --cc choqok.spec
index a2885b8,15a7cb4..99211ff
--- a/choqok.spec
+++ b/choqok.spec
@@@ -90,14 -90,12 +89,20 @@@ gtk-update-icon-cache %{_kde4_iconsdir}
  %{_kde4_sharedir}/applications/kde4/choqok.desktop
  %{_kde4_sharedir}/config.kcfg/*.kcfg
  %{_kde4_sharedir}/kde4/services/choqok_*.desktop
- %{_kde4_sharedir}/kde4/apps/choqok
- %{_kde4_sharedir}/kde4/apps/choqok_*/*.rc
+ %{_kde4_appsdir}/choqok/
+ %{_kde4_appsdir}/choqok_*/
  %{_kde4_sharedir}/kde4/servicetypes/choqok*.desktop
++<<<<<<< HEAD
 +%{_kde4_sharedir}/kde4/apps/dbus-1/services/org.kde.choqok.service
 +%{_kde4_sharedir}/kde4/apps/khtml/kpartplugins/konqchoqok.desktop
 +%{_kde4_sharedir}/kde4/apps/khtml/kpartplugins/konqchoqok.rc
 +%{_kde4_sharedir}/kde4/services/ServiceMenus/choqok_share.desktop
 +%{_kde4_sharedir}/kde4/services/ServiceMenus/choqok_upload.desktop
++=======
+ %{_kde4_appsdir}/dbus-1/services/org.kde.choqok.service
+ %{_kde4_appsdir}/khtml/kpartplugins/konqchoqok.*
+ %{_kde4_sharedir}/kde4/services/ServiceMenus/choqok_*.desktop
++>>>>>>> master
  
  %files libs
  %defattr(-,root,root,-)
@@@ -107,15 -105,22 +112,28 @@@
  %defattr(-,root,root,-)
  %{_kde4_includedir}/choqok/
  %{_kde4_libdir}/lib*.so
- %{_kde4_sharedir}/kde4/apps/cmake/modules/*.cmake
+ %{_kde4_appsdir}/cmake/modules/*.cmake
  
  %changelog
+ * Tue Aug 09 2011 Sven Lankes <sven at lank.es> - 1.1-4
+ - fix bug on friendlist update (rhbz #729464)
+ 
 +* Tue Jul 26 2011 Alexey Kurov <nucleo at fedoraproject.org> - 1.0.1-2
 +- drop kwebkitpart support
 +
 +* Sun Apr 03 2011 Sven Lankes <sven at lank.es> - 1.0.1-1
 +- new upstream bugfix release
 +
+ * Tue Jul 26 2011 Rex Dieter <rdieter at fedoraproject.org> 1.1-3
+ - drop kwebkitpart support
+ 
+ * Tue Jun 21 2011 Rex Dieter <rdieter at fedoraproject.org> 1.1-2
+ - simplify %%files, use %%_kde4_appsdir macro
+ - use %%?_isa to tighten subpkg deps
+ 
+ * Sun Apr 03 2011 Sven Lankes <sven at lank.es> - 1.1-1
+ - new upstream release
+ 
  * Sun Mar 26 2011 Sven Lankes <sven at lank.es> - 1.0-3
  - apply upstream patch for rhbz #691237