Add zeromq2-* provides (#1190463)

.gitignore

@@ -1,11 +1,8 @@
-/zeromq-*.tar.*
-/zeromq-*.src.rpm
-/zeromq-*.*.*/
-/libzmq-*.*.*/
-/clog
-.build-*.*.log
-/noarch/
-/x86_64/
-/i?86/
-/tarballs/
-/libzmq-*.*.*.tar.gz
+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
+/zeromq-2.1.9.tar.gz
+/zeromq-2.1.11.tar.gz
+/zeromq-2.2.0.tar.gz

sources

@@ -1 +1 @@
-SHA512 (zeromq-4.3.5.tar.gz) = a71d48aa977ad8941c1609947d8db2679fc7a951e4cd0c3a1127ae026d883c11bd4203cf315de87f95f5031aec459a731aec34e5ce5b667b8d0559b157952541
+1b11aae09b19d18276d0717b2ea288f6  zeromq-2.2.0.tar.gz

zeromq-configure-c99.patch

@@ -1,37 +0,0 @@
-Build with -D_DEFAULT_SOURCE along with -std=c11
-    
-On its own, -std=c11 hides POSIX and other extensions from C headers
-such as <stdlib.h> when building against glibc. This causes the
-posix_memalign probe to fail incorrectly with compilers that do not
-accept implicit function declarations. _DEFAULT_SOURCE is ignored by
-most non-GNU/Linux systems or not relevant in this context, so there
-is no separate check for adding it.
-
-Submitted upstream: <https://github.com/zeromq/libzmq/pull/4635>
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 68fb7251..f956f3fd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -122,7 +122,7 @@ if (NOT MSVC)
-   if(NOT CMAKE_C_FLAGS MATCHES "-std=" AND NOT C_STANDARD AND NOT CMAKE_C_STANDARD)
-     check_c_compiler_flag("-std=c11" COMPILER_SUPPORTS_C11)
-     if(COMPILER_SUPPORTS_C11)
--      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
-+      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_DEFAULT_SOURCE -std=c11")
-     else()
-       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
-     endif()
-diff --git a/configure.ac b/configure.ac
-index b9e13d4f..ffcc145b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -66,7 +66,7 @@ ZMQ_ORIG_CXXFLAGS="${CXXFLAGS:-none}"
- 
- # Checks for programs.
- AC_PROG_CC
--AX_CHECK_COMPILE_FLAG([-std=c11], [CFLAGS+=" -std=c11"], [AC_PROG_CC_C99])
-+AX_CHECK_COMPILE_FLAG([-std=c11], [CFLAGS+=" -std=c11 -D_DEFAULT_SOURCE"], [AC_PROG_CC_C99])
- AC_PROG_CXX
- AX_CODE_COVERAGE
- AM_PROG_CC_C_O

zeromq.spec

@@ -1,34 +1,38 @@
 %bcond_without pgm
-%bcond_without unwind
 
 Name:           zeromq
-Version:        4.3.5
-Release:        %autorelease
+Version:        2.2.0
+Release:        11%{?dist}
 Summary:        Software library for fast, message-based applications
 
-License:        MPL-2.0 AND BSD-3-Clause AND MIT
-URL:            https://zeromq.org
-Source0:        https://github.com/%{name}/libzmq/archive/v%{version}/%{name}-%{version}.tar.gz
-Patch1:         zeromq-configure-c99.patch
+Group:          System Environment/Libraries
+License:        LGPLv3+
+URL:            http://www.zeromq.org
+# VCS:          git:http://github.com/zeromq/zeromq2.git
+Source0:        http://download.zeromq.org/zeromq-%{version}.tar.gz
 
-BuildRequires:  make
 BuildRequires:  autoconf
 BuildRequires:  automake
-BuildRequires:  gcc-c++
 BuildRequires:  libtool
-BuildRequires:  asciidoc
-BuildRequires:  xmlto
-BuildRequires:  libsodium-devel
 
-%if %{with unwind}
-BuildRequires:  libunwind-devel
+BuildRequires:  glib2-devel
+%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
+BuildRequires:  e2fsprogs-devel
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+%else
+BuildRequires:  libuuid-devel
 %endif
-
 %if %{with pgm}
 BuildRequires:  openpgm-devel
-BuildRequires:  krb5-devel
 %endif
 
+# utils subpackage was removed in F-16
+# -> can be deleted in F-19
+Obsoletes:      zeromq-utils < 2.1.3-1
+# zeromq in F22+ was rebased to zeromq-4 and zeromq2 contains the same library as this one
+Provides:       zeromq2%{?_isa} = %{version}-%{release}
+
+
 %description
 The 0MQ lightweight messaging kernel is a library which extends the
 standard socket interfaces with features traditionally provided by
@@ -42,7 +46,9 @@ This package contains the ZeroMQ shared library.
 
 %package devel
 Summary:        Development files for %{name}
+Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
+Provides:       zeromq2-devel%{?_isa} = %{version}-%{release}
 
 
 %description devel
@@ -51,63 +57,138 @@ developing applications that use %{name}.
 
 
 %prep
-%autosetup -p1
+%setup -q
 
-# Remove bundled code.
-rm -rf external/wepoll
+# Don't turn warnings into errors
+sed -i "s/libzmq_werror=\"yes\"/libzmq_werror=\"no\"/g" \
+    configure
 
-# Fix permissions.
-chmod -x src/xsub.hpp
+# Sed version number of openpgm into configure
+%global openpgm_pc $(basename %{_libdir}/pkgconfig/openpgm*.pc .pc)
+sed -i "s/openpgm-[0-9].[0-9]/%{openpgm_pc}/g" \
+    configure*
+
+
+# remove all files in foreign except Makefiles
+rm -v $(find foreign -type f | grep -v Makefile)
 
 
 %build
 autoreconf -fi
 %configure \
 %if %{with pgm}
-            --with-pgm \
-            --with-libgssapi_krb5 \
+            --with-system-pgm \
 %endif
-            --with-libsodium \
-            --enable-drafts \
-%if %{with unwind}
-            --enable-libunwind \
-%endif
-            --disable-Werror \
             --disable-static
-%make_build
+make %{?_smp_mflags}
 
 
 %install
-%make_install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL="install -p"
 
 # remove *.la
 rm %{buildroot}%{_libdir}/libzmq.la
 
 
 %check
-%ifarch s390x
-make check V=1 XFAIL_TESTS=tests/test_radio_dish || ( cat test-suite.log && exit 1 )
-%endif
+make check
 
 
-%ldconfig_scriptlets
+%post -p /sbin/ldconfig
+
+
+%postun -p /sbin/ldconfig
 
 
 %files
-%doc README.md AUTHORS NEWS
-%license LICENSE
-%{_bindir}/curve_keygen
-%{_libdir}/libzmq.so.5*
-%{_mandir}/man3/zmq_*
-%{_mandir}/man7/zmq_*
-%{_mandir}/man7/zmq.*
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING COPYING.LESSER NEWS README
+%{_libdir}/libzmq.so.*
 
 %files devel
+%defattr(-,root,root,-)
 %{_libdir}/libzmq.so
 %{_libdir}/pkgconfig/libzmq.pc
-%{_includedir}/zmq*.h
+%{_includedir}/zmq*
+%{_mandir}/man3/zmq*
+%{_mandir}/man7/zmq*
 
 
 %changelog
-%autochangelog
+* Tue Feb 10 2015 Thomas Spura <tomspur@fedoraproject.org> - 2.2.0-11
+- Add zeromq2-* provides (#1190463)
 
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Fri May 17 2013 Thomas Spura <tomspur@fedoraproject.org> - 2.2.0-7
+- Rebuilt for openpm-5.2 and sed correct version into configure (#963894)
+
+* Wed Mar 27 2013 Thomas Spura <tomspur@fedoraproject.org> - 2.2.0-6
+- run autoreconf before configure so aarch64 is supported (#926859)
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Mon Jan 14 2013 Thomas Spura <tomspur@fedoraproject.org> - 2.2.0-4
+- delete foreign files with dubious license in %%prep (#892111)
+
+* Mon Dec 24 2012 Thomas Spura <tomspur@fedoraproject.org> - 2.2.0-3
+- add bcond_without pgm macro (Jose Pedro Oliveira, #867182)
+- remove bundled pgm
+- build against openpgm
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu Apr 26 2012 Thomas Spura <tomspur@fedoraproject.org> - 2.2.0-1
+- update to 2.2.0
+
+* Sat Jan  7 2012 Thomas Spura <tomspur@fedoraproject.org> - 2.1.11-1
+- update to 2.1.11 (as part of rebuilding with gcc-4.7)
+
+* Tue Sep 20 2011 Thomas Spura <tomspur@fedoraproject.org> - 2.1.9-1
+- update to 2.1.9
+- add check section
+
+* 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
+
+* 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
+- change descriptions
+
+* Tue Jul 20 2010 Thomas Spura <tomspur@fedoraproject.org> - 2.0.7-3
+- move binaries to seperate utils package
+
+* Sat Jun 12 2010 Thomas Spura <tomspur@fedoraproject.org> - 2.0.7-2
+- remove BR: libstdc++-devel
+- move man3 to the devel package
+- change group to System Environment/Libraries
+
+* Sat Jun 12 2010 Thomas Spura <tomspur@fedoraproject.org> - 2.0.7-1
+- initial package (based on upstreams example one)