From 36f56f53eaf00ba6652c43b81b1fcbc2eba5a363 Mon Sep 17 00:00:00 2001 From: Evan Klitzke Date: Mar 03 2016 20:56:11 +0000 Subject: Upgrade to the latest upstream release, 2.1.2 --- diff --git a/.gitignore b/.gitignore index 129adc1..a145245 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /gflags-2.1.1.tar.gz +/gflags-2.1.2.tar.gz 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 index a204d8b..5f72183 100644 --- a/gflags-0001-Set-VERSION-property-of-library-targets-to-major.patch +++ b/gflags-0001-Set-VERSION-property-of-library-targets-to-major.patch @@ -1,35 +1,18 @@ -From bf889786c2a3a2dab89610d0722634d2eedfc694 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 1 May 2014 20:16:16 +0100 Subject: [PATCH] Set VERSION property of library targets to .. ---- - CMakeLists.txt | 5 +++++ - 1 file changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index a4d0f07..7f65563 100644 +index 54b5c35..756ddba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -22,6 +22,8 @@ version_numbers ( +@@ -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 - set (GFLAGS_NAMESPACE "${PACKAGE_NAME}" CACHE STRING "C++ namespace identifier of gflags library.") -@@ -257,6 +259,9 @@ foreach (TYPE IN ITEMS STATIC SHARED) - set_target_properties ( - gflags${opts}-${type} PROPERTIES COMPILE_DEFINITIONS "${defines}" - OUTPUT_NAME "gflags${opts}" -+ # Set VERSION instead of SOVERSION such -+ # that it is also used on Windows -+ VERSION "${PACKAGE_SOVERSION}" - ) - if (HAVE_SHLWAPI_H) - target_link_libraries (gflags${opts}-${type} shlwapi.lib) --- -1.9.0 - diff --git a/gflags-0001-cmake-append-LIB_SUFFIX-to-LIBRARY_INSTALL_DIR.patch b/gflags-0001-cmake-append-LIB_SUFFIX-to-LIBRARY_INSTALL_DIR.patch deleted file mode 100644 index 51bf154..0000000 --- a/gflags-0001-cmake-append-LIB_SUFFIX-to-LIBRARY_INSTALL_DIR.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 251684169627f0aae205c9a316863e0e3f257912 Mon Sep 17 00:00:00 2001 -From: John Khvatov -Date: Thu, 1 May 2014 00:57:04 +0400 -Subject: [PATCH] cmake: append LIB_SUFFIX to LIBRARY_INSTALL_DIR - ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 17d38b4..10c9cca 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -280,9 +280,9 @@ if (OS_WINDOWS) - set (CONFIG_INSTALL_DIR CMake) - else () - set (RUNTIME_INSTALL_DIR bin) -- set (LIBRARY_INSTALL_DIR lib) -+ set (LIBRARY_INSTALL_DIR lib${LIB_SUFFIX}) - set (INCLUDE_INSTALL_DIR include) -- set (CONFIG_INSTALL_DIR lib/cmake/${PACKAGE_NAME}) -+ set (CONFIG_INSTALL_DIR lib${LIB_SUFFIX}/cmake/${PACKAGE_NAME}) - endif () - - file (RELATIVE_PATH INSTALL_PREFIX_REL2CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/${CONFIG_INSTALL_DIR}" "${CMAKE_INSTALL_PREFIX}") --- -1.9.0 - diff --git a/gflags.spec b/gflags.spec index a8eb636..4a0439d 100644 --- a/gflags.spec +++ b/gflags.spec @@ -1,15 +1,12 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - Name: gflags -Version: 2.1.1 -Release: 9%{?dist} +Version: 2.1.2 +Release: 1%{?dist} Summary: Library for commandline flag processing Group: Development/Tools License: BSD -URL: http://code.google.com/p/%{name} -Source0: http://github.com/schuhschuh/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz -Patch0: gflags-0001-cmake-append-LIB_SUFFIX-to-LIBRARY_INSTALL_DIR.patch +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 BuildRequires: cmake @@ -32,7 +29,6 @@ This package contains development files for %{name}. %prep %setup -q -%patch0 -p1 -b .lib_suffix %patch1 -p1 -b .lib_version %build @@ -50,21 +46,24 @@ ctest %postun -p /sbin/ldconfig %files -%doc ChangeLog.txt README.txt COPYING.txt AUTHORS.txt +%license COPYING.txt +%doc AUTHORS.txt ChangeLog.txt README.md %{_bindir}/gflags_completions.sh %{_libdir}/libgflags.so.* %{_libdir}/libgflags_nothreads.so.* %files devel -%doc doc/designstyle.css doc/gflags.html +%doc doc/designstyle.css doc/index.html %dir %{_includedir}/%{name} %{_includedir}/%{name}/*.h %{_libdir}/libgflags.so %{_libdir}/libgflags_nothreads.so -%dir %{_libdir}/cmake %{_libdir}/cmake/%{name} %changelog +* Sat Feb 27 2016 Evan Klitzke - 2.1.2-1 +- Upgrade to the latest upstream release, 2.1.2 + * Wed Feb 03 2016 Fedora Release Engineering - 2.1.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index acd624e..439a11c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -18acc0ae270672a70a86b33ebbe9761b gflags-2.1.1.tar.gz +ac432de923f9de1e9780b5254884599f gflags-2.1.2.tar.gz