[stout/el5: 4/4] new upstream version additional adaptions for el5 create direct subpkg instead of named package
Björn Esser
besser82 at fedoraproject.org
Tue Aug 13 11:10:47 UTC 2013
commit 1f5bef9804dc93ffc049a6e584cd39291b2438cf
Author: Björn Esser <bjoern.esser at gmail.com>
Date: Tue Aug 13 13:08:23 2013 +0200
new upstream version
additional adaptions for el5
create direct subpkg instead of named package
sources | 2 +-
stout.spec | 23 +++++++++++++++--------
2 files changed, 16 insertions(+), 9 deletions(-)
---
diff --git a/sources b/sources
index 4596b5c..fe0b3dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-21885bb4ddc3a26144c373c522f1564c stout-0.1.1-7c9d71c.tar.gz
+726bc6f1f7e5f15e79668ff679c2a64b stout-0.1.2-099483f.tar.gz
diff --git a/stout.spec b/stout.spec
index 8c781c3..6aa701c 100644
--- a/stout.spec
+++ b/stout.spec
@@ -1,11 +1,11 @@
%global debug_package %{nil}
-%global commit 7c9d71c8fda7719e5cc071b39377e85a7a450781
+%global commit 099483f8eeb75d0e90bca40d100e7957e4fc1609
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: stout
-Version: 0.1.1
-Release: 5.%{shortcommit}%{?dist}
+Version: 0.1.2
+Release: 1.%{shortcommit}%{?dist}
Summary: C++ headers for building sturdy software
%{?el5:Group: Development/Libraries}
@@ -23,7 +23,8 @@ Source0: https://github.com/besser82/stout/archive/%{commit}/%{name}-%{version}-
%{?el5:BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)}
BuildRequires: automake
BuildRequires: zlib-devel
-BuildRequires: libcurl-devel
+%{?el5:BuildRequires: curl-devel}
+%{?!el5:BuildRequires: libcurl-devel}
%description
Headers used for for development of sturdy applications, and leveraged
@@ -38,7 +39,7 @@ this package (i.e., the -devel package) is the one containing all of the
project. There's no package with a library to link for this.
-%package -n %{name}-devel
+%package devel
Summary: C++ headers for building sturdy software
%{?el5:Group: Development/Libraries}
@@ -57,9 +58,10 @@ Requires: glog-devel%{?el5:%{?_isa}}
Requires: gmock-devel%{?el5:%{?_isa}}
Requires: gtest-devel%{?el5:%{?_isa}}
Requires: zlib-devel%{?el5:%{?_isa}}
-Requires: libcurl-devel%{?el5:%{?_isa}}
+%{?el5:Requires: curl-devel%{?_isa}}
+%{?!el5:Requires: libcurl-devel}
-%description -n %{name}-devel
+%description devel
Headers used for for development of sturdy applications, and leveraged
by Mesos.
@@ -102,7 +104,7 @@ make %{?_smp_mflags}
%{?el5:rm -rf %{buildroot}}
-%files -n %{name}-devel
+%files devel
%doc LICENSE README.md examples
%{?el5:%{_libdir}/pkgconfig/*}
%{?el5:%exclude %{_datadir}/pkgconfig/*}
@@ -111,6 +113,11 @@ make %{?_smp_mflags}
%changelog
+* Tue Aug 13 2013 Björn Esser <bjoern.esser at gmail.com> - 0.1.2-1.099483f
+- new upstream version
+- additional adaptions for el5
+- create direct subpkg instead of named package
+
* Tue Aug 13 2013 Björn Esser <bjoern.esser at gmail.com> - 0.1.1-5.7c9d71c
- modified as suggested in rhbz #988545 comment 17 and following.
See: https://bugzilla.redhat.com/show_bug.cgi?id=988545#c17
More information about the scm-commits
mailing list