From a90f18f51695b9e54f7a8d7537971e6bd2ea7a10d5d6597779357390054a8455 Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Tue, 15 Mar 2016 14:00:24 +0000 Subject: [PATCH 1/2] Accepting request 373257 from home:qzhao:branches:M17N Make sure source code's COPYING file install by default. OBS-URL: https://build.opensuse.org/request/show/373257 OBS-URL: https://build.opensuse.org/package/show/M17N/google-glog?expand=0&rev=6 --- google-glog.changes | 5 +++++ google-glog.spec | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/google-glog.changes b/google-glog.changes index 2b021d7..0d533a4 100644 --- a/google-glog.changes +++ b/google-glog.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 29 20:01:48 UTC 2016 - qzhao@suse.com + +- Make sure source code's COPYING file install by default. + ------------------------------------------------------------------- Sat Jun 29 18:05:14 UTC 2013 - i@marguerite.su diff --git a/google-glog.spec b/google-glog.spec index 66e3432..18a0e67 100644 --- a/google-glog.spec +++ b/google-glog.spec @@ -1,7 +1,7 @@ # # spec file for package google-glog # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -69,6 +69,7 @@ rm -rf %{buildroot}%{_libdir}/*.{a,la} mkdir -p %{buildroot}%{_docdir}/%{name} mv %{buildroot}%{_datadir}/doc/glog-%{version}/* %{buildroot}%{_docdir}/%{name}/ rm -rf %{buildroot}%{_docdir}/%{name}/INSTALL +install COPYING %{buildroot}%{_docdir}/%{name} %post -n libglog0 -p /sbin/ldconfig From 0567dd5f3e0e5f6aca53a55d60c871110fa60d4b0f003c1ccd1707a3cb0338e5 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Wed, 16 Mar 2016 10:29:49 +0000 Subject: [PATCH 2/2] Accepting request 373620 from home:pluskalm:branches:M17N - Install documentation in default location with correct permissions - Use macro for configure - Cleanup spec file with spec-cleaner OBS-URL: https://build.opensuse.org/request/show/373620 OBS-URL: https://build.opensuse.org/package/show/M17N/google-glog?expand=0&rev=7 --- google-glog.changes | 8 ++++++++ google-glog.spec | 27 +++++++++++---------------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/google-glog.changes b/google-glog.changes index 0d533a4..eb0b931 100644 --- a/google-glog.changes +++ b/google-glog.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Mar 16 08:14:42 UTC 2016 - mpluskal@suse.com + +- Install documentation in default location with correct + permissions +- Use macro for configure +- Cleanup spec file with spec-cleaner + ------------------------------------------------------------------- Mon Feb 29 20:01:48 UTC 2016 - qzhao@suse.com diff --git a/google-glog.spec b/google-glog.spec index 18a0e67..49861c9 100644 --- a/google-glog.spec +++ b/google-glog.spec @@ -29,8 +29,8 @@ BuildRequires: pkg-config BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -The glog library implements application-level logging. -This library provides logging APIs based on C++-style +The glog library implements application-level logging. +This library provides logging APIs based on C++-style streams and various helper macros. %package -n libglog0 @@ -38,8 +38,8 @@ Summary: Logging library for C++ Group: System/Libraries %description -n libglog0 -The glog library implements application-level logging. -This library provides logging APIs based on C++-style +The glog library implements application-level logging. +This library provides logging APIs based on C++-style streams and various helper macros. %package -n glog-devel @@ -48,8 +48,8 @@ Group: Development/Libraries/C and C++ Requires: libglog0 = %{version} %description -n glog-devel -The glog library implements application-level logging. -This library provides logging APIs based on C++-style +The glog library implements application-level logging. +This library provides logging APIs based on C++-style streams and various helper macros. This package provides development files for libglog0. @@ -58,31 +58,26 @@ This package provides development files for libglog0. %setup -q -n glog-%{version} %build -./configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir} +%configure make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install - +make %{?_smp_mflags} DESTDIR=%{buildroot} install rm -rf %{buildroot}%{_libdir}/*.{a,la} - -mkdir -p %{buildroot}%{_docdir}/%{name} -mv %{buildroot}%{_datadir}/doc/glog-%{version}/* %{buildroot}%{_docdir}/%{name}/ -rm -rf %{buildroot}%{_docdir}/%{name}/INSTALL -install COPYING %{buildroot}%{_docdir}/%{name} +rm -rf %{buildroot}%{_datadir}/doc/glog-* %post -n libglog0 -p /sbin/ldconfig - %postun -n libglog0 -p /sbin/ldconfig %files -n libglog0 %defattr(-,root,root) +%doc COPYING %{_libdir}/libglog.so.0 %{_libdir}/libglog.so.0.0.0 -%doc %{_docdir}/%{name} %files -n glog-devel %defattr(-,root,root) +%doc COPYING AUTHORS ChangeLog README %{_includedir}/glog/ %{_libdir}/libglog.so %{_libdir}/pkgconfig/libglog.pc