[gloox/epel7: 5/5] Merge branch 'master' into epel7

Christopher Meng cicku at fedoraproject.org
Thu Feb 12 01:21:55 UTC 2015 

commit 4df0bf858b159d72b11d70c591198bdcdcdc16b1
Merge: 20dddf2 ad110b0
Author: Christopher Meng <i at cicku.me>
Date:   Wed Feb 11 19:57:17 2015 +0800

    Merge branch 'master' into epel7

 fix_gcc4.9_ftbfs.patch |   25 -------
 gloox.spec             |  174 ++++++++----------------------------------------
 sources                |    2 +-
 3 files changed, 28 insertions(+), 173 deletions(-)
---
diff --cc gloox.spec
index 19eff57,56a3db7..db86ed1
--- a/gloox.spec
+++ b/gloox.spec
@@@ -37,20 -33,23 +33,22 @@@ mv -f AUTHORS AUTHORS.ol
  iconv -f iso8859-1 -t UTF-8 AUTHORS.old > AUTHORS
  
  %build
- 
  %configure --disable-static
 -%make_build
 +make %{?_smp_mflags}
  
  %install
- make install DESTDIR=%{buildroot}
+ %make_install
  find %{buildroot} -name '*.la' -delete -print
  
+ %check
+ make check
+ 
  %post -p /sbin/ldconfig
  
  %postun -p /sbin/ldconfig
  
  %files
- %doc AUTHORS ChangeLog LICENSE README TODO UPGRADING
 -%doc AUTHORS ChangeLog
 -%license LICENSE
++%doc AUTHORS ChangeLog LICENSE
  %{_libdir}/libgloox.so.*
  
  %files devel
@@@ -60,127 -60,127 +59,8 @@@
  %{_libdir}/libgloox.so
  
  %changelog
- * Tue Feb 10 2015 Christopher Meng <rpm at cicku.me> - 1:1.0.12-1
- - Update to 1.0.12
- 
- * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.0.10-4
- - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
- 
- * Mon Jul 21 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1:1.0.10-3
- - Add patch from Debian for ftbfs with gcc 4.9
- - Update license to GPLv3
- 
- * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.0.10-2
- - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
- 
- * Mon May 26 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1:1.0.10-1
- - Update to 1.0.10
- 
- * Tue Mar 4 2014 Pavel Alexeev <Pahan at Hubbitus.info> - 1:1.0.9-3
- - Make added before requirements arch-specific: gnutls-devel%%{?_isa}, libidn-devel%%{?_isa}bz#1034988.
- 
- * Mon Mar 3 2014 Pavel Alexeev <Pahan at Hubbitus.info> - 1:1.0.9-2
- - Add Requires: gnutls-devel, libidn-devel into devel package bz#1034988.
+ * Thu Feb 05 2015 Christopher Meng <rpm at cicku.me> - 1:1.0.13-1
+ - Update to 1.0.13
  
 -* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.0.10-4
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 -
 -* Mon Jul 21 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1:1.0.10-3
 -- Add patch from Debian for ftbfs with gcc 4.9
 -- Update license to GPLv3
 -
 -* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.0.10-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 -
 -* Mon May 26 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1:1.0.10-1
 -- Update to 1.0.10
 -
 -* Tue Mar 4 2014 Pavel Alexeev <Pahan at Hubbitus.info> - 1:1.0.9-3
 -- Make added before requirements arch-specific: gnutls-devel%%{?_isa}, libidn-devel%%{?_isa}bz#1034988.
 -
 -* Mon Mar 3 2014 Pavel Alexeev <Pahan at Hubbitus.info> - 1:1.0.9-2
 -- Add Requires: gnutls-devel, libidn-devel into devel package bz#1034988.
 -
  * Sun Dec 1 2013 Pavel Alexeev <Pahan at Hubbitus.info> - 1:1.0.9-1
  - Update to 1.0.9 bz#1034994
