From 89360bb46bfe93e9f5df5c7b4d798aa4b4e35b572181a289414413679d98b894 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 9 Mar 2018 10:01:16 +0000 Subject: [PATCH] Accepting request 583528 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/583528 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pangomm?expand=0&rev=60 --- pangomm-2.41.4.tar.xz | 3 -- pangomm-2.41.5.tar.xz | 3 ++ pangomm.changes | 23 ++++++++++++ pangomm.spec | 83 ++++++++++++++++++++++++------------------- 4 files changed, 72 insertions(+), 40 deletions(-) delete mode 100644 pangomm-2.41.4.tar.xz create mode 100644 pangomm-2.41.5.tar.xz diff --git a/pangomm-2.41.4.tar.xz b/pangomm-2.41.4.tar.xz deleted file mode 100644 index 0d08974..0000000 --- a/pangomm-2.41.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:db36e8d09c8a4a16b07cd00715c10c2bc8dd99bb1db9b76413426694148db7ef -size 819680 diff --git a/pangomm-2.41.5.tar.xz b/pangomm-2.41.5.tar.xz new file mode 100644 index 0000000..e7ed79d --- /dev/null +++ b/pangomm-2.41.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5131830d5b37b181ca4fa8f641ad86faa985c0bb7dcc833c98672d294367b304 +size 841780 diff --git a/pangomm.changes b/pangomm.changes index 26ca96a..5918b72 100644 --- a/pangomm.changes +++ b/pangomm.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Wed Feb 28 16:38:19 UTC 2018 - dimstar@opensuse.org + +- Modernize spec-file by calling spec-cleaner + +------------------------------------------------------------------- +Sat Feb 24 22:55:06 UTC 2018 - luc14n0@linuxmail.org + +- Update to version 2.41.5: + + No visible changes. +- Update '+' in GPL/LGPL License tags to '-or-later', add GPL + version 3 and change LGPL version to 2.1 in the preamble's + License tag. And add GPL/LGPL License tags to all subpackages to + comply with the copyrights. +- Update packages descriptions to show more explictly subpackages' + content. +- Drop unneeded standard BuildRoot tag declaration: RPM already + handles this itself. +- Point fdupes to the data directory under the build root instead + of the build root directly, which is a practice that must be + avoided. +- Recommend the documentation subpackage. + ------------------------------------------------------------------- Sat Sep 9 08:58:18 UTC 2017 - jengelh@inai.de diff --git a/pangomm.spec b/pangomm.spec index 5d42a8b..fe8541f 100644 --- a/pangomm.spec +++ b/pangomm.spec @@ -1,7 +1,7 @@ # # spec file for package pangomm # -# 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 @@ -16,52 +16,62 @@ # -# Update baselibs.conf when changing this -%define so_ver -2_42-1 - +%define base_ver 2.42 +# Update baselibs.conf when changing the version here +%define libname lib%{name}-2_42-1 Name: pangomm -Version: 2.41.4 +Version: 2.41.5 Release: 0 Summary: C++ interface for pango -License: GPL-2.0+ and LGPL-2.0+ +License: LGPL-2.1-or-later AND GPL-2.0-or-later AND GPL-3.0-only Group: Development/Libraries/C and C++ -Url: http://www.gtkmm.org -Source: http://download.gnome.org/sources/pangomm/2.41/%{name}-%{version}.tar.xz +URL: https://www.gtkmm.org +Source: http://download.gnome.org/sources/%{name}/2.41/%{name}-%{version}.tar.xz Source99: baselibs.conf BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: pkgconfig BuildRequires: pkgconfig(cairomm-1.16) >= 1.2.2 -BuildRequires: pkgconfig(glibmm-2.56) +BuildRequires: pkgconfig(glibmm-2.56) >= 2.55.1 BuildRequires: pkgconfig(pangocairo) >= 1.38.0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Recommends: %{name}-doc = %{version} %description -pangomm provides a C++ interface to the pango library. +Pangomm provides a C++ interface to the pango library. -%package -n libpangomm%{so_ver} -Summary: C++ interface for pango +%package -n %{libname} +Summary: C++ interface for Pango -- Shared Library +License: LGPL-2.1-or-later Group: System/Libraries -%description -n libpangomm%{so_ver} -pangomm provides a C++ interface to the pango library. +%description -n %{libname} +Pangomm provides a C++ interface to the pango library. + +This package contains the Pangomm's shared library. %package devel -Summary: Development files for pangomm, a C++ API for Pango +Summary: C++ interface for Pango -- Development Files +License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ -Requires: libpangomm%{so_ver} = %{version} +Requires: %{libname} >= %{version} %description devel -pangomm provides a C++ interface to the pango library. +Pangomm provides a C++ interface to the pango library. + +This package contains all the necessary files for development with Pangomm. %package doc -Summary: Developer documentation for pangomm, a C++ interface for Pango +Summary: C++ interface for Pango -- Documentation +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Documentation/HTML %description doc -pangomm provides a C++ interface to the pango library. +Pangomm provides a C++ interface to the pango library. + +This package contains the documentation files for Pangomm. %prep -%setup +%setup -q %build %configure --disable-static @@ -69,29 +79,28 @@ make %{?_smp_mflags} %install %make_install -rm %{buildroot}%{_libdir}/*.la +find %{buildroot} -type f -name "*.la" -delete -print %fdupes %{buildroot}/%{_prefix} -%post -n libpangomm%{so_ver} -p /sbin/ldconfig +%post -n %{libname} -p /sbin/ldconfig +%postun -n %{libname} -p /sbin/ldconfig -%postun -n libpangomm%{so_ver} -p /sbin/ldconfig - -%files -n libpangomm%{so_ver} -%defattr (-, root, root) -%doc AUTHORS NEWS README -%{_libdir}/*.so.* +%files -n %{libname} +%license COPYING +%doc NEWS +%{_libdir}/libpangomm-%{base_ver}.so.* %files devel -%defattr (-, root, root) -%{_includedir}/* -%{_libdir}/*.so -%{_libdir}/pkgconfig/*.pc -%{_libdir}/pangomm-2.42 +%license COPYING.tools +%{_includedir}/pangomm-%{base_ver}/ +%{_libdir}/libpangomm-%{base_ver}.so +%{_libdir}/pkgconfig/pangomm-%{base_ver}.pc +%{_libdir}/pangomm-%{base_ver} %files doc -%defattr (-, root, root) -%{_datadir}/devhelp/books/pangomm-2.42/ -%{_datadir}/doc/pangomm-2.42/ +%doc AUTHORS README +%{_datadir}/devhelp/books/pangomm-%{base_ver}/ +%{_datadir}/doc/pangomm-%{base_ver}/ # Avoid BuildRequires on devhelp %dir %{_datadir}/devhelp %dir %{_datadir}/devhelp/books