From 0372e5ce22470192cdf8b7b05929a3f70c479393 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 30 Jul 2016 16:32:36 +0100 Subject: [PATCH] Problem: spec file needs version before build on OBS Solution: stop autogenerating it and hard code version so that the OBS build service can extract it and use it to build packages automatically --- .gitignore | 2 -- Makefile.am | 1 - configure.ac | 3 +-- packaging/redhat/{zeromq.spec.in => zeromq.spec} | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) rename packaging/redhat/{zeromq.spec.in => zeromq.spec} (99%) diff --git a/.gitignore b/.gitignore index e5393a7c..1a4ebc37 100644 --- a/.gitignore +++ b/.gitignore @@ -163,10 +163,8 @@ src/libzmq.pc bin/ lib/ obj/ -builds/redhat/zeromq.spec builds/android/prefix/ packaging/nuget/*.nupkg -packaging/redhat/zeromq.spec foreign/openpgm/* !foreign/openpgm/*.tar.bz2 !foreign/openpgm/*.tar.gz diff --git a/Makefile.am b/Makefile.am index 7b02748a..1f7d292b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -810,7 +810,6 @@ dist-hook: else \ echo A git clone is required to generate a ChangeLog >&2; \ fi - -cp $(top_srcdir)/packaging/redhat/zeromq.spec $(distdir)/zeromq.spec maintainer-clean-local: -rm -rf $(top_srcdir)/config diff --git a/configure.ac b/configure.ac index 80a36151..4fc49ced 100644 --- a/configure.ac +++ b/configure.ac @@ -662,7 +662,6 @@ AC_CONFIG_FILES([ \ src/libzmq.pc \ doc/Makefile \ builds/Makefile \ - builds/msvc/Makefile \ - packaging/redhat/zeromq.spec]) + builds/msvc/Makefile]) AC_OUTPUT diff --git a/packaging/redhat/zeromq.spec.in b/packaging/redhat/zeromq.spec similarity index 99% rename from packaging/redhat/zeromq.spec.in rename to packaging/redhat/zeromq.spec index be467cf9..b2c5b42e 100644 --- a/packaging/redhat/zeromq.spec.in +++ b/packaging/redhat/zeromq.spec @@ -1,5 +1,5 @@ Name: zeromq -Version: @PACKAGE_VERSION@ +Version: 4.2.0 Release: 1%{?dist} Summary: The ZeroMQ messaging library Group: Applications/Internet