diff --git a/.gflags.metadata b/.gflags.metadata index 7458cd9..083ac3c 100644 --- a/.gflags.metadata +++ b/.gflags.metadata @@ -1 +1 @@ -8bdbade9d041339dc14b4ab426e2354a5af38478 SOURCES/gflags-2.1.2.tar.gz +4d42470afb7236fb0cf90f8bbb0cec588073c17c SOURCES/gflags-2.2.2.tar.gz diff --git a/SOURCES/gflags-fix_pkgconfig.patch b/SOURCES/gflags-fix_pkgconfig.patch new file mode 100644 index 0000000..c0d33ec --- /dev/null +++ b/SOURCES/gflags-fix_pkgconfig.patch @@ -0,0 +1,12 @@ +diff -up gflags-2.2.2/cmake/package.pc.in.orig gflags-2.2.2/cmake/package.pc.in +--- gflags-2.2.2/cmake/package.pc.in.orig 2018-11-11 22:21:00.000000000 +0100 ++++ gflags-2.2.2/cmake/package.pc.in 2020-03-09 13:54:40.797884193 +0100 +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} + bindir=${prefix}/@RUNTIME_INSTALL_DIR@ +-libdir=${prefix}/@LIBRARY_INSTALL_DIR@ ++libdir=@LIBRARY_INSTALL_DIR@ + includedir=${prefix}/@INCLUDE_INSTALL_DIR@ + + Name: @PACKAGE_NAME@ diff --git a/SPECS/gflags.spec b/SPECS/gflags.spec index 6445c18..0297e47 100644 --- a/SPECS/gflags.spec +++ b/SPECS/gflags.spec @@ -1,14 +1,13 @@ Name: gflags -Version: 2.1.2 -Release: 6%{?dist} +Version: 2.2.2 +Release: 8%{?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 -BuildRequires: python-setuptools +Source0: https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz +Patch0: gflags-fix_pkgconfig.patch +BuildRequires: gcc-c++ BuildRequires: cmake %description @@ -20,7 +19,6 @@ they're used. %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} @@ -28,22 +26,22 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package contains development files for %{name}. %prep -%setup -q -%patch1 -p1 -b .lib_version +%autosetup -p1 %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 +%cmake_build %install -make install DESTDIR=%{buildroot} INSTALL="install -p" +%cmake_install %check -ctest +%ctest -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %license COPYING.txt @@ -53,14 +51,53 @@ 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 +* Thu Jul 22 2021 Fedora Release Engineering - 2.2.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 2.2.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 2.2.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild +- Fix cmake build + +* Mon Mar 09 2020 Nicolas Chauvet - 2.2.2-5 +- Fix pkgconfig libdir value + +* Tue Jan 28 2020 Fedora Release Engineering - 2.2.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Oct 29 2019 Sérgio Basto - 2.2.2-3 +- Drop BR python2-setuptools + +* Thu Jul 25 2019 Fedora Release Engineering - 2.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun May 12 2019 Sérgio Basto - 2.2.2-1 +- Update gflags to 2.2.2 + +* Thu Jan 31 2019 Fedora Release Engineering - 2.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* 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 + +* Thu Mar 15 2018 Iryna Shcherbina - 2.1.2-7 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Wed Feb 07 2018 Fedora Release Engineering - 2.1.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild