[qxmpp-dev/f17: 4/4] Merge branch 'f16' into f17

[Minh Ngo]

commit 67048ab054a34b02ccad9df4a6cdc7f2afcd2da3
Merge: 2647462 0343c1f
Author: Minh Ngo <nlminhtl at gmail.com>
Date:   Thu Apr 26 21:43:24 2012 +0300

    Merge branch 'f16' into f17
    
    Conflicts:
    	.gitignore
    	qxmpp-dev-dynamiclib.patch
    	qxmpp-dev-htmldoc.patch
    	qxmpp-dev-rename.patch
    	qxmpp-dev.spec
    	sources

 .gitignore                 |    4 ++++
 qxmpp-dev-dynamiclib.patch |   12 ++++++------
 qxmpp-dev-htmldoc.patch    |    8 ++++----
 qxmpp-dev-rename.patch     |   27 +++++++++------------------
 qxmpp-dev.spec             |    9 ++++++---
 sources                    |    2 +-
 6 files changed, 30 insertions(+), 32 deletions(-)
---
diff --cc .gitignore
index 1c34a66,308250b..442fab1
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,3 +1,7 @@@
  /qxmpp-0.3.45.1-extras.tar.bz2
  /qxmpp-0.3.45.2-extras.tar.bz2
++<<<<<<< HEAD
 +/qxmpp-0.3.47-extras.tar.bz2
++=======
+ /qxmpp-0.3.61-extras.tar.bz2
++>>>>>>> f16
diff --cc qxmpp-dev.spec
index 7956c7d,9b0fc22..cec83bd
--- a/qxmpp-dev.spec
+++ b/qxmpp-dev.spec
@@@ -73,18 -72,16 +72,22 @@@ make %{?_smp_mflags
  %{_libdir}/pkgconfig/%{name}.pc
   
  %changelog
- * Thu Mar 16 2012 Minh Ngo <nlminhtl at gmail.com> 0.3.47-1
+ * Thu Apr 26 2012 Minh Ngo <nlminhtl at gmail.com> 0.3.61-1
+ - XEP 0033
+ 
+ * Sat Mar 17 2012 Minh Ngo <nlminhtl at gmail.com> 0.3.47-1
  - Synchronization with upstream
+ - updating patches
  
 -* Sun Feb 19 2012 Minh Ngo <nlminhtl at gmail.com> 0.3.45.2-1
 +* Sun Mar 14 2012 Minh Ngo <nlminhtl at gmail.com> 0.3.45.2-1
  - Synchronization with upstream
  
 +* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.45.1-6
 +- Rebuilt for c++ ABI breakage
 +
 +* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.45.1-5
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 +
  * Mon Jan 08 2012 Minh Ngo <nlminhtl at gmail.com> 0.3.45.1-4
  - fixing summary/description in the devel package
  - adding a dependence for the devel package