From 14dcdec648133ff0aea96192e4e4b4754fc9593e Mon Sep 17 00:00:00 2001 From: "John A. Khvatov" Date: Sun, 25 Jan 2009 10:36:09 +0000 Subject: [PATCH] update to 0.2 --- .cvsignore | 2 +- glog-lpthread.patch | 113 -------------------------------------------- glog-r38.patch | 13 +++++ glog.spec | 9 ++-- import.log | 1 + sources | 2 +- 6 files changed, 22 insertions(+), 118 deletions(-) delete mode 100644 glog-lpthread.patch create mode 100644 glog-r38.patch diff --git a/.cvsignore b/.cvsignore index b985d82..7e5a9b3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -glog-0.1.2.tar.gz +glog-0.2.tar.gz diff --git a/glog-lpthread.patch b/glog-lpthread.patch deleted file mode 100644 index 4e19df6..0000000 --- a/glog-lpthread.patch +++ /dev/null @@ -1,113 +0,0 @@ -Index: configure -=================================================================== ---- configure (revision 20) -+++ configure (revision 21) -@@ -22818,7 +22818,80 @@ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -+# To make libglog depend on libpthread on Linux, we need to add -+# -lpthread in addition to -pthread. - -+{ echo "$as_me:$LINENO: checking for pthread_self in -lpthread" >&5 -+echo $ECHO_N "checking for pthread_self in -lpthread... $ECHO_C" >&6; } -+if test "${ac_cv_lib_pthread_pthread_self+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lpthread $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char pthread_self (); -+int -+main () -+{ -+return pthread_self (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_pthread_pthread_self=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_pthread_pthread_self=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_self" >&5 -+echo "${ECHO_T}$ac_cv_lib_pthread_pthread_self" >&6; } -+if test $ac_cv_lib_pthread_pthread_self = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_LIBPTHREAD 1 -+_ACEOF -+ -+ LIBS="-lpthread $LIBS" -+ -+fi -+ -+ - # Check if there is google-gflags library installed. - { echo "$as_me:$LINENO: checking for main in -lgflags" >&5 - echo $ECHO_N "checking for main in -lgflags... $ECHO_C" >&6; } -Index: src/config.h.in -=================================================================== ---- src/config.h.in (revision 20) -+++ src/config.h.in (revision 21) -@@ -15,6 +15,9 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_INTTYPES_H - -+/* Define to 1 if you have the `pthread' library (-lpthread). */ -+#undef HAVE_LIBPTHREAD -+ - /* Define to 1 if you have the header file. */ - #undef HAVE_LIBUNWIND_H - -Index: configure.ac -=================================================================== ---- configure.ac (revision 20) -+++ configure.ac (revision 21) -@@ -83,6 +83,9 @@ - - # Some of the code in this directory depends on pthreads - ACX_PTHREAD -+# To make libglog depend on libpthread on Linux, we need to add -+# -lpthread in addition to -pthread. -+AC_CHECK_LIB(pthread, pthread_self) - - # Check if there is google-gflags library installed. - AC_CHECK_LIB(gflags, main, ac_cv_have_libgflags=1, ac_cv_have_libgflags=0) diff --git a/glog-r38.patch b/glog-r38.patch new file mode 100644 index 0000000..5f3e331 --- /dev/null +++ b/glog-r38.patch @@ -0,0 +1,13 @@ +Index: src/logging_unittest.cc +=================================================================== +--- src/logging_unittest.cc (revision 37) ++++ src/logging_unittest.cc (revision 38) +@@ -154,7 +154,7 @@ + FLAGS_logtostderr = true; + + InitGoogleTest(&argc, argv); +-#ifdef HAVE_LIB_GTEST ++#ifdef HAVE_LIB_GMOCK + InitGoogleMock(&argc, argv); + #endif + diff --git a/glog.spec b/glog.spec index 1c30fec..9c2feee 100644 --- a/glog.spec +++ b/glog.spec @@ -1,13 +1,13 @@ Name: glog -Version: 0.1.2 -Release: 6%{?dist} +Version: 0.2 +Release: 2%{?dist} Summary: A C++ application logging library Group: System Environment/Libraries License: BSD URL: http://code.google.com/p/google-glog Source0: http://google-glog.googlecode.com/files/%{name}-%{version}.tar.gz -Patch0: glog-lpthread.patch +Patch0: glog-r38.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: autoconf @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jan 25 2009 John A. Khvatov 0.2-2 +- update to 0.2 + * Thu Dec 4 2008 John A. Khvatov 0.1.2-6 - fix %%{_includedir} - fixed documentation diff --git a/import.log b/import.log index eaf4969..e4be222 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ glog-0_1_2-6_fc10:HEAD:glog-0.1.2-6.fc10.src.rpm:1229343821 +glog-0_2-2_fc10:HEAD:glog-0.2-2.fc10.src.rpm:1232879474 diff --git a/sources b/sources index 663e913..269c05b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -64b44e0a36b25c4afc77a0f6b2b208ed glog-0.1.2.tar.gz +c0fe88ea51ba4e2328580cffc4856ca5 glog-0.2.tar.gz