Permalink
Browse files

RPM packaging improvements

Signed-off-by: Mikko Koppanen <mkoppanen@php.net>
  • Loading branch information...
1 parent 6fd403c commit e62686aca57ab307e952c53fd3848acaad22735e Mikko Koppanen committed with sustrik Apr 9, 2011
Showing with 7 additions and 6 deletions.
  1. +0 −1 Makefile.am
  2. +5 −4 builds/redhat/{zeromq.spec → zeromq.spec.in}
  3. +2 −1 configure.in
View
@@ -33,7 +33,6 @@ dist-hook:
echo A git clone is required to generate a ChangeLog >&2; \
fi
-cp $(top_srcdir)/builds/redhat/zeromq.spec $(distdir)/zeromq.spec
- -sed s/\@PACKAGE_VERSION\@/@PACKAGE_VERSION@/ -i $(distdir)/zeromq.spec
-rm -rf $(distdir)/foreign/openpgm/build-staging
distclean-local:
-rm -rf $(top_srcdir)/foreign/openpgm/build-staging
@@ -5,7 +5,7 @@ Summary: The ZeroMQ messaging library
Group: Applications/Internet
License: LGPLv3+
URL: http://www.zeromq.org/
-Source: http://www.zeromq.org/local--files/area:download/%{name}-%{version}.tar.gz
+Source: http://download.zeromq.org/%{name}-%{version}.tar.gz
Prefix: %{_prefix}
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: gcc, make, gcc-c++, libstdc++-devel
@@ -24,8 +24,7 @@ Requires: uuid
# Build pgm only on supported archs
%ifarch pentium3 pentium4 athlon i386 i486 i586 i686 x86_64
-BuildRequires: glib2-devel
-Requires: glib2
+BuildRequires: python, perl
%endif
%description
@@ -125,13 +124,15 @@ This package contains ZeroMQ related development libraries and header files.
%{_mandir}/man3/zmq_strerror.3.gz
%{_mandir}/man3/zmq_term.3.gz
%{_mandir}/man3/zmq_version.3.gz
-%{_mandir}/man7/zmq_cpp.7.gz
%{_mandir}/man7/zmq_epgm.7.gz
%{_mandir}/man7/zmq_inproc.7.gz
%{_mandir}/man7/zmq_ipc.7.gz
%{_mandir}/man7/zmq_pgm.7.gz
%{_mandir}/man7/zmq_tcp.7.gz
%changelog
+* Fri Apr 8 2011 Mikko Koppanen <mikko@kuut.io> 3.0.0-1
+- Update dependencies and packaged files
+
* Sat Apr 10 2010 Mikko Koppanen <mkoppanen@php.net> 2.0.7-1
- Initial packaging
View
@@ -375,6 +375,7 @@ AC_SUBST(LIBZMQ_EXTRA_LDFLAGS)
AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile
perf/Makefile src/libzmq.pc \
builds/msvc/Makefile tests/Makefile \
- foreign/openpgm/Makefile])
+ foreign/openpgm/Makefile \
+ builds/redhat/zeromq.spec])
AC_OUTPUT

0 comments on commit e62686a

Please sign in to comment.