rpms/loudmouth/devel .cvsignore, 1.13, 1.14 loudmouth.spec, 1.37, 1.38 sources, 1.13, 1.14 loudmouth-connect-fail-async.patch, 1.1, NONE loudmouth-connect-fail-sync.patch, 1.1, NONE loudmouth-eai-nodata.patch, 1.1, NONE loudmouth-stream-error.patch, 1.1, NONE

[Brian Pepple (bpepple)]

Author: bpepple

Update of /cvs/pkgs/rpms/loudmouth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14854

Modified Files:
	.cvsignore loudmouth.spec sources 
Removed Files:
	loudmouth-connect-fail-async.patch 
	loudmouth-connect-fail-sync.patch loudmouth-eai-nodata.patch 
	loudmouth-stream-error.patch 
Log Message:
* Wed Apr  2 2008 Brian Pepple <bpepple at fedoraproject.org> - 1.3.4-1
- Update to 1.3.4.
- Run check test.
- Bump min version needed for gnutls-devel.
- Drop stream-error.patch. Fixed upstream.
- Drop eai-nodata.patch. Fixed upstream.
- Drop connect-fail-sync.patch. Fixed upstream.
- Drop connect-fail-async patch. Fixed upstream.
- Update URL & Source URL.
- Don't generate the gtk-doc docs, and use the ones in the tarball
  to avoid having different files in different builds, fixes
  multilib problems (#342551)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/loudmouth/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	19 Jan 2008 00:26:00 -0000	1.13
+++ .cvsignore	2 Apr 2008 23:47:51 -0000	1.14
@@ -1 +1 @@
-loudmouth-1.3.3.tar.bz2
+loudmouth-1.3.4.tar.bz2


Index: loudmouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/loudmouth/devel/loudmouth.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- loudmouth.spec	21 Feb 2008 19:06:41 -0000	1.37
+++ loudmouth.spec	2 Apr 2008 23:47:51 -0000	1.38
@@ -1,32 +1,24 @@
-%define with_ssl 1
+%define with_ssl   1
+%define gnutls_ver 1.4.0
 
 Name:           loudmouth
-Version:        1.3.3
-Release:        4%{?dist}
+Version:        1.3.4
+Release:        1%{?dist}
 Summary:        Loudmouth is a Jabber programming library written in C
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://www.imendio.com/projects/loudmouth
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
-# http://developer.imendio.com/issues/browse/LM-104
-Patch0:         %{name}-stream-error.patch
-# http://developer.imendio.com/issues/browse/LM-117
-Patch1:         %{name}-connect-fail-async.patch
-# http://developer.imendio.com/issues/browse/LM-117
-Patch2:         %{name}-connect-fail-sync.patch
-# http://developer.imendio.com/issues/browse/LM-120
-Patch3:         %{name}-eai-nodata.patch
+URL:            http://www.loudmouth-project.org/
+Source0:        http://ftp.imendio.com/pub/imendio/%{name}/src/%{name}-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel >= 2.4.0
-BuildRequires:	gtk-doc >= 0.10
 BuildRequires:	check-devel
 BuildRequires:	libidn-devel
 
 %if %{with_ssl}
-BuildRequires:	gnutls-devel >= 1.0.0
+BuildRequires:	gnutls-devel >= %{gnutls_ver}
 %endif
 
 
@@ -44,7 +36,7 @@
 Requires:	libidn-devel
 Requires:	pkgconfig
 %if %{with_ssl}
-Requires:	gnutls-devel >= 1.0.0
+Requires:	gnutls-devel >= %{gnutls_ver}
 %endif
 
 
@@ -56,14 +48,9 @@
 %prep
 %setup -q
 
-%patch0 -p1 -b .stream-error
-%patch1 -p1 -b .connect-fail-async
-%patch2 -p1 -b .connect-fail-sync
-%patch3 -p1 -b .eai-nodata
 
 %build
-%configure --enable-gtk-doc	\
-	   --enable-static=no	\
+%configure --enable-static=no	\
 %if %{with_ssl}
 	   --with-ssl=gnutls
 %else
@@ -78,6 +65,15 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
+# Copy the files from the tarball to avoid the IDs generated by gtk-doc being
+# different on different builds
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/%{name}/
+cp -a docs/reference/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/%{name}/
+
+
+%check
+make check
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -104,6 +100,19 @@
 
 
 %changelog
+* Wed Apr  2 2008 Brian Pepple <bpepple at fedoraproject.org> - 1.3.4-1
+- Update to 1.3.4.
+- Run check test.
+- Bump min version needed for gnutls-devel.
+- Drop stream-error.patch. Fixed upstream.
+- Drop eai-nodata.patch. Fixed upstream.
+- Drop connect-fail-sync.patch. Fixed upstream.
+- Drop connect-fail-async patch. Fixed upstream.
+- Update URL & Source URL.
+- Don't generate the gtk-doc docs, and use the ones in the tarball
+  to avoid having different files in different builds, fixes
+  multilib problems (#342551)
+
 * Thu Feb 21 2008 Owen Taylor <otaylor at redhat.com> - 1.3.3-4
 - Fix build with recent GNU libc
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/loudmouth/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	19 Jan 2008 00:26:00 -0000	1.13
+++ sources	2 Apr 2008 23:47:51 -0000	1.14
@@ -1 +1 @@
-3076bac0f75d22a24e464051af173f18  loudmouth-1.3.3.tar.bz2
+da5d7b788afbde39e2e06e5cb1194ff3  loudmouth-1.3.4.tar.bz2


--- loudmouth-connect-fail-async.patch DELETED ---


--- loudmouth-connect-fail-sync.patch DELETED ---


--- loudmouth-eai-nodata.patch DELETED ---


--- loudmouth-stream-error.patch DELETED ---