From bfb05144bcdef042c8da03bb7017837ca36928becdcacf7290df64949f616a4f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 9 Mar 2018 10:07:40 +0000 Subject: [PATCH 1/2] Accepting request 583592 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/583592 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libsecret?expand=0&rev=33 --- libsecret.changes | 5 +++++ libsecret.spec | 20 ++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/libsecret.changes b/libsecret.changes index c696e7b..650432f 100644 --- a/libsecret.changes +++ b/libsecret.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 28 16:36:16 UTC 2018 - dimstar@opensuse.org + +- Modernize spec-file by calling spec-cleaner + ------------------------------------------------------------------- Mon Jul 17 15:25:56 UTC 2017 - dimstar@opensuse.org diff --git a/libsecret.spec b/libsecret.spec index 39c0c20..a82dbb0 100644 --- a/libsecret.spec +++ b/libsecret.spec @@ -1,7 +1,7 @@ # # spec file for package libsecret # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -17,14 +17,13 @@ %define have_lang 1 - Name: libsecret Version: 0.18.5 Release: 0 Summary: Library for accessing the Secret Service API -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries -Url: https://wiki.gnome.org/Projects/Libsecret +URL: https://wiki.gnome.org/Projects/Libsecret Source0: http://download.gnome.org/sources/libsecret/0.18/%{name}-%{version}.tar.xz Source99: baselibs.conf # PATCH-FIX-UPSTREAM libsecret-secret-size.patch bgo#778357 dimstar@opensuse.org -- Ensure that generated secret occupies the same number of bytes as prime. @@ -36,13 +35,13 @@ BuildRequires: fdupes BuildRequires: gobject-introspection-devel >= 1.29 BuildRequires: intltool BuildRequires: libgcrypt-devel >= 1.2.2 +BuildRequires: pkgconfig BuildRequires: translation-update-upstream BuildRequires: vala >= 0.17.2.12 BuildRequires: xsltproc BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(glib-2.0) >= 2.38.0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description libsecret is a library for storing and retrieving passwords and other @@ -92,6 +91,7 @@ secrets. It communicates with the "Secret Service" using DBus. %if %{have_lang} %lang_package %endif + %prep %setup -q %patch0 -p1 @@ -104,7 +104,7 @@ translation-update-upstream %configure \ --disable-static #make %{?_smp_mflags} V=1 -make V=1 +make %{?_smp_mflags} V=1 %install %make_install @@ -115,25 +115,21 @@ find %{buildroot} -type f -name "*.la" -delete -print %fdupes %{buildroot} %post -n libsecret-1-0 -p /sbin/ldconfig - %postun -n libsecret-1-0 -p /sbin/ldconfig %files -n libsecret-1-0 -%defattr (-, root, root) -%doc AUTHORS ChangeLog COPYING NEWS README +%license COPYING +%doc AUTHORS ChangeLog NEWS README %{_libdir}/libsecret-1.so.* %files -n typelib-1_0-Secret-1 -%defattr(-,root,root) %{_libdir}/girepository-1.0/Secret-1.typelib %files tools -%defattr(-,root,root) %{_bindir}/secret-tool %{_mandir}/man1/secret-tool.1%{?ext_man} %files devel -%defattr (-, root, root) %{_libdir}/libsecret-1.so %{_libdir}/pkgconfig/libsecret-1.pc %{_libdir}/pkgconfig/libsecret-unstable.pc From dbfc2e7a99d850118ccc62eb381297168f6f4a4956c67af0312ffb81d9bb3290 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 13 Mar 2018 08:52:36 +0000 Subject: [PATCH 2/2] Accepting request 586258 from home:jengelh:branches:GNOME:Factory - SRPM group fix. Update summaries. - Remove duplicate commands. Limit fdupes to /usr. OBS-URL: https://build.opensuse.org/request/show/586258 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libsecret?expand=0&rev=34 --- libsecret.changes | 6 ++++++ libsecret.spec | 13 ++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/libsecret.changes b/libsecret.changes index 650432f..9ba88d8 100644 --- a/libsecret.changes +++ b/libsecret.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Mar 10 00:23:06 UTC 2018 - jengelh@inai.de + +- SRPM group fix. Update summaries. +- Remove duplicate commands. Limit fdupes to /usr. + ------------------------------------------------------------------- Wed Feb 28 16:36:16 UTC 2018 - dimstar@opensuse.org diff --git a/libsecret.spec b/libsecret.spec index a82dbb0..193c7e9 100644 --- a/libsecret.spec +++ b/libsecret.spec @@ -22,8 +22,8 @@ Version: 0.18.5 Release: 0 Summary: Library for accessing the Secret Service API License: LGPL-2.1-or-later -Group: System/Libraries -URL: https://wiki.gnome.org/Projects/Libsecret +Group: Development/Libraries/GNOME +Url: https://wiki.gnome.org/Projects/Libsecret Source0: http://download.gnome.org/sources/libsecret/0.18/%{name}-%{version}.tar.xz Source99: baselibs.conf # PATCH-FIX-UPSTREAM libsecret-secret-size.patch bgo#778357 dimstar@opensuse.org -- Ensure that generated secret occupies the same number of bytes as prime. @@ -61,7 +61,7 @@ libsecret is a library for storing and retrieving passwords and other secrets. It communicates with the "Secret Service" using DBus. %package -n typelib-1_0-Secret-1 -Summary: Library for accessing the Secret Service API -- Introspection bindings +Summary: Introspection bindings for the Secret Service API library Group: System/Libraries %description -n typelib-1_0-Secret-1 @@ -71,7 +71,7 @@ secrets. It communicates with the "Secret Service" using DBus. This package provides the GObject Introspection bindings for libsecret. %package tools -Summary: Library for accessing the Secret Service API -- Tools +Summary: Tools from the Secret Service API library Group: System/Libraries %description tools @@ -79,7 +79,7 @@ libsecret is a library for storing and retrieving passwords and other secrets. It communicates with the "Secret Service" using DBus. %package devel -Summary: Library for accessing the Secret Service API -- Development Files +Summary: Development files for the Secret Service API library Group: Development/Libraries/GNOME Requires: libsecret-1-0 = %{version} Requires: typelib-1_0-Secret-1 = %{version} @@ -103,7 +103,6 @@ translation-update-upstream %build %configure \ --disable-static -#make %{?_smp_mflags} V=1 make %{?_smp_mflags} V=1 %install @@ -112,7 +111,7 @@ find %{buildroot} -type f -name "*.la" -delete -print %if %{have_lang} %find_lang %{name} %{?no_lang_C} %endif -%fdupes %{buildroot} +%fdupes %{buildroot}/%{_prefix} %post -n libsecret-1-0 -p /sbin/ldconfig %postun -n libsecret-1-0 -p /sbin/ldconfig