From 72f33109d43f83b67fdc548884a229b3e280cf0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 2 Oct 2018 07:54:39 +0100 Subject: [PATCH] Update to 2.2.1 Patch1 already upstreamed --- ...property-of-library-targets-to-major.patch | 18 --------------- gflags.spec | 23 +++++++++++-------- 2 files changed, 14 insertions(+), 27 deletions(-) delete mode 100644 gflags-0001-Set-VERSION-property-of-library-targets-to-major.patch diff --git a/gflags-0001-Set-VERSION-property-of-library-targets-to-major.patch b/gflags-0001-Set-VERSION-property-of-library-targets-to-major.patch deleted file mode 100644 index 5f72183..0000000 --- a/gflags-0001-Set-VERSION-property-of-library-targets-to-major.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: Andreas Schuh -Date: Thu, 1 May 2014 20:16:16 +0100 -Subject: [PATCH] Set VERSION property of library targets to .. - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 54b5c35..756ddba 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -34,7 +34,7 @@ version_numbers ( - PACKAGE_VERSION_PATCH - ) - --set (PACKAGE_SOVERSION "${PACKAGE_VERSION_MAJOR}") -+set (PACKAGE_SOVERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}") - - # ---------------------------------------------------------------------------- - # options diff --git a/gflags.spec b/gflags.spec index f61664d..086330a 100644 --- a/gflags.spec +++ b/gflags.spec @@ -1,13 +1,12 @@ Name: gflags -Version: 2.1.2 -Release: 8%{?dist} +Version: 2.2.1 +Release: 1%{?dist} Summary: Library for commandline flag processing Group: Development/Tools License: BSD URL: https://gflags.github.io/gflags/ -Source0: https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz -Patch1: gflags-0001-Set-VERSION-property-of-library-targets-to-major.patch +Source0: https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz BuildRequires: gcc-c++ BuildRequires: python2-setuptools BuildRequires: cmake @@ -30,14 +29,16 @@ This package contains development files for %{name}. %prep %setup -q -%patch1 -p1 -b .lib_version %build -%cmake -DBUILD_TESTING:BOOL=ON . -make %{?_smp_mflags} +%cmake -DBUILD_TESTING:BOOL=ON \ + -DINSTALL_HEADERS:BOOL=ON \ + -DREGISTER_BUILD_DIR:BOOL=OFF \ + -DREGISTER_INSTALL_PREFIX:BOOL=OFF . +%make_build %install -make install DESTDIR=%{buildroot} INSTALL="install -p" +%make_install %check ctest @@ -54,14 +55,18 @@ ctest %{_libdir}/libgflags_nothreads.so.* %files devel -%doc doc/designstyle.css doc/index.html %dir %{_includedir}/%{name} %{_includedir}/%{name}/*.h %{_libdir}/libgflags.so +%{_libdir}/pkgconfig/gflags.pc %{_libdir}/libgflags_nothreads.so %{_libdir}/cmake/%{name} %changelog +* Tue Oct 02 2018 Sérgio Basto - 2.2.1-1 +- Update to 2.2.1 +- Patch1 already upstreamed + * Fri Jul 13 2018 Fedora Release Engineering - 2.1.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild