From 1c900f0fb1e9ac760e4f8db4c73f4c4c944971a384bde68bedc03e6480a9159e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 5 Mar 2018 13:47:01 +0000 Subject: [PATCH] Accepting request 581039 from GNOME:Next spec-cleaner OBS-URL: https://build.opensuse.org/request/show/581039 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdk-pixbuf?expand=0&rev=146 --- gdk-pixbuf.changes | 5 +++++ gdk-pixbuf.spec | 20 ++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/gdk-pixbuf.changes b/gdk-pixbuf.changes index 2e0bcd3..a5b7270 100644 --- a/gdk-pixbuf.changes +++ b/gdk-pixbuf.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 28 16:25:54 UTC 2018 - dimstar@opensuse.org + +- Modernize spec-file by calling spec-cleaner + ------------------------------------------------------------------- Fri Jan 5 17:38:55 UTC 2018 - mgorse@suse.com diff --git a/gdk-pixbuf.spec b/gdk-pixbuf.spec index 454c374..a4820a2 100644 --- a/gdk-pixbuf.spec +++ b/gdk-pixbuf.spec @@ -22,9 +22,9 @@ Name: gdk-pixbuf Version: 2.36.11 Release: 0 Summary: An image loading library -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/GNOME -Url: https://www.gnome.org/ +URL: https://www.gnome.org/ Source: https://download.gnome.org/sources/gdk-pixbuf/2.36/%{name}-%{version}.tar.xz Source1: macros.gdk-pixbuf Source2: README.SUSE @@ -134,7 +134,7 @@ translation-update-upstream %patch2 -p1 %patch3 -p1 %patch4 -p1 -%if "%_lib" == "lib64" +%if "%{_lib}" == "lib64" cp -a %{SOURCE2} . %endif @@ -147,7 +147,7 @@ cp -a %{SOURCE2} . rm -rf %{buildroot}{%{_libexecdir},%{_datadir}}/installed-tests/ %find_lang %{name} touch %{buildroot}%{_libdir}/gdk-pixbuf-2.0/%{gdk_pixbuf_binary_version}/loaders.cache -%if "%_lib" == "lib64" +%if "%{_lib}" == "lib64" mv %{buildroot}%{_bindir}/gdk-pixbuf-query-loaders %{buildroot}%{_bindir}/gdk-pixbuf-query-loaders-64 mv %{buildroot}%{_mandir}/man1/gdk-pixbuf-query-loaders.1 %{buildroot}%{_mandir}/man1/gdk-pixbuf-query-loaders-64.1 %endif @@ -160,7 +160,7 @@ cp %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm ############################################################################# # Convenient %%define for the scriplets -%if "%_lib" == "lib64" +%if "%{_lib}" == "lib64" %define _gdk_pixbuf_query_loaders %{_bindir}/gdk-pixbuf-query-loaders-64 %else %define _gdk_pixbuf_query_loaders %{_bindir}/gdk-pixbuf-query-loaders @@ -202,9 +202,9 @@ fi %postun -n libgdk_pixbuf-2_0-0 -p /sbin/ldconfig %files -n libgdk_pixbuf-2_0-0 -%defattr(-, root, root) -%doc AUTHORS COPYING NEWS -%if "%_lib" == "lib64" +%license COPYING +%doc AUTHORS NEWS +%if "%{_lib}" == "lib64" %doc README.SUSE %endif %{_libdir}/libgdk_pixbuf-2.0.so.0* @@ -216,22 +216,18 @@ fi %ghost %{_libdir}/gdk-pixbuf-2.0/%{gdk_pixbuf_binary_version}/loaders.cache %files -n typelib-1_0-GdkPixbuf-2_0 -%defattr(-,root,root) %{_libdir}/girepository-1.0/GdkPixbuf-2.0.typelib %files query-loaders -%defattr(-, root, root) %{_bindir}/gdk-pixbuf-query-loaders* %{_mandir}/man1/gdk-pixbuf-query-loaders*.1* %files thumbnailer -%defattr(-, root, root) %{_bindir}/gdk-pixbuf-thumbnailer %dir %{_datadir}/thumbnailers %{_datadir}/thumbnailers/gdk-pixbuf-thumbnailer.thumbnailer %files devel -%defattr(-, root, root) %{_bindir}/gdk-pixbuf-csource %{_bindir}/gdk-pixbuf-pixdata %{_mandir}/man1/gdk-pixbuf-csource.1*