[stout/f20] update to latest to enable libprocess and mesos builds
tstclair
tstclair at fedoraproject.org
Thu Sep 5 16:44:06 UTC 2013
commit dee8f640a072800c13373db026cf08b1fee3a6bc
Author: Timothy St. Clair <tstclair at redhat.com>
Date: Thu Sep 5 11:43:34 2013 -0500
update to latest to enable libprocess and mesos builds
sources | 2 +-
stout.spec | 109 ++++++++++++++++++++----------------------------------------
2 files changed, 37 insertions(+), 74 deletions(-)
---
diff --git a/sources b/sources
index fe0b3dc..826185f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-726bc6f1f7e5f15e79668ff679c2a64b stout-0.1.2-099483f.tar.gz
+1f1f25abfbfb5a9fe1d8f7845469c840 stout-0.1.1-c784a5e.tar.gz
diff --git a/stout.spec b/stout.spec
index 6aa701c..db83e9b 100644
--- a/stout.spec
+++ b/stout.spec
@@ -1,71 +1,47 @@
%global debug_package %{nil}
-%global commit 099483f8eeb75d0e90bca40d100e7957e4fc1609
+%global commit c784a5efc2431babcb39a078f8b2af5b7bf5f0cb
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-Name: stout
-Version: 0.1.2
-Release: 1.%{shortcommit}%{?dist}
-Summary: C++ headers for building sturdy software
-%{?el5:Group: Development/Libraries}
+Name: stout
+Summary: C++ headers for building sturdy software
+Version: 0.1.1
+Release: 5.%{shortcommit}%{?dist}
-License: ASL 2.0
-URL: https://github.com/3rdparty/stout
+Group: Development/Libraries
+License: ASL 2.0
+URL: https://github.com/3rdparty/stout
## Will use this when pull-request in merged by upstream
# https://github.com/3rdparty/stout/pull/4
-#Source0: %%{url}/archive/%%{commit}/%%{name}-%%{version}-%%{shortcommit}.tar.gz
+#Source0: %{url}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
#
# We'll use this during devel :)
#
-Source0: https://github.com/besser82/stout/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
+Source0: https://github.com/besser82/stout/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
+%{?el5:BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)}
+BuildArch: noarch
-%{?el5:BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)}
-BuildRequires: automake
-BuildRequires: zlib-devel
-%{?el5:BuildRequires: curl-devel}
-%{?!el5:BuildRequires: libcurl-devel}
+BuildRequires: automake
+BuildRequires: zlib-devel
+BuildRequires: libcurl-devel
-%description
-Headers used for for development of sturdy applications, and leveraged
-by Mesos.
+Provides: %{name}-devel%{?isa} = %{version}-%{release}
-%{name} is a header only library that is contains a series of primitives
-to assist in the development of building sturdy C++ applications. Currently
-this application is leveraged by Mesos.
-
-Note: as that project has only headers (i.e., no library/binary object),
-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.
+Requires: boost-devel%{?isa}
+Requires: protobuf-devel%{?isa}
+## TBD - glog removed in the future
+Requires: glog-devel%{?isa}
+Requires: gmock-devel%{?isa}
+Requires: gtest-devel%{?isa}
+Requires: zlib-devel%{?isa}
+Requires: libcurl-devel%{?isa}
-
-%package devel
-Summary: C++ headers for building sturdy software
-%{?el5:Group: Development/Libraries}
-
-# el5 doesn't like noarch subpkgs
-%{?!el5:BuildArch: noarch}
-
-# obsoleting previous versions because change to devel subpkg
-# el5 pkg will be arched, so we should use %%{?_isa}in this case
-Obsoletes: %{name} <= 0.1.1-4.7c9d71c
-Provides: %{name}%{?el5:%{?_isa}} = %{version}-%{release}
-
-Requires: boost-devel%{?el5:%{?_isa}}
-Requires: protobuf-devel%{?el5:%{?_isa}}
-# TBD - glog removed in the future
-Requires: glog-devel%{?el5:%{?_isa}}
-Requires: gmock-devel%{?el5:%{?_isa}}
-Requires: gtest-devel%{?el5:%{?_isa}}
-Requires: zlib-devel%{?el5:%{?_isa}}
-%{?el5:Requires: curl-devel%{?_isa}}
-%{?!el5:Requires: libcurl-devel}
-
-%description devel
+%description
Headers used for for development of sturdy applications, and leveraged
by Mesos.
-%{name} is a header only library that is contains a series of primitives
+Stout is a header only library that is contains a series of primitives
to assist in the development of building sturdy C++ applications. Currently
this application is leveraged by Mesos.
@@ -85,16 +61,13 @@ autoreconf -vfi
%configure
make %{?_smp_mflags}
+%check
+make check
%install
%if 0%{?el5}
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
-
-# having pkgconfig-file in %%{_datadir} will conflict with multiarch on el5
-# moving stuff to %%{_libdir} in this case
- mkdir -p %{buildroot}%{_libdir}/pkgconfig
- cp -a %{buildroot}%{_datadir}/pkgconfig/* %{buildroot}%{_libdir}/pkgconfig
%else
%make_install
%endif
@@ -104,28 +77,18 @@ make %{?_smp_mflags}
%{?el5:rm -rf %{buildroot}}
-%files devel
-%doc LICENSE README.md examples
-%{?el5:%{_libdir}/pkgconfig/*}
-%{?el5:%exclude %{_datadir}/pkgconfig/*}
-%{?!el5:%{_datadir}/pkgconfig/*}
+%files
+%{_datadir}/pkgconfig/*
%{_includedir}/%{name}/
+%doc LICENSE README examples
%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
-- commented macros properly
-- replaced spaces with tabs
+* Tue Sep 3 2013 Timothy St. Clair <tstclair at redhat.com> 0.1.0-5.b1d3cc4d
+- Minor update to the tip of mesos
-* Mon Aug 12 2013 Björn Esser <bjoern.esser at gmail.com> - 0.1.1-4.7c9d71c
-- nuked %%{?_isa}-macros from noarch-pkg
+* Fri Aug 16 2013 Timothy St. Clair <tstclair at redhat.com> 0.1.0-4.4e63c67
+- Updating to the tip of mesos dated 8.15.2013
* Fri Aug 9 2013 Igor Gnatenko <i.gnatenko.brain at gmail.com> - 0.1.1-3.7c9d71c
- Update to latest
@@ -156,4 +119,4 @@ make %{?_smp_mflags}
- other fixes
* Mon Jul 22 2013 Timothy St. Clair <tstclair at redhat.com> 0.1.0-1
-- initial fedora package (#988545)
+- initial fedora package
More information about the scm-commits
mailing list