rpms/loudmouth/OLPC-2 loudmouth.spec,1.30,1.31

[Marco Pesenti Gritti (mpg)]

Author: mpg

Update of /cvs/pkgs/rpms/loudmouth/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24642/OLPC-2

Modified Files:
	loudmouth.spec 
Log Message:
Sync with F-9



Index: loudmouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/loudmouth/OLPC-2/loudmouth.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- loudmouth.spec	24 Apr 2008 11:15:32 -0000	1.30
+++ loudmouth.spec	24 Apr 2008 11:29:53 -0000	1.31
@@ -1,4 +1,5 @@
-%define with_ssl 1
+%define with_ssl   1
+%define gnutls_ver 1.4.0
 
 Name:           loudmouth
 Version:        1.3.4
@@ -7,17 +8,17 @@
 
 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
+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
 
 
@@ -35,7 +36,7 @@
 Requires:	libidn-devel
 Requires:	pkgconfig
 %if %{with_ssl}
-Requires:	gnutls-devel >= 1.0.0
+Requires:	gnutls-devel >= %{gnutls_ver}
 %endif
 
 
@@ -47,9 +48,9 @@
 %prep
 %setup -q
 
+
 %build
-%configure --enable-gtk-doc	\
-	   --enable-static=no	\
+%configure --enable-static=no	\
 %if %{with_ssl}
 	   --with-ssl=gnutls
 %else
@@ -64,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
@@ -90,17 +100,52 @@
 
 
 %changelog
-* Thu Nov 15 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.3-2
+* 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
+
+* Thu Feb  7 2008 Owen Taylor <otaylor at redhat.com> - 1.3.3-3
+- Add patches fixing reentrancy problems on connection failure
+
+* Wed Jan 30 2008 Owen Taylor <otaylor at redhat.com> - 1.3.3-2
+- Add back stream-error patch, it wasn't fixed in the 1.3 branch
+
+* Fri Jan 18 2008 Brian Pepple <bpepple at fedoraproject.org> - 1.3.3-1
+- Update to 1.3.3.
+- Drop reconnect-failure patch.
+- Drop gnutls compression patch. fixed upstream.
+
+* Thu Nov 15 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.3-6
+- Ugh.  Let's acutally use a valid e-mail addy.
+
+* Thu Nov 15 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.3-5
 - Add patch to use gnutls compression.
 
-* Mon Nov 12 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.3-1
+* Mon Nov 12 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.3-4
 - Add reconnect-failure patch. Thanks to Robert McQueen.
-- Update to 1.2.3.
-- Drop stream-error patch. fixed upstream.
 
-* Sun Aug  5 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.2-4
+* Tue Aug 21 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.3-3
+- Rebuild.
+
+* Sun Aug  5 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.3-2
 - Update license tag.
 
+* Sun Jun 10 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.3-1
+- Update to 1.2.3.
+- Drop stream-error patch. fixed upstream.
+
 * Wed May 16 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.2-3
 - Add patch to fix stream error.