From 2c899cf48988080d80720a38177509748fb079239d361018c344fa5b65a6faa7 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 1 Mar 2018 11:12:26 +0000 Subject: [PATCH] Accepting request 581427 from GNOME:Next spec-cleaner OBS-URL: https://build.opensuse.org/request/show/581427 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/PackageKit?expand=0&rev=312 --- PackageKit.changes | 5 +++++ PackageKit.spec | 50 ++++++++++++++++++---------------------------- 2 files changed, 24 insertions(+), 31 deletions(-) diff --git a/PackageKit.changes b/PackageKit.changes index f63f3d3..cb47f09 100644 --- a/PackageKit.changes +++ b/PackageKit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 28 16:38:10 UTC 2018 - dimstar@opensuse.org + +- Modernize spec-file by calling spec-cleaner + ------------------------------------------------------------------- Mon Feb 19 11:25:34 UTC 2018 - dimstar@opensuse.org diff --git a/PackageKit.spec b/PackageKit.spec index d06d2ae..f2fcf82 100644 --- a/PackageKit.spec +++ b/PackageKit.spec @@ -16,21 +16,20 @@ # +%define BUILD_CNF 0 +%define with_offline_updates 1 # $ pkcon search file /usr/bin/anjuta #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} - %define _fillupdir /var/adm/fillup-templates + %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif - -%define BUILD_CNF 0 -%define with_offline_updates 1 Name: PackageKit Version: 1.1.8 Release: 0 Summary: Simple software installation management software -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Daemons -Url: http://packagekit.org/ +URL: http://packagekit.org/ Source0: http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz Source1: http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz.asc Source2: baselibs.conf @@ -81,7 +80,6 @@ Obsoletes: %{name}-gtk-module < 0.7.0 Obsoletes: ruck <= 0.6.3 # the browser-plugin was dropped with version 1.1.0 Obsoletes: %{name}-browser-plugin < 1.1.0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} %if !0%{?is_opensuse} BuildRequires: translation-update-upstream @@ -96,7 +94,7 @@ suck less. %package backend-zypp Summary: Simple software installation management software -- Zypp Backend -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Daemons Requires: %{name} = %{version} Provides: %{name}-backend = %{version} @@ -110,7 +108,7 @@ suck less. %package gstreamer-plugin Summary: Simple software installation management software -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Multimedia/Other Requires(post): update-alternatives Requires(postun): update-alternatives @@ -126,7 +124,7 @@ suck less. %package gtk3-module Summary: Simple software installation management software -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Libraries Recommends: %{name} = %{version} Supplements: packageand(%{name}:gtk3) @@ -141,7 +139,7 @@ suck less. %package devel Summary: Needed include files and libraries for development -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: libpackagekit-glib2-devel @@ -153,7 +151,7 @@ compile and link applications using PackageKit. %package -n libpackagekit-glib2-18 Summary: Simple software installation management software -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries Recommends: %{name} Conflicts: %{name} < %{version} @@ -169,7 +167,7 @@ suck less. %package -n typelib-1_0-PackageKitGlib-1_0 Summary: Simple software installation management software -- Introspection bindings -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries %description -n typelib-1_0-PackageKitGlib-1_0 @@ -184,7 +182,7 @@ PackageKit client library. %package -n libpackagekit-glib2-devel Summary: Simple software installation management software -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/GNOME Requires: libpackagekit-glib2-18 = %{version} Requires: typelib-1_0-PackageKitGlib-1_0 = %{version} @@ -200,11 +198,11 @@ suck less. %package branding-upstream Summary: Simple software installation management software -- Upstream configuration -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Daemons Requires: %{name} = %{version} Supplements: packageand(%{name}:branding-upstream) -Conflicts: otherproviders(%{name}-branding) +Conflicts: %{name}-branding Provides: %{name}-branding = %{version} BuildArch: noarch #BRAND: Provide configuration files - @@ -253,7 +251,7 @@ export CFLAGS="%{optflags} -DSLE" make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install find %{buildroot} -type f -name "*.la" -delete -print # move the cron configuration to a sysconfig template install -d %{buildroot}%{_fillupdir} @@ -325,15 +323,13 @@ fi %endif %post -n libpackagekit-glib2-18 -p /sbin/ldconfig - %postun -n libpackagekit-glib2-18 -p /sbin/ldconfig %files lang -f %{name}.lang -%defattr(-,root,root) %files -%defattr(-,root,root) -%doc AUTHORS COPYING HACKING NEWS README +%license COPYING +%doc AUTHORS HACKING NEWS README %dir %{_sysconfdir}/PackageKit %dir %{_datadir}/PackageKit %dir %{_datadir}/PackageKit/helpers @@ -365,7 +361,7 @@ fi %dir %{_localstatedir}/cache/%{name} %{_unitdir}/packagekit.service %{_sbindir}/rcpackagekit -%{_mandir}/man?/*.* +%{_mandir}/man?/*%{ext_man} %verify(not md5 size mtime) %{_localstatedir}/lib/PackageKit/transactions.db %if %{with_offline_updates} %{_libexecdir}/pk-offline-update @@ -376,17 +372,14 @@ fi %endif %files backend-zypp -%defattr(-,root,root) %{_libdir}/packagekit-backend/libpk_backend_zypp.so %files gstreamer-plugin -%defattr(-,root,root) %ghost %{_sysconfdir}/alternatives/gst-install-plugins-helper %{_libexecdir}/gst-install-plugins-helper %{_libexecdir}/pk-gstreamer-install %files gtk3-module -%defattr(-,root,root) %dir %{_libdir}/gnome-settings-daemon-3.0 %dir %{_libdir}/gnome-settings-daemon-3.0/gtk-modules %{_libdir}/gnome-settings-daemon-3.0/gtk-modules/pk-gtk-module.desktop @@ -394,7 +387,6 @@ fi %{_libdir}/gtk-2.0/modules/* %files devel -%defattr(-,root,root) %doc %{_datadir}/gtk-doc/html/PackageKit %{_datadir}/vala/vapi/packagekit-glib2.vapi # Test backends are not useful, except for developers @@ -406,16 +398,13 @@ fi %dir %{_includedir}/PackageKit %files -n libpackagekit-glib2-18 -%defattr(-,root,root) -%doc lib/packagekit-glib2/COPYING +%license lib/packagekit-glib2/COPYING %{_libdir}/libpackagekit-glib2.so.* %files -n typelib-1_0-PackageKitGlib-1_0 -%defattr(-,root,root) %{_libdir}/girepository-1.0/PackageKitGlib-1.0.typelib %files -n libpackagekit-glib2-devel -%defattr(-,root,root) %{_libdir}/libpackagekit-glib2.so %{_libdir}/pkgconfig/packagekit-glib2.pc %dir %{_includedir}/PackageKit @@ -423,7 +412,6 @@ fi %{_datadir}/gir-1.0/PackageKitGlib-1.0.gir %files branding-upstream -%defattr(-,root,root) %if %{BUILD_CNF} %config(noreplace) %{_sysconfdir}/PackageKit/CommandNotFound.conf %endif