From 0f97337ec2c89830e2526830b4e097491a720277 Mon Sep 17 00:00:00 2001 From: Rakesh Pandit Date: Wed, 5 Aug 2009 06:53:30 +0000 Subject: [PATCH] Updated to 1.1 and fixed FTBFS #511721 --- .cvsignore | 2 +- gflags-1.0-gcc44.patch | 13 ------------- gflags.spec | 13 +++++++------ import.log | 1 + sources | 2 +- 5 files changed, 10 insertions(+), 21 deletions(-) delete mode 100644 gflags-1.0-gcc44.patch diff --git a/.cvsignore b/.cvsignore index 7778cf5..bc68320 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gflags-1.0.tar.gz +gflags-1.1.tar.gz diff --git a/gflags-1.0-gcc44.patch b/gflags-1.0-gcc44.patch deleted file mode 100644 index 040328a..0000000 --- a/gflags-1.0-gcc44.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urNp gflags-1.0.orig/src/gflags_completions.cc gflags-1.0/src/gflags_completions.cc ---- gflags-1.0.orig/src/gflags_completions.cc 2009-02-27 03:06:25.029458422 +0530 -+++ gflags-1.0/src/gflags_completions.cc 2009-02-27 03:11:06.451708527 +0530 -@@ -49,7 +49,8 @@ - - - #include "config.h" --#include -+#include -+#include - - #include - #include diff --git a/gflags.spec b/gflags.spec index 7e19618..335cba6 100644 --- a/gflags.spec +++ b/gflags.spec @@ -1,15 +1,14 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: gflags -Version: 1.0 -Release: 4%{?dist} +Version: 1.1 +Release: 1%{?dist} Summary: Library for commandline flag processing Group: Development/Tools License: BSD URL: http://code.google.com/p/google-%{name}/ Source0: http://google-%{name}.googlecode.com/files/%{name}-%{version}.tar.gz -Patch0: %{name}-1.0-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-setuptools-devel @@ -31,7 +30,6 @@ This package contains development files for %{name}. %prep %setup -q -n %{name}-%{version} -%patch0 -p1 %build %configure --disable-static @@ -78,24 +76,27 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/gflags_completions.sh %{_bindir}/gflags2man.py %{_libdir}/libgflags.so.* +%{_libdir}/libgflags_nothreads.so.* %{python_sitelib}/gflags.py %{python_sitelib}/gflags.pyc %{python_sitelib}/gflags.pyo %{python_sitelib}/*egg-info -%exclude %{_bindir}/*.pyc -%exclude %{_bindir}/*.pyo %files devel %defattr(-,root,root,-) %doc doc/designstyle.css doc/gflags.html %{_libdir}/libgflags.so +%{_libdir}/libgflags_nothreads.so %dir %{_includedir}/%{name} %{_includedir}/%{name}/*.h %dir %{_includedir}/google %{_includedir}/google/*.h %changelog +* Wed Aug 05 2009 Rakesh Pandit - 1.1-1 +- removed extra files included in %%files section and updated to 1.1 + * Fri Jul 24 2009 Fedora Release Engineering - 1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/import.log b/import.log index dc3f6de..4d6d005 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ gflags-0_9-6_fc10:HEAD:gflags-0.9-6.fc10.src.rpm:1222674675 gflags-1_0-1_fc10:HEAD:gflags-1.0-1.fc10.src.rpm:1232013079 +gflags-1_1-1_fc11:HEAD:gflags-1.1-1.fc11.src.rpm:1249455264 diff --git a/sources b/sources index 8decfc9..10706be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -20125f5248f32214a5af20f67f115377 gflags-1.0.tar.gz +91816d7c96f06d1929f4a4fff6b47864 gflags-1.1.tar.gz