Hello community, here is the log from the commit of package gnome-desktop2 for openSUSE:Factory checked in at 2018-03-14 19:36:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-desktop2 (Old) and /work/SRC/openSUSE:Factory/.gnome-desktop2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-desktop2" Wed Mar 14 19:36:52 2018 rev:22 rq:584761 version:2.32.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-desktop2/gnome-desktop2.changes 2013-09-23 14:58:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-desktop2.new/gnome-desktop2.changes 2018-03-14 19:36:53.365780770 +0100 @@ -1,0 +2,5 @@ +Wed Feb 28 16:27:51 UTC 2018 - dimstar@opensuse.org + +- Modernize spec-file by calling spec-cleaner + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-desktop2.spec ++++++ --- /var/tmp/diff_new_pack.KgKAZ7/_old 2018-03-14 19:36:54.425743122 +0100 +++ /var/tmp/diff_new_pack.KgKAZ7/_new 2018-03-14 19:36:54.441742554 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnome-desktop2 # -# Copyright (c) 2013 SUSE LINUX Products 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,15 +17,14 @@ %define IS_DEFAULT_GNOME_DESKTOP 0 - -Name: gnome-desktop2 %define _name gnome-desktop +Name: gnome-desktop2 Version: 2.32.1 Release: 0 Summary: The GNOME Desktop API Library -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/GUI/GNOME -Url: http://www.gnome.org +URL: http://www.gnome.org Source: http://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.32/%{_name}-%{version}.tar.bz2 Source99: baselibs.conf # PATCH-FEATURE-OPENSUSE gnome-desktop-recently-used-apps.patch -- Add launched .desktop files to recently used apps. @@ -37,6 +36,7 @@ BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel BuildRequires: intltool +BuildRequires: pkgconfig BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: pkgconfig(gconf-2.0) @@ -48,21 +48,19 @@ BuildRequires: pkgconfig(xrandr) Recommends: %{name}-lang Recommends: gnome-about = %{version} -%if %IS_DEFAULT_GNOME_DESKTOP +Obsoletes: gnome-core +%if %{IS_DEFAULT_GNOME_DESKTOP} Provides: %{_name} = %{version} Obsoletes: %{_name} < %{version} %endif -Obsoletes: gnome-core -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package contains some desktop-wide documents. -%if %IS_DEFAULT_GNOME_DESKTOP - +%if %{IS_DEFAULT_GNOME_DESKTOP} %package -n gnome-about Summary: Information dialog about GNOME -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/GUI/GNOME Recommends: %{name}-lang @@ -72,7 +70,7 @@ %package -n libgnome-desktop-2-17 Summary: The GNOME Desktop API Library -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries Recommends: %{name}-lang @@ -85,10 +83,10 @@ %package -n libgnome-desktop-2-devel Summary: The GNOME Desktop API Library -- Development Files -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/GNOME Requires: libgnome-desktop-2-17 = %{version} -%if %IS_DEFAULT_GNOME_DESKTOP +%if %{IS_DEFAULT_GNOME_DESKTOP} Provides: %{_name}-devel = %{version} Obsoletes: %{_name}-devel < %{version} Provides: %{_name}-doc = %{version} @@ -103,11 +101,12 @@ gtk-doc. %lang_package + %prep %setup -q -n %{_name}-%{version} translation-update-upstream %patch3 -p1 -%patch5 -p0 +%patch5 %patch6 -p1 %build @@ -115,36 +114,32 @@ --disable-static\ --disable-scrollkeeper\ --with-gnome-distributor="SUSE"\ -%if ! %IS_DEFAULT_GNOME_DESKTOP +%if ! %{IS_DEFAULT_GNOME_DESKTOP} --disable-gnome-about \ --disable-desktop-docs \ %endif --disable-date-in-gnome-version -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install -%makeinstall +%make_install %if 0%{?suse_version} <= 1110 -%{__rm} %{buildroot}%{_datadir}/locale/ig/LC_MESSAGES/* +rm %{buildroot}%{_datadir}/locale/ig/LC_MESSAGES/* %endif %if 0%{?suse_version} <= 1120 -%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* +rm %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %endif %find_lang %{_name}-2.0 %{?no_lang_C} -%if %IS_DEFAULT_GNOME_DESKTOP +%if %{IS_DEFAULT_GNOME_DESKTOP} %find_lang fdl %{?no_lang_C} %{_name}-2.0.lang %find_lang gpl %{?no_lang_C} %{_name}-2.0.lang %find_lang lgpl %{?no_lang_C} %{_name}-2.0.lang %suse_update_desktop_file gnome-about Documentation %endif -%{__rm} -vf %{buildroot}%{_libdir}/*.la +find %{buildroot} -type f -name "*.la" -delete -print %fdupes %{buildroot} -%clean -rm -rf %{buildroot} - -%if %IS_DEFAULT_GNOME_DESKTOP - +%if %{IS_DEFAULT_GNOME_DESKTOP} %post -n gnome-about %desktop_database_post @@ -153,29 +148,26 @@ %endif %post -n libgnome-desktop-2-17 -p /sbin/ldconfig - %postun -n libgnome-desktop-2-17 -p /sbin/ldconfig %files -%defattr (-, root, root) %{_datadir}/pixmaps/*.png %{_datadir}/pixmaps/*.xpm -%if %IS_DEFAULT_GNOME_DESKTOP - +%if %{IS_DEFAULT_GNOME_DESKTOP} %files -n gnome-about -%defattr (-, root, root) -%doc COPYING +%license COPYING + %{_bindir}/gnome-about %{_datadir}/applications/gnome-about.desktop %{_datadir}/gnome-about/ -%doc %{_mandir}/man1/gnome-about.1* +%{_mandir}/man1/gnome-about.1* %endif %files -n libgnome-desktop-2-17 -%defattr(-, root, root) -%doc AUTHORS COPYING.LIB NEWS README -%if %IS_DEFAULT_GNOME_DESKTOP +%license COPYING.LIB +%doc AUTHORS NEWS README +%if %{IS_DEFAULT_GNOME_DESKTOP} %dir %{_datadir}/gnome/ %dir %{_datadir}/gnome/help/ %dir %{_datadir}/gnome/help/*/ @@ -188,7 +180,6 @@ %{_libdir}/libgnome-desktop-2.so.* %files -n libgnome-desktop-2-devel -%defattr (-, root, root) %{_includedir}/gnome-desktop-2.0/ %{_libdir}/libgnome-desktop-2.so %{_libdir}/pkgconfig/gnome-desktop-2.0.pc