[gloox] Revert back formating change, introduced rpmlint warnings, mangle changelog history records.
Pavel Alexeev
hubbitus at fedoraproject.org
Thu Feb 13 15:51:31 UTC 2014
commit 98d09209b6270b9653d4ce81acef63f546de0a6b
Author: Hubbitus <pahan at hubbitus.info>
Date: Thu Feb 13 19:52:04 2014 +0400
Revert back formating change, introduced rpmlint warnings, mangle changelog history records.
gloox.spec | 67 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 35 insertions(+), 32 deletions(-)
---
diff --git a/gloox.spec b/gloox.spec
index 3211b99..325d2eb 100644
--- a/gloox.spec
+++ b/gloox.spec
@@ -1,42 +1,44 @@
#% global prerel rc3
#% global SVN 4204
-Name: gloox
-Epoch: 1
-Version: 1.0.9
-Release: 1%{?prerel:%{prerel}.}%{?SVN:SVNr%{SVN}}%{?dist}
-Summary: A rock-solid, full-featured Jabber/XMPP client C++ library
-License: GPLv2
-URL: http://camaya.net/gloox
+Name: gloox
+Epoch: 1
+Version: 1.0.9
+Release: 1%{?prerel:%{prerel}.}%{?SVN:SVNr%{SVN}}%{?dist}
+Summary: A rock-solid, full-featured Jabber/XMPP client C++ library
+Group: System Environment/Libraries
+License: GPLv2
+URL: http://camaya.net/gloox
%if 0%{?prerel}
# svn export svn://svn.camaya.net/gloox/trunk gloox-1.0rc3 \
-# tar -cjf gloox-1.0rc3-SVNr4203.tar.bz2 gloox-1.0rc3
-Source0: %{name}-%{version}%{?prerel}%{?SVN:-SVNr%{SVN}}.tar.bz2
+# tar -cjf gloox-1.0rc3-SVNr4203.tar.bz2 gloox-1.0rc3
+Source0: %{name}-%{version}%{?prerel}%{?SVN:-SVNr%{SVN}}.tar.bz2
%else
-Source0: http://camaya.net/download/%{name}-%{version}.tar.bz2
+Source0: http://camaya.net/download/%{name}-%{version}.tar.bz2
%endif
%if 0%{?prerel}
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
+BuildRequires: libtool, autoconf, automake
%endif
-BuildRequires: gnutls-devel
-BuildRequires: libidn-devel
+BuildRequires: openssl-devel >= 0.9.8
+BuildRequires: gnutls-devel >= 1.2
+BuildRequires: zlib-devel >= 1.2.3
+BuildRequires: libidn-devel >= 0.5
BuildRequires: libgcrypt-devel
-BuildRequires: openssl-devel
-BuildRequires: zlib-devel
+
+Requires(postun): /sbin/ldconfig
+Requires(post): /sbin/ldconfig
%description
gloox is a rock-solid, full-featured Jabber/XMPP client library written in
C++. It makes writing spec-compliant clients easy and allows for hassle-free
integration of Jabber/XMPP functionality into existing applications.
-%package devel
-Summary: Development files for %{name}
-Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
+%package devel
+Summary: Development files for %{name}
+Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
-%description devel
-This package contains libraries and header files for
+%description devel
+The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%prep
@@ -72,10 +74,10 @@ find %{buildroot} -name '*.la' -delete -print
%{_libdir}/libgloox.so
%changelog
-* Sun Dec 01 2013 Pavel Alexeev <Pahan at Hubbitus.info> - 1:1.0.9-1
+* Sun Dec 1 2013 Pavel Alexeev <Pahan at Hubbitus.info> - 1:1.0.9-1
- Update to 1.0.9 bz#1034994
-* Sun Aug 04 2013 Pavel Alexeev <Pahan at Hubbitus.info> - 1:1.0.3-1
+* 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
@@ -95,9 +97,10 @@ find %{buildroot} -name '*.la' -delete -print
- 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.
+- 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 07 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-1.10
+* 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
@@ -134,17 +137,17 @@ find %{buildroot} -name '*.la' -delete -print
* 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 07 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.4.SVNr4003
+* 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 07 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.3.SVNr4003
+* 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 05 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.2.SVNr4003
+* 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 05 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0-0.1.SVNr4003
+* 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.
@@ -156,13 +159,13 @@ find %{buildroot} -name '*.la' -delete -print
- %%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 07 2008 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.9.4-1
+* 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 02 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.7-2
+* 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
More information about the scm-commits
mailing list