[packages/gflags] - updated to 2.2.0 (note: new soname, changed pkgconfig names) - removed obsolete nothreads patch -
qboosh
qboosh at pld-linux.org
Mon Dec 26 11:04:14 CET 2016
commit 61c87c6de9c3161ed4ef7ac20410e49107107873
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Dec 26 11:05:03 2016 +0100
- updated to 2.2.0 (note: new soname, changed pkgconfig names)
- removed obsolete nothreads patch
- use upstream gflags.pc, added pc-nothreads patch to add gflags_nothreads.pc file
gflags-nothreads.patch | 11 -----------
gflags-pc-nothreads.patch | 26 ++++++++++++++++++++++++++
gflags.spec | 33 ++++++++++-----------------------
libgflags.pc | 13 -------------
libgflags_nothreads.pc | 12 ------------
5 files changed, 36 insertions(+), 59 deletions(-)
---
diff --git a/gflags.spec b/gflags.spec
index d333b0c..786113e 100644
--- a/gflags.spec
+++ b/gflags.spec
@@ -1,18 +1,16 @@
Summary: A commandline flags library that allows for distributed flags
Summary(pl.UTF-8): Biblioteka flag linii poleceń pozwalająca na rozproszone flagi
Name: gflags
-Version: 2.1.2
+Version: 2.2.0
Release: 1
License: BSD
Group: Libraries
#Source0Download: https://github.com/gflags/gflags/releases
Source0: https://github.com/schuhschuh/gflags/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: ac432de923f9de1e9780b5254884599f
-Source1: libgflags.pc
-Source2: libgflags_nothreads.pc
-Patch0: %{name}-nothreads.patch
+# Source0-md5: b99048d9ab82d8c56e876fb1456c285e
+Patch0: %{name}-pc-nothreads.patch
URL: http://gflags.github.io/gflags/
-BuildRequires: cmake >= 2.8.4
+BuildRequires: cmake >= 2.8.12
BuildRequires: libstdc++-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -57,11 +55,6 @@ Statyczna biblioteka gflags.
%setup -q
%patch0 -p1
-%{__sed} -i \
- -e 's|LIBRARY_INSTALL_DIR lib|LIBRARY_INSTALL_DIR %{_lib}|g' \
- -e 's|CONFIG_INSTALL_DIR lib/cmake|CONFIG_INSTALL_DIR %{_lib}/cmake|g' \
- CMakeLists.txt
-
%build
install -d build
cd build
@@ -75,13 +68,6 @@ rm -rf $RPM_BUILD_ROOT
%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
-# .pc files used to be provided before gflags 2.1; reintroduce them
-install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
-for f in %{SOURCE1} %{SOURCE2} ; do
- sed -e "s|@prefix@|%{_prefix}|;s|@libdir@|%{_libdir}|" "$f" \
- >$RPM_BUILD_ROOT%{_pkgconfigdir}/$(basename $f)
-done
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -93,18 +79,19 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS.txt COPYING.txt ChangeLog.txt README.md
%attr(755,root,root) %{_bindir}/gflags_completions.sh
%attr(755,root,root) %{_libdir}/libgflags.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgflags.so.2
+%attr(755,root,root) %ghost %{_libdir}/libgflags.so.2.2
%attr(755,root,root) %{_libdir}/libgflags_nothreads.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgflags_nothreads.so.2
+%attr(755,root,root) %ghost %{_libdir}/libgflags_nothreads.so.2.2
%files devel
%defattr(644,root,root,755)
-%doc doc/{index.html,designstyle.css}
+# not present in 2.2.0
+#%doc doc/{index.html,designstyle.css}
%attr(755,root,root) %{_libdir}/libgflags.so
%attr(755,root,root) %{_libdir}/libgflags_nothreads.so
%{_includedir}/gflags
-%{_pkgconfigdir}/libgflags.pc
-%{_pkgconfigdir}/libgflags_nothreads.pc
+%{_pkgconfigdir}/gflags.pc
+%{_pkgconfigdir}/gflags_nothreads.pc
%{_libdir}/cmake/gflags
%files static
diff --git a/gflags-nothreads.patch b/gflags-nothreads.patch
deleted file mode 100644
index f1ccdf1..0000000
--- a/gflags-nothreads.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gflags-2.1.1/CMakeLists.txt.orig 2014-10-18 20:58:12.937871587 +0200
-+++ gflags-2.1.1/CMakeLists.txt 2014-10-18 21:09:27.351176620 +0200
-@@ -247,7 +247,7 @@
- if (BUILD_gflags${opts}_LIB)
- add_library (gflags${opts}-${type} ${TYPE} ${GFLAGS_SRCS} ${PRIVATE_HDRS} ${PUBLIC_HDRS})
- if (opts MATCHES "nothreads")
-- set (defines "GFLAGS_IS_A_DLL=${GFLAGS_IS_A_DLL};NOTHREADS")
-+ set (defines "GFLAGS_IS_A_DLL=${GFLAGS_IS_A_DLL};NO_THREADS")
- else ()
- set (defines "GFLAGS_IS_A_DLL=${GFLAGS_IS_A_DLL}")
- if (CMAKE_USE_PTHREADS_INIT)
diff --git a/gflags-pc-nothreads.patch b/gflags-pc-nothreads.patch
new file mode 100644
index 0000000..158b2b7
--- /dev/null
+++ b/gflags-pc-nothreads.patch
@@ -0,0 +1,26 @@
+--- gflags-2.2.0/cmake/package_nothreads.pc.in.orig 1970-01-01 01:00:00.000000000 +0100
++++ gflags-2.2.0/cmake/package_nothreads.pc.in 2016-12-26 09:36:10.647054844 +0100
+@@ -0,0 +1,12 @@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++bindir=${prefix}/@RUNTIME_INSTALL_DIR@
++libdir=${prefix}/@LIBRARY_INSTALL_DIR@
++includedir=${prefix}/@INCLUDE_INSTALL_DIR@
++
++Name: @PACKAGE_NAME at _nothreads
++Version: @PACKAGE_VERSION@
++Description: @PACKAGE_DESCRIPTION@
++URL: @PACKAGE_URL@
++Libs: -L${libdir} -lgflags_nothreads
++Cflags: -I${includedir}
+--- gflags-2.2.0/CMakeLists.txt.orig 2016-11-25 19:54:37.000000000 +0100
++++ gflags-2.2.0/CMakeLists.txt 2016-12-26 09:36:48.167054416 +0100
+@@ -533,6 +533,8 @@
+ if (PKGCONFIG_INSTALL_DIR)
+ configure_file ("cmake/package.pc.in" "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}.pc" @ONLY)
+ install (FILES "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}.pc" DESTINATION "${PKGCONFIG_INSTALL_DIR}")
++ configure_file ("cmake/package_nothreads.pc.in" "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}_nothreads.pc" @ONLY)
++ install (FILES "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}_nothreads.pc" DESTINATION "${PKGCONFIG_INSTALL_DIR}")
+ endif ()
+
+ # ----------------------------------------------------------------------------
diff --git a/libgflags.pc b/libgflags.pc
deleted file mode 100644
index 75a696a..0000000
--- a/libgflags.pc
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=${prefix}
-libdir=@libdir@
-includedir=${prefix}/include
-
-Name: gflags
-Version: 2.0
-Description: A commandline flags library that allows for distributed flags
-URL: http://code.google.com/p/gflags
-Requires:
-Libs: -L${libdir} -lgflags
-Libs.private: -pthread -lpthread
-Cflags: -I${includedir}
diff --git a/libgflags_nothreads.pc b/libgflags_nothreads.pc
deleted file mode 100644
index b1dffb8..0000000
--- a/libgflags_nothreads.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=${prefix}
-libdir=@libdir@
-includedir=${prefix}/include
-
-Name: gflags
-Version: 2.0
-Description: A commandline flags library that allows for distributed flags
-URL: http://code.google.com/p/gflags
-Requires:
-Libs: -L${libdir} -lgflags_nothreads
-Cflags: -I${includedir}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gflags.git/commitdiff/61c87c6de9c3161ed4ef7ac20410e49107107873
More information about the pld-cvs-commit
mailing list