--
--* Sun Aug 4 2013 Pavel Alexeev <Pahan at Hubbitus.info> - 1:1.0.3-1
--- Update to 1.0.3 version by request bz#991399
--- Add BR libgcrypt-devel
--
--* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.0-6.11
--- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
--
--* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.0-5.11
--- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
--
--* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.0-4.11
--- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
--
--* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.0-3.11
--- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
--
--* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.0-2.11
--- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
--
--* Tue Nov 10 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-1.11
--- Add Epoch: 1 due to correct my mistake in version enumeration: https://fedorahosted.org/rel-eng/ticket/3139
--	and disclaimer rel-end delete updates.
--
--* Sat Nov 7 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-1.10
--- long-awaited release 1.0
--
--* Mon Oct 19 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.9.rc3.SVNr4204
--- As right mention Peter Lemenkov, my naming cheme is incorrect, renum it.
--- Expand "beta" define and magick to "prerel".
--
--* Sun Oct 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0rc3-0.8.SVNr4204
--- New build due resolve my bugreport https://mail.camaya.net/horde/whups/ticket/?id=157
--
--* Sun Oct 18 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0rc3-0.7.SVNr4203
--- rc3.
--- Euroelessar (one of qutIM developer, thank you) submit patches:
--	http://bugs.camaya.net/horde/whups/ticket/?id=110
--	http://bugs.camaya.net/horde/whups/ticket/?id=155
--	http://bugs.camaya.net/horde/whups/ticket/?id=154
--	http://bugs.camaya.net/horde/whups/ticket/?id=153
--	http://bugs.camaya.net/horde/whups/ticket/?id=152
--	http://bugs.camaya.net/horde/whups/ticket/?id=151
--	http://bugs.camaya.net/horde/whups/ticket/?id=150
--	http://bugs.camaya.net/horde/whups/ticket/?id=149
--	all is important and rev 4200 at least required.
--- Include UPGRADING to %%doc
--
--* Wed Jul 29 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.6.SVNr4029
--- New build due to close several bugs:
--	https://mail.camaya.net/horde/whups/ticket/?id=140 - delete patch gloox-1.0-beta-SVNr4003-missed_header.patch
--	https://bugs.camaya.net/horde/whups/ticket/?id=141 - delete patch gloox-1.0-GCC4.4-missing_includes.patch
--	https://bugs.camaya.net/horde/whups/ticket/?id=137 - delete patch gloox-1.0-SVNr4003.glibc-private-symbol.patch
--- Use "svn export" instead of "svn checkout".
--
--* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.6.SVNr4003
--- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
--
--* Fri Apr 17 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.5.SVNr4003
--- Add --exclude='.svn' to tar pack source and set time to last commit. This may allow pass hash checking soucre later.
--
--* Tue Apr 7 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.4.SVNr4003
--- Add Patch3: gloox-1.0-GCC4.4-missing_includes.patch to allow build on GCC4.4
--
--* Tue Apr 7 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.3.SVNr4003
--- REmade patch1. Instead of just comment private stuff I use temporray ugly hack - copy-past function implementation from glibc source until
--	author do not reimplement it properly.
--
--* Sun Apr 5 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.2.SVNr4003
--- Add patch2 gloox-1.0-beta-SVNr4003-missed_header.patch - see bug http://bugs.camaya.net/horde/whups/ticket/?id=140
--
--* Sun Apr 5 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.1.SVNr4003
--- qutIM require gloox version 1.0 with SVN revision >= 3873. Try build current.
--- Patch1 (http://bugs.camaya.net/horde/whups/ticket/?id=137) little adopted (gloox-1.0-beta7.glibc-private-symbol.patch -> gloox-1.0-SVNr4003.glibc-private-symbol.patch).
--- Add SVN part into Release tag.
--
--* Fri Mar 27 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.0.beta3
--- Import http://www.salstar.sk/pub/fedora/SRPMS/10/gloox-1.0-0.0beta3.fc10.src.rpm
--- Step to 1.0-beta7 version
--- Reformat with tabs spec file.
--- %%beta (replace %%beta_version) now represent only number. According it change all mention of it.
--- Add Requires(postun): /sbin/ldconfig and Requires(post): /sbin/ldconfig
--
--* Fri Mar 7 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.9.4-1
--- update to upstream
--
--* Thu Feb 28 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.9.3-1
--- update to upstream
--
--* Sun Dec 2 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.7-2
--- removed patch
--- added undef for HAVE_RES_QUERY, HAVE_RES_QUERYDOMAIN, HAVE_DN_SKIPNAME
--  see: https://mail.camaya.net/horde/whups/ticket/?id=52
--
--* Wed Nov 28 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.7-1
--- update upstream
--- added patch to avoid dependecny problem on libresolv.so.2(GLIBC_PRIVATE)
--
--* Mon Sep 17 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.4.1-1
--- first release

More information about the scm-commits mailing list