From c7458a3a137232143c36e3812d524cee57ea9b1f Mon Sep 17 00:00:00 2001
From: Thomas Spura <tomspur@fedoraproject.org>
Date: Apr 06 2011 09:02:40 +0000
Subject: Merge branch 'master' into f14


Conflicts:
	.gitignore
	zeromq.spec

---

diff --git a/.gitignore b/.gitignore
index ecce95c..cfa06ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 zeromq-2.0.7.tar.gz
+/zeromq-2.0.8.tar.gz
 /zeromq-2.0.10.tar.gz
 /zeromq-2.1.3.tar.gz
 /zeromq-2.1.4.tar.gz
diff --git a/zeromq.spec b/zeromq.spec
index 131d0fe..779a9a7 100644
--- a/zeromq.spec
+++ b/zeromq.spec
@@ -1,5 +1,5 @@
 Name:           zeromq
-Version:        2.0.10
+Version:        2.1.4
 Release:        1%{?dist}
 Summary:        Software library for fast, message-based applications
 
@@ -7,12 +7,15 @@ Group:          System Environment/Libraries
 License:        LGPLv3+
 URL:            http://www.zeromq.org
 # VCS:          git:http://github.com/zeromq/zeromq2.git
-Source0:        http://www.zeromq.org/local--files/area:download/zeromq-%{version}.tar.gz
+Source0:        http://download.zeromq.org/zeromq-%{version}.tar.gz
 
 BuildRequires:  glib2-devel
 BuildRequires:  libuuid-devel
 BuildRequires:  chrpath
 
+# utils subpackage was removed in F-16
+# -> can be deleted in F-19
+Obsoletes:      zeromq-utils < 2.1.3-1
 
 %description
 The 0MQ lightweight messaging kernel is a library which extends the
@@ -28,7 +31,7 @@ This package contains the ZeroMQ shared library.
 %package devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 
 %description devel
@@ -36,17 +39,6 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 
-%package utils
-Summary:        Utility files for %{name}
-Group:          Development/Tools
-Requires:       %{name} = %{version}-%{release}
-
-
-%description utils
-This package contains ZeroMQ related utility files,
-e.g. zmq_forwarder, zmq_streamer and zmq_queue.
-
-
 %prep
 %setup -q
 
@@ -88,20 +80,26 @@ chrpath --delete %{buildroot}/%{_bindir}/zmq_streamer
 %{_mandir}/man7/zmq*
 
 
-%files utils
-%defattr(-,root,root,-)
-%{_bindir}/zmq_forwarder
-%{_bindir}/zmq_queue
-%{_bindir}/zmq_streamer
-%{_mandir}/man1/zmq*
+%changelog
+* Wed Apr  6 2011 Thomas Spura <tomspur@fedoraproject.org> - 2.1.4-1
+- update to new version (#690199)
 
+* Wed Mar 23 2011 Thomas Spura <tomspur@fedoraproject.org> - 2.1.3-1
+- update to new version (#690199)
+- utils subpackage was removed upstream
+  (obsolete it)
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
-%changelog
 * Thu Jan 13 2011 Pavel Zhukov <pavel@zhukoff.net> - 2.0.10-1
 - update version
 - add rpath delete
 - change includedir filelist
 
+* Fri Aug 27 2010 Thomas Spura <tomspur@fedoraproject.org> - 2.0.8-1
+- update to new version
+
 * Fri Jul 23 2010 Thomas Spura <tomspur@fedoraproject.org> - 2.0.7-4
 - upstream VCS changed
 - remove buildroot / %%clean