rpms/loudmouth/EL-5 .cvsignore, 1.8, 1.9 loudmouth.spec, 1.19, 1.20 sources, 1.8, 1.9

Mon Apr 14 16:28:03 UTC 2008

Author: lkundrak

Update of /cvs/pkgs/rpms/loudmouth/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1044/EL-5

Modified Files:
	.cvsignore loudmouth.spec sources 
Log Message:
merge from devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/loudmouth/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9

--- .cvsignore	11 Sep 2006 14:34:44 -0000	1.8
+++ .cvsignore	14 Apr 2008 16:27:25 -0000	1.9
@@ -1 +1 @@
-loudmouth-1.0.5.tar.gz
+loudmouth-1.3.4.tar.bz2


Index: loudmouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/loudmouth/EL-5/loudmouth.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- loudmouth.spec	5 Aug 2007 22:02:34 -0000	1.19
+++ loudmouth.spec	14 Apr 2008 16:27:25 -0000	1.20
@@ -1,23 +1,24 @@
-%define with_ssl 1
+%define with_ssl   1
+%define gnutls_ver 1.4.0
 
 Name:           loudmouth
-Version:        1.0.5
-Release:        3%{?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.gz
+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:	libtasn1 >= 0.2.6
+BuildRequires:	gnutls-devel >= %{gnutls_ver}
 %endif
 
 
@@ -32,9 +33,10 @@
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	glib2-devel
+Requires:	libidn-devel
 Requires:	pkgconfig
 %if %{with_ssl}
-Requires:	gnutls-devel >= 1.0.0
+Requires:	gnutls-devel >= %{gnutls_ver}
 %endif
 
 
@@ -48,11 +50,9 @@
 
 
 %build
-%configure --enable-gtk-doc	\
-	   --enable-mono=no	\
-	   --enable-static=no	\
+%configure --enable-static=no	\
 %if %{with_ssl}
-	   --with-ssl=yes
+	   --with-ssl=gnutls
 %else
 	   --with-ssl=no
 %endif
@@ -63,8 +63,16 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 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}/
+
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+%check
+make check
 
 
 %clean
@@ -92,9 +100,78 @@
 
 
 %changelog
-* Sun Aug  5 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.0.5-3
+* 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-4
+- Add reconnect-failure patch. Thanks to Robert McQueen.
+
+* 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.
+
+* Tue May 15 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.2-2
+- Drop BR on libtasn1-devel.
+
+* Mon May 14 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.2-1
+- Update to 1.2.2.
+
+* Sat Feb 24 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.1-2
+- Fix typo.
+
+* Sat Feb 24 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.1-1
+- Update to 1.2.1.
+
+* Tue Feb 20 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.0-3
+- Add necessary requires to devel package. D'Oh!
+
+* Tue Feb 20 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.0-2
+- Add BR on libidn-devel.
+- Specify which ssl implementation to use.
+
+* Mon Feb  5 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.0-1
+- Update to 1.2.0.
+- Drop mono config option since it's been dropped from the tarball.
+
 * Mon Sep 11 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.5-2
 - Change source to .gz.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/loudmouth/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	11 Sep 2006 14:34:44 -0000	1.8
+++ sources	14 Apr 2008 16:27:25 -0000	1.9
@@ -1 +1 @@
-415b025541b326d691ae93e6ea19f130  loudmouth-1.0.5.tar.gz
+da5d7b788afbde39e2e06e5cb1194ff3  loudmouth-1.3.4.tar.bz2


